From 556655673ce7067a74cb48d9fee7f06dfd887db7 Mon Sep 17 00:00:00 2001 From: TheDanseMacabre <57339900+TheDanseMacabre@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:55:49 -0500 Subject: [PATCH] Crew Armory Team Leader Headband (#15842) --- .../objects/items/weapons/storage/internal.dm | 3 +- code/modules/clothing/head/misc.dm | 8 ++++ html/changelogs/dansemacabre-teamleader.yml | 41 ++++++++++++++++++ icons/clothing/kit/helmet_garb.dmi | Bin 2436 -> 2531 bytes .../item/clothing/head/leader_headband.dmi | Bin 0 -> 391 bytes maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 2 + 6 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/dansemacabre-teamleader.yml create mode 100644 icons/obj/item/clothing/head/leader_headband.dmi 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 8225fe4ee27d924ff3e070669768ee4c6afd9f1f..6f38bd58e6859ac143398c6458643f4ed1e0155c 100644 GIT binary patch delta 2030 zcmVfFDZ*Bkpc$|&VISzv`5J1t|KE(+7C=0EN zAVWj}S3nay!6TL++e)sVB1O6|<(FRfb117@(}8Up{h|>0xq^Y>aMbF}E_pC;Icw#K zN1whC6D9%!nWuT7)ZcM+nO2TN1OtUukAMqBFmU?WfyWJpiGR|ryb4_@bXMppp{s>% z3n-LMPS;5)Jr151oOoBxgpNY*3EjVyIaHkm+cx?GHwB^J$9G{2000Q`Nkl+(4A8ef|$b?7d38W&6;s0a~Q#Dk*9}stQL*4v+p~<_g%lA z)8Y<3&->2%oq1;$_TM)(H6;KZUvqB&c$9tJy#b`dk<%wa({(t`d2Y$cRYH4C(BDRBfukYT2 zbM3e0PKRF%J(Jk@+S0PmwvGebyLWGBwOS8-Tz`MR#>dAaKLPIb7qW*q1AN$H;yivt zuj5^!jAjh9i3}7n_>Ll|I$0#cc@%0Yj}7#{##Hyx|+>qShZ?Z z;$HxIwHME3vl+H++a^gmdi1D@#UcR$X~VA}0Fw~|PLnVN1b5+R;bnH^m=K1 zV&@Z#lxD-=;E?tmcr5lkj*Z?5l2ohBNm8QEOB9yse8SYsh8R7&A{=Bx!DLuIuqw@Jh`OVJ0UhV;j5~rC#lG=gysX zzMh$x>BW*(%@JlZ70>@d_sK0NV3eA7Kwv48K>|LLKnMwwFa-*KsO#Y@M^2vzlGHeJ zPLdKmw=D`6_a6&0pB~o>Q&WjO&VLjNVZ--c(#H1=#lFXj`;P@ln)&p&BqjR1M4?ZkCWLD9a?wnaQOVtn~A^3(z4IAnVg&q!^6XopH~6|jJo~|*lae#TXUzw z(9lpw%jhsfr`c>ThNn;dndg6z7WG4zced}4G(RA6savY^=@z5@!(T~yG@k!_wh+sC z-&(L_QlLt~qLty3w;M!hxr* zCH}moWuHmGa2CKQwVwgA*9u{Bax&zzg%B>rGdc>%HBy=lqi0t>gt5_EVWc#h+UGy= z0OOjYc0a%W*-=T-rO$h{q7U;4@Ac}zZ))U)ew9Yn>)RVn^kT_aa0?0;rS=vSSPGLd z0#1Jj5HRXEz)YbKuD<+YqURG_efh)?Q@d!^Ad&C%WC2J7au43IIn;4 zaag^q){{N1URDe3bF!H8((!=Kb>Cm9`X7!bdhXkr4?gN!ckrc9@4;I2si{6mTGNBI zlHiGzgId0JFwxKd^0m+QJ+V^Z%SQZbeffW%`E#*+?ck#RABM94Mv;!Few3_URtvv; z?U;_feMpyQFKPMOXA}MIfM^wq#jt79CSAC2K{syP(8R<XP?||zE6lNPr{6*HQ zeYQVq?t1b`jofT#%?BSP{@g4^u~-b{ayjwG*sFcEKWko|y(CFpzW{R!3K;Qg2*8sP z2se{31sZ>&)C_0YbNE!a+4@W$zPl^2^9g?P^S_11`@gHdytzI0J?=StDoE1J)@PEG z=<|XHOHF`}ulP<+F6_nl@ZDW~ul%mjlL3+cI~Ut~v0Nf#v)M2(Fd#{Kex#<8yK|bp zyjffF|CA&(8Vy~!awWEFB%93!Now!mZjHwLP{MzOuAiD)(D#2mkm&f@(z4IAX3h)Q9ws#bu3lCP?Xkc~)~kI+ zHJ?ik-O1z<#M@@$z+aHDwW@M^Z%sgGhiCxlX|z$sAiO-JN0^9`F#F2?Fc1x z6<}&U0|H4>tycRay>ZvqT_HfAOLu?v>lTwR1Td2y1Q&m$<`44%aVQiD*7bP@1dIp} zFk0{}=`7SPy@wuNL_+PZaXdtk=iN~JO$_1gJtAxxj2f07^exHw*b z-0Lr74{>rHe;hge}h!(zgCmm6{*Iv@h^% zHk+vUB&kxVjAt^Lec5a_RIAm#dc8gt^%|XC)NwOi{OtH0 znNsr(*!KTFcuA5Z?+v)01qT?#OtiQpd2hh|@OzUn2|bfQ2nrVe0%x{1ZO-3;UH||9 M07*qoM6N<$f(gY7l>h($ delta 1957 zcmV;W2U_^!6ND3xB!8iLR9JLGWpiV4X>fFDZ*Bkpc$|&Oy$*sf6b8__eTpxz8-G|k zNQ#C5Ucpp)r8fwYw$ayjaBwo-@g%22-JIJVwrlm1V&caFgKD$Y>cu_>7##Lm1>!N} z4^noSU{D0Q&y+7$xA;OU&oRNE(&`r7ObG_N?;Utt-7r!9JAaSDR|}sNzDD>?!nZ~z zoL*j+NjifY0?%&ZU$aEhTiCAEZ|B65ODrbP%m4rgo=HSORCt{2-9c!Z=N-rKpVqk} zT^xw5ICAE7$1eI#^xo!>Y^X zLU#(3VF=7RjekN3*+FTFm&OZDovKoGP#{Z2cy{oVB_nAhS+9QYYkxl{lL)_$9=%_` zuVnB)H9tQu03Kg)F92B2zUp28lHtU;GogNdLBIdWk(7Ha_w&-9-VVdNcj?t9e-QZ^ zPnH8_v``trH(v(YDG z8(&LO*4ff_fQJqp3e9HofsY#;9MsIrOwTvKef&<=5M_W5dQ6nhAHCQ1Eoi$xUE4WH zy5T;)B>RaS_0=8iYcv{R=3oERn|t=ER4QqFd_4MFP^@2#Mk8$AygBwi0Q$AgMxzmS z@7^s*It_X9qzZ)s0Rl9tILuU>wW2kwK|_LF|#42E^G`Fk6(-J=C>qeok^3FxqqFmGcf@I zYf)luL2MD zG!pUpce+k)K>?%0TmgZ#lR*MVlQ07bf1|F4vz$10CP-5K{DLIKdTv`UTsm?pEPixa z&&U_G@sQvI4lGexTpUdPU*;j5s0V9450h1sIHIps~ z9e>pIe877t7K>r~_U$SZ3XzY;DwRqr^XV2BTgP70Be|xhZiQ-fS+5kwV*5NNi%Vf- zWK@SI9*TU8(^I#CBvq>`b1CAyFJGqTvmv6Iqqg2nUDy~V9={g*eNDTToyvAd^7@DU(nG8k0~14S%TZ z0Mq$=`26{2V?CeX^XH!p>3n}?Q>63x(Atx@?@KQX4OGMR&pwRx^Su7qhhb=-+LtvB z4OByGPgb)pZ4c<&_PtH2{qA(E=e})u_x;qiqtAs}AC6UGUM^^QH7|sG1^>jq_dNMRn4L^VRluo{JOjnjJ zYs1#3VtsW$ZxsrKuyf~5UA%ZvH*Va}?Cfk;uYcQDz_DS4rMhB&lJ#qyt@oPyAAMAl zH|yH+?)$Odo7E^33ZYag#r`?=Yn`q4npc)COH$WAfVl+)jQBMKU_^j`5tB6tAd@Z# zCzCD+27ggvhO-r+Y|X34<0`oB$-aNYGmg~CX)%0)LO%x>h+bOgnykLKQXtU@BDH&*73C@Wt~aWI{90! zFaKTNpRMRS-}uLuKCaitA08f7I-OR%UROGumL#Rq>Dy6udVHoMCDg&=XTx9K7}MUD zmlXF~^IphgGNGNTOS_L-?eVkOY-l!{@9fyIX8YbdND?&+K z1(=xkfIys7DwUL^SMT_`D+CC1>CX3l-IG8ADw9wH8h?lY0i(qHVcw|Z^Lh6Yu#RyB z1dIp}FzWag^uK=xUy^Q*XKLAX^t=`(vMOJlk7Pc=6JN`RkFPwYr+>6?*T2_lwcB5> z=Ffx!{npVHFqg|6l5~4M+MOr9v@)}8*Hop4%e&jX=E2o!wYz4uwblqELEGcWa=F~0 zTCFx+sbf@HBbg4D%jKD9m)D-vtc?$0;MDdNuyulGGMQM#CrRaUc_y7sAI@Ylp;D=& zYPH(5drd$)Iv&uO&1OSf-)D8RHm-nh>iAR8|Nr16PU5^a;9fcouopAYq7vt|0r$f1 r0h6%_8VXV|784XL$_lQ2 zE?_qS0Bt8NzFA7XKL7v#nMp)JR7i>KkwFT=Fc3u(@c{lb9w4nbfHN0pA?{7V`(MSx zZbYz5ur8E&oABX3W|$cBw>YN5TK-&6wgE_2dD{Z#G-Y|eqv(zG4Sm#dkbb`9Jl1z7 z6&x+gbYg+SV}g?kmw`@ovqclIpE+ZK6JN<7&V3)fbU+~;Z%7UOVzkv2pL2;} lRlx8n5WcXNqA1EwatH2}55mSL&x!y5002ovPDHLkV1jyyo3j7_ literal 0 HcmV?d00001 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" = (