From 7f6fb9d369f7984638c8535e74e8ee9555f443d9 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Sun, 3 Dec 2017 05:57:22 -0600 Subject: [PATCH 1/6] Fix IPCs vomiting on rotting bodies --- code/modules/mob/living/carbon/human/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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")) From d7143964883b19345f2be60683689b72b55a82fd Mon Sep 17 00:00:00 2001 From: Teri Date: Sun, 3 Dec 2017 14:35:50 +0000 Subject: [PATCH 2/6] Lichfix This fixes the bug with the Wizard, in which he sometimes spawns without hat and/or sandals and needs to pick up both afterwards from the ground. --- code/datums/spells/lichdom.dm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 From 0e5b07402916c29ff2af1f8d54f7a973d1aceda8 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sun, 3 Dec 2017 16:54:41 -0500 Subject: [PATCH 3/6] Automatic changelog generation for PR #8419 [ci skip] --- html/changelogs/AutoChangeLog-pr-8419.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8419.yml diff --git a/html/changelogs/AutoChangeLog-pr-8419.yml b/html/changelogs/AutoChangeLog-pr-8419.yml new file mode 100644 index 00000000000..5f62341b41d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8419.yml @@ -0,0 +1,4 @@ +author: "Tayyyyyyy" +delete-after: True +changes: + - bugfix: "IPCs no longer vomit next to rotting bodies" From e61c94f88619d7336a1bfaa5f0ba94716b59dcbe Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 4 Dec 2017 01:14:10 -0500 Subject: [PATCH 4/6] Automatic changelog compile, [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-8419.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-8419.yml diff --git a/html/changelog.html b/html/changelog.html index ed1b451596e..ab921112e13 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

04 December 2017

+

Tayyyyyyy updated:

+
    +
  • IPCs no longer vomit next to rotting bodies
    • +
+

02 December 2017

uraniummeltdown updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index f78763724d2..477b6236278 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5832,3 +5832,6 @@ 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 diff --git a/html/changelogs/AutoChangeLog-pr-8419.yml b/html/changelogs/AutoChangeLog-pr-8419.yml deleted file mode 100644 index 5f62341b41d..00000000000 --- a/html/changelogs/AutoChangeLog-pr-8419.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Tayyyyyyy" -delete-after: True -changes: - - bugfix: "IPCs no longer vomit next to rotting bodies" From 31cab9cceff4893c9eaced803562770cbf0628a4 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 4 Dec 2017 10:26:05 -0500 Subject: [PATCH 5/6] Automatic changelog generation for PR #8420 [ci skip] --- html/changelogs/AutoChangeLog-pr-8420.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8420.yml diff --git a/html/changelogs/AutoChangeLog-pr-8420.yml b/html/changelogs/AutoChangeLog-pr-8420.yml new file mode 100644 index 00000000000..9d0d67f5702 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8420.yml @@ -0,0 +1,4 @@ +author: "Terillia" +delete-after: True +changes: + - bugfix: "Fixes the litch Hat and Sandals" From 27c26df364efba19e505adca48e38ee0e9a302b8 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 4 Dec 2017 10:58:36 -0500 Subject: [PATCH 6/6] Automatic changelog compile, [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/AutoChangeLog-pr-8420.yml | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-8420.yml diff --git a/html/changelog.html b/html/changelog.html index ab921112e13..7b365628cdb 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -61,6 +61,10 @@
    • IPCs no longer vomit next to rotting bodies
    +

    Terillia updated:

    +
      +
    • Fixes the litch Hat and Sandals
      • +

    02 December 2017

    uraniummeltdown updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 477b6236278..848351a2907 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5835,3 +5835,5 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2017-12-04: Tayyyyyyy: - bugfix: IPCs no longer vomit next to rotting bodies + Terillia: + - bugfix: Fixes the litch Hat and Sandals diff --git a/html/changelogs/AutoChangeLog-pr-8420.yml b/html/changelogs/AutoChangeLog-pr-8420.yml deleted file mode 100644 index 9d0d67f5702..00000000000 --- a/html/changelogs/AutoChangeLog-pr-8420.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Terillia" -delete-after: True -changes: - - bugfix: "Fixes the litch Hat and Sandals"