Update morgue.dm

This commit is contained in:
Kiyahitayika
2020-10-04 20:49:21 -04:00
parent c48c6b59ff
commit f804e46adc
+16 -16
View File
@@ -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, "<span class='warning'>It's locked.</span>")
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)