bugfix: Signal Overrides (#5670)

* Signal Overrides * Correct Slot
ss220-space · Aug 7, 2024 · d3ac91b · d3ac91b
1 parent 4dfa5ce
commit d3ac91b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm
@@ -106,7 +106,7 @@
 
 /obj/item/twohanded/rcl/equipped(mob/user, slot, initial)
 	. = ..()
-	RegisterSignal(user, COMSIG_MOB_CLIENT_MOVED, PROC_REF(on_mob_move))
+	RegisterSignal(user, COMSIG_MOB_CLIENT_MOVED, PROC_REF(on_mob_move), override = TRUE)
 
 /obj/item/twohanded/rcl/dropped(mob/user, slot, silent = FALSE)
 	. = ..()

diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
@@ -233,22 +233,19 @@
 
 /obj/item/clothing/suit/space/hardsuit/ancient/equipped(mob/user, slot, initial)
 	. = ..()
-	RegisterSignal(user, COMSIG_MOB_CLIENT_MOVED, PROC_REF(on_mob_move))
+	if(slot & slot_flags)
+		RegisterSignal(user, COMSIG_MOB_CLIENT_MOVED, PROC_REF(on_mob_move), override = TRUE)
 
 /obj/item/clothing/suit/space/hardsuit/ancient/dropped(mob/user, slot, silent)
 	. = ..()
 	UnregisterSignal(user, COMSIG_MOB_CLIENT_MOVED)
 
 /obj/item/clothing/suit/space/hardsuit/ancient/on_mob_move(mob/user, dir)
-	var/mob/living/carbon/human/H = loc
-	if(!istype(H) || H.wear_suit != src)
-		return
 	if(footstep > 1)
-		playsound(src, 'sound/effects/servostep.ogg', 100, 1)
+		playsound(src, 'sound/effects/servostep.ogg', 100, TRUE)
 		footstep = 0
 	else
 		footstep++
-	..()
 
 // Chemical bottles
 /obj/item/reagent_containers/glass/bottle/aluminum