Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 19f8c54

Browse files
authored
runtimes (#22525)
1 parent 3a9ac9e commit 19f8c54

File tree

8 files changed

+14
-9
lines changed

8 files changed

+14
-9
lines changed

code/_onclick/hud/hud.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,9 +632,9 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
632632
src.owner = owner
633633

634634
/datum/action_group/Destroy()
635-
owner = null
636635
QDEL_NULL(landing)
637636
QDEL_LIST(actions)
637+
owner = null
638638
return ..()
639639

640640
/datum/action_group/proc/insert_action(atom/movable/screen/action, index)

code/_onclick/hud/parallax.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/parallax_layer)
368368
/atom/movable/screen/parallax_layer/planet/proc/on_z_change(mob/source)
369369
SIGNAL_HANDLER
370370
var/client/boss = source.client
371+
if(!boss) //since we call this when the mob logs out, we might not have an actually source.client to use.
372+
boss = source.canon_client
371373
var/turf/posobj = get_turf(boss?.eye)
372374
if(!posobj)
373375
return

code/_onclick/other_mobs.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
if(override)
3838
return
3939

40-
SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A)
40+
SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A, modifiers)
4141
if(modifiers[RIGHT_CLICK])
4242
var/secondary_result = A.attack_hand_secondary(src, modifiers)
4343
if(secondary_result == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || secondary_result == SECONDARY_ATTACK_CONTINUE_CHAIN)

code/game/machinery/doors/door.dm

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,6 @@
203203
add_fingerprint(user)
204204
if(operating || (obj_flags & EMAGGED))
205205
return
206-
if(!requiresID())
207-
user = null //so allowed(user) always succeeds
208206
if(obj_flags & CMAGGED)
209207
if(ishuman(user))
210208
var/mob/living/carbon/human/H = user
@@ -225,7 +223,7 @@
225223
else
226224
open()
227225
return TRUE
228-
if(!allowed(user))
226+
if(requiresID() && !allowed(user))
229227
if(density)
230228
do_animate("deny")
231229
return FALSE

code/modules/client/client_procs.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
306306
src.add_donator_verbs()
307307
else
308308
if(prefs.read_preference(/datum/preference/toggle/quiet_mode))
309-
prefs.write_preference(/datum/preference/toggle/quiet_mode, FALSE)
309+
prefs.write_preference(GLOB.preference_entries[/datum/preference/toggle/quiet_mode], FALSE)
310310

311311
. = ..() //calls mob.Login()
312312

code/modules/client/preferences/gender.dm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@
1111

1212
var/datum/species/species_type = preferences.read_preference(/datum/preference/choiced/species)
1313

14-
var/list/possible_genders = initial(species_type.possible_genders)
14+
var/datum/species/species = new species_type
15+
16+
var/list/possible_genders = species.possible_genders
1517
if(possible_genders.len < 1)
1618
stack_trace("[species_type.type] has no possible genders!")
19+
qdel(species)
1720
return list(PLURAL)
18-
21+
qdel(species)
1922
return pick(possible_genders)
2023

2124
/datum/preference/choiced/gender/apply_to_human(mob/living/carbon/human/target, value)

code/modules/mob/living/carbon/carbon.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
if(src && buckled)
264264
to_chat(src, span_warning("You fail to unbuckle yourself!"))
265265
else
266-
buckled.user_unbuckle_mob(src,src)
266+
buckled?.user_unbuckle_mob(src,src) //if we mash it after we get unbuckled before the alert dissapears we'll resist and runtime
267267

268268
/mob/living/carbon/resist_fire()
269269
adjust_fire_stacks(-5)

yogstation/code/modules/mob/living/silicon/silicon.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
var/list/list/law_history = list() //its a list of lists
33

44
/mob/living/silicon/proc/update_law_history(mob/uploader = null)
5+
if(!laws) //sometimes we just don't have laws (staff of change)
6+
return
57
var/ai_law_sync = "UNKNOWN/Innate laws"
68
if(!uploader && iscyborg(src))
79
var/mob/living/silicon/robot/R = src

0 commit comments

Comments
 (0)