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 1/8] 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<t$?{g&OVyaI}T22WQ%mvv4F
FO#tX3oRa_m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..0835b86a14dcf0f64acfe60e6b76c25f9744696a
GIT binary patch
literal 891
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz}S-M>>S|f?5q$_l%JNFlghxL
zaenGVTaUvIGDqWsmuiU$T6b8atnd?aah35F=}uU<MKr3^VCNU^Stcr)dVNjV2M_ii
zUDe#Zc^%)nCWRl2k6t}m@<K`VpT6c64$(aYPmb@d?%!SB5TI{-_SGyFle=b<4L#4K
zgdaViUG-Ahg@tiuq?^sw8E(fvmh#L0zwcTh_Rsv+)j3BQ=6lGbwq*+E3!Klp#rC}R
zk%0Cot&f%;TRhoS>YnU+^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<VlYAfX@dt*X8H`<CzDp37~w_pr~7DO%$0WO)}DEusNFA+DX-{E=?#*EVac
z@0GIBVbG8VN-$*2y0sffv6lq-1^)*F1}Sf5H=qz_fk$L90|U1(2s1Lwnj--elqhkH
zC<)F_D=AMbN@WO0%*-p%^K%VRFx4~EGw;6k-4dv#CpE$|&C^qhfdj~4WsqWIWncud
zynt95$_6DG4Mt|LI1`X<$jHPX0HmXUIJ2DvES?2qgMg<bBf|?|+Jez&mNEeKPhe+Y
z0je}GGB#jb05SFdf3RkTug#mRp1YP+0C{UYT^vIq+}}>~<~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(<V=R(4BV+oUqJM)dp|<x?w^4lh#LI!$(3wdm2svKQ8>bQXy<W{K>Y
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@<ySd_{TkeHcQqUYxtqF}0LsAt}N?YkvV
zO;2isXPT#{76S*6!^$AV$jZP7WO)IxG?WcW(;AG-U~wiO+mMloK>$cc0dZzK3s^i0
z$OZv@Nk)bjz@!hO(JW;E>Yu>QzyefhU}S8-xBz16|Nmgk3@!7!eT<s>`+&S1o-U3d
z7XEL~o#bmW5NUnbwB?@Gg;hRElfxL@pZtyY<1}9=B%FMwD(vn3{J=|fH{`$kmJ>KU
zC!*q=8Pky^Ib3&UJ*;JU#<u*x4Bwp(6RH?nc8h2*h!$-;vWz+V=}$(69Zqc*r53Ys
zd{?-q!s8;9TG?32a65qEw(1!%t<&Gzg+4Q^niaGm_xp+~C;7XKpD|iYH<-GKPr0=B
zaddO&f9F)&#xw6yFK4`$%2=IOA-AmY`|swu{Y~3y8U7b+d0!avITPd~Pgg&ebxsLQ
E03kEA!vFvP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..5224f718d8af00a94eb28db6c5e5330d015b98c3
GIT binary patch
literal 853
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz*wH?>>S|f?5q$_l%JNFlghxL
zaenH=-QI@-M2_vZI}+~gDC;6)6jGSsC~_q5^@XJ#D@E7rQpvo<<ta5uL~~tJxAQ^A
zl8>f8<X>p*(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$9<z)hBOdeO7CaL>tSZ02vv=;GBp@K#@>;d-#b9Ohs74f90v!_NM<*vY<0
zx@J*!LcYAj)1N0^nNN9|eq%<E$}eC{hz9tCxOQgqN4l|J+pMv^SISC<K|>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>7PJ2av<cAjQbazzAe{0kJfc4N4~(jLcwh
zCLr68k%>V7NJjy2W;+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<g0B}-Km+}EC%n7OFoq_?Mb&Tnxo_p
zZPR_vKR)s6-V7cMRR;zk1qM!mhJRc~rhT|2y@;tn_n>|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)*(D<a;dce^NY6R)L_p<
z&HXwo@d6F}i7prQPi?cDeR9di^qPAgbsn2Nyn5*WqV)@I7(IBc=zntA(+M|uFTL)2
z`O&P>L9dhblcHtbM#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~%xAcvJfijkFp5y<iaVreKFluk4lnZe>r
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<NJWNu>_?@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+<YnKNhp2kK#9IJ4~IPaq{y666>B9}_V6`#%>1%5xTYL>4nJ@ErzW
z#^d=bQh<UIC9V-A!TD(=<%vb93;~Imc_n&&t|1DhdWL%D-PgWb0@Z9wjqptK^weVD
z0CHFvq!?Kl7=bJ=AeM%*LB7^tWCn{f0ojI(Obh}*Itqw0+gZTkSwJ=jBmgl;Ka57R
zlmQrS6WAG8fGP}(j13qUKuiVcU|j$)X$p`H0!%=2n7}H7EG>X6s4hbT1CXq$`@G)8
zCR>jJne#kd978PppH95UcSwQ9b!q9=kZUXd{NEqN(X1Nu^=gIO?8(&&ZJ+Z0nPpJE
zU!3Vpi_>gAMuCqx3VJ1x6LuT2<T2)GU2<vAXyqs|WxVxAW62bkAf_l;$57XhMz5o{
zS=KL7Uvt7n_?5KlpRP&ys!NmR3Amb1o&CFepT_DLY6^FGjpq2;-O|-szn$ZZZR3pN
nmgS1qmHBUdQK<OSI^nZ${2$vl+49!+L9X_6^>bP0l+XkK0|c^m

literal 0
HcmV?d00001


From 76f105cd3a3fb922dec315ac636d5a069386df65 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Thu, 22 May 2025 13:20:40 -0400
Subject: [PATCH 2/8] renamed teamster -> courier

---
 .../Prototypes/Entities/Objects/Devices/pda.yml     |   8 ++++----
 .../Textures/Objects/Devices/pda.rsi/meta.json      |   2 +-
 ...pda-seniorteamster.png => pda-seniorcourier.png} | Bin
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename Resources/Textures/Objects/Devices/pda.rsi/{pda-seniorteamster.png => pda-seniorcourier.png} (100%)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 63aa6a66b1..9c46769d43 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1420,8 +1420,8 @@
 
 - type: entity
   parent: BasePDA
-  id: SeniorTeamsterPDA
-  name: senior teamster PDA
+  id: SeniorCourierPDA
+  name: senior courier PDA
   description: PDA for the guys that order the crucial station supplies.
   components:
   - type: Pda
@@ -1430,12 +1430,12 @@
     appearanceDataInit:
      enum.PdaVisuals.PdaType:
        !type:String
-       pda-seniorteamster
+       pda-seniorcourier
   - type: PdaBorderColor
     borderColor: "#e39751"
     accentVColor: "#DFDFDF"
   - type: Icon
-    state: pda-seniorteamster
+    state: pda-seniorcourier
 
 - type: entity
   parent: [ BaseMajorContraband, SyndiPDA ]
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
index 9e7ad16c89..9606232b68 100644
--- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
@@ -233,7 +233,7 @@
       "name": "pda-seniorofficer"
     },
     {
-      "name": "pda-seniorteamster"
+      "name": "pda-seniorcourier"
     },
 	{
       "name": "pda-wizard",
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorteamster.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcourier.png
similarity index 100%
rename from Resources/Textures/Objects/Devices/pda.rsi/pda-seniorteamster.png
rename to Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcourier.png

From 83232cc0a6b87ecc8db6c8de2a82c04673231db0 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Mon, 16 Jun 2025 07:58:32 -0400
Subject: [PATCH 3/8] Added senior cargo items to loadout menu

---
 .../en-US/preferences/loadout-groups.ftl      |  1 +
 .../Loadouts/Jobs/Cargo/cargo_technician.yml  | 42 +++++++++++++++++++
 .../Prototypes/Loadouts/loadout_groups.yml    |  8 ++++
 .../Prototypes/Loadouts/role_loadouts.yml     |  1 +
 .../Roles/Jobs/Cargo/cargo_technician.yml     |  1 -
 5 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index c07e288e8c..6de33abddc 100644
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -99,6 +99,7 @@ loadout-group-cargo-technician-jumpsuit = Cargo Technician jumpsuit
 loadout-group-cargo-technician-backpack = Cargo Technician backpack
 loadout-group-cargo-technician-outerclothing = Cargo Technician outer clothing
 loadout-group-cargo-technician-shoes = Cargo Technician shoes
+loadout-group-cargo-technician-id = Cargo Technician ID
 
 loadout-group-salvage-specialist-backpack = Salvage Specialist backpack
 loadout-group-salvage-specialist-outerclothing = Salvage Specialist outer clothing
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
index fb823fdcb9..f1c2936588 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
@@ -1,9 +1,37 @@
+# Senior times
+- type: loadoutEffectGroup
+  id: SeniorCargo
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobCargoTechnician
+      time: 21600 #6 hrs
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSalvageSpecialist
+      time: 21600 #6 hrs
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Cargo
+      time: 216000 # 60 hrs
+
 # Head
 - type: loadout
   id: CargoTechnicianHead
   equipment:
     head: ClothingHeadHatCargosoft
 
+- type: loadout
+  id: SeniorCourierBeret
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorCargo
+  equipment:
+    head: ClothingHeadHatBeretCargo
+
 # Jumpsuit
 - type: loadout
   id: CargoTechnicianJumpsuit
@@ -42,3 +70,17 @@
   id: CargoWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterCargo
+
+# ID
+- type: loadout
+  id: CargoTechnicianPDA
+  equipment:
+    id: CargoPDA
+
+- type: loadout
+  id: SeniorCourierPDA
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorCargo
+  equipment:
+    id: SeniorCourierPDA
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 39b6be2b04..ab07e6a4aa 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -641,6 +641,7 @@
   minLimit: 0
   loadouts:
   - CargoTechnicianHead
+  - SeniorCourierBeret
 
 - type: loadoutGroup
   id: CargoTechnicianJumpsuit
@@ -671,6 +672,13 @@
   - BlackShoes
   - CargoWinterBoots
 
+- type: loadoutGroup
+  id: CargoTechnicianID
+  name: loadout-group-cargo-technician-id
+  loadouts:
+  - CargoTechnicianPDA
+  - SeniorCourierPDA
+
 - type: loadoutGroup
   id: SalvageSpecialistBackpack
   name: loadout-group-salvage-specialist-backpack
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index cf4b443285..d2ab079888 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -224,6 +224,7 @@
   - CargoTechnicianBackpack
   - CargoTechnicianOuterClothing
   - CargoTechnicianShoes
+  - CargoTechnicianID
   - Glasses
   - Survival
   - Trinkets
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
index ae64cb438a..dcf7add35e 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -19,7 +19,6 @@
 - type: startingGear
   id: CargoTechGear
   equipment:
-    id: CargoPDA
     ears: ClothingHeadsetCargo
     pocket1: AppraisalTool
   #storage:

From 9ffa1a7f7bec4727551e97559aadb7053437d358 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Mon, 16 Jun 2025 08:08:42 -0400
Subject: [PATCH 4/8] Added cargo beret to uniform printer

---
 Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml | 1 +
 Resources/Prototypes/Recipes/Lathes/clothing.yml       | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
index aa95781729..1c04caba6c 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
@@ -10,6 +10,7 @@
 - type: latheRecipePack
   id: ClothingCargo
   recipes:
+  - ClothingHeadHatBeretCargo
   - ClothingUniformJumpsuitCargo
   - ClothingUniformJumpskirtCargo
   - ClothingUniformJumpsuitSalvageSpecialist
diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index c5f81153e2..6fb2d95b21 100644
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -857,6 +857,11 @@
   id: ClothingHeadHatBeretBrigmedic
   result: ClothingHeadHatBeretBrigmedic
 
+- type: latheRecipe
+  parent: BaseHatRecipe
+  id: ClothingHeadHatBeretCargo
+  result: ClothingHeadHatBeretCargo
+
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatBeretSecurity

From 917b001cb49e3939d1ad637fa7515e7312a45ed8 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Sat, 28 Jun 2025 15:41:28 -0400
Subject: [PATCH 5/8] removed cargo beret entirely

---
 .../Entities/Clothing/Head/hats.yml           |  19 +----------
 .../Loadouts/Jobs/Cargo/cargo_technician.yml  |   8 -----
 .../Prototypes/Loadouts/loadout_groups.yml    |   1 -
 .../Recipes/Lathes/Packs/clothing.yml         |   1 -
 .../Prototypes/Recipes/Lathes/clothing.yml    |   7 +---
 .../equipped-HELMET-hamster.png               | Bin 549 -> 0 bytes
 .../Hats/beret_cargo.rsi/equipped-HELMET.png  | Bin 891 -> 0 bytes
 .../Head/Hats/beret_cargo.rsi/icon.png        | Bin 1061 -> 0 bytes
 .../Head/Hats/beret_cargo.rsi/inhand-left.png | Bin 853 -> 0 bytes
 .../Hats/beret_cargo.rsi/inhand-right.png     | Bin 858 -> 0 bytes
 .../Head/Hats/beret_cargo.rsi/meta.json       |  30 ------------------
 11 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png
 delete mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png
 delete mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/icon.png
 delete mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png
 delete mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 5c4b5ad5d0..b984d58974 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -104,23 +104,6 @@
     - 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
@@ -1393,4 +1376,4 @@
     - HamsterWearable
     - ClothMade
     - Recyclable
-    - WhitelistChameleon
\ No newline at end of file
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
index f1c2936588..d23027130f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
@@ -24,14 +24,6 @@
   equipment:
     head: ClothingHeadHatCargosoft
 
-- type: loadout
-  id: SeniorCourierBeret
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorCargo
-  equipment:
-    head: ClothingHeadHatBeretCargo
-
 # Jumpsuit
 - type: loadout
   id: CargoTechnicianJumpsuit
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index cd8aba66c1..fc6b5b4f5e 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -642,7 +642,6 @@
   minLimit: 0
   loadouts:
   - CargoTechnicianHead
-  - SeniorCourierBeret
 
 - type: loadoutGroup
   id: CargoTechnicianJumpsuit
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
index 1080fc1d0a..808f1c680a 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
@@ -10,7 +10,6 @@
 - type: latheRecipePack
   id: ClothingCargo
   recipes:
-  - ClothingHeadHatBeretCargo
   - ClothingUniformJumpsuitCargo
   - ClothingUniformJumpskirtCargo
   - ClothingUniformJumpsuitSalvageSpecialist
diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index 16b7317dd1..a39ac99607 100644
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -814,7 +814,7 @@
   parent: BaseCommandHatRecipe
   id: ClothingHeadHatBeretHop
   result: ClothingHeadHatBeretHop
-  
+
 - type: latheRecipe
   parent: BaseCommandHatRecipe
   id: ClothingHeadHatQMsoft
@@ -862,11 +862,6 @@
   id: ClothingHeadHatBeretBrigmedic
   result: ClothingHeadHatBeretBrigmedic
 
-- type: latheRecipe
-  parent: BaseHatRecipe
-  id: ClothingHeadHatBeretCargo
-  result: ClothingHeadHatBeretCargo
-
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatBeretSecurity
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
deleted file mode 100644
index c6bee40c3d79b1c4366bb8339853d795e6b23f63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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<t$?{g&OVyaI}T22WQ%mvv4F
FO#tX3oRa_m

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png
deleted file mode 100644
index 0835b86a14dcf0f64acfe60e6b76c25f9744696a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 891
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz}S-M>>S|f?5q$_l%JNFlghxL
zaenGVTaUvIGDqWsmuiU$T6b8atnd?aah35F=}uU<MKr3^VCNU^Stcr)dVNjV2M_ii
zUDe#Zc^%)nCWRl2k6t}m@<K`VpT6c64$(aYPmb@d?%!SB5TI{-_SGyFle=b<4L#4K
zgdaViUG-Ahg@tiuq?^sw8E(fvmh#L0zwcTh_Rsv+)j3BQ=6lGbwq*+E3!Klp#rC}R
zk%0Cot&f%;TRhoS>YnU+^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<VlYAfX@dt*X8H`<CzDp37~w_pr~7DO%$0WO)}DEusNFA+DX-{E=?#*EVac
z@0GIBVbG8VN-$*2y0sffv6lq-1^)*F1}Sf5H=qz_fk$L90|U1(2s1Lwnj--elqhkH
zC<)F_D=AMbN@WO0%*-p%^K%VRFx4~EGw;6k-4dv#CpE$|&C^qhfdj~4WsqWIWncud
zynt95$_6DG4Mt|LI1`X<$jHPX0HmXUIJ2DvES?2qgMg<bBf|?|+Jez&mNEeKPhe+Y
z0je}GGB#jb05SFdf3RkTug#mRp1YP+0C{UYT^vIq+}}>~<~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

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/icon.png
deleted file mode 100644
index de3e17b049af9bb169841451eb532bcff237fd19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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(<V=R(4BV+oUqJM)dp|<x?w^4lh#LI!$(3wdm2svKQ8>bQXy<W{K>Y
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@<ySd_{TkeHcQqUYxtqF}0LsAt}N?YkvV
zO;2isXPT#{76S*6!^$AV$jZP7WO)IxG?WcW(;AG-U~wiO+mMloK>$cc0dZzK3s^i0
z$OZv@Nk)bjz@!hO(JW;E>Yu>QzyefhU}S8-xBz16|Nmgk3@!7!eT<s>`+&S1o-U3d
z7XEL~o#bmW5NUnbwB?@Gg;hRElfxL@pZtyY<1}9=B%FMwD(vn3{J=|fH{`$kmJ>KU
zC!*q=8Pky^Ib3&UJ*;JU#<u*x4Bwp(6RH?nc8h2*h!$-;vWz+V=}$(69Zqc*r53Ys
zd{?-q!s8;9TG?32a65qEw(1!%t<&Gzg+4Q^niaGm_xp+~C;7XKpD|iYH<-GKPr0=B
zaddO&f9F)&#xw6yFK4`$%2=IOA-AmY`|swu{Y~3y8U7b+d0!avITPd~Pgg&ebxsLQ
E03kEA!vFvP

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png
deleted file mode 100644
index 5224f718d8af00a94eb28db6c5e5330d015b98c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 853
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz*wH?>>S|f?5q$_l%JNFlghxL
zaenH=-QI@-M2_vZI}+~gDC;6)6jGSsC~_q5^@XJ#D@E7rQpvo<<ta5uL~~tJxAQ^A
zl8>f8<X>p*(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$9<z)hBOdeO7CaL>tSZ02vv=;GBp@K#@>;d-#b9Ohs74f90v!_NM<*vY<0
zx@J*!LcYAj)1N0^nNN9|eq%<E$}eC{hz9tCxOQgqN4l|J+pMv^SISC<K|>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>7PJ2av<cAjQbazzAe{0kJfc4N4~(jLcwh
zCLr68k%>V7NJjy2W;+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<g0B}-Km+}EC%n7OFoq_?Mb&Tnxo_p
zZPR_vKR)s6-V7cMRR;zk1qM!mhJRc~rhT|2y@;tn_n>|KuSnh**V=XiIf>j3H;g|S
hXfy2xDl%&{)Dx+QTdO^H^+u3uJzf1=);T3K0RU;ZHF*F4

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
deleted file mode 100644
index 39393b9c72cbffce0c9e1399a4c92ddeee3f15a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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)*(D<a;dce^NY6R)L_p<
z&HXwo@d6F}i7prQPi?cDeR9di^qPAgbsn2Nyn5*WqV)@I7(IBc=zntA(+M|uFTL)2
z`O&P>L9dhblcHtbM#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~%xAcvJfijkFp5y<iaVreKFluk4lnZe>r
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<NJWNu>_?@muz=Bm(41bTsEvxwPFaqRcPgg&ebxsLQ03H%UNB{r;

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json
deleted file mode 100644
index 88d19a44fc..0000000000
--- a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "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
-    }
-  ]
-}

From ab7a64e3b3d2dfb4ee84588f306b754ba52f27a0 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Sat, 28 Jun 2025 15:52:44 -0400
Subject: [PATCH 6/8] Updated PDA description

---
 Resources/Prototypes/Entities/Objects/Devices/pda.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index bf423d4dd9..856e156b79 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1429,7 +1429,7 @@
   parent: BasePDA
   id: SeniorCourierPDA
   name: senior courier PDA
-  description: PDA for the guys that order the crucial station supplies.
+  description: Smells like postage stamps and shuttle fuel.
   components:
   - type: Pda
     id: CargoIDCard

From babe4b5dcd1e687001cb015307f9428fde001808 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Mon, 7 Jul 2025 18:18:36 -0400
Subject: [PATCH 7/8] Update clothing.yml (merge went wrong and needs to be
 cleaned up)

---
 Resources/Prototypes/Recipes/Lathes/clothing.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index a39ac99607..c5f81153e2 100644
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -810,11 +810,6 @@
   id: ClothingHeadHatHopcap
   result: ClothingHeadHatHopcap
 
-- type: latheRecipe
-  parent: BaseCommandHatRecipe
-  id: ClothingHeadHatBeretHop
-  result: ClothingHeadHatBeretHop
-
 - type: latheRecipe
   parent: BaseCommandHatRecipe
   id: ClothingHeadHatQMsoft

From 92e50ece3af474e585558feaaca994894357530f Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Mon, 7 Jul 2025 18:19:06 -0400
Subject: [PATCH 8/8] Update hats.yml (merge went wrong and needs to be cleaned
 up)

---
 .../Prototypes/Entities/Clothing/Head/hats.yml  | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index b984d58974..ec7801802b 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -1360,20 +1360,3 @@
       path: /Audio/Items/flashlight_on.ogg
     soundDeactivate:
       path: /Audio/Items/flashlight_off.ogg
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatBeretHop
-  name: head of personnel's beret
-  description: A dark blue beret with a ruby inserted in the center, for true connoisseurs of bureaucracy!
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hats/beret_hop.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hats/beret_hop.rsi
-  - type: Tag
-    tags:
-    - HamsterWearable
-    - ClothMade
-    - Recyclable
-    - WhitelistChameleon