From cce17a7efe514d2a6cf291d4a88d192c6dd8d913 Mon Sep 17 00:00:00 2001 From: TheDanseMacabre <57339900+TheDanseMacabre@users.noreply.github.com> Date: Thu, 9 Feb 2023 16:06:13 -0500 Subject: [PATCH] Konyanger Hachimaki (#15743) --- .../objects/items/weapons/storage/internal.dm | 3 +- .../preference_setup/loadout/loadout_head.dm | 5 +++ code/modules/clothing/head/helmet.dm | 2 +- code/modules/clothing/head/misc.dm | 8 ++++ html/changelogs/dansemacabre-hachimaki.yml | 42 ++++++++++++++++++ icons/clothing/kit/helmet_garb.dmi | Bin 746 -> 2436 bytes icons/obj/item/clothing/head/hachimaki.dmi | Bin 0 -> 1232 bytes 7 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/dansemacabre-hachimaki.yml create mode 100644 icons/obj/item/clothing/head/hachimaki.dmi 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 280686c34a455dd6a2c7759686b3620e38cb0f46..8225fe4ee27d924ff3e070669768ee4c6afd9f1f 100644 GIT binary patch literal 2436 zcmb`Jdpr~BAICSTq)-jwI=lgxGyQ1tBVUh@wVsV&c%jB$A?{v0sxZ8dH=L3W*$=A*4>nr zV_L6?_d4#7a~0^{j!CIFBA5UC9q&?fw7GB&Qe`_t7J!~dhzbHnSu$DSwEn41_;z(I zvG>+dvrkIs#Gu>HK6jl#N1Lo!T zg;~uWx49%=7$DaL%d^?Rw+_o8{k;=KsYWNb?sv3HO8i!+2M&XrsY{=Yz$2gqattD< z70aj#`i8JXAWQ)uY>X+ui_Y*JABx|- ztl>gFt^#=^)$^N$Bn-6i!FEM0xvZ?L#kGxK+9N)n|LQ(nvh>yRC~<9NzUdq79rTaaL%I zgeA|H%V)~~WsuA|T>w}{_J-W<0 z=T9{AHAgSfL>e8gmk7v`I!2`VhxPaDgI}2IOCFv94 zUZfsW%MFkkZ=foFi^wv#eadiQQf;3P%fA=gR9O|39iDKePL&lXIRX8T%QuWWI7&Cg zR!-1#OYfCE7drdBSJwwI)Ff%n|G++GelW^#3mo1OTsy`b9Q1v4eqPr%CpcbpG~&;{ zRDX~nMW`bv=HSyhJZH;|@S6jztK#f}{Bkx`Jbew`1*Hod?HRSNL$;kJYxN#!q)xJQ z!R^Ke&KAD+aXo9ifAc{99}y2{0KLn&rPbw-bH7nX7AB|)lQ?{^d-=k0_dvm4vyP^_ z6fjH?2Yy4eKwsw*0zw}QkSrAyFuzB*c+gBQD19Cjw>np^eT{!I(RLwuajoxp87JFY z=jQ2RstdB`4qVGn5yZDBRq(M7TwA&Leg!ji%UK@VSBBv3+wkY-O4mI^Y3grf)J5^O zq7-urR|N!qxe(PBf=w;GI0FI^N4=m?f&5$lswCNpc8tAiD&ENdu%5Soz5-~|smbUksiay8QzP(Gox^<+^ZoPq)TdQCgxqW=eU+;Of*#Vv#Y5D7`3byj{%+#f zx<0a+H{F~f3J;oa&@b4L-{;MwOo?unT%mvvW{nSKS7VQI=Nf+0pO-!Qf2 z^YP&&771R0^+AGH(b+eM#T$WP?L*aQTma8T*W?@o+aGNlqKuApN%9y}Oukl8iC9U0Cip zyVPtbD;Gccb}@Zuld5^y%hdqk!%qvzi^}ykW48Wm6jMuT-x>Jr*!(DBNH{;?J6%ox zPXjE47zFQ7!LkX&x)YUE_-D~P1~0rpfUO(nT-mb5eYf`ziLIR~(=PBZ z6$EyRpmn^xKfIwOxS@e72eB4>d>z{~SmIq{<@X5V4K7k7vB!!+Nxb|0Px6!kM*75i z>k~3V%!|A_p~$h=WPJ)s=dILZ^rQ0dhJk0P&L@weokM(I`~{xHS*eTUzbDo->37dvKwo73*rw{$W_=lb9@u=HC6K>mTUt+hFu`7eYi BC>Q_$ delta 735 zcmV<50wDc_6Y2$!7k|JA0{{R3Dqo-F0001NP)t-sz`(#ikbEp=R~Z=@CMG6Hr;x9& zui4qzd3kwYU|?BRy+c5xR+!8{KtP`;3KokYgaEY-YKuTI;lF|tB|NmH3Ri#v9 z%&}u*M_TI%X|}iLVf=J7;_ePQGMNU0(@DBxGOcNu&42%zwOqdzxUzho-dXG9f9A7) z=B?J>1wLNC_I%%FAN*>vJ_gzSA|HAWNm&QUY_TZ1*b4vv0000myyYqwTrJZb%T=`H zLKpMHS`R%Wo9KOhNI;S2;~j6sCyVK1mgnoX@9$!M2mk;8004|j{r$Uon{6<--K0A< z+i1&$qJQ<&Bj~Y*WE11Pc6Lic-@nVg_5A+N+`k+8{@k006+S*6Hy;QLI}} z;fB6{_)b3qo}up_^2bxY`#$9RR}bNXUMD?id)n=Ov~3-Feh2^n0001tOSumQ_hq`H z+(%n3REJ>jP^CMnL%QWTyp?#eiI*OdG*$f!A6T?r9Dg0te~#G25h=^p*5BZf?ST+3fdjEUa$-w!R|&Wzfq1PVIaZs{{@Q2mkc!SDMhFBd~8>vb%3+V~KT3 zHdD)=56bTaEaq!&OZxrf_ul7oUS}V_aqk|R^Kteoj5cLA7?Oa<=M{t6(L$L}z3CtS z91nhzv#Ub-$_Jl6eHvW_MMX(_`d>3U?2I}0%{7pPVdpyg&5|G9f0Y06M_fL;`}h05 zx3aUdI~H+l%T2#sX;>jPh5veK=<>@yGgDKaW}p9Dlz#6_8iVP!+{Z6oypYyZZ4tQt z-1hvH>IMO)m*?Lb1-+AwsyP3d=X$AVgZ!sC=~=2C919;=xJk6#+*h^t-vS>2rxoRY zZG#OL#Q%Bx_%XZk50f3Ag;ZJss;jF#Cb8VjyME#KBMUYLli9vzOZu(z4@Lb^;9!X9 z+P{B)zX8w143m(pQK8CypEFL(W&Eq8=GkQ8d+}w-hAmrKzJ4uba9A6*dlK*6JaLAI zKX%8A5-xPCz5e>f-MeR7^u@X(Vq#b>oNl^&Ihf(ZsR?b>heF$=7PPLv{+fXy_W13$ zWor8}XSJn9GBoVmX<1rU))uz9_2hANee!WP~E6Qfe_{h)Cuej7jfMtWuX@-W^hrVCVG3#|(ypW;6IKjj`&9T+VF;q*G zVedr!r7p9U&HS-gLxk(prZqazGamBHZHt=L8nw19Xl2Xi&!0D@>+cFTSiCdP`;v+4 z?z?OZHNWn@zBj##uguK;@ay`z;ANTjW^rE43I&?ilDOjcku8tv4DJM+F!6o-;DN*1 zb?d%u>jtWgJ)-&H%j4w?3%=~xAEK3dTvtcOq5FQ;R)aGd&n87*Z{ligVrp1lSJxE3 zzkrcJe(itT54+!%NqbIG=u#@Nn!E8gtMRd<7@6a%B6Jo3_4_w8+$++#pdHB&@ncSp z&ZVd;3LI0!q<4tKT(7J(KIU`mM(n3wFVYUaXRA~3=MX_a9M`8A>#yf(^d!@BnZcGZ=_oep! z4vD||Hs`BN|9&{8p5J3^$bHHFOyQhrO*@8)dEZZMdn?}eSmXY8Ud^Z8uVx%eT(o_0 z?Df#^d(ZhvJ@!dycvkgzZ~qymp1(dR2Xy}IOcG0a)Bc{hBas61Q+|%!A-~9t(u;vb O6oaR$pUXO@geCxdh&W;Z literal 0 HcmV?d00001