diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index 76a5b0f6001..bda640f80a1 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -66,11 +66,6 @@ var/mob/living/carbon/human/lich = new /mob/living/carbon/human(item_turf) - lich.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(lich), slot_shoes) - lich.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(lich), slot_w_uniform) - lich.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(lich), slot_wear_suit) - lich.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(lich), slot_head) - lich.real_name = M.mind.name M.mind.transfer_to(lich) lich.set_species("Skeleton") @@ -81,6 +76,11 @@ current_body = lich lich.Weaken(10+10*resurrections) ++resurrections + lich.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(lich), slot_shoes) + lich.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(lich), slot_w_uniform) + lich.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(lich), slot_wear_suit) + lich.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(lich), slot_head) + if(old_body && old_body.loc) if(iscarbon(old_body)) var/mob/living/carbon/C = old_body @@ -125,5 +125,9 @@ H.set_species("Skeleton") H.unEquip(H.wear_suit) H.unEquip(H.head) + H.unEquip(H.shoes) + H.unEquip(H.head) H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index fe210b697d1..73903252b3f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -977,7 +977,7 @@ var/obj/item/clothing/mask/M = H.wear_mask if(M && (M.flags_cover & MASKCOVERSMOUTH)) return - if(NO_BREATHE in species.species_traits) + if(NO_BREATHE in H.species.species_traits) return //no puking if you can't smell! // Humans can lack a mind datum, y'know if(H.mind && (H.mind.assigned_role == "Detective" || H.mind.assigned_role == "Coroner")) diff --git a/html/changelog.html b/html/changelog.html index ed1b451596e..7b365628cdb 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,16 @@ -->
+

04 December 2017

+

Tayyyyyyy updated:

+ +

Terillia updated:

+ +

02 December 2017

uraniummeltdown updated: