From 4dc8a93c5411e369d8f393be1398b0b107205d80 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Wed, 16 Jul 2025 22:04:02 +0800 Subject: [PATCH] fixes head loadout (#21014) * Please describe the intent of your changes in a clear fashion. * Please make sure that, in the case of mapping changes, you include images of these changes in the PR's description. * Please make sure to mark your PR as wip or review required by making a comment with !wip or !review required * If you include sprites/sounds/... (assets) that you have not created yourself specify the license and original author below. * Ensure that you also credit them in the appropriate location / changelog as specified in the contributor guidelines ### Asset Licenses The following assets that **have not** been created by myself are included in this PR: | Path | Original Author | License | | --- | --- | --- | | icons/example.dmi | ExamplePerson (Example Station) | CC0 | --- .../preference_setup/loadout/items/head.dm | 8 +-- .../loadout/items/xeno/human.dm | 1 + html/changelogs/wezzy-hatfixer.yml | 58 +++++++++++++++++++ 3 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/wezzy-hatfixer.yml diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index 938b7aebb01..73541f2567f 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -1,4 +1,6 @@ -ABSTRACT_TYPE(/datum/gear/head) +/datum/gear/head + display_name = "headwear, circuitry (empty)" + path = /obj/item/clothing/head/circuitry sort_category = "Hats and Headwear" slot = slot_head @@ -187,10 +189,6 @@ ABSTRACT_TYPE(/datum/gear/head) iac["IAC beret"] = /obj/item/clothing/head/beret/iac gear_tweaks += new /datum/gear_tweak/path(iac) -/datum/gear/head/circuitry - display_name = "headwear, circuitry (empty)" - path = /obj/item/clothing/head/circuitry - /datum/gear/head/tcaf display_name = "tcaf hat selection" path = /obj/item/clothing/head/beret/legion diff --git a/code/modules/client/preference_setup/loadout/items/xeno/human.dm b/code/modules/client/preference_setup/loadout/items/xeno/human.dm index 4f8dfe73473..a2fb2e6cac7 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/human.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/human.dm @@ -117,6 +117,7 @@ var/list/hats = list() hats["hat, gat"] = /obj/item/clothing/head/konyang hats["hat, konyanger hachimaki"] = /obj/item/clothing/head/hachimaki + gear_tweaks += new /datum/gear_tweak/path(hats) /datum/gear/head/human/himeo display_name = "himean cap" diff --git a/html/changelogs/wezzy-hatfixer.yml b/html/changelogs/wezzy-hatfixer.yml new file mode 100644 index 00000000000..53f433d47f2 --- /dev/null +++ b/html/changelogs/wezzy-hatfixer.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: Wowzewow (Wezzy) + +# 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: + - bugfix: "Fixes head loadout."