From 0f692b378813c1b899ca0424e724dad7918e4d2f Mon Sep 17 00:00:00 2001 From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Tue, 20 May 2025 08:20:13 -0400 Subject: [PATCH] added senior teamster PDA, cargo beret --- .../Entities/Clothing/Head/hats.yml | 23 ++++++++++++-- .../Entities/Objects/Devices/pda.yml | 19 +++++++++++ .../equipped-HELMET-hamster.png | Bin 0 -> 549 bytes .../Hats/beret_cargo.rsi/equipped-HELMET.png | Bin 0 -> 891 bytes .../Head/Hats/beret_cargo.rsi/icon.png | Bin 0 -> 1061 bytes .../Head/Hats/beret_cargo.rsi/inhand-left.png | Bin 0 -> 853 bytes .../Hats/beret_cargo.rsi/inhand-right.png | Bin 0 -> 858 bytes .../Head/Hats/beret_cargo.rsi/meta.json | 30 ++++++++++++++++++ .../Objects/Devices/pda.rsi/meta.json | 3 ++ .../Devices/pda.rsi/pda-seniorteamster.png | Bin 0 -> 599 bytes 10 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-seniorteamster.png diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index a97941b389..7ef10cb39c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -41,7 +41,7 @@ - type: Tag tags: - ClothMade - - Recyclable + - Recyclable - WhitelistChameleon - type: entity @@ -104,6 +104,23 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretCargo + name: cargo beret + description: A beret in cargo colors. Fancy! + components: + - type: Sprite + sprite: Clothing/Head/Hats/beret_cargo.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beret_cargo.rsi + - type: Tag + tags: + - ClothMade + - Recyclable + - HamsterWearable + - WhitelistChameleon + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretEngineering @@ -477,8 +494,8 @@ - state: icon-nobeard map: [ "foldedLayer" ] visible: true - - + + - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index fbbdfe2b77..63aa6a66b1 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1418,6 +1418,25 @@ - type: Icon state: pda-seniorofficer +- type: entity + parent: BasePDA + id: SeniorTeamsterPDA + name: senior teamster PDA + description: PDA for the guys that order the crucial station supplies. + components: + - type: Pda + id: CargoIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-seniorteamster + - type: PdaBorderColor + borderColor: "#e39751" + accentVColor: "#DFDFDF" + - type: Icon + state: pda-seniorteamster + - type: entity parent: [ BaseMajorContraband, SyndiPDA ] id: PiratePDA diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..c6bee40c3d79b1c4366bb8339853d795e6b23f63 GIT binary patch literal 549 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%xc4qTm+pM7>&#=B%%1Q?)${_r;;4hG3D+%%o{tp5SoA)o-4;0}n z@Q5sCVBi)8VMc~ob0mO*5+$w?CBgY=CFO}lsSE*$nRz98ey$-3rh0~Y=H1u6TLRT= zOO5bM^YqkW-~e)18Kf9l85n^qFCdnNvO%ubU}Of1GXdF#j7$syKspMDGuv6f;#oj8 z2zW{|GQ0qK5=Nt0$^ev_z|Oz|RB2#jY{0kxVk*c+)&&rgrU2O>zyvgx39K^6(gMhW z>M}Gi0LeafV0SJMQ7;2Bmw383hD5l(o#rUiqQJw#toZ-`C$&?J2Rq)q%FO=76x?Vw zujz)f#t-Ml6H`AFFfE!AG_7mb+!u-IK5?PX?*uGflOfS0vh~%M8G=u{+6vd#?p@&2 zf8m_(g5&Wl46Gt7A^`#c4vrso9eDo#(994+?=$~jG8!lx%~|I(CHK$oDfW)B2GV^^ z*Q&fc?(wb2uG^pg-stbeSD!5>Kd9DNps=8!>A}JSZ>S|f?5q$_l%JNFlghxL zaenGVTaUvIGDqWsmuiU$T6b8atnd?aah35F=}uUYnU+^ileG(`lyjJTqTDu_^3`(Al!_(y=ueSx1bIB!*trj6YGa zrs&?IHB(owsr0KmoZuJlSvdEZMpA^63};6`fGcO}jVs}tR+?gyw&<09=-=^=Wv58d z)B`6rHgK7oSSSC7x2`<<>GI`!mMmZ?*>7>~xP-tBRw>itKkdrq9OHaY&$jN%wEaQs z&+I(cZ{6}i&|m{^Ow4wZRQ?@z7~AIa+?*17(m(jb^TzMSRm*e?O1QtQt=wyRz3>;q zl9j8UN~<~ypu!~FC9{}a8JLzG^y zF1)U1EA5cymfCu`qEmdy7ICk6xxXK<1!<-(cZd@|{AcHrP!8T{)rY^7YHck&*k^yD zqdKoFM9neozutkfyS3+>)o&5EYh~hMU=?BD(qM?^Uc&HZO2>81===Z%ubc}NmH+N~ za=YB&pV#ytJ%{!0xxb%no9i|Ro5=P*7d7Fzt#$4i%Wb*GEdL!CSsTEn^cWsv{Sq3d TWoso@1@eZctDnm{r-UW|S;j~G literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..de3e17b049af9bb169841451eb532bcff237fd19 GIT binary patch literal 1061 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U@Xscb`J1#c2)=|%1_J8No8Qr zI6rmbUhl&JB1ipmmnKD9-Ecgj=q%bU=He)`l`pnyO4Pws-m}!!PFSMoIq{L!4hs<( z7xDdU|CwW1!&w~zSOm?>_ls$MT%x(9gYVw)(|-#;oqM|Pcf-6Mt<10lwhJY<&nyi- z6qFdru}^_PUWr3d&1;(B?6YYf(rfO0)Ol?7^4g*QN+FYUIX`@zxLoD%mXmMTW|rPA zsGKb`Su3ft#=~z$&V-t$uUz}*$Ldx8dADii`LiGM@_ZNGIeJuYn$|KmIpyP~Th+Gy zF3cC2_Vp<1GsSm_5hoOTMOZ`v4@-sI@GyEk=jQu;AE)KZg;uH5@m@*16zJA^kL9Y= z>QiU9N@sez-ktmVd}Y+BCoSQ&bC{~;%RJ9z;dsYzw(W6^tfk*)i4XQn;#J4vpUzok zzrx%q>JLLl9#i^s*|j^k=j1as^S5Pm>7G1)cd^ES*O~&F49w;Z|GUgrf2*H!hxsS3 z-9^(4+xdGw)s%ddo?D%MXL;|}y}+257T^=&x^9BhhKUmU=F0AzDYbQ))R|Q(x3;R@ z*rIxQgUX5JN(bQXyY zEx&Gp?1XaRvP6-hc;P$S)%MMkU(_Z&t5K>tm48v2_`^LK8DRpGDkUaXidQ7@&utVt zut4$HQpNTH@%(7sr5zHr=_0vNe1$RmExCd~r`^wL`3IzoN`m}?|C0(Bcmrm<2kPc5 z@Q5sCVBiKC$SufNpAtV2C@4|l8c`CQpH@$cc0dZzK3s^i0 z$OZv@Nk)bjz@!hO(JW;E>Yu>QzyefhU}S8-xBz16|Nmgk3@!7!eT`+&S1o-U3d z7XEL~o#bmW5NUnbwB?@Gg;hRElfxL@pZtyY<1}9=B%FMwD(vn3{J=|fH{`$kmJ>KU zC!*q=8Pky^Ib3&UJ*;JU#>S|f?5q$_l%JNFlghxL zaenH=-QI@-M2_vZI}+~gDC;6)6jGSsC~_q5^@XJ#D@E7rQpvo<f8p*(Bf!P>e#XKchr(2`o0TYOFqQpo$J^CZat@3?}7iyO=+y@48GgX`WPwd zJe}5hPMqbTvqbF+vDDKue3u9RFt&SNF|AO#Jo{n&#o6IHk{?PZE>AhU<>VW-m8G`} zDreg$Oh01tbApWVO@*JQuB!IWkJYRC^KR43vu8f$<@qkWaV$vsv}&+&|HQ?!q9)G% zyThDQ^VcJ$&jQ~KbW$d`FfplwY+w^LdvwMs{oC&RJr8HQ&y<@P&m20VL?m#Lx!cx5 ztGJ3AcO6=~=+(Ku&u!KodeRbZJB7h&p3L)HmKS#zUzr~NX;n1mm!Uufi{6)M`_EYV z)(5QLy5$9tSZ02vv=;GBp@K#@>;d-#b9Ohs74f90v!_NM<*vY<0 zx@J*!LcYAj)1N0^nNN9|eq%xW!H_lU z)@~rhUJ~RN{2vS$q`aBkfI^%F9+AZi4BUbs%vhfiKM^P>QQ{g=5}cn_Ql40p$`Fv4 znOCCc=Nh75s%NNY-hJ)6B~VRIYJ_K+r>7PJ2avV7NJjy2W;+X5JPXJM0ewkEh8Mu(1f$U`WdQ1*z|Oz|RB2#jY{0kxV(S0@ zV9g9I^SgbFn)~~JyeXb8jv*25Z?8G>H5>4_1Rig^^Z!Iei>tI%WW>Z>v-Tenk!$kJ zO*Up^n!v!=!JPK_=Zt8%eTy4*{x)yisn5c8|KuSnh**V=XiIf>j3H;g|S hXfy2xDl%&{)Dx+QTdO^H^+u3uJzf1=);T3K0RU;ZHF*F4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..39393b9c72cbffce0c9e1399a4c92ddeee3f15a6 GIT binary patch literal 858 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz*wH?>>S|f?5q$_l%JNFlghxL zaenH=z21idM2`CBE?uN6`by!^goRzs+=~?YqT2Obz1AjNRrQ=4=5cAl5|2XB7#S|U zMcwhu{~Omet!`4#XzG}~JHC5L#U-&Q7xwp$pZ>F`d|q_F)*(DL9dhblcHtbM#oQ6mwWrxecN&4NqPU;n6kd|&skhY`KDP#=tWvp_Q+h`+I8pE z@!g&thGOC~+IO@kDtC)a5>Qy!WSUVhA;HXI^ZnY#y!UNReL3-G)`~-m7Iz5kEnFoU z7CIyJ71#8(Rp#I4f8KKSWM|sf0HGIkMR&IgD(qmslD+PC>62YwlMnpoh>^&xpIJQX z--5X8?2XI{n>gphZZpjkx46&5Chv1mNP5!z-QJ;%*Mk-2urD%qc<)slw)VfpPWB?{ znnl?O`SKD^f1Y?{zDz&;!Th+hX26&b4e$wZ?abznbYs7^Sz~>#l$8#HhCEP$A#2vH z-9U=HB*-uLKNv7bc{95Kg*Xd5B8wRqxCKF&u|6e!B2ZAG#5JNMI6tkVJh3R1As{g` zuSCz!HAKNw&rr|2``UL)pqif42+uT6Pb~%xAcvJfijkFp5yr zK(-+x6N3PdjsoJ$b{4RB7LW}B`jU(cFM!DjMx$BE0MtK$oq+|Y(!j{rfN=rD)c^m% zni*Q=cl#JM_xAyLGd*1#Ln7SYPIKgIFyLT`zV+$9`sqtm8!ob3d3^5Rg_M~mIJ@dv zn79~NMH)0URMj`t*n0o(@NjFaiDuh!bGKyT;Zy$2rJ|X&694!D1?9IcHgmN7uh#kf zH^=*5;tvnbU(mqhz{uLb#C705Q}kcWmvYBmP47uO{p+Q`evzK+vNM+x_1;N@JAVJ> o^WV_?@muz=Bm(41bTsEvxwPFaqRcPgg&ebxsLQ03H%UNB{r; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json new file mode 100644 index 0000000000..88d19a44fc --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and changed by Hitlinemoss", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 8f987ac66e..9e7ad16c89 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -231,6 +231,9 @@ }, { "name": "pda-seniorofficer" + }, + { + "name": "pda-seniorteamster" }, { "name": "pda-wizard", diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorteamster.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorteamster.png new file mode 100644 index 0000000000000000000000000000000000000000..b1224dae9c1db2eb0bea360aba004bd7df508314 GIT binary patch literal 599 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikV0(?STEzHb-OjA>}$I}Dv-@kvcFX&*o@tH;&2M7ICyJoe_&RMCfT+kY| zh>59gT6*o&w5+B9}_V6`#%>1%5xTYL>4nJ@ErzW z#^d=bQhX6s4hbT1CXq$`@G)8 zCR>jJne#kd978PppH95UcSwQ9b!q9=kZUXd{NEqN(X1Nu^=gIO?8(&&ZJ+Z0nPpJE zU!3Vpi_>gAMuCqx3VJ1x6LuT2bP0l+XkK0|c^m literal 0 HcmV?d00001 -- 2.51.2