From 729c3a192335f39728b087eef3e62e3f79db3176 Mon Sep 17 00:00:00 2001 From: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com> Date: Sat, 3 Oct 2020 19:15:25 -0400 Subject: [PATCH 1/5] Morgue Destruction Fix --- code/game/objects/structures/morgue.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 5849d96a158..5817894c752 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -155,9 +155,13 @@ return /obj/structure/morgue/Destroy() - QDEL_NULL(connected) + var/turf/T = src.loc + if(!connected) + for(var/atom/movable/A as mob|obj in src) + A.forceMove(T) return ..() + /obj/structure/morgue/container_resist(var/mob/living/L) var/mob/living/carbon/CM = L if(!istype(CM)) @@ -389,7 +393,10 @@ return /obj/structure/crematorium/Destroy() - QDEL_NULL(connected) + var/turf/T = src.loc + if(!connected) + for(var/atom/movable/A as mob|obj in src) + A.forceMove(T) return ..() /obj/structure/crematorium/container_resist(var/mob/living/L) From c48c6b59ff90f7a958dc2b8e807a4cb6d074bbbf Mon Sep 17 00:00:00 2001 From: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com> Date: Sat, 3 Oct 2020 19:29:33 -0400 Subject: [PATCH 2/5] Update morgue.dm --- code/game/objects/structures/morgue.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 5817894c752..1f96cebc191 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -155,13 +155,14 @@ return /obj/structure/morgue/Destroy() - var/turf/T = src.loc if(!connected) + var/turf/T = src.loc for(var/atom/movable/A as mob|obj in src) A.forceMove(T) + else + QDEL_NULL(connected) return ..() - /obj/structure/morgue/container_resist(var/mob/living/L) var/mob/living/carbon/CM = L if(!istype(CM)) @@ -393,10 +394,12 @@ return /obj/structure/crematorium/Destroy() - var/turf/T = src.loc if(!connected) + var/turf/T = src.loc for(var/atom/movable/A as mob|obj in src) A.forceMove(T) + else + QDEL_NULL(connected) return ..() /obj/structure/crematorium/container_resist(var/mob/living/L) From 0816b7037bf9045bbc1575ac95056a7313ef335d Mon Sep 17 00:00:00 2001 From: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com> Date: Sun, 4 Oct 2020 20:48:28 -0400 Subject: [PATCH 3/5] Update code/game/objects/structures/morgue.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/game/objects/structures/morgue.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 1f96cebc191..62fd39cdec7 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -156,8 +156,8 @@ /obj/structure/morgue/Destroy() if(!connected) - var/turf/T = src.loc - for(var/atom/movable/A as mob|obj in src) + var/turf/T = loc + for(var/atom/movable/A in src) A.forceMove(T) else QDEL_NULL(connected) From 8282cfaef4a0461282c22297fbf7287d9ace51f0 Mon Sep 17 00:00:00 2001 From: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com> Date: Sun, 4 Oct 2020 20:48:35 -0400 Subject: [PATCH 4/5] Update code/game/objects/structures/morgue.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/game/objects/structures/morgue.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 62fd39cdec7..3421927fd07 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -395,8 +395,8 @@ /obj/structure/crematorium/Destroy() if(!connected) - var/turf/T = src.loc - for(var/atom/movable/A as mob|obj in src) + var/turf/T = loc + for(var/atom/movable/A in src) A.forceMove(T) else QDEL_NULL(connected) From f804e46adcb0bff1ebc00309ba5d8ccd6370f171 Mon Sep 17 00:00:00 2001 From: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com> Date: Sun, 4 Oct 2020 20:49:21 -0400 Subject: [PATCH 5/5] Update morgue.dm --- code/game/objects/structures/morgue.dm | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 1f96cebc191..e7b95ba7122 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -72,21 +72,21 @@ /obj/structure/morgue/ex_act(severity) switch(severity) if(1.0) - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(loc) ex_act(severity) qdel(src) return if(2.0) if(prob(50)) - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(loc) ex_act(severity) qdel(src) return if(3.0) if(prob(5)) - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(loc) ex_act(severity) qdel(src) @@ -95,7 +95,7 @@ /obj/structure/morgue/attack_hand(mob/user as mob) if(connected) - for(var/atom/movable/A as mob|obj in connected.loc) + for(var/atom/movable/A in connected.loc) if(!( A.anchored )) A.forceMove(src) playsound(loc, open_sound, 50, 1) @@ -109,7 +109,7 @@ if(T.contents.Find(connected)) connected.connected = src icon_state = "morgue0" - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(connected.loc) connected.icon_state = "morguet" connected.dir = dir @@ -147,7 +147,7 @@ if(T.contents.Find(connected)) connected.connected = src icon_state = "morgue0" - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(connected.loc) connected.icon_state = "morguet" else @@ -156,8 +156,8 @@ /obj/structure/morgue/Destroy() if(!connected) - var/turf/T = src.loc - for(var/atom/movable/A as mob|obj in src) + var/turf/T = loc + for(var/atom/movable/A in src) A.forceMove(T) else QDEL_NULL(connected) @@ -271,21 +271,21 @@ /obj/structure/crematorium/ex_act(severity) switch(severity) if(1.0) - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(loc) ex_act(severity) qdel(src) return if(2.0) if(prob(50)) - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(loc) ex_act(severity) qdel(src) return if(3.0) if(prob(5)) - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(loc) ex_act(severity) qdel(src) @@ -297,7 +297,7 @@ to_chat(usr, "It's locked.") return if((connected) && (locked == 0)) - for(var/atom/movable/A as mob|obj in connected.loc) + for(var/atom/movable/A in connected.loc) if(!( A.anchored )) A.forceMove(src) playsound(loc, open_sound, 50, 1) @@ -311,7 +311,7 @@ if(T.contents.Find(connected)) connected.connected = src icon_state = "crema0" - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(connected.loc) connected.icon_state = "cremat" else @@ -345,7 +345,7 @@ if(T.contents.Find(connected)) connected.connected = src icon_state = "crema0" - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(connected.loc) connected.icon_state = "cremat" else @@ -395,8 +395,8 @@ /obj/structure/crematorium/Destroy() if(!connected) - var/turf/T = src.loc - for(var/atom/movable/A as mob|obj in src) + var/turf/T = loc + for(var/atom/movable/A in src) A.forceMove(T) else QDEL_NULL(connected)