From fe7a42f5a698f173bfb4c7708b0f6f03f55702f1 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 23:25:11 -0500 Subject: [PATCH 1/6] moved to here --- .../code/modules/clothing/suits/suits.dm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm index 8c88a7e193..60b951bdb4 100644 --- a/modular_citadel/code/modules/clothing/suits/suits.dm +++ b/modular_citadel/code/modules/clothing/suits/suits.dm @@ -10,4 +10,17 @@ desc = "A trenchcoat enchanced with a special lightweight kevlar. This one appears to be designed to be draped over one's shoulders rather than worn normally.." alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' icon_state = "hostrench" - item_state = "hostrench" \ No newline at end of file + item_state = "hostrench" + +/obj/item/clothing/suit/hooded/cloak/david + name = "red cloak" + icon_state = "goliath_cloak" + desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids" + hoodtype = /obj/item/clothing/head/hooded/cloakhood/david + body_parts_covered = CHEST|GROIN|ARMS + +/obj/item/clothing/head/hooded/cloakhood/david + name = "red cloak hood" + icon_state = "golhood" + desc = "conceal your face in shame with this nanotrasen brand hood" + flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR From 81e1501828d1ae50684cc26c70d8232ca48cd18d Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 23:26:14 -0500 Subject: [PATCH 2/6] wrong branch --- .../code/modules/clothing/suits/suits.dm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm index 60b951bdb4..323ac91068 100644 --- a/modular_citadel/code/modules/clothing/suits/suits.dm +++ b/modular_citadel/code/modules/clothing/suits/suits.dm @@ -11,16 +11,3 @@ alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' icon_state = "hostrench" item_state = "hostrench" - -/obj/item/clothing/suit/hooded/cloak/david - name = "red cloak" - icon_state = "goliath_cloak" - desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids" - hoodtype = /obj/item/clothing/head/hooded/cloakhood/david - body_parts_covered = CHEST|GROIN|ARMS - -/obj/item/clothing/head/hooded/cloakhood/david - name = "red cloak hood" - icon_state = "golhood" - desc = "conceal your face in shame with this nanotrasen brand hood" - flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR From cf027f87569650b5115a18e278382b5f870afe75 Mon Sep 17 00:00:00 2001 From: commandersand Date: Fri, 23 Mar 2018 17:12:54 -0500 Subject: [PATCH 3/6] wrong branch (reverted from commit 81e1501828d1ae50684cc26c70d8232ca48cd18d) --- .../code/modules/clothing/suits/suits.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm index 323ac91068..60b951bdb4 100644 --- a/modular_citadel/code/modules/clothing/suits/suits.dm +++ b/modular_citadel/code/modules/clothing/suits/suits.dm @@ -11,3 +11,16 @@ alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' icon_state = "hostrench" item_state = "hostrench" + +/obj/item/clothing/suit/hooded/cloak/david + name = "red cloak" + icon_state = "goliath_cloak" + desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids" + hoodtype = /obj/item/clothing/head/hooded/cloakhood/david + body_parts_covered = CHEST|GROIN|ARMS + +/obj/item/clothing/head/hooded/cloakhood/david + name = "red cloak hood" + icon_state = "golhood" + desc = "conceal your face in shame with this nanotrasen brand hood" + flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR From 76e4c4440c31536367fbe50a7e4df1750d2372df Mon Sep 17 00:00:00 2001 From: commandersand Date: Fri, 23 Mar 2018 17:12:55 -0500 Subject: [PATCH 4/6] moved to here (reverted from commit fe7a42f5a698f173bfb4c7708b0f6f03f55702f1) --- .../code/modules/clothing/suits/suits.dm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm index 60b951bdb4..8c88a7e193 100644 --- a/modular_citadel/code/modules/clothing/suits/suits.dm +++ b/modular_citadel/code/modules/clothing/suits/suits.dm @@ -10,17 +10,4 @@ desc = "A trenchcoat enchanced with a special lightweight kevlar. This one appears to be designed to be draped over one's shoulders rather than worn normally.." alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' icon_state = "hostrench" - item_state = "hostrench" - -/obj/item/clothing/suit/hooded/cloak/david - name = "red cloak" - icon_state = "goliath_cloak" - desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids" - hoodtype = /obj/item/clothing/head/hooded/cloakhood/david - body_parts_covered = CHEST|GROIN|ARMS - -/obj/item/clothing/head/hooded/cloakhood/david - name = "red cloak hood" - icon_state = "golhood" - desc = "conceal your face in shame with this nanotrasen brand hood" - flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR + item_state = "hostrench" \ No newline at end of file From 5395e0c89340148217b270dcd1a9a9c967f5db4a Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 20 Nov 2019 10:35:40 -0600 Subject: [PATCH 5/6] meme --- .../clockcult/clock_structures/traps/brass_skewer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm index 93a3e14045..805d6cf4c3 100644 --- a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm +++ b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm @@ -106,7 +106,7 @@ "You start tenderly lifting [skewee] off of [src]...") if(!do_after(user, 60, target = skewee)) skewee.visible_message("[skewee] painfully slides back down [src].") - skewee.emote("moan") + skewee.forcesay("Oof, ouch owwie!!") return skewee.visible_message("[skewee] comes free of [src] with a squelching pop!", \ "You come free of [src]!") From a95b78af52801f922e85cae6485a57bb241a887a Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 21 Nov 2019 00:52:52 -0600 Subject: [PATCH 6/6] Update code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- .../clockcult/clock_structures/traps/brass_skewer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm index 805d6cf4c3..6b50d40057 100644 --- a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm +++ b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm @@ -106,7 +106,7 @@ "You start tenderly lifting [skewee] off of [src]...") if(!do_after(user, 60, target = skewee)) skewee.visible_message("[skewee] painfully slides back down [src].") - skewee.forcesay("Oof, ouch owwie!!") + skewee.say("Oof, ouch owwie!!", forced = "fail brass skewer removal") return skewee.visible_message("[skewee] comes free of [src] with a squelching pop!", \ "You come free of [src]!")