From c98d9d054b671bea62c183cc2fc0bea64dc98e5d Mon Sep 17 00:00:00 2001 From: Vile Beggar Date: Mon, 28 Jan 2019 09:10:57 +0100 Subject: [PATCH] Properly adds a drill sergeant hat to the warden's locker (#42533) * does the thing - please work * adds it to the locker * remove var/datum Co-Authored-By: VileBeggar * Update code/modules/clothing/head/jobs.dm adds space Co-Authored-By: VileBeggar * adds denton's review suggestion it's a webedit but i tested it and it worked * makes it a bit less annoying * grammar fix --- code/__DEFINES/DNA.dm | 1 + code/datums/mutations/speech.dm | 13 +++++++++++++ .../crates_lockers/closets/secure/security.dm | 1 + code/modules/clothing/head/jobs.dm | 15 +++++++++++++++ 4 files changed, 30 insertions(+) diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 82496943be3..1d93b044ac7 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -38,6 +38,7 @@ #define INSULATED /datum/mutation/human/insulated #define SHOCKTOUCH /datum/mutation/human/shock #define OLFACTION /datum/mutation/human/olfaction +#define YELLING /datum/mutation/human/yelling #define UI_CHANGED "ui changed" #define UE_CHANGED "ue changed" diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 330066d441a..38544fef6bb 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -219,3 +219,16 @@ ..() owner.grant_language(/datum/language/common) owner.remove_language(/datum/language/beachbum) + +/datum/mutation/human/yelling + name = "Yelling" + desc = "A mutation that forces the host to constantly yell their sentences out." + quality = MINOR_NEGATIVE + locked = TRUE + text_gain_indication = "You feel really angry." + text_lose_indication = "You feel calmer." + +/datum/mutation/human/yelling/say_mod(message) + if(message) + message = "[uppertext(replacetext(message, ".", "!"))]!" + return (message) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 51f6ff2a3d6..51fdb490bfc 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -104,6 +104,7 @@ new /obj/item/radio/headset/headset_sec(src) new /obj/item/clothing/suit/armor/vest/warden(src) new /obj/item/clothing/head/warden(src) + new /obj/item/clothing/head/warden/drill(src) new /obj/item/clothing/head/beret/sec/navywarden(src) new /obj/item/clothing/suit/armor/vest/warden/alt(src) new /obj/item/clothing/under/rank/warden/navyblue(src) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index e1e084efc30..d113a6df3ef 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -145,6 +145,21 @@ strip_delay = 60 dog_fashion = /datum/dog_fashion/head/warden +/obj/item/clothing/head/warden/drill + name = "warden's drill hat" + desc = "A special armored campaign hat with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection. Has the letters 'FMJ' enscribed on its side." + icon_state = "wardendrill" + item_state = "wardendrill" + dog_fashion = null + +/obj/item/clothing/head/warden/drill/equipped(mob/living/carbon/human/user, slot) + ..() + if(slot == SLOT_HEAD) + user.dna.add_mutation(YELLING) + +/obj/item/clothing/head/warden/drill/dropped(mob/living/carbon/human/user) + user.dna.remove_mutation(YELLING) + /obj/item/clothing/head/beret/sec name = "security beret" desc = "A robust beret with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."