From 7706ec6329b65d843bbbb8259aeefefbcb4d6815 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sun, 9 Jun 2019 02:45:14 +0200 Subject: [PATCH] I LOVE THE SMELL OF NAPALM IN THE MORNING! --- code/__DEFINES/DNA.dm | 1 + code/datums/mutations/speech.dm | 13 +++++++++++++ .../crates_lockers/closets/secure/security.dm | 1 + code/modules/clothing/head/jobs.dm | 16 ++++++++++++++++ 4 files changed, 31 insertions(+) diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 4ed099d9e2..bfa25961a6 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -28,6 +28,7 @@ #define SWEDISH "Swedish" #define CHAV "Chav" #define ELVIS "Elvis" +#define YELLING "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 3f303535ce..ca9289f428 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -230,3 +230,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) \ No newline at end of file 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 b4cdff4224..8c06af91a4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -106,6 +106,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 b6c5a5417a..e3a0211665 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -148,6 +148,22 @@ 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."