diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index 9e44ca1f07a..4de1325c01d 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -384,18 +384,20 @@ display_name = "headwear, circuitry (empty)" path = /obj/item/clothing/head/circuitry -/datum/gear/head/tcfl - display_name = "tcfl hat selection" +/datum/gear/head/tcaf + display_name = "tcaf hat selection" path = /obj/item/clothing/head/beret/legion flags = GEAR_HAS_DESC_SELECTION -/datum/gear/head/tcfl/New() +/datum/gear/head/tcaf/New() ..() - var/list/tcfl = list() - tcfl["tcfl beret, dress"] = /obj/item/clothing/head/beret/legion - tcfl["tcfl beret, field"] = /obj/item/clothing/head/beret/legion/field - tcfl["tcfl softcap"] = /obj/item/clothing/head/softcap/tcfl - gear_tweaks += new /datum/gear_tweak/path(tcfl) + var/list/tcaf = list() + tcaf["tcaf beret, dress"] = /obj/item/clothing/head/beret/legion/tcaf + tcaf["tcaf beret, field"] = /obj/item/clothing/head/beret/legion/tcaf/tcaf_field + tcaf["tcfl beret, dress"] = /obj/item/clothing/head/beret/legion + tcaf["tcfl beret, field"] = /obj/item/clothing/head/beret/legion/field + tcaf["tcfl softcap"] = /obj/item/clothing/head/softcap/tcfl + gear_tweaks += new /datum/gear_tweak/path(tcaf) /datum/gear/head/padded_cap display_name = "padded cap" diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index 873772d0c6e..ec34e224a66 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -350,18 +350,19 @@ coat["long fisanduhian bomber jacket"] = /obj/item/clothing/suit/storage/toggle/dominia/bomber/long gear_tweaks += new /datum/gear_tweak/path(coat) -/datum/gear/suit/tcfl - display_name = "Tau Ceti Foreign Legion jacket selection" - description = "A selection of fine, surplus jackets of the Foreign Legion." +/datum/gear/suit/tcaf + display_name = "Tau Ceti Armed Forces jacket selection" + description = "A selection of fine, surplus jackets of the Armed Forces." path = /obj/item/clothing/suit/storage/legion flags = GEAR_HAS_DESC_SELECTION -/datum/gear/suit/tcfl/New() +/datum/gear/suit/tcaf/New() ..() - var/list/tcfljac = list() - tcfljac ["tcfl jacket"] = /obj/item/clothing/suit/storage/legion - tcfljac ["tcfl jacket, flight"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion - gear_tweaks += new /datum/gear_tweak/path(tcfljac) + var/list/tcafjacket = list() + tcafjacket ["tcaf jacket"] = /obj/item/clothing/suit/storage/legion/tcaf + tcafjacket ["tcfl jacket"] = /obj/item/clothing/suit/storage/legion + tcafjacket ["tcfl jacket, flight"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion + gear_tweaks += new /datum/gear_tweak/path(tcafjacket) /datum/gear/suit/dep_jacket display_name = "department jackets selection" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index fc5a9c81912..411e715987f 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -491,12 +491,19 @@ name = "brown varsity jacket" icon_state = "varsity_brown" item_state = "varsity_brown" + /obj/item/clothing/suit/storage/legion name = "tcfl jacket" desc = "A pale blue canvas jacket embossed with the insignia of the Tau Ceti Foreign Legion." icon_state = "tcfljacket" item_state = "tcfljacket" +/obj/item/clothing/suit/storage/legion/tcaf + name = "tcaf jacket" + desc = "A pale blue canvas jacket embossed with the insignia of the Tau Ceti Armed Forces." + icon_state = "tcaf_jacket" + item_state = "tcaf_jacket" + /obj/item/clothing/suit/jacket/puffer name = "puffer jacket" desc = "A thick jacket with a rubbery, water-resistant shell. Oddly enough, you don't feel any heat." diff --git a/html/changelogs/tcaf hat additions changelog.yml b/html/changelogs/tcaf hat additions changelog.yml new file mode 100644 index 00000000000..0d2c8f6430e --- /dev/null +++ b/html/changelogs/tcaf hat additions changelog.yml @@ -0,0 +1,58 @@ +################################ +# 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: not-a-gonk + +# 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: "Adds the TCAF berets and a jacket to the loadout, included in a new selection alongside their older TCFL variants." diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 8d8ec312f87..4e1d2a78b0f 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ