diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index 089c232ab08..8238f0edaee 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -110,7 +110,8 @@ /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/clothing/head/hachimaki = HELMET_GARB_PASS_ICON + /obj/item/clothing/head/hachimaki = HELMET_GARB_PASS_ICON, + /obj/item/clothing/head/leader_headband = HELMET_GARB_PASS_ICON ) can_hold_strict = TRUE diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 68776c65453..2c25a664500 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -630,4 +630,12 @@ icon = 'icons/obj/item/clothing/head/hachimaki.dmi' icon_state = "hachimaki" item_state = "hachimaki" + contained_sprite = TRUE + +/obj/item/clothing/head/leader_headband + name = "militia leader headband" + desc = "A simple headband that is used to denote the leader of a Horizon militia team." + icon = 'icons/obj/item/clothing/head/leader_headband.dmi' + icon_state = "leader_headband" + item_state = "leader_headband" contained_sprite = TRUE \ No newline at end of file diff --git a/html/changelogs/dansemacabre-teamleader.yml b/html/changelogs/dansemacabre-teamleader.yml new file mode 100644 index 00000000000..ff373868e32 --- /dev/null +++ b/html/changelogs/dansemacabre-teamleader.yml @@ -0,0 +1,41 @@ +################################ +# 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 headband you can attach to your helmet to the militia armory, which is supposed to denote team leaders." diff --git a/icons/clothing/kit/helmet_garb.dmi b/icons/clothing/kit/helmet_garb.dmi index 8225fe4ee27..6f38bd58e68 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/leader_headband.dmi b/icons/obj/item/clothing/head/leader_headband.dmi new file mode 100644 index 00000000000..026a00d2134 Binary files /dev/null and b/icons/obj/item/clothing/head/leader_headband.dmi differ diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 5450053d825..3c3aea51648 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -10129,6 +10129,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/head/leader_headband, /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury) "ioA" = ( @@ -30111,6 +30112,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/head/leader_headband, /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury) "ycu" = (