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

Fixes runtime

Browse Source 
Fixes the other runtime in #9310
This commit is contained in:
mwerezak
2015-06-23 23:26:46 -04:00
parent a147a4e15e
commit cb0b3a30da
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,16 +544,20 @@
proc/move() proc/move()
var/obj/structure/disposalpipe/last var/obj/structure/disposalpipe/last
while(active) while(active)
sleep(1) // was 1
if(!loc) return // check if we got GC'd
if(hasmob && prob(3)) if(hasmob && prob(3))
for(var/mob/living/H in src) for(var/mob/living/H in src)
if(!istype(H,/mob/living/silicon/robot/drone)) //Drones use the mailing code to move through the disposal system, if(!istype(H,/mob/living/silicon/robot/drone)) //Drones use the mailing code to move through the disposal system,
H.take_overall_damage(20, 0, "Blunt Trauma")//horribly maim any living creature jumping down disposals. c'est la vie H.take_overall_damage(20, 0, "Blunt Trauma")//horribly maim any living creature jumping down disposals. c'est la vie
sleep(1) // was 1
var/obj/structure/disposalpipe/curr = loc var/obj/structure/disposalpipe/curr = loc
last = curr last = curr
curr = curr.transfer(src) curr = curr.transfer(src)
if(!loc) return //side effects
if(!curr) if(!curr)
last.expel(src, loc, dir) last.expel(src, loc, dir)