From af683008c23f9dfd6b2080f88e5a928de4a21f54 Mon Sep 17 00:00:00 2001 From: Silvore <62766806+Silvore@users.noreply.github.com> Date: Wed, 19 Jun 2024 04:15:56 -0500 Subject: [PATCH] Loadout Items + gentlemans coat changes (#19469) Added the gentlemans coat, gentlemans cap, bear pelt hat, and carp slippers to the loadout menu after being requested for them. I also deleted the variable from the gentlemans coat that made jumpsuits invisible, as while it did hide some minor sprite issues, the coat itself didn't go down far enough for it to not look weird. --------- Signed-off-by: Silvore <62766806+Silvore@users.noreply.github.com> --- .../preference_setup/loadout/items/head.dm | 13 ++++ .../preference_setup/loadout/items/shoes.dm | 1 + .../preference_setup/loadout/items/suit.dm | 6 ++ code/modules/clothing/suits/wiz_robe.dm | 1 - html/changelogs/Silvorz- Loadout-Items.yml | 59 +++++++++++++++++++ 5 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Silvorz- Loadout-Items.yml diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index 0d6a909b452..c0e93ab348f 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -340,6 +340,18 @@ path = /obj/item/clothing/head/hachimaki flags = GEAR_HAS_DESC_SELECTION +/datum/gear/head/bearpelt + display_name = "bear pelt hat" + path = /obj/item/clothing/head/bearpelt + description = "A fuzzy pelt to wear on your head." + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/head/gentlecap + display_name = "gentlemans cap" + path = /obj/item/clothing/head/wizard/cap + description = "A checkered gray flat cap woven together with the rarest of threads." + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + /datum/gear/head/iac display_name = "IAC headgear selection" description = "A selection of hats worn by Interstellar Aid Corps volunteers." @@ -492,3 +504,4 @@ var/datum/gear_tweak/hair_block/gear_tweak_hair_block = new() H.flags_inv |= BLOCKHEADHAIR if("No") H.flags_inv &= ~BLOCKHEADHAIR + diff --git a/code/modules/client/preference_setup/loadout/items/shoes.dm b/code/modules/client/preference_setup/loadout/items/shoes.dm index 2bc367d7141..ed2f7eec29e 100644 --- a/code/modules/client/preference_setup/loadout/items/shoes.dm +++ b/code/modules/client/preference_setup/loadout/items/shoes.dm @@ -143,6 +143,7 @@ /datum/gear/shoes/slippers/New() ..() var/list/slippers = list() + slippers["carp slippers"] = /obj/item/clothing/shoes/slippers/carp slippers["bunny slippers"] = /obj/item/clothing/shoes/slippers slippers["worn bunny slippers"] = /obj/item/clothing/shoes/slippers/worn gear_tweaks += new /datum/gear_tweak/path(slippers) diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index b67cf3ea964..062f425f9f7 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -573,3 +573,9 @@ patterned_ponczo["brown patterned ponczo"] = /obj/item/clothing/suit/storage/hooded/wintercoat/patterned_ponczo/brown patterned_ponczo["blue patterned ponczo"] = /obj/item/clothing/suit/storage/hooded/wintercoat/patterned_ponczo/blue gear_tweaks += new /datum/gear_tweak/path(patterned_ponczo) + +/datum/gear/suit/gentlecoat + display_name = "gentlemans coat" + description = "A heavy threaded tweed gray jacket. For a different sort of Gentleman." + path = /obj/item/clothing/suit/storage/toggle/wizrobe/gentlecoat + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 1e37a193ee9..b203aa0db1a 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -88,7 +88,6 @@ icon_state = "gentlecoat" item_state = "gentlecoat" allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/material/knife/ritual) - flags_inv = HIDEJUMPSUIT body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS diff --git a/html/changelogs/Silvorz- Loadout-Items.yml b/html/changelogs/Silvorz- Loadout-Items.yml new file mode 100644 index 00000000000..8ac9c3aa056 --- /dev/null +++ b/html/changelogs/Silvorz- Loadout-Items.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Silvorz + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added the old wizard's 'gentleman set' of clothes, carp slippers, and the bear pelt hat to the loadout." + - qol: "Removed the hide jumpsuit variable from the gentlemans coat, as it looked strange."