From 586a366e24b205d485795fab8887a5291baaa83f Mon Sep 17 00:00:00 2001 From: Casey Date: Tue, 26 Apr 2022 16:47:42 -0400 Subject: [PATCH 1/2] [MIRROR] Fixes catwalks making footsteps on everything --- code/game/objects/structures/catwalk.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index ac294a7531..c4fecdecb0 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -128,7 +128,11 @@ new /obj/item/stack/rods(get_turf(src)) Destroy() +<<<<<<< HEAD /obj/structure/catwalk/Crossed(atom/movable/AM as mob|obj) +======= +/obj/structure/catwalk/Crossed(atom/movable/AM) +>>>>>>> 41741010cb... Merge pull request #12583 from VOREStation/upstream-merge-8468 . = ..() if(isliving(AM) && !AM.is_incorporeal()) playsound(src, pick('sound/effects/footstep/catwalk1.ogg', 'sound/effects/footstep/catwalk2.ogg', 'sound/effects/footstep/catwalk3.ogg', 'sound/effects/footstep/catwalk4.ogg', 'sound/effects/footstep/catwalk5.ogg'), 25, 1) From 6aff76ff0237f23a8778f0c39d299d61106122ca Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 27 Apr 2022 02:31:59 -0700 Subject: [PATCH 2/2] powder that makes you say yes --- code/game/objects/structures/catwalk.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index c4fecdecb0..d4ba52ef82 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -128,11 +128,7 @@ new /obj/item/stack/rods(get_turf(src)) Destroy() -<<<<<<< HEAD -/obj/structure/catwalk/Crossed(atom/movable/AM as mob|obj) -======= /obj/structure/catwalk/Crossed(atom/movable/AM) ->>>>>>> 41741010cb... Merge pull request #12583 from VOREStation/upstream-merge-8468 . = ..() if(isliving(AM) && !AM.is_incorporeal()) playsound(src, pick('sound/effects/footstep/catwalk1.ogg', 'sound/effects/footstep/catwalk2.ogg', 'sound/effects/footstep/catwalk3.ogg', 'sound/effects/footstep/catwalk4.ogg', 'sound/effects/footstep/catwalk5.ogg'), 25, 1)