From fa9485d05f1606efbb3384dae4b6cb3a7748f948 Mon Sep 17 00:00:00 2001 From: FearTheGabby Date: Tue, 28 Jan 2025 11:43:50 -0600 Subject: [PATCH] Adds a camo boonie hat to the loadout (#20393) ![image](https://github.com/user-attachments/assets/14e32be0-85e8-4634-8c70-2b7ccdbd94ba) ![image](https://github.com/user-attachments/assets/6ec7e337-7678-467c-96b1-68974d51e256) ![image](https://github.com/user-attachments/assets/5a4099b3-cdb0-4873-bdc1-c6d2186bc3f5) ![image](https://github.com/user-attachments/assets/b7a39b0d-ce3f-4fe2-a074-23a28d449765) ![image](https://github.com/user-attachments/assets/fd71e6fd-269e-48ee-8f82-59eaf39ece54) Co-authored-by: Gabby <59633984+feartheblackout@users.noreply.github.com> --- .../preference_setup/loadout/items/head.dm | 1 + code/modules/clothing/head/wide_hats.dm | 5 ++ .../SimpleMaroon-booniehatupgrade.yml | 58 ++++++++++++++++++ icons/obj/item/clothing/head/bucket_hat.dmi | Bin 1554 -> 2020 bytes 4 files changed, 64 insertions(+) create mode 100644 html/changelogs/SimpleMaroon-booniehatupgrade.yml diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index 9c0bc3744e7..84e91b16039 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -248,6 +248,7 @@ hats_colourable["hat, newsboy"] = /obj/item/clothing/head/newsboy hats_colourable["hat, legionnaire"] = /obj/item/clothing/head/legionnaire hats_colourable["hat, boonie"] = /obj/item/clothing/head/bucket/boonie + hats_colourable["hat, camo boonie"] = /obj/item/clothing/head/bucket/boonie/camo gear_tweaks += new /datum/gear_tweak/path(hats_colourable) diff --git a/code/modules/clothing/head/wide_hats.dm b/code/modules/clothing/head/wide_hats.dm index be4a5c66c85..0f51afce479 100644 --- a/code/modules/clothing/head/wide_hats.dm +++ b/code/modules/clothing/head/wide_hats.dm @@ -53,6 +53,11 @@ build_from_parts = TRUE worn_overlay = "over" +/obj/item/clothing/head/bucket/boonie/camo + icon_state = "camo_boonie" + item_state = "camo_boonie" + has_accents = TRUE + /obj/item/clothing/head/bucket/boonie/green icon_state = "green_boonie" item_state = "green_boonie" diff --git a/html/changelogs/SimpleMaroon-booniehatupgrade.yml b/html/changelogs/SimpleMaroon-booniehatupgrade.yml new file mode 100644 index 00000000000..9c9bac788d8 --- /dev/null +++ b/html/changelogs/SimpleMaroon-booniehatupgrade.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: SimpleMaroon + +# 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: + - imageadd: "Added an alternate recolorable boonie hat with an accent to the loadout." diff --git a/icons/obj/item/clothing/head/bucket_hat.dmi b/icons/obj/item/clothing/head/bucket_hat.dmi index fbc42fa7fcad2febff68ad56b10aa1d4164d5f8e..c96fb27aaf9bb8c488a167580d2e369f03768ed5 100644 GIT binary patch delta 2010 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