From 1e1b727de72e7ec961eea9afce67bd05571be437 Mon Sep 17 00:00:00 2001 From: Smugman <85798843+Smugman@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:09:44 +0100 Subject: [PATCH 1/9] Copies PR#2285 from Lyndomen, Including the Sprites made by JustAnOrange --- .../Catalog/Fills/Items/briefcases.yml | 8 ++-- .../VendingMachines/Inventories/engidrobe.yml | 2 + .../VendingMachines/Inventories/lawdrobe.yml | 3 ++ .../VendingMachines/Inventories/scidrobe.yml | 2 + .../_DV/Entities/Clothing/Belt/belts.yml | 12 ++++++ .../Entities/Clothing/OuterClothing/coats.yml | 12 ++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 37 ++++++++++++++++++ .../_DV/Entities/Objects/Misc/briefcases.yml | 11 ++++++ .../syndbelt_overlay.rsi/equipped-BELT.png | Bin 0 -> 391 bytes .../Belt/syndbelt_overlay.rsi/icon.png | Bin 0 -> 387 bytes .../Belt/syndbelt_overlay.rsi/inhand-left.png | Bin 0 -> 352 bytes .../syndbelt_overlay.rsi/inhand-right.png | Bin 0 -> 360 bytes .../Belt/syndbelt_overlay.rsi/meta.json | 26 ++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1364 bytes .../Coats/cybersunovercoat.rsi/icon.png | Bin 0 -> 453 bytes .../cybersunovercoat.rsi/inhand-left.png | Bin 0 -> 562 bytes .../cybersunovercoat.rsi/inhand-right.png | Bin 0 -> 554 bytes .../Coats/cybersunovercoat.rsi/meta.json | 26 ++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1194 bytes .../Jumpsuit/cybersuncasual.rsi/icon.png | Bin 0 -> 359 bytes .../cybersuncasual.rsi/inhand-left.png | Bin 0 -> 512 bytes .../cybersuncasual.rsi/inhand-right.png | Bin 0 -> 527 bytes .../Jumpsuit/cybersuncasual.rsi/meta.json | 26 ++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1446 bytes .../Jumpsuit/cybersunhazard.rsi/icon.png | Bin 0 -> 547 bytes .../cybersunhazard.rsi/inhand-left.png | Bin 0 -> 534 bytes .../cybersunhazard.rsi/inhand-right.png | Bin 0 -> 556 bytes .../Jumpsuit/cybersunhazard.rsi/meta.json | 26 ++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1585 bytes .../Jumpsuit/cybersunrnd.rsi/icon.png | Bin 0 -> 489 bytes .../Jumpsuit/cybersunrnd.rsi/inhand-left.png | Bin 0 -> 511 bytes .../Jumpsuit/cybersunrnd.rsi/inhand-right.png | Bin 0 -> 533 bytes .../Jumpsuit/cybersunrnd.rsi/meta.json | 26 ++++++++++++ .../briefcase_cybersun.rsi/icon.png | Bin 0 -> 299 bytes .../briefcase_cybersun.rsi/inhand-left.png | Bin 0 -> 338 bytes .../briefcase_cybersun.rsi/inhand-right.png | Bin 0 -> 342 bytes .../briefcase_cybersun.rsi/meta.json | 22 +++++++++++ 37 files changed, 236 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Misc/briefcases.yml create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index 817a84ce639..fc3df5f143e 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -30,7 +30,7 @@ - type: entity id: BriefcaseSyndieLobbyingBundleFilled - parent: BriefcaseSyndie + parent: CybersunBriefcase # DeltaV suffix: Syndicate, Spesos components: - type: StorageFill @@ -41,8 +41,10 @@ - id: EncryptionKeySyndie - id: RubberStampTrader - id: PhoneInstrumentSyndicate - - id: ClothingUniformJumpsuitTacticool - - id: ClothingOuterCoatJensen + # - id: ClothingUniformJumpsuitTacticool # begin DeltaV + # - id: ClothingOuterCoatJensen + - id: ClothingOuterCybersunOvercoat + - id: ClothingUniformCybersunAttorney # end DeltaV - id: ClothingHandsGlovesCombat - id: ClothingMaskNeckGaiter - id: SyndieHandyFlag diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index 5d732def49f..cdb0dd1c2b8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -16,3 +16,5 @@ ClothingOuterWinterEngi: 2 ClothingNeckScarfStripedOrange: 3 ClothingShoesBootsWinterEngi: 2 + emaggedInventory: + ClothingUniformCybersunHazard: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 98834011e0f..8a2f4f5e8c2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -32,3 +32,6 @@ SpaceCash100: 2 emaggedInventory: CyberPen: 1 + ClothingUniformCybersunAttorney: 1 # DeltaV + CybersunBriefcase: 1 # DeltaV + ClothingOuterCybersunOvercoat: 1 # DeltaV diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index c4608af34eb..88c91a91f60 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -16,3 +16,5 @@ ClothingNeckScarfStripedPurple: 3 ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics ClothingShoesBootsWinterSci: 2 + emaggedInventory: + ClothingUniformCybersunRND: 1 diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml index 425d471677e..020a7521fbc 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml @@ -75,6 +75,7 @@ - type: Appearance - type: entity +<<<<<<< HEAD:Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml parent: ClothingBeltSheath id: ClothingBeltFoamSheath name: foam sheath @@ -106,3 +107,14 @@ components: - FitsInDispenser - Stamp +======= + parent: ClothingBeltUtility + id: ClothingBeltSyndicateUtility + name: syndicate utility belt + description: Can hold various nefarious things. + components: + - type: Sprite + sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi + - type: Clothing + sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi +>>>>>>> 78551dc8e2 (meow):Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml diff --git a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml index 3e4324b6d31..daee5c57d69 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml @@ -119,3 +119,15 @@ - type: TemperatureProtection coolingCoefficient: 0.1 +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCybersunOvercoat + name: cybersun overcoat + description: Heavy black robes with magenta and gold trim. It smells old. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi + - type: TemperatureProtection + coolingCoefficient: 0.1 diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index 13deb3fa6bf..c97b40b9355 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -428,6 +428,7 @@ - type: Sprite sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi - type: Clothing +<<<<<<< HEAD:Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi - type: entity @@ -451,3 +452,39 @@ sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi +======= + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCybersunHazard + name: cybersun hazard suit + description: This high-visibility jumpsuit prevents you from getting run over, yet keeps you dark enough to stay unnoticed! + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCybersunCasual + name: cybersun casual jumpsuit + description: With all the non-descript gizmos they shoved in this thing, are you sure it's even safe to put on? + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCybersunRND + name: cybersun research turtleneck + description: It's another Turtleneck. What'd you expect? + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi +>>>>>>> 78551dc8e2 (meow):Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/briefcases.yml new file mode 100644 index 00000000000..eb3e701c9bd --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/briefcases.yml @@ -0,0 +1,11 @@ +- type: entity + parent: BriefcaseBrown + id: CybersunBriefcase + name: cybersun briefcase + description: It's like a brown briefcase, but black + components: + - type: Sprite + sprite: DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi + state: icon + - type: Item + sprite: DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..89123d9fcfb6b474c2dce8181f03c7f10ef22859 GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z9X(wfLn`LH zy=9np$Ux%g$Lp(vZq89X6>vjqV*%r`ZvuN+pTE?t>hy~_pe*eqddi7SCEej&K#!A@ zhMSS>um7GJ4-bE;PTHypG#3aSEU`IX`&)8K>dV9GrFG`JZ|h!*J@aUjPHmvbs#RXD zfilk?{{CFFa{I2nd**8UGo^Uj56kaw<-2xk#hdmSM_+%9y1Z*zso(l@o|D3Sm0!1f4! zcV;|3xX<~;v`O!6ZWrG-_Mcdim+2*@(@}%jr zB!%@ne;C*5mC0}Zk-5>r`nN=H(ze}R){nQ_X_oXaKfG1qewF_!_4h0K^9p?K@xD2i iw^V<&H51Ul>A#q4ZnZz!n)N&$WQnJ%pUXO@geCxUJFcPt literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c32d265b26f511292acd42d4767da8818a4c02bc GIT binary patch literal 387 zcmV-}0et?6P)Px$JxN4CR9J=WRJ&@!Fcdv42n#xkJ7o3H;qIohf51b3Eq~FWzfs7jCE&G#(4@^F zP<2S8I*x5Aq;#ncTrhf^b9^5H3JMAe{yQFSJnw&-H|Jm!B_aTTQYvm*Yp*UCW3n|; z20Rf#DFtiolz0*04ghGaS9R75cxDa+k$4Wl;GEGB$F1dt@1*oNWx+GE$Eh62U}jH5 z@h!HaWoVN+G{`}1&!Yg^~golW+24XrggDe*oG zt2$W*j4`usK$wtlCS(ji5YEv^;-aA@jdc-?5WW#2tNHFWva~;mB$87wLKrb%KCRQW hyHj6KP*CtE_y&%oqt$`#(3SuI002ovPDHLkV1k0jqEG+; literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d694b675021b464aaa3eb59b8e13a6da9db2224b GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr9536Ln`LH zy=jH6VW3Rn1gmBVr&$~!dF!j6i)HqDHC~#b!16AHBl((Z0EZ*zk$JvbKGd^U zY{+lVbYlUU2Lc7Nt$g>c`n5GxcPF>tuMIan0!3DzjuKkZaQtoA)JX3p5dq=POd(h0 zmwAR8U?o8!fW$FOQwxvFASDdQJOZOnIqM4aIt^ST&T2@~0(c!sW?{Cxq)QcqVumvv4FO#uJZm9zi= literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9cf28a3fccbfa8176baa1fad066acb81c9009b7a GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zl{{S>Ln`LH zy|ppxuz^VH!`E!W6Sg%7F7@V>+xvU(Z?V{Bx8_|fNjx`=W(eHT%-kIjxJIk=cl~Ao zb@h|6>s)}wfx-M)HuAlOkM|b0aGd<}!1}|ED9=EV&%vr9lWs;IxLjpx9gw9sb1&@(}va~a<+pZuj(UNOwd`wS1v>V3aEP5-WWn(?Zf*=yyCayIdRX-}Vi zYz*>xwaYK8>6+EAxd&M@*6LfEKc7?n{oC!2b`S0`IvxFYT6Yygc5a!4%p$(~v$-tl zxi#4z%q-U1o%X(d?QFeYzYeb5+AZI5!2TO!eYvO6q_~-WAPYTR{an^LB{Ts5ICqy? literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json new file mode 100644 index 00000000000..9f00e200493 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..46f060ec1199c258507403647c8ce2ce6241e7fb GIT binary patch literal 1364 zcmV-a1*`grP)Px(^hrcPRCt{2nonrkRvgE_sU^!`*|p}*^KvMJo(yK~X<$ZgC1j^z*kLeO4x7 zo?=_u`aTeF^lW{<@2B7Ir)NC_91e%W;cz&wDKoX}zboOUUv`bs zSCT16qHTG(u!4k=M5A8AdU=g{@v2YolmWT&qLoh1(#T7q0Mlpz0G{1GPfZC@1nKlF za^=ObW&+W7PCkCGf_JuVA%3rd<-!W}l}^v%y>CA9tUodU*;3werrZ~+U*e}rXAzZU z06^yIlb+8AQe8clto|MKXC z=W`DYfT}g2w@lPG7mz8=BbKmlK}3+;V~w^6L5d)jNFh_4M}2dl>x%eA)tb;X4fV|h z0QS{)_9N010lV*zw6Fd60shu&p7fa(Lb;74O95cXE`-#^0nCp5np_FzB&<28r2OwwzLBj(Ow1J@E0SMYa&@ep`W8LeYJn@h}ReCqhIxmPkPefo@s?K)rSVC7Hs{ zpWd11Be9Ejmn@E@@?gAlTxRQJn_ zVK6sA=j8YIcIa_Q6aXPI=woB!?B(CPw#JAD5(HM513*%4e{Tn8(sS&JW9CeH4*PpM z^mhTQFa>~Yh781RbB5MoI(i{avCbXCFuXEuAitEF=asF z&AH)Go6rNb$y+!&GVt(|uX{Y?HkO!woXNa9oGH#*KzFT?71*S| z2M{jawI|x|%5Sf3G5tP(!{Kl^9M0>@KNtyo5*`a_asU7T4rN$LW=%~1DgXcg2mk;8 W00000(o>TF0000Px$e@R3^R9J=Wl`%`hKp2Lfn#KyblomvygS$BSAH>PsvA;kU7oj?7!No;4odg$m zLGTxdi<9^hgkWiClG1n=;-Ec=Ammb^OP(cplaG7fd>?m#ii(Pg8B;SUZnc-QFdA}p zev9KS5{K{X@9p4gF-0E!)Y;tXnT??usUk5F}F3 zZY&Uo?|9yd)`Px}Wjk3aW1~*Y6)AE>lX_zTfQDVCVSnX*y;#@xp0|Q4nkL@G12{qe zaM(TOesdLo@hD(z_eF zO6z1CYV$-Y!f0sjUNpdDiw*jIE<|S|Ad!ke-_OAtqhuYy{do418mAqW}|B`hAsSE}w+fWht}^08$y(!obhqXB;X;e|ak7+FEaG vx->=jedLxsf=e0yWj4*fprWFpV&;4TQ{|NSVmu)b00000NkvXXu0mjfVqeNW literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3e27e5e0f7b021b98dbfeb4940971c257d146f1b GIT binary patch literal 562 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z-*~z>hE&XX zdvm|n;Q$HN55co%IIY^Y)gwg2%EICoUmxGTM*j!vRw(SS*u|N*uhIEnc|l=OSxDEm zi;GNrPnBxy{IPzer~PX2bNR1)PrZCQUC4>w!372)r=0q%mB0Jd?#Gdz?c`72UUzEN z_tl@at!B&BvzxB^{`1F*6PceU`FOPWh%SFv$-Q9?)2cY%{B^IchE$g672o^4=6Sbo zswHd6NpGW13_z(!KSqWJH^gLaA3B*CtE;zGvbb|KT;s)- zjluKZ?B`S7A}9T#Re$IH6Vh%^FgRR!y?*hA=FO`Y#T|eC zUkfPQ%fg^FwW}(NUEWN5{p_=8ug*_A_dC?nKYfyaQ{?9k7&uXLsdP`E%IhEhzkdJ3 zKlRk-Q@UcMnV$;kXEQI5er$4gVT8Gb9#Bak^MrNh-PavI?z_v*{GGVKpkKIm`92GFeyR_Czt{KI_boC^>J)L(s6PtVr?QiYbb2@PL)2pU8zL~u$3y%BovqFbwb;qk?X=W>pMV^?h zc@*+&*IkkQPkBWbkx*qgS?)zMlrR0}Ih)#?k& zZye98PW^Q2^Tq1-32$n3Q~#Gv@}6zJiJigW{a)tlpP%k3eQ;v-(~I$+-OLZ3DtY|D zjoD^TNYZ(6UEg~rn7+*I+oQ1}>-B+&=C7@P{t{nuQaZBX>n2u)5635Oea~C?e~;Gn zgOzbW;oB#&w$A$TVt24O`|G^zv%A@T1TU+6ZfpDWr>DV7NkJGmyZrVEo8Vo&XF`wm z9ZP#@W)!|OgyF8+GfxdshwT$9g%*CS5CL<)GdS#@xRdLv+KQVeVx|@`mPpTB9i-Qg pr(7J`Icr*;@@Jny7T^Du&C?nkh292Ex(kea22WQ%mvv4FO#p^+1DOB- literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json new file mode 100644 index 00000000000..411e0702f21 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprites by JustAnOrange (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..784803d72127d0f4f3a34fa0ab4546f666ce297c GIT binary patch literal 1194 zcmV;b1XcTqP)Px(WJyFpRCt{2n!j%&MHI)s&e`idXTv4FoDfGM1c^v-7D@*c;ZlL12yGOK`~{RL zsVMmiC}~dA*IXHr6n9ExAtRF0#Rw(NVG%Efy|LG0J4@lr-0b>C_KkOKiJMPjduMjO z@4cOwUGIBfYABot1mD+cNeezso?2(1BL}K$HsNP(E2xa3OdMPj*YVy1q^G8A_)ET zKfQk&Z~goeR+m!9pR`cj+{V-MhLZkN7$XcTi(-Bs)k+xv@a2OAeE07jK3M(CXIQmT zMlrwN6Od5}>d(&I#p+TDGj~j^E~T)0R8rO-8X+G2;Cf3K(*S^!kru~!)a8Do&VoVu z4?ldjX9ny&FDdEYI0N|RA`g@@(mv;9ct3vLs08)hW(&JVB~&-J@$2W`qPn?_-J??9 zeqp$A6O?Z;d|<;GZ0Ml#R0)pbbr=|cz2_wW-Ko!7EqEQKq(3wOgQgF2Y~MO#jveYe zDuc%HIt*^p|65f*)F#*~-V#nT$A;VNy#jI3bQ{7B`I8@~66!fXP&!1Vbf_d038h0g zCBTVrNKyda&d%Wd`&pFj8UUc~GGt6cwEb~zqfq=SLi7AsnKY)&)WG&jm%j1RX23Od zm!WgjeJrolo47R<+v9%^ohuJBneH9v?^l<&H#;rtP=OqPvRxC-yQ~e2&7H$(tW+rxvUMR!Gs~f_PEHHhH!RnE(4$&6uuOxknaL@ z$;raW%S6B9al>celY`$A@^2N$0re%P_Nn6$n|qtR$I z8jVJy(Y(3j);7HLt)21w{|&+V){ZCF4p1P!NR#vQ!0UW`Zfzsdl=w|HaLs3=Kf;gqDr9k0<`-9BSXq&tlY>Bo9Dr)2EQI;`d-B^EzQ6O3EUt=~PKg99w}Cmf zD4?LA^j26-h4WxUT@^A6!^-+*K+q-%py-u>eAm=`5Y3~rBVJ%UnhP`>p{nnCq~ zVNqHFvJkHokT=D+DdzXZZLgnA6v*`fLU2-b0@u1{5$TfxFh4sjQq!DTy@{Dj+Ly77 z6DyO3X(WYaKYJ*UmVnFJJ^|SPo-K|WIU~)3AlpN|2;|4sPjc^hrjZl|0NotD(_p@A zah&9q-tny4Mo)2s%i4HW_>*JUOn*aa+07*qo IM6N<$f{2MgT>t<8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ff5daf1310ae191b3cfcdb55325996e97f49c50a GIT binary patch literal 359 zcmV-t0hs=YP)Px$AxT6*R9J=WlCes|P!xv0h)E*^hghjYx|Bi(BlHE*U5C7pFO@ftY%UIF>Ed7! z6ly>Sn%q#XQ(~=w=3W$+`)%i*1OI>jbHHFQ7!3c6r7|2wu^f(PtXE62G_m%*_u)`Q zd@^4E;0|m6nWc#pMzIX0A&%#Bd@^d^f8D?~j^`6hLx5IXmxDe-O~j(e0k}L5xPH4~ zGGF`b18PV3bj$0W{@)q^F5E`|ijS`!dq)lc z_sa4b1{&e_Qt*-&jC@Z+R?|TC@N5C{dwsT38w>`68lSZVe>_HTru_f_002ovPDHLk FV1hmFmQDZw literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..81bf1e649418f54218ea94d9cf165f039ce013eb GIT binary patch literal 512 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zcX_%vhE&XX zdvmWBv!g`oL-R!++dG6e`(l@!U=)ObPUVO*JD+~dy`E>A7x((sr(fH; zXJ7Z6?&`5&MzOH5Xb{xC))wS_Z zHa{_g#$5U->1wz{wPXsD$-Jk*)LYD(9R4-XHg z9gZ@+mbUiuq8U637Jj|z^J`Vq^R3B6Yzzg(eyl5|bj`o^-!+b1jhSQF@jF*4rup0# zW!SoWf=~Uff3-H;54fgpzi-dn1Ju2jvHyJH=gl!|4QHJ-xG+6$-T%@!bv5P{_PvJU ze}BLKceukWEy^o*14Vh{$K3Yyv1*4EsRgO=~n%nts%Gi%~Q#Qn{w5b4Q$=t zZk#q|Fv#xTE7On)6lXZF&h}doLsq}*kyFwWw7jlszFpD_j8Xlhqe?@;gbKxA#+Sv@C{ z6vsoQ&M~RiKS(`sIbZ(ki^IL{_vwN63(v3L|Gnn$Uj`)@U}D%EA@*=%&{D0G$5tD< zQv+9pv~TJ?Z7psZxi7&x|AhFPjg!ws&Dj%nC8e{3jUiyS-ByMN4}Qe3B=39v=;_8r zx4mX1|JSsB{xz?A_iS%&hEwX{N)p|tto3Ja`TUvtz|n{A_|ElxJ96~YzXReW>t8Rn ze}C?;u0Yh9z{;iC8RDmta+9T3J`H6!;FPqn{O#ktyvwg%N&3oM_{r;hgWKLT%e87P z|1Aw>zTbK4Z-qi!TqYya!?lZVU*n&xw*Ctb1H&G>1B?&0%yNDlHOpxI7KU$OVL8u? zJk;kiGThtVU!rxfcK&IGh76m%nV-!&CYu+r*OdObmwo%|hIyXJnloSYzD~Qf=Mq!N z>ZziO?Oz|>vd0AmmKm%~UXzrPykvf+Y;vfVzqjve34f(s#v(~k$0MeG%9?r2Fl=cJ z+YAsD)6kG9`?zq*c?O1Or9Gk=;s>_$ZCuq^1{6&eJ;j>9KCR>5V*6Y3+^u?F@B9pm OVFpiEKbLh*2~7Y${PSu6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json new file mode 100644 index 00000000000..e0f7bbd7d96 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustanOrange", + "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/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..df09def71a99227b7a6559c4f4d5077b2c9f31b1 GIT binary patch literal 1446 zcmV;X1zGxuP)Px)U`a$lRCt{2nonyRM;OK*6)PJ{SPRl3yfHS~kjla`wF+u3i;=<5l9&(>ZUVVF zhxC+FzCtef0=<~tdPs#Y1qTWSn;;CXz*doiw1mpIm1WFIMRC#pnlB(4j;O``J%_RFHDACZL;;|wZCDuf9~CD6Kp$*tJ&k@}4&cKPb?)x{ zi&6o>*_bZGha;+1mN4e^29m1(eLSiP$;B&S(jdB z87D?v4WZy{45KbLSjGt`+BE{}0vigc*=%-TCxk*FHK04cp$`D3wW|KvSU-37KG^eG zU;2H`0FL7zZLeWtK>*-H!jl0!0LG^P!lroScsaYRD z{;&!maMDq~U%GlI85h;LNgpao9gCaVK)ZD=NfH2HV?hARIFbIN1aU2CdKMI(-BVe{ ziLZZ^b%z@DWmyKtac%luuNS|3#i63qG4cJIuKJ&KYh2D%v2-jT`nCu%on%?=crB^V zX0wjy+ai{Z1uW;Py+_#v($A}L2bKP-affbqFS>fiJ0<8VZTT?oNXA7q;P+_vdkYn% zj)RjA5Z989*6;PS;u`g-j5DsrWWfP|fB(^bX(_V>D;|MX>i4}5XoZMg7sJx0a)6Uz zP&&$YZMPCD^r;+BR}}a@7cOltWe%wgpw(w5{d)QL_bJ@I6K&|1>Giul1zJf=yD{o& zyZ|(n6VvVr9y9mt+5*Qav8a;}P?Q(JYV+*XG=Yo7vE=u_>Qj9W}V+h%sEqqgD`(YLX&v9YnS zv9YnSvH5?)ha+n2@pDUa0ceOler`H9f%>mwYp9w8Blwn_0V^R|m)Szo7uAs%AC9O3 z>uNd)4$j7qjElNKH2s-@3_ckb_0T+d39JjWHc&Z$J+Fb|INT^{;pz0wI!0Y?1pFRq z;X&ZT5jEiVVASPCdS@Mg7DDGZ4(xf2sxRt8Q4)nc*j@twBs>|gj1#GO-txErpq>4v z=6SG8BTsu1gkSXEFEhhJ91dsFH|dLGA_1_n8fRi@p&o>C^6;;5Y1L-Y@nV2 z0APId;IBrkKAl^q>CP0(xhm$^7@%B)$PKv?Qikr=2TUx2O@qJSI&uX%X?C)$7embt z@Oh_D#2&Q~H2Azz`15_{(stS$0V)UlEuWySC~cnBZ-E`_Z-G+zkR)Ta%>pU21?99t z)gRR@P(I8%l+y}c)>C?&aqw5M6)x`YIf$c;c|tGiDJZ8E>d25OgS}IN`g8Oa0)7tw zEuHPE{s$2Fa70bb^8kQ@lMi^1Ix-a&GnFLecQJTztb#i;#On9W^kkmIv>PNZK$cbb zT@1|Rrkc(V02*7*L1Xl0Aev^jzeY^W0J0?pwCRU&Yx4pwvjKp?4!SKc!IT49@(E9HUIzs07*qoM6N<$f|rh} A2><{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b9ccee2f9337a9216011e9247580f8e96d47df2b GIT binary patch literal 547 zcmV+;0^I$HP)Px$-AP12R9J=WlQE0aU>L`L%7t<*rjRt%D^;3OLODWiuv zIE21Ot*oLOb?n{!^q&McHbSZmn_^Buub3Pjb#WYr!=o;G#iW>1s5WeljZmh)*b17> zW(v^1yJ*yz*qqO%guaJfG1<%)=&3{EdBWaH4}kG_EaWX5z_Ki&DB_uYjbcu@q>1MV z_lIB6G!55vg#&Deh@Nii?A(Nw8*uOScS@zwB~1{-L{Y?x+Zv}EI_PHSZq;KCZ>c>=(@vx!u55M05M&M3xGS^#Y3 z3#dV*x5@)#8v@hKEvgz_&r~4Da6HxL6)WUT_-&?EEjXIO*XPN%u0lo!i zB(o{j&fZ#$d)jCI+eH3afF;Y_e|R%o)v66!)@Fs&kJWCOY3^qL-Ke8iOhVry{PGrn l`D{w`-jnjo$jHdZ_yP0OmpU%l;kEz(002ovPDHLkV1nea2`c~q literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..53cc5b8a92f30aa7337ddf6ab73004ec8686e868 GIT binary patch literal 534 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zFL=5*hE&XX zd-I?dlcNmVhw~mPtu{I$o^Ek2Nr?-+Cv>#?#o3g66y5XF2>>)2fpvNRKDMH_>J5j1|=BaI&?;KYVPf;9z8x^~X_P2=F<=@>?p~7Pv9`ZBDwKTdk!t-$XJ*|bl z%yR2CpYoD=QQK?yw>kD*#n-*vZ|)vG^>xYTu$vYP3`R41m>No~{-&=BTg}KIb3C$I z_oa=#(tCz-0haPQ}D8;{zK>X=gYTVpLFiCQW5j9!;F2p!VCsdd}@!YFG?^h`1NDgRU7@J^OpjT z{i!UB48PHR3@90}`W`cb-5l}zuRWd%!ob9POKxRsEc#;ax$R<<9D~Ajx9oC;OSxOh z{;&7me*Bg!gTigO?C%^5o8E4Wu>Ny@$*p8vdB&69B2G&y+?30%WM%PY09eRxy5142<)w-BJ7W*`e`p<})ty^@5fnh_Cq|J1HcHwSS|0~k65i5OKR(wug zYP7=KO1ZmMZ+_SPPkuQEK1}sIb}dmnCQzqx(brE5>baWtqnA9C@w?^p`YGelN$PK! zv?pyWeOi4u>=<`=dga39c9YOZ4VX&;01HWlwe@^K*8wZ`;i#_S9a#wNm9(ujrHJ zjK=4Q*Y=#6d(+xRXm;n@3!Zb|Nz3KuPkScja&q+^M)|#ZWwO!?7v7h$f9Px)>q$gGRCt{2noDaNR}{zpvOVwUY1xiaq@;P^Laatm2wugQWaVO9LKfY1(_J8+ zpwNxKK`CULUAlA&36y{d?IHvMN*%QhL^O`DWjm5BX{>q5nl8q38Ow^LJ9-4t`GK(J zjCB9!oVjzaJm&yDK0ZD^K0ZGGQvx5`0WYNI7p+#?+UjqfVxjtyBV5`o;QZz5#J=(7 zIpUMao*bdoKbK4s`&MDivwqhfURlUkKTj;cFimLn>WTBb6b8#MxcmMQmL6sMo&-m~ zRw=>M)f49#PCzIUr`8|oR{Z9b6aau_81PaUyc7li@}6ZF0Km;FDXc7HPE65WaO;O6 zaWI^KJ9D%6{+q9HXKt1R??u030@Cw~MEpnjDFBdQoh#uSJLhj+NwvLCz0gj7Y4#dI z49cPY~BRJ2}q>U zUFnZ?`hYX=-Ivb;iK`jw+}<{Vv6EL=-rL4XI93WZ^ zYJI8%I4GKd!=}B%$cm29k>UMMb=b5J6gdFE`$`=X5sCQW1?mLs?8zi}&1isU$8gxR z>{&4cMn?jW6&;$<0AMG9XU9BW1gb@_t{LRLW;Af18pM&-^MgXF@f{n!*tT?NZ92u0$gPiK(CCzA+8;$RsDrmo_CYzmKG z$hcjZ@id<2hoZ|31G;RNqRKl3)GDQ+&45~^gz}E9rOOJI8{VHtQ$G_l^a{#5$88KJ z46Qf{*oDzn&GJqGhF+l_i+Tn$%>cB6Dq_(TxS&Yv3?~fj7I60>a6u8VXbRdv6-|?V z7p6);d@>3COqjgf+aE85hjt4%3m{-`hi;!}FM_AyXe*|!4)qq0_qO{s7F7b2cYi|x zAc^+W=Xu`#E7()=#>_N+>9RA!D>r7QQ7mo%u=@f4K+`k;7<_*~GK{0r^x=`E4q4F= zY;uql9UHj~Y6oc9$UOtkjv**=7&+8!f4HNQVcQRy9s#N~KrH+*lUlt~Egm%P zigZxqPWVGxC8Az7XJ^h^JUd1l0PGt5fodG977vn{O9|_Yz@BK1(2NG2z1pDifqENk z6>!9d6}(%kwIE6xJkVo#+-pU)pY-ZO&;0=(vohNc?Y=Zf3}f*dlx9x}a8~|d-v17- j^2I=FkCKm%4>kV*xy9ncfk8vk00000NkvXXu0mjfr2OGr literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bcbb6d1364f1d8e9143518a1d5496ec9e7e74c40 GIT binary patch literal 489 zcmVPx$qe(#~Pc z3hG5EqKl>qTT;fhleTU=l*AU4X3Bap&uQ}J%lE$dG8srnNJx0^e9$Q_f2#)oa`>0R z#!jT){yD);=K(nXeW=xQC2nD}Q3(p=Du!*%nFACycBXo{O0!W3{(FFCqY~6hMN&eL zceWV$9wXlah}L;$i<^bV2aR(e#9YnJnZKm#pfv$YNyaxVGNy^S;^8kd1gMoaJqU!oJ)()2Zi13bAMm|#av5Z^YsUt zoI6uC`%Zu6e*M7bou>Mgv+O+Yd)Fx_!N6~h#ff5Whu^&WX#W2EKkG92+2?M5lP$H` z#=*Hb@!7A$msMBy)y%lEAQIt~5Gsmqq_^nb;+)rpY_bs_x{90aS;?BAg zZ_dy7alGUCySMi$_onOTJ=IMse7eVIt8~lPV1^H`zG}Ypb2$AuVyWioqf_3;+c5?_ z&5L|K)$k_sr*6%-oYS8(%A2BJ^G^*wmLtp(p||Y7ullGzH9D2EXS`u#_*dlj>Fu0r zCpphqKC)1o>GNUw$-pPM$zcahGwk{oze8^FA1Pr5M}}hleR7WX%+gpH&P>)mZSmPg z5Dqepx+R$|n>)9sm^xp$!DMzbz3sr4qbC+doD(qF#IRwuqCxf9nv5`GmfpL}YtlHR zq8-+~<8e&>&ah#oVnzw07*Ilw!Nggi^e)5PN1Q_cbxijHW0b+u)z4*}Q$iB}HNEJV literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..aa88753fc64f707bf14e275ec2a2936245af9029 GIT binary patch literal 533 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z&wIK!hE&XX zdvkyGZ3l^CAM?GQvdwnkd|Bjtb!kh3U<$`g*R=mze==K%S&2F=bPmq&zVK**{INqD zJ*FtGSkbp+UXJO-*5{jlp0l$3F1PQXeg_P29C&vyaGQmg+hUy_xBg?h7idM_wCjos z)eZaFzhk^9 zKmDBdJh5rQ#}DOV^?x^Q`|&5(`0(FLm(O#5OxIJ=ey99>1;dAcv!8!RH~Subb}hQ& zgpWW`tz}x3?B?WeQFo85>Z5Zhk3h zzrUVs0r&Fx(W?0`Whd0{+!1m9bAPx#=d!O&4~40~_mMZ6~kEd?}b5UV&SWOozP#{Fi} zuzxSvB>@b>F#erGN>E+bbI8_pT~y9fO7XHRIhQ#`geV}i+qP|2-c zBEs!@2N3}PoO7tEYPFnm0Px~ZL~P4g0ZT4tdL{>eEX!7FY4`pTY_B-wv4q+n&VVp* zD*C<;+M@mf-(wAVo~!&+0%8ik$4EldL-;L30V%tWiDw0jc x&?oVi%_jF26T zs+gB$3JFe}a_R5yiEE}@T7GBq%sCBPU#xy+yDPGV?{L9M9f-L=a*t8yS;ZC|B_XF1 z%fz+jwMO56_G8!eUpF_$1=&i!*`@cr_W!o6cIS(8?wZXdh0o_%(go zJH9QsyMO;(_3_7M$-P&3_HPOADg3-$;_?HN%4y{8y@qmcDx60`{G!tDnm{r-UW|n_HSq literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4301450e8e4c36b77a79bc01050512f74e04a7e7 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z1w36GLn`LH zy>&3F#X#WL$IQ2mMQ2L$81MgYtYQ5qq!i~=<)yiHx7zDG)2IKL1A8pwo%4hRfu?}K z54X_EHznl)XZ`*=(|&i?tUcw@3s#+!P`-96Z5EIbrG0G1qBE}65A3zG4(wXD{@lk9 z)5`Z|2decAkF9?$_GFIXF_5%^`9e|CO8akiGnTy!m|?tSh9tyv28IVwA*PnkCv|ib z>uohMviAuM-sg31zt!o9U+0&lH_zN^cE4V9#`B%ao+TbOSW+l+f7?C%(?MU?KVs|1 zIe+)}zV%uarml|*-|uY^FuU%=QD0S-us$qz+A7%z&)>yfpIepoAndKXk*N6tFXQjg gk?W=iI!N0w-g;TIbUMeuRUkKby85}Sb4q9e0QH!XLjV8( literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json new file mode 100644 index 00000000000..aabb510bd03 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} From cd0f540bdbca55949eadfea6b42fb14f4c982055 Mon Sep 17 00:00:00 2001 From: Smugman <85798843+Smugman@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:26:05 +0100 Subject: [PATCH 2/9] Updated Vendor Inventories, they are now ContraInv instead of EmagInv. Added new Clothes to the Syndie Recruiter. --- .../Catalog/VendingMachines/Inventories/engidrobe.yml | 2 +- .../Catalog/VendingMachines/Inventories/lawdrobe.yml | 4 ++-- .../Catalog/VendingMachines/Inventories/scidrobe.yml | 2 +- Resources/Prototypes/_DV/Roles/Antags/recruiter.yml | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index cdb0dd1c2b8..fe28b47e03b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -16,5 +16,5 @@ ClothingOuterWinterEngi: 2 ClothingNeckScarfStripedOrange: 3 ClothingShoesBootsWinterEngi: 2 - emaggedInventory: + contrabandInventory: ClothingUniformCybersunHazard: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 8a2f4f5e8c2..8c65f99c40d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -30,8 +30,8 @@ ClothingHeadHatPwig: 1 # "Legally" obtained currency SpaceCash100: 2 - emaggedInventory: - CyberPen: 1 ClothingUniformCybersunAttorney: 1 # DeltaV CybersunBriefcase: 1 # DeltaV ClothingOuterCybersunOvercoat: 1 # DeltaV + emaggedInventory: + CyberPen: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index 88c91a91f60..a300491605e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -16,5 +16,5 @@ ClothingNeckScarfStripedPurple: 3 ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics ClothingShoesBootsWinterSci: 2 - emaggedInventory: + contrabandInventory: ClothingUniformCybersunRND: 1 diff --git a/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml b/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml index fa06809b46d..2999909b362 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml @@ -18,9 +18,11 @@ head: ClothingHeadHatFedoraBrown eyes: ClothingEyesGlassesSunglasses gloves: ClothingHandsGlovesColorWhite - outerClothing: ClothingOuterCoatTrench + outerClothing: ClothingOuterCybersunOvercoat shoes: ClothingShoesLeather id: PassengerPDA ears: ClothingHeadsetGrey pocket1: PenRecruiter pocket2: RubberStampSyndicate + inhand: CybersunBriefcase #Might give them the "false bottomed briefcase" version (when ive made it) + belt: ClothingBeltSyndiecateUtility From 27694ff325aa3012a3f618ad8913a51c8ae0bd3a Mon Sep 17 00:00:00 2001 From: Smugman <85798843+Smugman@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:15:41 +0100 Subject: [PATCH 3/9] Uncommented Uniprinter recipes for the new Uniforms (FINALLY) Added the new Untility belt to the emagged Uniprinter Moved the new Uniforms (and briefcase) to the Contraband Inventory of their respective vends. --- .../VendingMachines/Inventories/engidrobe.yml | 2 +- .../VendingMachines/Inventories/scidrobe.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 9 +++-- .../_DV/Entities/Clothing/Belt/belts.yml | 5 +-- .../Entities/Clothing/Uniforms/jumpsuits.yml | 5 +-- .../_DV/Recipes/Lathes/clothing.yml | 38 +++++++++++-------- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index fe28b47e03b..e7a85ac1576 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -17,4 +17,4 @@ ClothingNeckScarfStripedOrange: 3 ClothingShoesBootsWinterEngi: 2 contrabandInventory: - ClothingUniformCybersunHazard: 1 + ClothingUniformCybersunHazard: 1 #DeltaV diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index a300491605e..2fb784e9206 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -17,4 +17,4 @@ ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics ClothingShoesBootsWinterSci: 2 contrabandInventory: - ClothingUniformCybersunRND: 1 + ClothingUniformCybersunRND: 1 #DeltaV diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 6075671087c..52fd8f13e08 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1326,10 +1326,11 @@ - ClothingOuterCoatCybersunWindbreaker - ClothingMaskInterdyneChemistry - ClothingHeadHatSurgcapCybersun - #- ClothingUniformCybersunHazard - #- ClothingUniformCybersunCasual - #- ClothingUniformCybersunRND - #- ClothingOuterCybersunOvercoat + - ClothingUniformCybersunHazard + - ClothingUniformCybersunCasual + - ClothingUniformCybersunRND + - ClothingOuterCybersunOvercoat + - ClothingBeltSyndicateUtility # End DeltaV Additions - type: MaterialStorage whitelist: diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml index 020a7521fbc..3dc96596812 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml @@ -75,7 +75,6 @@ - type: Appearance - type: entity -<<<<<<< HEAD:Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml parent: ClothingBeltSheath id: ClothingBeltFoamSheath name: foam sheath @@ -107,7 +106,8 @@ components: - FitsInDispenser - Stamp -======= + +- type: entity parent: ClothingBeltUtility id: ClothingBeltSyndicateUtility name: syndicate utility belt @@ -117,4 +117,3 @@ sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi - type: Clothing sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi ->>>>>>> 78551dc8e2 (meow):Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index c97b40b9355..f1743a891f5 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -428,7 +428,6 @@ - type: Sprite sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi - type: Clothing -<<<<<<< HEAD:Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi - type: entity @@ -452,8 +451,6 @@ sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi -======= - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi - type: entity parent: ClothingUniformBase @@ -487,4 +484,4 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi ->>>>>>> 78551dc8e2 (meow):Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml + diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml index 9d9e6e84d4d..a5dd89969c8 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml @@ -131,20 +131,20 @@ id: ClothingUniformInterdyneChemist result: ClothingUniformInterdyneChemist -#- type: latheRecipe -# parent: BaseJumpsuitRecipe -# id: ClothingUniformCybersunHazard -# result: ClothingUniformCybersunHazard +- type: latheRecipe + parent: BaseJumpsuitRecipe + id: ClothingUniformCybersunHazard + result: ClothingUniformCybersunHazard -#- type: latheRecipe -# parent: BaseJumpsuitRecipe -# id: ClothingUniformCybersunCasual -# result: ClothingUniformCybersunCasual +- type: latheRecipe + parent: BaseJumpsuitRecipe + id: ClothingUniformCybersunCasual + result: ClothingUniformCybersunCasual -#- type: latheRecipe -# parent: BaseJumpsuitRecipe -# id: ClothingUniformCybersunRND -# result: ClothingUniformCybersunRND +- type: latheRecipe + parent: BaseJumpsuitRecipe + id: ClothingUniformCybersunRND + result: ClothingUniformCybersunRND - type: latheRecipe parent: BaseCoatRecipe @@ -162,10 +162,10 @@ Cloth: 100 Durathread: 200 #increased durathread cost since it has "armor" (Caustic is such a real damage type) -#- type: latheRecipe #Commented out for now until added -# parent: BaseCoatRecipe -# id: ClothingOuterCybersunOvercoat -# result: ClothingOuterCybersunOvercoat +- type: latheRecipe #Commented out for now until added + parent: BaseCoatRecipe + id: ClothingOuterCybersunOvercoat + result: ClothingOuterCybersunOvercoat - type: latheRecipe parent: BaseHatRecipe @@ -202,3 +202,9 @@ materials: Cloth: 200 Durathread: 100 + +- type: latheRecipe + id: ClothingBeltSyndicateUtility + result: ClothingBeltSyndicateUtility + materials: + Cloth: 200 From fc100c1a9b87214f8f568607fba5d24f6653960f Mon Sep 17 00:00:00 2001 From: Smugman <85798843+Smugman@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:31:58 +0100 Subject: [PATCH 4/9] Revamped Interdyne Synth Loadout. --- .../_DV/Roles/Antags/synthesis_specialist.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml b/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml index 9385d58bbe5..43063ba9e9a 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml @@ -13,17 +13,17 @@ - type: startingGear id: SyndicateSynthesisGear equipment: - jumpsuit: ClothingUniformJumpsuitSyndieFormal - jumpskirt: ClothingUniformJumpskirtSyndieFormalDress + jumpsuit: ClothingUniformInterdyneChemist back: ClothingBackpackChemistry belt: ChemBag - eyes: ClothingEyesGlassesChemical + eyes: ClothingEyesGlassesChemicalInterdyne gloves: ClothingHandsGlovesChemist - outerClothing: ClothingOuterCoatLabChem + outerClothing: ClothingOuterInterdyneChemistrySuit shoes: ClothingShoesEnclosedChem id: SyndiPDA ears: ClothingHeadsetAltSyndicate pocket1: HandLabeler pocket2: RubberStampSyndicate - mask: ClothingMaskNeckGaiter + mask: ClothingMaskInterdyneChemist head: ClothingHeadHatSyndie + inhand: DefibrilatorSyndicate From 13db919a034c299e9e9c18ca3ff005115237c98f Mon Sep 17 00:00:00 2001 From: Smugman <85798843+Smugman@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:56:48 +0100 Subject: [PATCH 5/9] Fix dumb typos --- Resources/Prototypes/_DV/Roles/Antags/recruiter.yml | 2 +- .../Prototypes/_DV/Roles/Antags/synthesis_specialist.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml b/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml index 2999909b362..06537b33a37 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml @@ -25,4 +25,4 @@ pocket1: PenRecruiter pocket2: RubberStampSyndicate inhand: CybersunBriefcase #Might give them the "false bottomed briefcase" version (when ive made it) - belt: ClothingBeltSyndiecateUtility + belt: ClothingBeltSyndicateUtility diff --git a/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml b/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml index 43063ba9e9a..d0588552ac2 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml @@ -24,6 +24,6 @@ ears: ClothingHeadsetAltSyndicate pocket1: HandLabeler pocket2: RubberStampSyndicate - mask: ClothingMaskInterdyneChemist + mask: ClothingMaskInterdyneChemistry head: ClothingHeadHatSyndie - inhand: DefibrilatorSyndicate + inhand: DefibrillatorSyndicate From a77f11a0cc88219b9f85e1ea0d207cdc8876eb29 Mon Sep 17 00:00:00 2001 From: Smugman <85798843+Smugman@users.noreply.github.com> Date: Thu, 23 Jan 2025 15:29:35 +0100 Subject: [PATCH 6/9] Fixed issues with inhand loadouts. --- Resources/Prototypes/_DV/Roles/Antags/recruiter.yml | 3 ++- Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml b/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml index 06537b33a37..e43998a1edd 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/recruiter.yml @@ -24,5 +24,6 @@ ears: ClothingHeadsetGrey pocket1: PenRecruiter pocket2: RubberStampSyndicate - inhand: CybersunBriefcase #Might give them the "false bottomed briefcase" version (when ive made it) belt: ClothingBeltSyndicateUtility + inhand: + - CybersunBriefcase diff --git a/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml b/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml index d0588552ac2..596ca70a715 100644 --- a/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml +++ b/Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml @@ -26,4 +26,5 @@ pocket2: RubberStampSyndicate mask: ClothingMaskInterdyneChemistry head: ClothingHeadHatSyndie - inhand: DefibrillatorSyndicate + inhand: + - DefibrillatorSyndicate From 98ad282f8175b062f80d1e285489aa61d56ce840 Mon Sep 17 00:00:00 2001 From: Smugman <85798843+Smugman@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:48:27 +0100 Subject: [PATCH 7/9] Fixed formatting. Added period to description of Briefcase. Moved files to _DV instead. --- .../Catalog/Fills/Items/briefcases.yml | 8 ++++-- .../VendingMachines/Inventories/engidrobe.yml | 2 +- .../VendingMachines/Inventories/lawdrobe.yml | 8 ++++-- .../VendingMachines/Inventories/scidrobe.yml | 2 +- .../_DV/Entities/Clothing/Belt/belts.yml | 4 +-- .../Entities/Clothing/OuterClothing/coats.yml | 4 +-- .../Entities/Clothing/Uniforms/jumpsuits.yml | 12 ++++---- .../_DV/Entities/Objects/Misc/briefcases.yml | 6 ++-- .../_DV/Recipes/Lathes/clothing.yml | 6 ++-- .../Belt/syndbelt_overlay.rsi/meta.json | 26 ------------------ .../Coats/cybersunovercoat.rsi/meta.json | 26 ------------------ .../Jumpsuit/cybersuncasual.rsi/meta.json | 26 ------------------ .../Jumpsuit/cybersunhazard.rsi/meta.json | 26 ------------------ .../Jumpsuit/cybersunrnd.rsi/meta.json | 26 ------------------ .../briefcase_cybersun.rsi/meta.json | 22 --------------- .../syndbelt_overlay.rsi/equipped-BELT.png | Bin .../Belt/syndbelt_overlay.rsi/icon.png | Bin .../Belt/syndbelt_overlay.rsi/inhand-left.png | Bin .../syndbelt_overlay.rsi/inhand-right.png | Bin .../Belt/syndbelt_overlay.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin .../Coats/cybersunovercoat.rsi/icon.png | Bin .../cybersunovercoat.rsi/inhand-left.png | Bin .../cybersunovercoat.rsi/inhand-right.png | Bin .../Coats/cybersunovercoat.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/cybersuncasual.rsi/icon.png | Bin .../cybersuncasual.rsi/inhand-left.png | Bin .../cybersuncasual.rsi/inhand-right.png | Bin .../Jumpsuit/cybersuncasual.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/cybersunhazard.rsi/icon.png | Bin .../cybersunhazard.rsi/inhand-left.png | Bin .../cybersunhazard.rsi/inhand-right.png | Bin .../Jumpsuit/cybersunhazard.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/cybersunrnd.rsi/icon.png | Bin .../Jumpsuit/cybersunrnd.rsi/inhand-left.png | Bin .../Jumpsuit/cybersunrnd.rsi/inhand-right.png | Bin .../Jumpsuit/cybersunrnd.rsi/meta.json | 26 ++++++++++++++++++ .../briefcase_cybersun.rsi/icon.png | Bin .../briefcase_cybersun.rsi/inhand-left.png | Bin .../briefcase_cybersun.rsi/inhand-right.png | Bin .../briefcase_cybersun.rsi/meta.json | 22 +++++++++++++++ 44 files changed, 180 insertions(+), 176 deletions(-) delete mode 100644 Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json delete mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json delete mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json delete mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json delete mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json delete mode 100644 Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json rename Resources/Textures/{DeltaV => _DV}/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Belt/syndbelt_overlay.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/meta.json rename Resources/Textures/{DeltaV => _DV}/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json rename Resources/Textures/{DeltaV => _DV}/Objects/Storage/Briefcases/briefcase_cybersun.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index fc3df5f143e..32adf103c2a 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -41,10 +41,12 @@ - id: EncryptionKeySyndie - id: RubberStampTrader - id: PhoneInstrumentSyndicate - # - id: ClothingUniformJumpsuitTacticool # begin DeltaV - # - id: ClothingOuterCoatJensen + # begin DeltaV + # - id: ClothingUniformJumpsuitTacticool + # - id: ClothingOuterCoatJensen - id: ClothingOuterCybersunOvercoat - - id: ClothingUniformCybersunAttorney # end DeltaV + - id: ClothingUniformCybersunAttorney + # end DeltaV - id: ClothingHandsGlovesCombat - id: ClothingMaskNeckGaiter - id: SyndieHandyFlag diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index e7a85ac1576..d225340335e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -17,4 +17,4 @@ ClothingNeckScarfStripedOrange: 3 ClothingShoesBootsWinterEngi: 2 contrabandInventory: - ClothingUniformCybersunHazard: 1 #DeltaV + ClothingUniformCybersunHazard: 1 # DeltaV diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 8c65f99c40d..f13ef4f1044 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -30,8 +30,10 @@ ClothingHeadHatPwig: 1 # "Legally" obtained currency SpaceCash100: 2 - ClothingUniformCybersunAttorney: 1 # DeltaV - CybersunBriefcase: 1 # DeltaV - ClothingOuterCybersunOvercoat: 1 # DeltaV + # Begin DeltaV additions + ClothingUniformCybersunAttorney: 1 + CybersunBriefcase: 1 + ClothingOuterCybersunOvercoat: 1 + # End DeltaV additions emaggedInventory: CyberPen: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index 2fb784e9206..3c159ccef12 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -17,4 +17,4 @@ ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics ClothingShoesBootsWinterSci: 2 contrabandInventory: - ClothingUniformCybersunRND: 1 #DeltaV + ClothingUniformCybersunRND: 1 # DeltaV diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml index 3dc96596812..d4b3aabfac8 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml @@ -114,6 +114,6 @@ description: Can hold various nefarious things. components: - type: Sprite - sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi + sprite: _DV/Clothing/Belt/syndbelt_overlay.rsi - type: Clothing - sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi + sprite: _DV/Clothing/Belt/syndbelt_overlay.rsi diff --git a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml index daee5c57d69..2abc28f439e 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml @@ -126,8 +126,8 @@ description: Heavy black robes with magenta and gold trim. It smells old. components: - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi + sprite: _DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi + sprite: _DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi - type: TemperatureProtection coolingCoefficient: 0.1 diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index f1743a891f5..45cf2b426d6 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -459,9 +459,9 @@ description: This high-visibility jumpsuit prevents you from getting run over, yet keeps you dark enough to stay unnoticed! components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi + sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi + sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi - type: entity parent: ClothingUniformBase @@ -470,9 +470,9 @@ description: With all the non-descript gizmos they shoved in this thing, are you sure it's even safe to put on? components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi + sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi + sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi - type: entity parent: ClothingUniformBase @@ -481,7 +481,7 @@ description: It's another Turtleneck. What'd you expect? components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi + sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi + sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/briefcases.yml index eb3e701c9bd..cc83b2760dd 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/briefcases.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/briefcases.yml @@ -2,10 +2,10 @@ parent: BriefcaseBrown id: CybersunBriefcase name: cybersun briefcase - description: It's like a brown briefcase, but black + description: It's like a brown briefcase, but black. components: - type: Sprite - sprite: DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi + sprite: _DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi state: icon - type: Item - sprite: DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi + sprite: _DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml index a5dd89969c8..6ced2defc06 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml @@ -148,7 +148,7 @@ - type: latheRecipe parent: BaseCoatRecipe - id: ClothingOuterCoatCybersunWindbreaker #unsure because its armored, but with an EMAG you can get far better things than it from machines that you DONT have to steal/make. + id: ClothingOuterCoatCybersunWindbreaker result: ClothingOuterCoatCybersunWindbreaker materials: Cloth: 100 @@ -162,7 +162,7 @@ Cloth: 100 Durathread: 200 #increased durathread cost since it has "armor" (Caustic is such a real damage type) -- type: latheRecipe #Commented out for now until added +- type: latheRecipe parent: BaseCoatRecipe id: ClothingOuterCybersunOvercoat result: ClothingOuterCybersunOvercoat @@ -172,7 +172,7 @@ id: ClothingHeadHatSurgcapCybersun result: ClothingHeadHatSurgcapCybersun -- type: latheRecipe #unsure about letting people craft a gasmask at the uniform printer, but also dont want to split up the uniform into different machines or leave it half-finished, added higher cloth cost because this is the only way to lathe gasmasks at all, apparently. +- type: latheRecipe parent: BaseHatRecipe id: ClothingMaskInterdyneChemistry result: ClothingMaskInterdyneChemistry diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json deleted file mode 100644 index 9f00e200493..00000000000 --- a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Modified by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json deleted file mode 100644 index 411e0702f21..00000000000 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "sprites by JustAnOrange (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json deleted file mode 100644 index e0f7bbd7d96..00000000000 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by JustanOrange", - "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/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json deleted file mode 100644 index e0f7bbd7d96..00000000000 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by JustanOrange", - "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/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json deleted file mode 100644 index e0f7bbd7d96..00000000000 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by JustanOrange", - "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/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json deleted file mode 100644 index aabb510bd03..00000000000 --- a/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png b/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png rename to Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/icon.png b/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/icon.png rename to Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png rename to Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png rename to Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png diff --git a/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/meta.json b/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/meta.json new file mode 100644 index 00000000000..a72532dec28 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/icon.png b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/icon.png rename to Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png rename to Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-right.png rename to Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-right.png diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json new file mode 100644 index 00000000000..523246843bd --- /dev/null +++ b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprites by JustAnOrange (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-right.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-right.png diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json new file mode 100644 index 00000000000..f1889b9d110 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustanOrange", + "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/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-right.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-right.png diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json new file mode 100644 index 00000000000..488ef276808 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustanOrange", + "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/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-left.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png rename to Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json new file mode 100644 index 00000000000..d5de2ed40b0 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustanOrange", + "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/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/icon.png b/Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/icon.png rename to Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-left.png rename to Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png rename to Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png diff --git a/Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json b/Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json new file mode 100644 index 00000000000..043c3cb517a --- /dev/null +++ b/Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} From 089e6c97e424062718bf332cd705917a691b3404 Mon Sep 17 00:00:00 2001 From: Smugman <85798843+Smugman@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:37:03 +0100 Subject: [PATCH 8/9] Properly Indented now (i think) --- .../Belt/syndbelt_overlay.rsi/meta.json | 2 +- .../Coats/cybersunovercoat.rsi/meta.json | 2 +- .../Jumpsuit/cybersuncasual.rsi/meta.json | 4 ++-- .../Jumpsuit/cybersunhazard.rsi/meta.json | 2 +- .../Jumpsuit/cybersunrnd.rsi/meta.json | 4 ++-- .../briefcase_cybersun.rsi/meta.json | 24 +++++++++---------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/meta.json b/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/meta.json index a72532dec28..db3adcd5af1 100644 --- a/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/meta.json @@ -22,5 +22,5 @@ "name": "inhand-right", "directions": 4 } - ] + ] } diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json index 523246843bd..e7c8636baee 100644 --- a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json @@ -22,5 +22,5 @@ "name": "inhand-right", "directions": 4 } - ] + ] } diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json index f1889b9d110..6d13525ddee 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json @@ -20,7 +20,7 @@ }, { "name": "inhand-right", - "directions": 4 + "directions": 4 } - ] + ] } diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json index 488ef276808..9bcc438a18a 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json @@ -22,5 +22,5 @@ "name": "inhand-right", "directions": 4 } - ] + ] } diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json index d5de2ed40b0..9bcc438a18a 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json @@ -20,7 +20,7 @@ }, { "name": "inhand-right", - "directions": 4 + "directions": 4 } - ] + ] } diff --git a/Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json b/Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json index 043c3cb517a..a24e4a0aae5 100644 --- a/Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json @@ -7,16 +7,16 @@ "y": 32 }, "states": [ - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "icon" - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] } From 8dd9fe545bd6df03d2f6ee541acbe933b39579fc Mon Sep 17 00:00:00 2001 From: Smugman <85798843+Smugman@users.noreply.github.com> Date: Thu, 23 Jan 2025 23:11:03 +0100 Subject: [PATCH 9/9] Indenting my skull --- .../_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json index 6d13525ddee..9bcc438a18a 100644 --- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json @@ -6,7 +6,7 @@ "x": 32, "y": 32 }, - "states": [ + "states": [ { "name": "icon" },