From 037571727113df727a04782592333264854c12c7 Mon Sep 17 00:00:00 2001 From: kushbreth Date: Mon, 20 Jan 2025 14:43:34 -0600 Subject: [PATCH 1/8] logi tech drip for professionals --- .../Loadouts/Jobs/Cargo/cargo_assistant.yml | 44 ++++++++++++++++++ .../Loadouts/Jobs/Cargo/cargo_technician.yml | 13 ++++-- .../Prototypes/Loadouts/loadout_groups.yml | 3 ++ .../Prototypes/Loadouts/role_loadouts.yml | 15 ++++++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 +++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 27 +++++++++++ .../Loadouts/Jobs/Cargo/cargo_assistant.yml | 44 ++++++++++++++++++ .../_DV/Loadouts/loadout_groups.yml | 4 +- .../equipped-INNERCLOTHING.png | Bin 0 -> 1734 bytes .../Jumpskirt/cargotechromper.rsi/icon.png | Bin 0 -> 550 bytes .../cargotechromper.rsi/inhand-left.png | Bin 0 -> 866 bytes .../cargotechromper.rsi/inhand-right.png | Bin 0 -> 743 bytes .../Jumpskirt/cargotechromper.rsi/meta.json | 26 +++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1889 bytes .../Jumpsuit/cargotechoveralls.rsi/icon.png | Bin 0 -> 625 bytes .../cargotechoveralls.rsi/inhand-left.png | Bin 0 -> 592 bytes .../cargotechoveralls.rsi/inhand-right.png | Bin 0 -> 669 bytes .../Jumpsuit/cargotechoveralls.rsi/meta.json | 26 +++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1354 bytes .../Jumpsuit/cargotechpants.rsi/icon.png | Bin 0 -> 480 bytes .../cargotechpants.rsi/inhand-left.png | Bin 0 -> 767 bytes .../cargotechpants.rsi/inhand-right.png | Bin 0 -> 591 bytes .../Jumpsuit/cargotechpants.rsi/meta.json | 26 +++++++++++ 23 files changed, 233 insertions(+), 6 deletions(-) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_assistant.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_assistant.yml new file mode 100644 index 00000000000..a4378777a58 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_assistant.yml @@ -0,0 +1,44 @@ +# Head +- type: loadout + id: CargoTechnicianHead + equipment: + head: ClothingHeadHatCargosoft + +# Jumpsuit +- type: loadout + id: ClothingUniformJumpsuitCargo + equipment: + jumpsuit: ClothingUniformJumpsuitCargo + +- type: loadout + id: ClothingUniformJumpskirtCargo + equipment: + jumpsuit: ClothingUniformJumpskirtCargo + +# Back +- type: loadout + id: CargoTechnicianBackpack + equipment: + back: ClothingBackpackCargo + +- type: loadout + id: CargoTechnicianSatchel + equipment: + back: ClothingBackpackSatchelCargo + +- type: loadout + id: CargoTechnicianDuffel + equipment: + back: ClothingBackpackDuffelCargo + +# OuterClothing +- type: loadout + id: CargoTechnicianWintercoat + equipment: + outerClothing: ClothingOuterWinterCargo + +# Shoes +- type: loadout + id: CargoWinterBoots + equipment: + shoes: ClothingShoesBootsWinterCargo diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index fb823fdcb9f..d88262dfe0e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -6,14 +6,19 @@ # Jumpsuit - type: loadout - id: CargoTechnicianJumpsuit + id: ClothingUniformJumpsuitCargoTechOveralls equipment: - jumpsuit: ClothingUniformJumpsuitCargo + jumpsuit: ClothingUniformJumpsuitCargoTechOveralls + +- type: loadout + id: ClothingUniformJumpsuitCargoTechPants + equipment: + jumpsuit: ClothingUniformJumpsuitCargoTechPants - type: loadout - id: CargoTechnicianJumpskirt + id: ClothingUniformJumpskirtCargoTechRomper equipment: - jumpsuit: ClothingUniformJumpskirtCargo + jumpsuit: ClothingUniformJumpskirtCargoTechRomper # Back - type: loadout diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 29a7a0f7941..ddb77fdf94f 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -698,6 +698,9 @@ loadouts: - CargoTechnicianJumpsuit - CargoTechnicianJumpskirt + - ClothingUniformJumpsuitCargoTechPants # DeltaV + - ClothingUniformJumpsuitCargoTechOveralls # DeltaV + - ClothingUniformJumpskirtCargoTechRomper # DeltaV - type: loadoutGroup id: CargoTechnicianBackpack diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 5ef7a79d8bb..37e80315206 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -226,6 +226,21 @@ - Trinkets - GroupSpeciesBreathTool +- type: roleLoadout + id: JobCargoAssistant + groups: + - GroupTankHarness + - CargoTechnicianHead + - CargoTechnicianNeck + - CargoAssistantJumpsuit + - CargoTechnicianBackpack + - CargoTechnicianClothing + - CargoTechnicianShoes + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + - type: roleLoadout id: JobCargoTechnician groups: diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml index e1977234004..fb1e3041816 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -268,3 +268,14 @@ sprite: _DV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtCargoTechRomper + name: cargo tech romper + description: A flexible and professional skirt. It has a pair of skorts underneath for the hardest working skirt-wearers of Logistics. + components: + - type: Sprite + sprite: _DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi + - type: Clothing + sprite: _DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index 13deb3fa6bf..974816d1729 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -451,3 +451,30 @@ sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi + +# Cargo Tech Overalls uniform + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCargoTechOveralls + name: cargo tech overalls + description: A sturdy pair of overalls with leather straps and chartreuse buckles. Helpful for lifting heavy loads. + components: + - type: Sprite + sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi + - type: Clothing + sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi + +# Cargo Tech Pants uniform + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCargoTechPants + name: cargo tech pants + description: A crisp white collared shirt with a snappy pair of pants. There are leather knee pads for support. + components: + - type: Sprite + sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi + - type: Clothing + sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi + diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml new file mode 100644 index 00000000000..b5a316ce448 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml @@ -0,0 +1,44 @@ +# Head +- type: loadout + id: CargoTechnicianHead + equipment: + head: ClothingHeadHatCargosoft + +# Jumpsuit +- type: loadout + id: ClothingUniformJumpsuitCargo + equipment: + jumpsuit: ClothingUniformJumpsuitCargo + +- type: loadout + id: ClothingUniformJumpskirtCargo + equipment: + jumpsuit: ClothingUniformJumpskirtCargo + +# Back +- type: loadout + id: CargoTechnicianBackpack + equipment: + back: ClothingBackpackCargo + +- type: loadout + id: CargoTechnicianSatchel + equipment: + back: ClothingBackpackSatchelCargo + +- type: loadout + id: CargoTechnicianDuffel + equipment: + back: ClothingBackpackDuffelCargo + +# OuterClothing +- type: loadout + id: CargoTechnicianWintercoat + equipment: + outerClothing: ClothingOuterWinterCargo + +# Shoes +- type: loadout + id: CargoWinterBoots + equipment: + shoes: ClothingShoesBootsWinterCargo \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index d873d4df00c..c6bc847a458 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -154,8 +154,8 @@ id: CargoAssistantJumpsuit name: loadout-group-cargo-assistant-jumpsuit loadouts: - - CargoTechnicianJumpsuit - - CargoTechnicianJumpskirt + - ClothingUniformJumpsuitCargo + - ClothingUniformJumpskirtCargo - type: loadoutGroup id: CargoAssistantBackpack diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..f9ed0e660e96ada3aed32d3cb0c7b3124647a3cc GIT binary patch literal 1734 zcmV;%208hOP)Px*fJsC_RCt{2nqO>NR~^Sc_Vu4wCcd%Tb#+bHN=MwJE!|dCqER2br#=Bf{eF#vkp47f<3TU0yGO>-ph7?tsEVPja7^_6d+90oOQrBJ5T>IK_ z{rCFtV6L&#klgFU1!?#5a&pe`J>TE?-E+@9xxXLS*x1n3xdIn7pd0M8ZA9Vlfm&5mqN=21QYt`hx?#1g?jueTtlN^lDF>W6>lTrI4*-J$z39o&rV~_EMNf`0IM55w6(<;zH}oaR$)mf2LCevfG4k)vpc$@QxdK2u9(OF&Uy7k03*m9A@LW@d(&nHj*M1ExPMu=T+&G!1aO z|D#i>)S3RYU}ZSV82T&qn_+x>e8KqJ^f>_F?T>eG?6qA0e0b|=_I~G2e0b|=0FJ%3 zi?=`CVP!bWwCX2jpW=h`k4VfuwI+Q_r>3zHSxAzD;k_aH`aI3{Y_`Im|DvMnf+MH3 zuAKzCp>JsgEGG`o*XLn)ZwN{1+T6RQZ~BV2PHqv=fdBxyUT?g2mz2=h2*35r&2{%g zxAZNofcg2x0Yg$Ycw$+XPZn56_VF8F_-Z)0O)V`F1uV`F1uV`KAqWo$$iuO7d@ zD`D_Xc=h=GqSLQXmOmi0Mr&_;@Li;Br#N)z(EsE^#JO|lgq|Gbi~D~AKq8T_oFHL2 zL*$XzFG$T+80x=3@7$AoGMz`-c8X9aL@Jfy@ZrNtmV0d{N;P$=ph8DWLq-DO-4l`vui2lt$3a&ofc zoCM1&zz8cZhyNa|fLESfAX|j5o(Q+KtE$@3c$OVt#Os&iUaWu{+2z|;vTG&Qv|&yC zVSDq{Q!eXV{JX{z&(C#r6a3ZBHi?IK$<3SufT6En?pV|E9?;5C;nsYCZn0EjEt3a} z4j3LDzU#2@+^-ukc_Uw-+qC8+7}~8YXX8p(a=ZocJU2iWdl{$IN{M`qW4j3DeMXBaR4s9kq z=OmZc$mMD*E;hhm+DJLH;PQQ%Fy=B$N?8lr-Q6kqfd5GuM4zXjj7AG`0|(hU3~=pd9}dK?E(5^ zHx376vQ>h8ZiIlWR^`&=oTX5?WkX*&x>2Z^Mm%24R0#ze@%d2D%@2>?oA|t)BVc1= cW3x{D3xd3hE-bx|-~a#s07*qoM6N<$f;weq%m4rY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..910f95f05a38d95a97d3dc88a37446be3a0bdcc7 GIT binary patch literal 550 zcmV+>0@?kEP)Px$;7LS5R9J=WlTT|CK^Vq=?&RMRnuYoYx4mkXfJea|_bc?+ySH8f9;GlM9x4Pq zdGe$mpf_PJB_Bc%g{7^Ep~MbJ$R=*H<9JvSj9QpIc-!CQ<$Y)NnTKa*proXvq@(~+ zN^`jHnJ9|P@AD{%%;COgq?G2WZ?D3!-T3Nl)r4Wlw%il~r{C`*rL@wvP9RNFblk;tE7WQZ_c|WQTyuLTW5|@3PrjhzE@_(DO4=EaQkozL zP)e=MYc+?aD|qwxf_E>*q**>!N)ZHs^rWUl!-f**NH(-rLQ z?O8={ZQx(DT2<0ivsf5<&+byM3jjWTniSS5^a|p$8Kco90QI`y!TrtE;iJ(d@!71f z0qeMqdRr!Fw*b)kCqg)XRmfA=ee}&*w@?DZVSdAv%76NJyjbg(>qW3OkjyonSLNh1 zVVYzlNyd1R*J+Y*a+=_IRg$^>KL(nvAUZw=;MUFh+S;;@j?ZbjqL6_?PX^%i!3}ev o7F^$~@@IYc^m}2wl9G~=U)YG&h2V`;9{>OV07*qoM6N<$g1vVNIsgCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a7184d161f369e20116812eb6dead79618789e79 GIT binary patch literal 866 zcmV-o1D*VdP)Px&97#k$RCt{2nL%h2R~W~C$!0dm(rkv&wu$1Q5~7<1J(PmvG?x$%8ptKL9$I<} z$Q}xwgb_~xK`H3Tn}>lyDJTeo_Yx?%l+a{DgF?jtlRkF0Zjx>F7pRPQ4~c{6h%=KMNt$*QT|PWAh3%I!#0W{dw6bfVb}&iaOC(u zp;t;MHGcSb6h*dM<3SKu-}gB^I)E{TH;WL4p*=l1fbaXL8Jh8?>imiVHkGI zMNwppF{H-3y?dqcA(D-9rwCyf+GL|lX?#e+?g9EF#Y*Ettge>{!_a!3hcSlK_@7;z z@B2P+9OD$4jE?mY|5j%Ed5&Z!VX`z#lI#=5F%xGV1HOo7kq($R^O!h}0oq14%51NE zMY2(5bgYlv{w8r8DW@e@bVD zK@jvvcuo-&`}N`Z&Kj?**ZJ}L=Kxf9;K485Uu)_t7GS`EufP15u}?k#pjdR6_+m}e zv*;cGP_OR+(AY_MR)yWY;oJaT{q9=>5;B6M1D2Kzljn^jeCd zD2k#eilQirq9}^;KSDA>7keuFzL1X4#gn1;MVdq#Zg*n%<0R23nJa*Fgr2!2ARVD+ z_F4Vx1*|*Rem^&VigV+|&fIab!^|y#l&zQT*MQSbqSI8mSago1lgSQ{N}?g71(1x; sGq(wXY=oZ40!T*anOp*(NwgxxE4vrr>9rJ!zyJUM07*qoM6N<$g7Yb-Pyhe` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..646ffb4f00bc439fdca1564643d18dea7701f117 GIT binary patch literal 743 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 b@-gJ!L)0Na?@v)200000NkvXXu0mjfaCxb- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..41799b28219c468d3df1f4d406e5d652d4878a58 GIT binary patch literal 625 zcmV-%0*?KOP)Px%5lKWrR9J=Wl+SAuK@@<$-TY{1nys~3n}|IKCH)h6DG1(7j)Lau$)3fYdWcB9 zSkLhwf(RWCg^F}r@D#+Go`fPOs1)i#NGc}TknC(`Jj7o;h&!kUVZY13+c$5&nKv^K z6B85jKOuzB%S-5ujfdKGUHvUqtycB&61rNgYSWrYlVmG<4?loH;S2!vdR+tL^Lg&? zLa|sh{eN_UM^Db{K)s|Fz)tM~=_Dj=2o(e&^n#Iy5JFcf73;4G2qE;WlLtT!&vE(U zX@*0I1}q?vNO9xlTfkhxj%o_v`&~K%ux%KsQS5c*6K}@m=nO{RP5G^W5JEdn4$t%O zJnzTEuQM0=Q!L1RfbThulS2p*=|D!>foygHfbQN3>ud7_QnI<#V8?B+xz!+$lJ&KD zx_c`}@}m%`Pp-SI+wBgSkJrfO)7Z9+g<_~6VS~m-DTU_+^b2=zoE)W6Ia2M&rxoDt z_2c^8exLC)l*%($fCk*{2E72z&SkiI`_QPS(K~QzHpAlLG%}P&;-&Hosbq@xAAFN? zfZ;6we!XW#>;3})DMzb6I0#UBH2xen#i#|(UbGo|m7v>GgrVZfrIS2;-o{Q?OpMzM z2E%_VFg=wfn@y7W9MEWK9`7~*IB_h&w3;o63@wz_+9pHn`aJFdjv0Rty;mu9|l zzkV(J!{clDry}DYp0aZ-cJhf}-TPnSr;6vXx@jt$Z_BJ-JXl-gG?PccH(37cKSsTC zKN9|a{k-zw@2b6Zk0t+@r$cOY!gx?&plu}%b#_&_2I2=-vs&7-+eAxE&V4p z%u?}PWSg$Oudx34n5b+s@gKj|vX^+D=S=*@!!Tohy+K*+m*Z2W3Lh$AP*<-%87u$b z((C^D@BE6KX53?%zyC|cuarrD4;$ax^ZHuc-i|*<%l?C;;usl@NB+O{c2ltn4Ez&* zEcN8J$;D^?Ij0@m|G`&rb;v1Fgr0-rXjUCW+!8W`H5w|*)!KjrCiQh z;}gbP^fa%LaW&h{P0SmzCTLf4N0^?Nx|hj;cT-1Wv6Od!ebHOV6ydeaSW-L z^Y-T6tlI$+$3E`&j=r?SWhRr7fRnc}zv=|*3%n}9A1*BvzhHWSPnK`qE$$brCeA5F ztWN6|L~EpIHg221(tI(&Y2(L*ZEAD)+>XglQab6SHTC=U8&+p4>X8rk1mpV@gn3`s9^4+n?47Y`kpJ{~xe=E#GxMzF9Vr zHAimy&pq+?-_$jg@@};o{^c;H*B0ii4U2yIyI=3ZNyValo1XR7aQMmTY}oY4BKnZ^ zG}HVi40?K|ws+Yjs&lvJZ%W$}9QoPp9#j0jvdW)HefjqFA0HMk|MYHaD%-q-OU__V~lo@M4+is+qdYAmdKI;Vst0C7Jc A6951J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json new file mode 100644 index 00000000000..6c7f3113623 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..857cd30d8fb04a044250c3a41e6abf755816691f GIT binary patch literal 1354 zcmV-Q1-1H#P)Px)1W80eRCt{2nonrkRvgE_HjW))vUmw3IL5U2V2|w7i%DVvX~Fo=!|2h_btT88 zr-l(q=n#xC!sx-!^sqxnmxC{6WvqochG7WIxo1r)8*(wWNJwO z{3n#^b1~AB-}m>vdhbc-_XA8!OiWBnOiWBZPb?%CGYlgGz}(y%B9Vyt-()f=XEGV( z8lpaF^aFtaO0@^@cnZi|rwK#+w2Fa2$v6@o_{V5lb?elzE;a!zNsLkzQO&Hk*at@5ezt481|UGNF@x zCyeS_jdUhS64L23IF4&Nued(rO<@dgz;PVX=`ed z=XsP$C3T}wsMTss$1KaDR4Rezc?1Fhb1rmKjdw?Eg zu*wY3ug!jQa&iIy>Y$Zl8amDZJv%!)*x%pBPY>VXpZ^{q91bIuO5x6p=XkpHb>EF> z(q|v3=kMHjj;FuT=@U)W_2n@c02XE^;Bwj3^MX*p?%pW?V0A<6+nZoN^of^%UK{{i zE;|-xCrG=ZqSyLF2KaqWRh-R!X!>=z?C|@XR6)?_>!H;r+5;2>p#lK->u(NzpA&*m zxiqkTAP5y49e>1GxrR}v4O5fD)cQm-VC!WOPuAW80J4W=tZs;w>|q%I@MP^hwq6#g zf}kOLSjK}Nk5zqIhzyt>1I{ja%RG}B?VlP%1{6hL)X~0e)X`}F)F9de9)35CsmbBC zZL2@{aCH0;f3Ea*87TXY(eqb9WPoYY>DA?$2io#n=hrCGhImwCeEs@|dh-X8k@V?yVI2{ziCjrD##o#7UT*DBB^M!R|s0Isht zpi`{^30*A#L8uI@E9pg?7SHYX2UPhMWHsniRYn3xdpKYRM9>?IWZ(*OVf M07*qoM6N<$f+7un^#A|> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f9fcbf32221fa96acbf6bf14a33e3cac66f8dabc GIT binary patch literal 480 zcmV<60U!Q}P)Px$nn^@KR9J=Wl(9+!K@f(&Xf%QZB|>Baf>+#@gR{16`_*c7ltM~5wl^3I#@13wlv00Fz+`gx=)iA&KcPK_xm+%gq0wlN&1QjN`=ylHV>s0m zxULI)bYQfehFKlwe!p)yj>Ey$6}J!T7=}TuRwJK2qj>pDy>qG>ssbr9#Gk>U6)@BO)Rq!txGZ W&8oEU8%zQK0000Px%xk*GpRCt{2*}qF0VHgMSZ%SKQ6<@nlPQjEGytouxTwD%8>|$x51fkG>Al)hy zvBQxqL$~XiA%hVS8VEvBD1uXqAaoG#kk(3)cMvH#azv=|c1SP8_N?z~UxdTwvn2Oi z^38isEsvZAk!f878J58Tk19B_<~)v9`8`iKK(_2aeb8>e8>3%P`UOepH`R?{@lW&U#%b#~kiGRZFLb;CjANjtp(z0RXUCs$p(^=TvQO zeg~_ino`c-;LXVTpH0z0YXfR^V1TvmH-aMot?ioPn|5$;(tdvD?YF%^+gd|f8!$4; zFh11}*YhzpvzKr^ALCQ~7#U?sIUAckyxk@W%N%1fdx^p_hqv3r#-^`xxd1eO2LM2o zAK}OEU&Bvd0^I4jc+S7J2_b|KLI@#*5JCvKV$Pa6tIiFzUlY6x#bQwyh7q~XvMdxz zOuTp^H$c&PRroU4wted0qo&cU?^yawh+P9hokP-mJ}<(9=bVFKMLH*z4bU}-24dI% zU6bh8%Vn6@E~kX!IKp*Z;W&=iE~i8;!<2pnw2qoD)BCprB5GLbdOn`Ms!1PL>^=e^ xU6bh8HbB=TI<^haHHnVpKf#c$Ni-o>*e_)TT{YMQ#Ag5i002ovPDHLkV1mW)T2%l5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8e4f07e13a65d256ceea79d3b0c3d873e8ffafc0 GIT binary patch literal 591 zcmV-V0Px%2}wjjRCt{2*`aUSKokb>uhZbP%TRR%gL4Z@N=nR1H@1-d1BF9XiD|)@u|bJp zBUL3urlSK@9S{v9J~$=vNd=W|Aaj&9=k?;mlW+Qd$a&U9pP!s_jJII&NX3^yeka|f&f~V7>_5`1>^AqT9*id zpkdtYYAx@@sW5lf`zDTKljpgK{PmsSGT$b~u4>;3FY|3;ybk9(pqdyI5#aa#UZDQ=g`F}u# d6Ii1E%5SNnXuY>_Gd} Date: Tue, 21 Jan 2025 15:21:35 -0600 Subject: [PATCH 2/8] logi tech uniform fix attempt --- .../Loadouts/Jobs/Cargo/cargo_assistant.yml | 44 ------------------- .../Loadouts/Jobs/Cargo/cargo_technician.yml | 12 ++--- .../Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- .../Loadouts/Jobs/Cargo/cargo_assistant.yml | 8 +--- 4 files changed, 8 insertions(+), 58 deletions(-) delete mode 100644 Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_assistant.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_assistant.yml deleted file mode 100644 index a4378777a58..00000000000 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_assistant.yml +++ /dev/null @@ -1,44 +0,0 @@ -# Head -- type: loadout - id: CargoTechnicianHead - equipment: - head: ClothingHeadHatCargosoft - -# Jumpsuit -- type: loadout - id: ClothingUniformJumpsuitCargo - equipment: - jumpsuit: ClothingUniformJumpsuitCargo - -- type: loadout - id: ClothingUniformJumpskirtCargo - equipment: - jumpsuit: ClothingUniformJumpskirtCargo - -# Back -- type: loadout - id: CargoTechnicianBackpack - equipment: - back: ClothingBackpackCargo - -- type: loadout - id: CargoTechnicianSatchel - equipment: - back: ClothingBackpackSatchelCargo - -- type: loadout - id: CargoTechnicianDuffel - equipment: - back: ClothingBackpackDuffelCargo - -# OuterClothing -- type: loadout - id: CargoTechnicianWintercoat - equipment: - outerClothing: ClothingOuterWinterCargo - -# Shoes -- type: loadout - id: CargoWinterBoots - equipment: - shoes: ClothingShoesBootsWinterCargo diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index d88262dfe0e..6c3214ee587 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -6,19 +6,19 @@ # Jumpsuit - type: loadout - id: ClothingUniformJumpsuitCargoTechOveralls + id: ClothingUniformJumpsuitCargoTechOveralls # DeltaV equipment: - jumpsuit: ClothingUniformJumpsuitCargoTechOveralls + jumpsuit: ClothingUniformJumpsuitCargoTechOveralls # DeltaV - type: loadout - id: ClothingUniformJumpsuitCargoTechPants + id: ClothingUniformJumpsuitCargoTechPants # DeltaV equipment: - jumpsuit: ClothingUniformJumpsuitCargoTechPants + jumpsuit: ClothingUniformJumpsuitCargoTechPants # DeltaV - type: loadout - id: ClothingUniformJumpskirtCargoTechRomper + id: ClothingUniformJumpskirtCargoTechRomper # DeltaV equipment: - jumpsuit: ClothingUniformJumpskirtCargoTechRomper + jumpsuit: ClothingUniformJumpskirtCargoTechRomper # DeltaV # Back - type: loadout diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index 974816d1729..9780ed40188 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -477,4 +477,4 @@ sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi - + \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml index b5a316ce448..e972511aa67 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml @@ -1,9 +1,3 @@ -# Head -- type: loadout - id: CargoTechnicianHead - equipment: - head: ClothingHeadHatCargosoft - # Jumpsuit - type: loadout id: ClothingUniformJumpsuitCargo @@ -41,4 +35,4 @@ - type: loadout id: CargoWinterBoots equipment: - shoes: ClothingShoesBootsWinterCargo \ No newline at end of file + shoes: ClothingShoesBootsWinterCargo From 4d0315ebc0448134c5f5d83fc524df88e05173ea Mon Sep 17 00:00:00 2001 From: kushbreth Date: Tue, 21 Jan 2025 21:31:30 -0600 Subject: [PATCH 3/8] logi tech drip FUNCTIONAL --- .../Prototypes/Loadouts/loadout_groups.yml | 2 -- .../Prototypes/Loadouts/role_loadouts.yml | 15 ---------- .../Loadouts/Jobs/Cargo/cargo_assistant.yml | 28 ------------------- 3 files changed, 45 deletions(-) diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index ddb77fdf94f..8425d37cbcc 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -696,8 +696,6 @@ id: CargoTechnicianJumpsuit name: loadout-group-cargo-technician-jumpsuit loadouts: - - CargoTechnicianJumpsuit - - CargoTechnicianJumpskirt - ClothingUniformJumpsuitCargoTechPants # DeltaV - ClothingUniformJumpsuitCargoTechOveralls # DeltaV - ClothingUniformJumpskirtCargoTechRomper # DeltaV diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 37e80315206..5ef7a79d8bb 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -226,21 +226,6 @@ - Trinkets - GroupSpeciesBreathTool -- type: roleLoadout - id: JobCargoAssistant - groups: - - GroupTankHarness - - CargoTechnicianHead - - CargoTechnicianNeck - - CargoAssistantJumpsuit - - CargoTechnicianBackpack - - CargoTechnicianClothing - - CargoTechnicianShoes - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - - type: roleLoadout id: JobCargoTechnician groups: diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml index e972511aa67..e36cf205b97 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml @@ -8,31 +8,3 @@ id: ClothingUniformJumpskirtCargo equipment: jumpsuit: ClothingUniformJumpskirtCargo - -# Back -- type: loadout - id: CargoTechnicianBackpack - equipment: - back: ClothingBackpackCargo - -- type: loadout - id: CargoTechnicianSatchel - equipment: - back: ClothingBackpackSatchelCargo - -- type: loadout - id: CargoTechnicianDuffel - equipment: - back: ClothingBackpackDuffelCargo - -# OuterClothing -- type: loadout - id: CargoTechnicianWintercoat - equipment: - outerClothing: ClothingOuterWinterCargo - -# Shoes -- type: loadout - id: CargoWinterBoots - equipment: - shoes: ClothingShoesBootsWinterCargo From eaf698e57d1b35aa9357387082b6489cde518406 Mon Sep 17 00:00:00 2001 From: kushbreth Date: Sat, 25 Jan 2025 20:10:38 -0600 Subject: [PATCH 4/8] i fixed with hammers --- .../Loadouts/Jobs/Cargo/cargo_technician.yml | 15 +++---- .../Entities/Clothing/Uniforms/jumpsuits.yml | 1 - .../Loadouts/Jobs/Cargo/cargo_technician.yml | 16 +++++++ .../_DV/Loadouts/loadout_groups.yml | 4 +- .../Jumpskirt/cargotechromper.rsi/meta.json | 44 +++++++++---------- .../Jumpsuit/cargotechoveralls.rsi/meta.json | 44 +++++++++---------- .../Jumpsuit/cargotechpants.rsi/meta.json | 44 +++++++++---------- 7 files changed, 83 insertions(+), 85 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index 6c3214ee587..b230d17f19d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -6,19 +6,14 @@ # Jumpsuit - type: loadout - id: ClothingUniformJumpsuitCargoTechOveralls # DeltaV + id: CargoTechnicianJumpsuit equipment: - jumpsuit: ClothingUniformJumpsuitCargoTechOveralls # DeltaV - -- type: loadout - id: ClothingUniformJumpsuitCargoTechPants # DeltaV - equipment: - jumpsuit: ClothingUniformJumpsuitCargoTechPants # DeltaV + jumpsuit: ClothingUniformJumpsuitCargo - type: loadout - id: ClothingUniformJumpskirtCargoTechRomper # DeltaV + id: CargoTechnicianJumpskirt equipment: - jumpsuit: ClothingUniformJumpskirtCargoTechRomper # DeltaV + jumpsuit: ClothingUniformJumpskirtCargo # Back - type: loadout @@ -46,4 +41,4 @@ - type: loadout id: CargoWinterBoots equipment: - shoes: ClothingShoesBootsWinterCargo + shoes: ClothingShoesBootsWinterCargo \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index 9780ed40188..f9ace6d171b 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -477,4 +477,3 @@ sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi - \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml index 3db26712131..2f28abe732c 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -1,3 +1,19 @@ +# Jumpsuit +- type: loadout + id: ClothingUniformJumpsuitCargoTechOveralls + equipment: + jumpsuit: ClothingUniformJumpsuitCargoTechOveralls + +- type: loadout + id: ClothingUniformJumpsuitCargoTechPants + equipment: + jumpsuit: ClothingUniformJumpsuitCargoTechPants + +- type: loadout + id: ClothingUniformJumpskirtCargoTechRomper + equipment: + jumpsuit: ClothingUniformJumpskirtCargoTechRomper + # PDA - type: loadout id: CargoPDA diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index c6bc847a458..d873d4df00c 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -154,8 +154,8 @@ id: CargoAssistantJumpsuit name: loadout-group-cargo-assistant-jumpsuit loadouts: - - ClothingUniformJumpsuitCargo - - ClothingUniformJumpskirtCargo + - CargoTechnicianJumpsuit + - CargoTechnicianJumpskirt - type: loadoutGroup id: CargoAssistantBackpack diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json index 6c7f3113623..659609b7a68 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json @@ -1,26 +1,22 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "drip by kush.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json index 6c7f3113623..659609b7a68 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json @@ -1,26 +1,22 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "drip by kush.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json index 6c7f3113623..659609b7a68 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json @@ -1,26 +1,22 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "drip by kush.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file From f418ddab3f07f57c62e43375a8d6ae78eb99b0b4 Mon Sep 17 00:00:00 2001 From: kushbreth Date: Sat, 25 Jan 2025 22:20:15 -0600 Subject: [PATCH 5/8] BLARGH --- .../Jumpskirt/cargotechromper.rsi/meta.json | 44 ++++++++++--------- .../Jumpsuit/cargotechoveralls.rsi/meta.json | 44 ++++++++++--------- .../Jumpsuit/cargotechpants.rsi/meta.json | 44 ++++++++++--------- 3 files changed, 72 insertions(+), 60 deletions(-) diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json index 659609b7a68..6c7f3113623 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json @@ -1,22 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "drip by kush.", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC0-1.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json index 659609b7a68..6c7f3113623 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json @@ -1,22 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "drip by kush.", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC0-1.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json index 659609b7a68..6c7f3113623 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json @@ -1,22 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "drip by kush.", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC0-1.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From c3fb8f7178692209e81c956d631384ca029814f0 Mon Sep 17 00:00:00 2001 From: kushbreth Date: Mon, 27 Jan 2025 16:38:08 -0600 Subject: [PATCH 6/8] nothing bad ever happens to me --- .../Loadouts/Jobs/Cargo/cargo_technician.yml | 3 ++- Resources/Prototypes/Loadouts/loadout_groups.yml | 2 ++ .../_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml | 10 ---------- 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index b230d17f19d..9fa0acf966e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -41,4 +41,5 @@ - type: loadout id: CargoWinterBoots equipment: - shoes: ClothingShoesBootsWinterCargo \ No newline at end of file + shoes: ClothingShoesBootsWinterCargo + diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 8425d37cbcc..b5625c6ee57 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -696,6 +696,8 @@ id: CargoTechnicianJumpsuit name: loadout-group-cargo-technician-jumpsuit loadouts: + #- CargoTechnicianJumpsuit + #- CargoTechnicianJumpskirt - ClothingUniformJumpsuitCargoTechPants # DeltaV - ClothingUniformJumpsuitCargoTechOveralls # DeltaV - ClothingUniformJumpskirtCargoTechRomper # DeltaV diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml deleted file mode 100644 index e36cf205b97..00000000000 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml +++ /dev/null @@ -1,10 +0,0 @@ -# Jumpsuit -- type: loadout - id: ClothingUniformJumpsuitCargo - equipment: - jumpsuit: ClothingUniformJumpsuitCargo - -- type: loadout - id: ClothingUniformJumpskirtCargo - equipment: - jumpsuit: ClothingUniformJumpskirtCargo From 280cdc31d9704266ce177d65080955f68d4a3a3f Mon Sep 17 00:00:00 2001 From: kushbreth Date: Tue, 28 Jan 2025 01:33:25 -0600 Subject: [PATCH 7/8] nintendo 3DS streetpass --- .../Loadouts/Jobs/Cargo/cargo_technician.yml | 2 +- .../Jumpskirt/cargotechromper.rsi/meta.json | 50 ++++++++++--------- .../Jumpsuit/cargotechoveralls.rsi/meta.json | 50 ++++++++++--------- .../Jumpsuit/cargotechpants.rsi/meta.json | 50 ++++++++++--------- 4 files changed, 82 insertions(+), 70 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index 9fa0acf966e..50da8442d58 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -42,4 +42,4 @@ id: CargoWinterBoots equipment: shoes: ClothingShoesBootsWinterCargo - + diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json index 6c7f3113623..fa373384b0b 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "drip by kush.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json index 6c7f3113623..fa373384b0b 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "drip by kush.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json index 6c7f3113623..fa373384b0b 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "drip by kush.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } From 6ae840f9ff6cadf6ac5a3924dc801b733c8aa52e Mon Sep 17 00:00:00 2001 From: kushbreth Date: Tue, 28 Jan 2025 22:49:34 -0600 Subject: [PATCH 8/8] family guy funny moments --- Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml | 1 - .../Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json | 4 ---- .../Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json | 4 ---- .../Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json | 4 ---- 4 files changed, 13 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index 50da8442d58..fb823fdcb9f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -42,4 +42,3 @@ id: CargoWinterBoots equipment: shoes: ClothingShoesBootsWinterCargo - diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json index fa373384b0b..c65dfb901a7 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json index fa373384b0b..c65dfb901a7 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json index fa373384b0b..c65dfb901a7 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, { "name": "inhand-left", "directions": 4