diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index 1697619219a..089c232ab08 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -109,7 +109,8 @@ /obj/item/storage/box/fancy/cigarettes/rugged = HELMET_GARB_PASS_ICON, /obj/item/storage/box/fancy/cigarettes/pra = HELMET_GARB_PASS_ICON, /obj/item/storage/box/fancy/cigarettes/dpra = HELMET_GARB_PASS_ICON, - /obj/item/storage/box/fancy/cigarettes/nka = HELMET_GARB_PASS_ICON + /obj/item/storage/box/fancy/cigarettes/nka = HELMET_GARB_PASS_ICON, + /obj/item/clothing/head/hachimaki = HELMET_GARB_PASS_ICON ) can_hold_strict = TRUE diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 4049a0d12b2..e4921800e43 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -316,6 +316,11 @@ display_name = "gat" path = /obj/item/clothing/head/konyang +/datum/gear/head/hachimaki + display_name = "konyanger hachimaki" + path = /obj/item/clothing/head/hachimaki + flags = GEAR_HAS_DESC_SELECTION + /datum/gear/head/iac display_name = "IAC headgear selection" description = "A selection of hats worn by Interstellar Aid Corps volunteers." diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 49831d6f728..2fa54486d07 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -45,8 +45,8 @@ for(var/obj/item/thing in hold.contents) var/icon_type = hold.helmet_storage_types[thing.type] var/thing_state = icon_type == HELMET_GARB_PASS_ICON ? initial(thing.icon_state) : icon_type + I.add_overlay(image('icons/clothing/kit/helmet_garb.dmi', null, "helmet_band")) I.add_overlay(image('icons/clothing/kit/helmet_garb.dmi', null, thing_state)) - I.add_overlay(image('icons/clothing/kit/helmet_garb.dmi', null, "helmet_band")) return I /obj/item/clothing/head/helmet/attack_hand(mob/user) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 42235df442b..68776c65453 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -623,3 +623,11 @@ desc = "A paper sack with crude holes cut out for eyes and a sketchy smile drawn on the front. Not creepy at all." icon_state = "papersack_smile" flags_inv = BLOCKHEADHAIR + +/obj/item/clothing/head/hachimaki + name = "konyanger hachimaki" + desc = "A simple headband emblazoned with the taijitu national emblem of the planet Konyang. It is typically worn as a symbol of effort or courage, or perhaps national pride and patriotic sentiment." + icon = 'icons/obj/item/clothing/head/hachimaki.dmi' + icon_state = "hachimaki" + item_state = "hachimaki" + contained_sprite = TRUE \ No newline at end of file diff --git a/html/changelogs/dansemacabre-hachimaki.yml b/html/changelogs/dansemacabre-hachimaki.yml new file mode 100644 index 00000000000..63e6f1740ec --- /dev/null +++ b/html/changelogs/dansemacabre-hachimaki.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: TheDanseMacabre + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a Konyanger hachimaki headband to the loadout." + diff --git a/icons/clothing/kit/helmet_garb.dmi b/icons/clothing/kit/helmet_garb.dmi index 280686c34a4..8225fe4ee27 100644 Binary files a/icons/clothing/kit/helmet_garb.dmi and b/icons/clothing/kit/helmet_garb.dmi differ diff --git a/icons/obj/item/clothing/head/hachimaki.dmi b/icons/obj/item/clothing/head/hachimaki.dmi new file mode 100644 index 00000000000..f96ec29cf22 Binary files /dev/null and b/icons/obj/item/clothing/head/hachimaki.dmi differ