shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9683 from Ghommie/Ghommie-cit303

Browse Source 
Dullahans fixes and QoL.
This commit is contained in:
kevinz000
2019-11-14 15:52:11 -07:00
committed by GitHub
parent 3cf1b09e0c e0afed1f8e
commit 318c03cc28
15 changed files with 128 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/recycler.dm
+1 -1
View File
@@ -109,7 +109,7 @@
var/atom/movable/AM = i
var/obj/item/bodypart/head/as_head = AM
var/obj/item/mmi/as_mmi = AM
var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || isbrain(AM)
var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || isbrain(AM) || istype(AM, /obj/item/dullahan_relay)
if(brain_holder)
emergency_stop(AM)
else if(isliving(AM))