From 107f9efbebf31871768f07631c19e8a52159156a Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 11 Feb 2021 10:38:38 +0100 Subject: [PATCH 1/3] Enabling Tesh Facemask I guess when i initially ported this from old chomp i forgot to enabled it in DME, woops --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index a37b133121..8a9cdd7050 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2009,6 +2009,7 @@ #include "code\modules\clothing\masks\hailer.dm" #include "code\modules\clothing\masks\miscellaneous.dm" #include "code\modules\clothing\masks\shiny_vr.dm" +#include "code\modules\clothing\masks\tesh_synth_facemask.dm" #include "code\modules\clothing\masks\voice.dm" #include "code\modules\clothing\rings\material.dm" #include "code\modules\clothing\rings\rings.dm" From 85b80d63580efd5492db6f03e37064e434a71f5e Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 11 Feb 2021 12:33:13 +0100 Subject: [PATCH 2/3] Tesh facemask ondeath event fix --- .../clothing/masks/tesh_synth_facemask.dm | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/masks/tesh_synth_facemask.dm b/code/modules/clothing/masks/tesh_synth_facemask.dm index 1f8f241c5b..be68071d4b 100644 --- a/code/modules/clothing/masks/tesh_synth_facemask.dm +++ b/code/modules/clothing/masks/tesh_synth_facemask.dm @@ -7,15 +7,27 @@ icon_override = 'icons/mob/species/seromi/synth_facemask.dmi' icon_state = "synth_facemask" origin_tech = list(TECH_ILLEGAL = 1) + var/lstat + var/mob/living/carbon/maskmaster equipped() ..() var/mob/living/carbon/human/H = loc if(istype(H) && H.wear_mask == src) canremove = 0 + maskmaster = H + START_PROCESSING(SSprocessing, src) + dropped() canremove = 1 + maskmaster = null + STOP_PROCESSING(SSprocessing, src) return ..() + + Destroy() + . = ..() + STOP_PROCESSING(SSprocessing, src) + mob_can_equip(var/mob/living/carbon/human/user, var/slot) if (!..()) return 0 @@ -27,12 +39,19 @@ return 0 update_icon() var/mob/living/carbon/human/H = loc - if (H.stat == DEAD) icon_state = "synth_facemask_dead" + if (maskmaster && maskmaster.stat == DEAD) icon_state = "synth_facemask_dead" if(istype(H)) H.update_inv_wear_mask() + process() + if(maskmaster && lstat != maskmaster.stat) + lstat = maskmaster.stat + update_icon() + lstat = maskmaster.stat + + //LOADOUT ITEM /datum/gear/mask/synthface/ - display_name = "Synth Facemask(Tesh)" + display_name = "Synth Facemask (Teshari)" path = /obj/item/clothing/mask/synthfacemask sort_category = "Xenowear" whitelisted = SPECIES_TESHARI @@ -40,4 +59,4 @@ /datum/gear/mask/synthface/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) + gear_tweaks = list(gear_tweak_free_color_choice) \ No newline at end of file From 18795c6275bd41f27fa0d617ff1ea38868fa6821 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 12 Feb 2021 11:26:32 +0100 Subject: [PATCH 3/3] should probably revert to non bsod on alive again --- code/modules/clothing/masks/tesh_synth_facemask.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/masks/tesh_synth_facemask.dm b/code/modules/clothing/masks/tesh_synth_facemask.dm index be68071d4b..166c115aac 100644 --- a/code/modules/clothing/masks/tesh_synth_facemask.dm +++ b/code/modules/clothing/masks/tesh_synth_facemask.dm @@ -40,6 +40,7 @@ update_icon() var/mob/living/carbon/human/H = loc if (maskmaster && maskmaster.stat == DEAD) icon_state = "synth_facemask_dead" + else icon_state = "synth_facemask" if(istype(H)) H.update_inv_wear_mask() process() @@ -59,4 +60,4 @@ /datum/gear/mask/synthface/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) \ No newline at end of file + gear_tweaks = list(gear_tweak_free_color_choice)