Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo

dullahans 2: electric boogaloo
This commit is contained in:
Lin
2022-12-14 19:07:59 -07:00
committed by GitHub
33 changed files with 330 additions and 241 deletions
+1 -1
View File
@@ -119,7 +119,7 @@
if(istype(AM, /obj/item))
var/obj/item/bodypart/head/as_head = AM
var/obj/item/mmi/as_mmi = AM
if(istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /obj/item/dullahan_relay))
if(istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /obj/item/dullahan_head))
living_detected = living_detected ? living_detected : AM
nom += AM
else if(isliving(AM))
+1
View File
@@ -41,6 +41,7 @@
if(new_style)
H.hair_style = new_style
H.update_mutant_bodyparts()
H.update_hair()
/obj/structure/mirror/examine_status(mob/user)