cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10442 from Baystation12/dev-freeze

Browse Source 
Dev freeze
This commit is contained in:
PsiOmegaDelta
2015-08-07 10:37:47 +02:00
parent 1b42a56f4b 21648ddfd8
commit a6d9002806
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
code/game/objects/structures/morgue.dm
View File

@@ -40,21 +40,21 @@
switch(severity) switch(severity)
if(1.0) if(1.0)
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc A.forceMove(src.loc)
ex_act(severity) ex_act(severity)
qdel(src) qdel(src)
return return
if(2.0) if(2.0)
if (prob(50)) if (prob(50))
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc A.forceMove(src.loc)
ex_act(severity) ex_act(severity)
qdel(src) qdel(src)
return return
if(3.0) if(3.0)
if (prob(5)) if (prob(5))
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc A.forceMove(src.loc)
ex_act(severity) ex_act(severity)
qdel(src) qdel(src)
return return
@@ -67,7 +67,7 @@
if (src.connected) if (src.connected)
for(var/atom/movable/A as mob|obj in src.connected.loc) for(var/atom/movable/A as mob|obj in src.connected.loc)
if (!( A.anchored )) if (!( A.anchored ))
A.loc = src A.forceMove(src)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
qdel(src.connected) qdel(src.connected)
src.connected = null src.connected = null
@@ -81,7 +81,7 @@
src.connected.connected = src src.connected.connected = src
src.icon_state = "morgue0" src.icon_state = "morgue0"
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.connected.loc A.forceMove(src.connected.loc)
src.connected.icon_state = "morguet" src.connected.icon_state = "morguet"
src.connected.set_dir(src.dir) src.connected.set_dir(src.dir)
else else
@@ -117,7 +117,7 @@
src.connected.connected = src src.connected.connected = src
src.icon_state = "morgue0" src.icon_state = "morgue0"
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.connected.loc A.forceMove(src.connected.loc)
src.connected.icon_state = "morguet" src.connected.icon_state = "morguet"
else else
qdel(src.connected) qdel(src.connected)
@@ -149,7 +149,7 @@
if (src.connected) if (src.connected)
for(var/atom/movable/A as mob|obj in src.loc) for(var/atom/movable/A as mob|obj in src.loc)
if (!( A.anchored )) if (!( A.anchored ))
A.loc = src.connected A.forceMove(src.connected)
//Foreach goto(26) //Foreach goto(26)
src.connected.connected = null src.connected.connected = null
src.connected.update() src.connected.update()
@@ -166,7 +166,7 @@
return return
if (!ismob(user) || user.stat || user.lying || user.stunned) if (!ismob(user) || user.stat || user.lying || user.stunned)
return return
O.loc = src.loc O.forceMove(src.loc)
if (user != O) if (user != O)
for(var/mob/B in viewers(user, 3)) for(var/mob/B in viewers(user, 3))
if ((B.client && !( B.blinded ))) if ((B.client && !( B.blinded )))
@@ -210,21 +210,21 @@
switch(severity) switch(severity)
if(1.0) if(1.0)
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc A.forceMove(src.loc)
ex_act(severity) ex_act(severity)
qdel(src) qdel(src)
return return
if(2.0) if(2.0)
if (prob(50)) if (prob(50))
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc A.forceMove(src.loc)
ex_act(severity) ex_act(severity)
qdel(src) qdel(src)
return return
if(3.0) if(3.0)
if (prob(5)) if (prob(5))
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc A.forceMove(src.loc)
ex_act(severity) ex_act(severity)
qdel(src) qdel(src)
return return
@@ -246,7 +246,7 @@
if ((src.connected) && (src.locked == 0)) if ((src.connected) && (src.locked == 0))
for(var/atom/movable/A as mob|obj in src.connected.loc) for(var/atom/movable/A as mob|obj in src.connected.loc)
if (!( A.anchored )) if (!( A.anchored ))
A.loc = src A.forceMove(src)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
//src.connected = null //src.connected = null
qdel(src.connected) qdel(src.connected)
@@ -260,7 +260,7 @@
src.connected.connected = src src.connected.connected = src
src.icon_state = "crema0" src.icon_state = "crema0"
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.connected.loc A.forceMove(src.connected.loc)
src.connected.icon_state = "cremat" src.connected.icon_state = "cremat"
else else
//src.connected = null //src.connected = null
@@ -294,7 +294,7 @@
src.connected.connected = src src.connected.connected = src
src.icon_state = "crema0" src.icon_state = "crema0"
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.connected.loc A.forceMove(src.connected.loc)
src.connected.icon_state = "cremat" src.connected.icon_state = "cremat"
else else
qdel(src.connected) qdel(src.connected)
@@ -366,11 +366,17 @@
anchored = 1 anchored = 1
throwpass = 1 throwpass = 1
/obj/structure/c_tray/Destroy()
if(connected && connected.connected == src)
connected.connected = null
connected = null
return ..()
/obj/structure/c_tray/attack_hand(mob/user as mob) /obj/structure/c_tray/attack_hand(mob/user as mob)
if (src.connected) if (src.connected)
for(var/atom/movable/A as mob|obj in src.loc) for(var/atom/movable/A as mob|obj in src.loc)
if (!( A.anchored )) if (!( A.anchored ))
A.loc = src.connected A.forceMove(src.connected)
//Foreach goto(26) //Foreach goto(26)
src.connected.connected = null src.connected.connected = null
src.connected.update() src.connected.update()
@@ -387,7 +393,7 @@
return return
if (!ismob(user) || user.stat || user.lying || user.stunned) if (!ismob(user) || user.stat || user.lying || user.stunned)
return return
O.loc = src.loc O.forceMove(src.loc)
if (user != O) if (user != O)
for(var/mob/B in viewers(user, 3)) for(var/mob/B in viewers(user, 3))
if ((B.client && !( B.blinded ))) if ((B.client && !( B.blinded )))
@@ -406,7 +412,7 @@
/obj/machinery/button/crematorium/attack_hand(mob/user as mob) /obj/machinery/button/crematorium/attack_hand(mob/user as mob)
if(..()) if(..())
return return
if(src.allowed(usr)) if(src.allowed(user))
for (var/obj/structure/crematorium/C in world) for (var/obj/structure/crematorium/C in world)
if (C.id == id) if (C.id == id)
if (!C.cremating) if (!C.cremating)

4
code/modules/recycling/disposal.dm
View File

@@ -46,7 +46,7 @@
eject() eject()
if(trunk) if(trunk)
trunk.linked = null trunk.linked = null
..() return ..()
// attack by item places it in to disposal // attack by item places it in to disposal
/obj/machinery/disposal/attackby(var/obj/item/I, var/mob/user) /obj/machinery/disposal/attackby(var/obj/item/I, var/mob/user)
@@ -636,7 +636,7 @@
/obj/structure/disposalholder/Destroy() /obj/structure/disposalholder/Destroy()
qdel(gas) qdel(gas)
active = 0 active = 0
..() return ..()
// Disposal pipes // Disposal pipes