Merge pull request #1 from ParadiseSS13/master

Updating
This commit is contained in:
Terilia
2017-12-04 16:16:33 +00:00
committed by GitHub
4 changed files with 25 additions and 6 deletions
+9 -5
View File
@@ -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)
+1 -1
View File
@@ -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"))
+10
View File
@@ -56,6 +56,16 @@
-->
<div class="commit sansserif">
<h2 class="date">04 December 2017</h2>
<h3 class="author">Tayyyyyyy updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">IPCs no longer vomit next to rotting bodies</li>
</ul>
<h3 class="author">Terillia updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixes the litch Hat and Sandals</li>
</ul>
<h2 class="date">02 December 2017</h2>
<h3 class="author">uraniummeltdown updated:</h3>
<ul class="changes bgimages16">
+5
View File
@@ -5832,3 +5832,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: Screwdrivering an airlock now displays a message. No more guessing if the
panel is open or not.
- tweak: Cult airlocks will keep their old name on being converted.
2017-12-04:
Tayyyyyyy:
- bugfix: IPCs no longer vomit next to rotting bodies
Terillia:
- bugfix: Fixes the litch Hat and Sandals