From 696f1d599576268eb14ffd63a826bf606ae607f2 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Sat, 23 Mar 2024 15:31:28 +1100 Subject: [PATCH] one star jumpsuit and hat (#6355) we have the coat so i want these also :cl: add: os js and hat /:cl: --- code/modules/clothing/head/misc.dm | 7 +++++++ code/modules/clothing/under/misc.dm | 7 +++++++ code/modules/loadout/loadout_head.dm | 5 +++++ code/modules/loadout/loadout_uniform.dm | 4 ++++ icons/clothing/head/onestar.dmi | Bin 0 -> 830 bytes icons/clothing/uniform/misc/onestar.dmi | Bin 0 -> 1271 bytes 6 files changed, 23 insertions(+) create mode 100644 icons/clothing/head/onestar.dmi create mode 100644 icons/clothing/uniform/misc/onestar.dmi diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index d973fc727077..33f98bf01aa4 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -734,3 +734,10 @@ desc = "A simple wedge cap with red accents, highly popular within Tri-Star Compact space." icon_state = "eulrhat" body_cover_flags = 0 + +/obj/item/clothing/head/onestar + name = "one star hat" + desc = "It's a maroon-ish hat with an odd logo.." + icon = 'icons/clothing/head/onestar.dmi' + icon_state = "os_cap" + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL diff --git a/code/modules/clothing/under/misc.dm b/code/modules/clothing/under/misc.dm index adbda32c1a25..7fad7786c70a 100644 --- a/code/modules/clothing/under/misc.dm +++ b/code/modules/clothing/under/misc.dm @@ -23,3 +23,10 @@ name = "special ops fatigues" desc = "These worn fatigues match the pattern known to be used by JSDF Marine Corps special forces." icon_state = "russobluecamo" + +/obj/item/clothing/under/onestar + name = "one star jumpsuit" + desc = "A jumpsuit in One Star colours." + icon = 'icons/clothing/uniform/misc/onestar.dmi' + icon_state = "os_jumpsuit" + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL diff --git a/code/modules/loadout/loadout_head.dm b/code/modules/loadout/loadout_head.dm index 2f89a4d06cc2..2c3b4d60c1e6 100644 --- a/code/modules/loadout/loadout_head.dm +++ b/code/modules/loadout/loadout_head.dm @@ -262,6 +262,11 @@ var/obj/item/clothing/head/beret/orion/orion = orion_style orions[initial(orion.name)] = orion tweaks += new/datum/loadout_tweak/path(tim_sort(orions, GLOBAL_PROC_REF(cmp_text_asc))) + +/datum/loadout_entry/head/onestar + name = "One Star Cap" + path = /obj/item/clothing/head/onestar + /datum/loadout_entry/head/surgery name = "Surgical Cap Selection" description = "Choose from a number of rings of different Caps." diff --git a/code/modules/loadout/loadout_uniform.dm b/code/modules/loadout/loadout_uniform.dm index 8a4f61e64deb..997bdb8d79fd 100644 --- a/code/modules/loadout/loadout_uniform.dm +++ b/code/modules/loadout/loadout_uniform.dm @@ -310,6 +310,10 @@ brandjumpsuit_selection[initial(brandjumpsuit_type.name)] = brandjumpsuit_type tweaks += new/datum/loadout_tweak/path(tim_sort(brandjumpsuit_selection, GLOBAL_PROC_REF(cmp_text_asc))) +/datum/loadout_entry/uniform/onestar + name = "One Star Jumpsuit" + path = /obj/item/clothing/under/onestar + /datum/loadout_entry/uniform/yogapants name = "Yoga Pants" path = /obj/item/clothing/under/pants/yogapants diff --git a/icons/clothing/head/onestar.dmi b/icons/clothing/head/onestar.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7fdafb6becfbb892f3b6a0a6e0dfa830911e4bc5 GIT binary patch literal 830 zcmeAS@N?(olHy`uVBq!ia0vp^2|(6bQ88&6cY_7z`n%(|qPC9CsItH#<^WfEUrZOf5 z*~#j9%on~MV_;xv@pN$vshIP2wxRc72Z=U)B|fFQE>}EbSj5?5Sw8YxSXu6Tsnpb5 zR#dQxuW84NYbz%&wqNk*)q|i3O&m=fJ46EyF8szFXVHJ-naRo1N53})bhhrU@z7YtG(YooY;}o=hyyxR&wzx z-Ha8_m$QeimP`M|VRU=@&)naQ{gXGaINGTS6g_mhcJMscdbfsS*AtFEys8r8qQSt! z+OUwp;N0X7H^1e*NlN~iu--s8d7erg@6^zFagDQLO2k~GiW?`nM=jt`sbcvnQghIc z^T|{(4K7>O67GGyb7w2=eW=2tc2Q=5yQ9!2A6{|B=Yk6T5+|KbEtI!3`~F^jWyw4H z2^lOiPOfkLmMu}^7b_P<&rDEDc*Y|SG#CB|QUaz9TU zJindo(BqdI1#6Fg-(t{pMEl|5zeO8%26x_j`*!!-#{aT@D>)`k2zCFb9m5WCzX(Gc z(}4g62`&a_#ss*hb}K#VG7f4nJfFJN`Ouw-iQ8A6{~5+nB(#7zA^*Ht_OWMrojM&{ z4s**MZR_-wuf3)8c#HL}+kWg56%tr_eA*p)k4wK{33t5nL3HO}bt7)U8YbC- VpX!@E5V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DZe;At2DQuxHPjwiHkEOv#1y-YRJWzR+N~V3SnbY8=shygHUgR zqF!0S)z1a&7yvN#E6B9Em$m=^1UN}VK~#90?VB-Z6hRb*=Om@1N({!zMhq$>plz&- zV6CF5Vj-y{gXQb=r)vXYWIUktkVtIxy$&5STxab=eR3j5P)XU4@LA2udlrS?sPH!eY;p#Y2w zC^ay9E}>@*4g~<`5d_{_T|)LraQ-Yr=ShUTlv)7l^`ZVx!hUW6CMNHtX{D=9&~aQh zJ9B%_KMiMz0+qvrq~d`{NX)CXwz$-$AP z-ba6NoX?U%*e82M>|2ciF!-*%oPLJ#FuvcQ7!+-LZUN@!9@R#*X(*)~i9y#D@~92% zGLXNY32C2azm0vP4DcCT6Qnbc?4#rqwO{IKsE*$A@!*BIcc@n(KJ3R|#DuAo090qQ zo`ge<0qtH#dmjU&X_e|yCCG&jwYWG}mP(bNy+{;5n6CX^0@jBj~n8G!tOZ}8E#4=ynhfPxS7^_N9gh~*_~ zc{pE@%(Jr!SpOo1#y(totGfGLx?>K?&duRdvQ8AhdJsmh`~2r`(=qf+pJfR5)_XsE z@UC19siE6!&s50mLVUcz!l>2y?