cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-18 11:30:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #627 from ArchieBeepBoop/spooky

Browse Source 
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
This commit is contained in:
Dahlular
2020-10-29 22:51:07 -06:00
committed by GitHub
parent c567887a32 68665d2006
commit ee0017721e
34 changed files with 857 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/recycler.dm
+1 -1
View File
@@ -107,7 +107,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))
code/game/objects/effects/effect_system/effects_smoke.dm
+1 -1
View File
@@ -288,7 +288,7 @@
contained = "\[[contained]\]"
var/where = "[AREACOORD(location)]"
if(carry.my_atom.fingerprintslast)
if(carry.my_atom && carry.my_atom.fingerprintslast)
var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast)
var/more = ""
if(M)