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

Merge pull request #9171 from PsiOmegaDelta/DroneSplosion

Browse Source 
Fixes #9169.
This commit is contained in:
Chinsky
2015-05-10 18:06:22 +03:00
parent 6e003e6d99 647298e550
commit 6b57189076
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/silicon/robot/drone/drone.dm
View File

@@ -188,8 +188,8 @@
//Standard robots use config for crit, which is somewhat excessive for these guys. //Standard robots use config for crit, which is somewhat excessive for these guys.
//Drones killed by damage will gib. //Drones killed by damage will gib.
/mob/living/silicon/robot/drone/handle_regular_status_updates() /mob/living/silicon/robot/drone/handle_regular_status_updates()
var/turf/T = get_turf(src)
if((health <= -35 || (master_fabricator && src.z != master_fabricator.z)) && src.stat != 2) if((!T || health <= -35 || (master_fabricator && T.z != master_fabricator.z)) && src.stat != DEAD)
timeofdeath = world.time timeofdeath = world.time
death() //Possibly redundant, having trouble making death() cooperate. death() //Possibly redundant, having trouble making death() cooperate.
gib() gib()