Skip to content

Commit 8d80b8d

Browse files
authored
Fix wrong height being available all this time (#771)
* Wrong height all this time * Surgery fix * This too * FD
1 parent 2694031 commit 8d80b8d

4 files changed

Lines changed: 12 additions & 8 deletions

File tree

code/game/objects/items/devices/flashlight.dm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -925,18 +925,14 @@
925925
var/dark_light_range = 3.5
926926
///Variable to preserve old lighting behavior in flashlights, to handle darkness.
927927
var/dark_light_power = -3
928-
var/on = FALSE
929928

930929
/obj/item/flashlight/flashdark/Initialize(mapload)
931930
. = ..()
932931
AddComponent(/datum/component/overlay_lighting, dark_light_range, dark_light_power, force = TRUE)
933932

934933
/obj/item/flashlight/flashdark/update_brightness()
935934
. = ..()
936-
if(on)
937-
set_light(dark_light_range, dark_light_power)
938-
else
939-
set_light(0)
935+
set_light(dark_light_range, dark_light_power)
940936

941937
//type and subtypes spawned and used to give some eyes lights,
942938
/obj/item/flashlight/eyelight

maplestation_modules/code/datums/pain/pain_status_effects/anesthetic.dm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,15 @@
8080
owner.set_pain_mod(type, 0.9)
8181
owner.adjust_drugginess(initial(duration) / 8)
8282
to_chat(owner, span_warning("You feel[strength <= 90 ? " ":" a bit "]groggy..."))
83+
RegisterSignal(owner, COMSIG_LIVING_HEALTHSCAN, PROC_REF(report_grog))
8384
return TRUE
8485

8586
/datum/status_effect/anesthesia_grog/on_remove()
8687
owner.remove_max_consciousness_value(type)
8788
owner.unset_pain_mod(type)
89+
UnregisterSignal(owner, COMSIG_LIVING_HEALTHSCAN)
90+
91+
/datum/status_effect/anesthesia_grog/proc/report_grog(datum/source, list/render_list, advanced, mob/user, mode, tochat)
92+
SIGNAL_HANDLER
93+
94+
render_list += conditional_tooltip("<span class='alert ml-1'>[strength > 50 ? "Moderate" : "Trace"] amount of anesthetic detected in bloodstream.</span>", "Will subside over time.", tochat)

maplestation_modules/code/game/objects/structures/surgery_table.dm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@
130130
return FALSE
131131
if(!istype(who.wear_mask) || !(who.wear_mask.clothing_flags & MASKINTERNALS))
132132
return FALSE
133-
if(!who.is_mouth_covered())
134-
return FALSE // Must have an internals mask + mouth covered
135133
return TRUE
136134

137135
/// Called when the safety triggers and attempts to unhook the patient from the tank.
@@ -150,7 +148,10 @@
150148
PRIVATE_PROC(TRUE)
151149
if(isnull(attached_tank) || !can_have_tank_opened(new_patient))
152150
return
151+
ASSERT(istype(new_patient.wear_mask))
153152

153+
if (new_patient.wear_mask.up)
154+
new_patient.wear_mask.adjust_visor(src)
154155
new_patient.open_internals(attached_tank, TRUE)
155156
patient_set_at = world.time
156157
update_appearance(UPDATE_OVERLAYS)

maplestation_modules/code/modules/client/preferences/height.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"Short" = HUMAN_HEIGHT_SHORT,
100100
DEFAULT_HEIGHT = HUMAN_HEIGHT_MEDIUM,
101101
"Tall" = HUMAN_HEIGHT_TALL,
102-
"Tallest" = HUMAN_HEIGHT_TALLEST,
102+
"Tallest" = HUMAN_HEIGHT_TALLER,
103103
)
104104

105105
/datum/preference/choiced/mob_height/init_possible_values()

0 commit comments

Comments
 (0)