From d3ac91b6903400b86f88d9b56a5d45899855092f Mon Sep 17 00:00:00 2001
From: Zwei <35403274+Gottfrei@users.noreply.github.com>
Date: Wed, 7 Aug 2024 12:29:02 +0300
Subject: [PATCH] bugfix: Signal Overrides (#5670)

* Signal Overrides

* Correct Slot
---
 code/game/objects/items/weapons/RCL.dm                   | 2 +-
 .../awaymissions/mission_code/ruins/oldstation.dm        | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm
index ec608a60bab..452c25fd1fe 100644
--- 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
index 578b3e4dd84..15cf608acb9 100644
--- 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