From 84d135d169c9b9dbef06f0a74830f5c594858b53 Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Sat, 19 Oct 2024 08:41:59 -0400 Subject: [PATCH] Adds Greatcoats (#20037) Adds Black and Brown Greatcoats to loadout, thanks to greytide_(discord) for sprites! Black: ![image](https://github.com/user-attachments/assets/94db4114-afa8-443e-ae81-a051ceda2995) ![image](https://github.com/user-attachments/assets/99b8b94c-be94-4f68-b545-b39fc06888f6) Brown: ![image](https://github.com/user-attachments/assets/585625f5-9a60-4034-8429-a6fab1f742bd) ![image](https://github.com/user-attachments/assets/d8c0229c-e61b-4729-be08-00828cf8dc8e) - [x] Description - [x] Open Sprites --------- Co-authored-by: Ben10083 --- .../preference_setup/loadout/items/suit.dm | 13 ++++ code/modules/clothing/clothing.dm | 3 +- code/modules/clothing/suits/storage.dm | 24 +++++++ .../changelogs/Ben10083 - Zavod_Greatcoat.yml | 59 ++++++++++++++++++ .../suit/storage/toggle/greatcoat.dmi | Bin 0 -> 1957 bytes 5 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Ben10083 - Zavod_Greatcoat.yml create mode 100644 icons/obj/item/clothing/suit/storage/toggle/greatcoat.dmi diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index 444a067beec..dc3a447726e 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -230,6 +230,19 @@ gear_tweaks += new /datum/gear_tweak/path(trenches) +/datum/gear/suit/greatcoats + display_name = "greatcoat selection" + description = "A selection of greatcoats." + path = /obj/item/clothing/suit/storage/toggle/greatcoat + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/suit/greatcoats/New() + ..() + var/list/greatcoat = list() + greatcoat["greatcoat, black"] = /obj/item/clothing/suit/storage/toggle/greatcoat + greatcoat["greatcoat, brown"] = /obj/item/clothing/suit/storage/toggle/greatcoat/brown + gear_tweaks += new /datum/gear_tweak/path(greatcoat) + /datum/gear/suit/ian display_name = "worn shirt" description = "A worn out, curiously comfortable t-shirt with a picture of Ian." diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 60d8dd3ad72..d6ffb741374 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -594,7 +594,8 @@ valid_accessory_slots = list(ACCESSORY_SLOT_HEAD) - var/allow_hair_covering = TRUE //in case if you want to allow someone to switch the BLOCKHEADHAIR var from the helmet or not + /// In case if you want to allow someone to switch the BLOCKHEADHAIR var from the helmet or not + var/allow_hair_covering = TRUE var/light_overlay = "helmet_light" var/light_applied diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm index e0f583b34e8..d74b7c3e72a 100644 --- a/code/modules/clothing/suits/storage.dm +++ b/code/modules/clothing/suits/storage.dm @@ -100,6 +100,30 @@ return update_clothing_icon() +// Greatcoats + +/obj/item/clothing/suit/storage/toggle/greatcoat + name = "black greatcoat" + desc = "A black greatcoat. It looks warmer, if a bit heavier, than most other clothing." + icon = 'icons/obj/item/clothing/suit/storage/toggle/greatcoat.dmi' + icon_state = "greatcoat" + item_state = "greatcoat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + armor = list( + bio = ARMOR_BIO_MINOR + ) + siemens_coefficient = 0.8 + protects_against_weather = TRUE + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/toggle/greatcoat/brown + name = "brown greatcoat" + desc = "A brown greatcoat. It looks warmer, if a bit heavier, than most other clothing." + icon_state = "greatcoat_bwn" + item_state = "greatcoat_bwn" + // Corporate Jackets /obj/item/clothing/suit/storage/toggle/corp diff --git a/html/changelogs/Ben10083 - Zavod_Greatcoat.yml b/html/changelogs/Ben10083 - Zavod_Greatcoat.yml new file mode 100644 index 00000000000..0b2ce28beb1 --- /dev/null +++ b/html/changelogs/Ben10083 - Zavod_Greatcoat.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: Ben10083 + +# 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 new black and brown greatcoats, thanks to greytide_ for the sprites!" + - rscadd: "Greatcoat options added to loadout." diff --git a/icons/obj/item/clothing/suit/storage/toggle/greatcoat.dmi b/icons/obj/item/clothing/suit/storage/toggle/greatcoat.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e281ca28c749f5beef6c2b922010e3b5694fa81c GIT binary patch literal 1957 zcmY+_dpOhk9{}+0#BAC^VP;`+YtBJzwiIR(R$@#@$R)SqH@8+;VN6ruBKcCO@{yd+{`*}T|i!?8Hq?(=@ z002m;hpVq5Rx27Cwnfpm^NVqc;6U^AJJ{LTiAI}kg`pG^=H_@J$+_m|x|2yvcW+Vxiw-!?zKm83uCV+9 znXXZ%B2(g$m~n{-0FYKr_fJYWy|PSC`t*6);;^N~(13t`|LC4!ykzowfhX=MkWx_i za4+5$KZ-wuEuSoYT{n~dw2~<9`?Q{GQ>njV1^`eN)s^Cx zR{kLV9oXKXcfgo!Gd#Zlh6EA#F!`jxX{KWmtgx!_vomLXdILVdH+0LdVp{Z=}Qta~ONPb=;ANQl!|qg}N! z8KOkDTN}kDF1|~Ka?Z(rA|=u){YMxB4H1Z<12M{bk|0#H)J?WMhomk`fsV!+i{9u* zYRyM7w;zCJ^K!+^K7z}(Dfo8fS3O~XxP8k7&D3{y-7wIH^E-!O_m0_?p0G}T<}`7$ z8wz{3lm&a=I?I67w3SU5eBo1DI~wg1$(eybn`NR#m5vWkFM+i1&lg0*y_5wJKha*jf^A_CoMcmev4XZE! z!5Rrf^)d;frY~B~E%29B6UQ=qJrQi5jV|gfcYSCWD>dWs>Ord|H^T}=RZDR6JL~T! zN8|Gc1?f=lr7Qz}tCYh}=h+~Od%4qIOc^;ZbO+R059Ke$T6|Q_(~w)kIizip;rPQE zi%>_~G-$Va-SBC-x2{&teSwRncv`rRkAW%5P&DpGHJGZXH^AK#d+?$zWRLb zz9MsBwA3(oNSdVw8;w719g0Y5M%*A)!!R>Ax!}fl1Ua@*uOs>?c3Rc@Q_Lq95*yyw9xRrC`#kANw#=d8JrWwt5Q;jvD`PRO>ZVPbG?Ki_zNpH|K0_z zxGgTt3ED`6%z#La;!(eu(V`!U!g1v@GdYGcF8bh;H3{jG>8Njv5Mr!h$8Z3 zrH!{M88HQqu$>~&e-E6y_8J}@$8c~TK`8}((SHZWe6gOHnwr|!*gy@0Gql}mW%Qi- z^^$%4n(tMrYieim>Xr_} z@@k)o6ORx_NgFDW+W&xITxuzsoKsSwT`xuut5?=loEsj}1MEa$wd3gSuYa#`D#@m$ zm(|p)rtzSH1ArTj~EiAhhGSws2wevZ8##B^3KbVG$2-P$eUQwXlT@Atd%IiW~Ep zYLgArvu=8w_~@=bc2*vOBvDBap!QnRcKsW_^la^P*@EAe2n$PB5=b9WL}_yC;Q7_~f)p;Ql2! zR)M4B>`iF=^kUXFe(SQ%$+7A<31oTG`>21o&(_wiICj8-o#Q}iul(0t7TC|b$cxB@JCMI$4$6r%;y`?V{1OCS3urJ ebuZa>Gi1){Innj0!d;3l5}+RRa&2@8%lRMfnT;C& literal 0 HcmV?d00001