From a4db4af193c07c5b2227b4c8c729c9b543ef595d Mon Sep 17 00:00:00 2001 From: Ledniky <150331005+Ledniky@users.noreply.github.com> Date: Thu, 17 Jul 2025 01:40:19 +0300 Subject: [PATCH 1/5] Delete Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit удаление --- .../ghostface.rsi/equipped-OUTERCLOTHING.png | Bin 2665 -> 0 bytes .../Neck/Cloaks/ghostface.rsi/icon.png | Bin 655 -> 0 bytes .../Neck/Cloaks/ghostface.rsi/inhand-left.png | Bin 663 -> 0 bytes .../Cloaks/ghostface.rsi/inhand-right.png | Bin 706 -> 0 bytes .../Neck/Cloaks/ghostface.rsi/meta.json | 27 ------------------ 5 files changed, 27 deletions(-) delete mode 100644 Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi/icon.png delete mode 100644 Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi/inhand-left.png delete mode 100644 Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi/inhand-right.png delete mode 100644 Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi/meta.json diff --git a/Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index 30da279bd9084b4d431e286c271dc05823839d7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2665 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 diff --git a/Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi/meta.json b/Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi/meta.json deleted file mode 100644 index dfd30d55c4a..00000000000 --- a/Resources/Textures/_RPSX/Clothing/Neck/Cloaks/ghostface.rsi/meta.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-SA-4.0", - "copyright": "RPS-eXtended & by unotka, (discord:659107974253641791)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} - From 165b9e92302d1027fcd47073ad4c6c65d8a4752b Mon Sep 17 00:00:00 2001 From: Ledniky Date: Fri, 18 Jul 2025 13:03:09 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BE=D0=B2=D0=B8=D0=BD=D0=B0=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=D0=BE=D0=B2=20=D0=BC=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_RPSX/NewYear/Structures/trees.yml | 2 +- .../Belt/rapier.rsi/Sprite-0003.aseprite | Bin 1003 -> 0 bytes .../Hands/Gloves/combat.rsi/meta.json | 4 + .../Gloves/fingerlessinsuls.rsi/meta.json | 4 + .../Hardsuits/cburn.rsi/equipped-head-vox.png | Bin 453 -> 0 bytes .../Hardsuits/cburn.rsi/equipped-head.png | Bin 623 -> 0 bytes .../Head/Hardsuits/syndiemedic.rsi/meta.json | 8 ++ .../Head/Hats/beret_warden.rsi/meta.json | 8 ++ .../Clothing/Head/Hats/hoshat.rsi/meta.json | 4 + .../Head/Hats/redwizard.rsi/meta.json | 8 ++ .../Head/Hats/safarihat.rsi/meta.json | 8 ++ .../Head/Hats/violetwizard.rsi/meta.json | 4 + .../Head/Soft/paramedicsoft.rsi/meta.json | 8 ++ .../Clothing/Mask/squadron.rsi/meta.json | 4 + .../Clothing/Neck/Misc/pins.rsi/meta.json | 32 +++++++ .../OuterClothing/Coats/bomber.rsi/meta.json | 17 +++- .../Hardsuits/atmospherics.rsi/meta.json | 4 + .../Hardsuits/cburn.rsi/meta.json | 8 ++ .../Hardsuits/cybersun.rsi/meta.json | 4 + .../Hardsuits/syndicate.rsi/meta.json | 4 + .../Hardsuits/syndiecommander.rsi/meta.json | 4 + .../Hardsuits/syndieelite.rsi/meta.json | 4 + .../Hardsuits/syndiemedic.rsi/meta.json | 4 + .../Shoes/Boots/speedboots.rsi/meta.json | 16 ++++ .../ce.rsi/s-equipped-INNERCLOTHING.png | Bin 906 -> 0 bytes .../Clothing/Uniforms/Jumpsuit/ce.rsi/s.png | Bin 224 -> 0 bytes .../Structures/Furniture/chairs.rsi/meta.json | 4 + .../Textures/Mobs/Aliens/blob.rsi/meta.json | 3 + .../Moth/moth_wings.rsi/meta.json | 12 +++ .../Mobs/Customization/eyes.rsi/meta.json | 26 +++++- .../Mobs/Species/Moth/parts.rsi/icon.png | Bin 83 -> 0 bytes .../Species/Skeleton/parts.rsi/l_arm_icon.png | Bin 499 -> 0 bytes .../Skeleton/parts.rsi/l_foot_icon.png | Bin 390 -> 0 bytes .../Skeleton/parts.rsi/l_hand_icon.png | Bin 337 -> 0 bytes .../Species/Skeleton/parts.rsi/l_leg_icon.png | Bin 412 -> 0 bytes .../Species/Skeleton/parts.rsi/r_arm_icon.png | Bin 504 -> 0 bytes .../Skeleton/parts.rsi/r_foot_icon.png | Bin 412 -> 0 bytes .../Skeleton/parts.rsi/r_hand_icon.png | Bin 329 -> 0 bytes .../Species/Skeleton/parts.rsi/r_leg_icon.png | Bin 427 -> 0 bytes .../Species/Vulpkanin/organs.rsi/meta.json | 9 ++ .../Consumable/Food/skewer.rsi/meta.json | 84 ++++++++++++++++++ .../Objects/Devices/pda.rsi/meta.json | 3 + .../Objects/Fun/Plushies/shark.rsi/meta.json | 9 ++ .../Objects/Misc/bureaucracy.rsi/meta.json | 6 ++ .../Objects/Misc/id_cards.rsi/meta.json | 3 + .../Objects/Tools/crowbar.rsi/meta.json | 15 ++++ .../EnergyCores/sprnd/sprnd.rsi/meta.json | 3 + .../{Trees.rsi => Trees}/32x48.rsi/meta.json | 0 .../{Trees.rsi => Trees}/32x48.rsi/tree1.png | Bin .../{Trees.rsi => Trees}/32x48.rsi/tree2.png | Bin .../64x64.rsi/Engineers_tree.png | Bin .../64x64.rsi/Engineers_tree_broken.png | Bin .../{Trees.rsi => Trees}/64x64.rsi/meta.json | 0 53 files changed, 333 insertions(+), 3 deletions(-) delete mode 100644 Resources/Textures/Clothing/ExternalSources/Belt/rapier.rsi/Sprite-0003.aseprite delete mode 100644 Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png delete mode 100644 Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png delete mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png delete mode 100644 Resources/Textures/Mobs/Species/Moth/parts.rsi/icon.png delete mode 100644 Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_arm_icon.png delete mode 100644 Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_foot_icon.png delete mode 100644 Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_hand_icon.png delete mode 100644 Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_leg_icon.png delete mode 100644 Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_arm_icon.png delete mode 100644 Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_foot_icon.png delete mode 100644 Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_hand_icon.png delete mode 100644 Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_leg_icon.png rename Resources/Textures/_RPSX/NewYear/Structures/{Trees.rsi => Trees}/32x48.rsi/meta.json (100%) rename Resources/Textures/_RPSX/NewYear/Structures/{Trees.rsi => Trees}/32x48.rsi/tree1.png (100%) rename Resources/Textures/_RPSX/NewYear/Structures/{Trees.rsi => Trees}/32x48.rsi/tree2.png (100%) rename Resources/Textures/_RPSX/NewYear/Structures/{Trees.rsi => Trees}/64x64.rsi/Engineers_tree.png (100%) rename Resources/Textures/_RPSX/NewYear/Structures/{Trees.rsi => Trees}/64x64.rsi/Engineers_tree_broken.png (100%) rename Resources/Textures/_RPSX/NewYear/Structures/{Trees.rsi => Trees}/64x64.rsi/meta.json (100%) diff --git a/Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml b/Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml index e1f7533e347..730824650d1 100644 --- a/Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml +++ b/Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml @@ -4,7 +4,7 @@ name: christmas tree components: - type: Sprite - sprite: _RPSX/NewYear/Structures/Trees.rsi/32x48.rsi + sprite: _RPSX/NewYear/Structures/Trees/32x48.rsi layers: - state: tree1 - type: Damageable diff --git a/Resources/Textures/Clothing/ExternalSources/Belt/rapier.rsi/Sprite-0003.aseprite b/Resources/Textures/Clothing/ExternalSources/Belt/rapier.rsi/Sprite-0003.aseprite deleted file mode 100644 index 77faf9d2200851da18ad89f32253192e7dbc31f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1003 zcmcJL|4+|}zDUickJiqKTz5rZx8_Uo_0%1m+$mO_?nVYC%XMI?@+c^i%fX;P0hq8d1FYupK%FQQd~~1zROPM* zGh&=+ITkP`*q6e9C9nbX;SO-a()@Vk z`aRukl5X2&xqM#sx=hpU5_VRpEVL&C;2rUYW4vH<^4@#Jb1wLy8V6l{!W3yq^KvA<0C?mwq$r9QE{m7`KVYcsp_8W zG9O|O>yB56Q=d7bvbIqMAVsQ`kVVioB-aM`<7;0 zae&pp?VpmYnPZAijJ(aF)g$Z-wu!7OA%F3NRz1?dtkf{O(s)O9%|71J9JNDK5hyjy z2)AggK)*S1O%O{lSAXN!-Tt@(*TlshO>2u^TzJ=CUg;<;Ydu==h)-Wv zuv{~Xw>7DsDtbzlpNVjVnNx*J?W&I8=)zZ>gI?ZELAPx6X{S%-)#Y+!seTb0hi?-v zmk+68(si8qg(VR)V(Zlx!y>CCT1pzCI;hl&`*rVmhikIUe4|-nkH(l2kqf=|+l|(Y bU0kHho|W}QsPT*Fjn|J0e=se4Tg`s~->+$2 diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json index 466cbb11c22..757b8aecbd4 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json index d484b8fbfde..a821e255f9e 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png deleted file mode 100644 index cc2fa16917f060d5dec1ac5f0c23646547a20175..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=yc9cdgo=~=b-Hg&Cw}Q;rn+rppolK4lbg?(r>1Zqis`~o!>meY; zT@vIM{2vY&y!;tI0fjjWJR*x382Ao@Fyrz36)8YV#XMacLn7SYPP@x@NP)-g=gVWq ze%o(|XPmrMWZ6Y&-s9Z5OWR$A?PLB;(C3!9Y!@w28)zl(^dY(V>U5?r&NDcA{%zG_ z_mMmJCcayugLC86SsjV|oiDf>m*?I;!Otp@uGVzKhvjMb42}zjPxG>tZhjNb`c={W zvE}3{eGkTc8Cwgw@7decAK1-argKopzWEcHocyF~p0e(%5g?nUdY1Je>O z1eSUiJf0Nro^9_!VG-s)uiT{*g^K1s&u2LiZl>_;`?gCrCjKssOAS|dsBxay=bY1X zeB!AcyM+bjuDPHY`(EtaT$f_T!(0|y7`m5peCtwdXp#*I;LC44AkrYQ)M1*qThsK& lCe?%j+Li$D3paC_l23#Y`%lYzm;;OXk;vd$@?2>>KAxEcTe diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png deleted file mode 100644 index 98b9db4665424e685838a9c98c81737568909468..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 623 zcmV-#0+9WQP)Px%DM>^@RCt{2+P_O%Q4|O8ZzUZHmaZ|sge(dLDIIFW!O5jd<_!J;Zz(Q9Mn`E7 z+}yf!aILFO9RwW&8#+WN84{m)A{QbJWQ>E}@ZR$UJtr^EA>YrI`||EN_was%+yl^b zd!spNXR9&@k5y|2s<~b}zWAh_t;!&q%_CPR4#%!qO}K75ks`z$e@2spKX}yVNsBYS zr~tP5QL@>5NyJY{zHE%a^2!My6jxX*Hh-y$sx<4QsGgm08x5rie0Z|K1 zqCdc&LzuP*s@>tMRx?lp+b?kA-D;*2`Sb4Jv7CxJY=XC%8Z-w)T3Q+rT6nM>SIvWFj zA(9ea_+IV1`t_^21uWZ)U<(1^{ihbg!ik88h=_=Yh=^!9-2?hz1wgJJTsi;%002ov JPDHLkV1gY18@T`g diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json index 4a86ae7f76d..22f340c7bb1 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json @@ -20,6 +20,14 @@ { "name": "on-equipped-HELMET", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json index d0bd1515649..7875e2e8b16 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json @@ -17,6 +17,14 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json index 557644093f2..69fd5811f9a 100644 --- a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-HELMET-hamster", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json index 14fad20aa5a..200afa9a9fa 100644 --- a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json @@ -18,6 +18,14 @@ "name": "equipped-HELMET-dog", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/meta.json index df8266aa164..92d280f66b0 100644 --- a/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/meta.json @@ -17,6 +17,14 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json index 14fad20aa5a..e5139b5b7b0 100644 --- a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-HELMET-dog", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json index b60639b2654..f828bd456ba 100644 --- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json @@ -25,10 +25,18 @@ "name": "equipped-HELMET-hamster", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "flipped-equipped-HELMET-hamster", "directions": 4 }, + { + "name": "flipped-equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json index 8f944b45a43..9fc94dfca08 100644 --- a/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, { "name": "equipped-MASK-vox", "directions": 4 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index d6c4a337c01..9f2b30b15a3 100644 --- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json @@ -132,6 +132,38 @@ { "name": "fluid-equipped-NECK", "directions": 4 + }, + { + "name": "les-equipped", + "directions": 4 + }, + { + "name": "aro-equipped", + "directions": 4 + }, + { + "name": "lgbt-equipped", + "directions": 4 + }, + { + "name": "pan-equipped", + "directions": 4 + }, + { + "name": "trans-equipped", + "directions": 4 + }, + { + "name": "inter-equipped", + "directions": 4 + }, + { + "name": "bi-equipped", + "directions": 4 + }, + { + "name": "asex-equipped", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json index 59e16da4285..359692e7ce5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json @@ -21,6 +21,21 @@ { "name": "inhand-right", "directions": 4 - } + }, + { + "name": "open-icon" + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json index ece31dcb611..983e44c93b6 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json @@ -22,6 +22,10 @@ "name": "equipped-OUTERCLOTHING-dog", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json index 3cbd6d5ef30..98036f8bceb 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json @@ -14,6 +14,14 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json index b19f353b405..8a0735485a3 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json @@ -26,6 +26,10 @@ "name": "equipped-OUTERCLOTHING-dog", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json index 78875bc2739..621f7dff0d3 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json @@ -26,6 +26,10 @@ "name": "equipped-OUTERCLOTHING-dog", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, { "name": "equipped-OUTERCLOTHING-scurret", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json index 66fb1489a70..98c47207117 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json @@ -22,6 +22,10 @@ "name": "equipped-OUTERCLOTHING-dog", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json index 1d50a81060d..2dada911386 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, { "name": "equipped-OUTERCLOTHING-dog", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json index f938e341f60..4d6fb176533 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json index 781de100d41..fe7f407ee3b 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json @@ -11,10 +11,26 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "equipped-FEET-reptilian", + "directions": 4 + }, { "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "on-equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-reptilian", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png deleted file mode 100644 index 213562cf9716a1b71e490086cb0d1cedb6d423ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 906 zcmV;519kj~P)yg-0Oz*MdH~P$RW2J1uq*fiUGk(K*c~b3A22S zr9JMLnQnWg$KC#c%pV88uWG7mWV*@Wa5x+ehr{uo;zfq-Z+06$8tbFxucjAu-ZZk# zE&}>7oWxE5#H-aR9UmWy<8HURzNA*GiS1&spkA++ND`obd3j00;ZPixN+rtY^Yr@q zN|VV%oGX{h)bIB<`lb@V;xb1^M8+?9#Hj)GcpUdUM9cK>!KBm(t6^lio3s@T!@$vCN&1SUz*ElBl z2iXWjw}Bb?I+H*X31xlgpxhZ$0-uLIZWykQL+l~Ihha&OgJ(<+fiQjCd9H*|eUnX) zq;dopd)xzX2Y@KMgr5RY2~d3se9`0U7XM6_x7-^rVr4vzzZ=b&XDcr`W{3^qwf@{JHCChza>*You-l*X`-gNHUe@cIB9 zv}cAM9v%qQAfHPMSqmQEMOR-b0Vpk$SfI>SWtip+@%H+JUB2R=JTbCM0EToXCv^y0 zp`sc%W9)yxKI71)mQn(?o7~OM8xISUA0XR{goetb;j zpCCNQx-!DU%CqN1+fg0@a*#HHXAc}Wd)W3Cm%V#{yf`s!Ola?w02o*6X9 gI2;a#z>% diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png deleted file mode 100644 index 7282eb27f639df9141715345b52bf90a8ea4a83c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmV<603ZK}P)`ve;{>A{+ z7Dmq`fDWb1LI#*#voHyuFB@(^;eiUDF~UQKzK6A!w*Y=HZPzi;+SfQj!pmErD2j4( aj4^Mt%_S}I2GY6!0000+?Ju bK+N}S0tyU_?u-jMfE)%-S3j3^P6NS%G}c0*}aI z1_m)D5N4DXYw8CIN|v}rlmzFem6RtIr7{#GX6BXX<)xM=nCKbk85w?5$ehZ+z*ykv z;usR)est_%pQxttL?a;-V$#ptD}HWX%g+6(D`oe4z$27#V5+^G%iEMCDHa;LBG=2^diGXX z^7r@iSN6Pn(~)oRbz>YzeOvP+%M(X?WSQ^(iqOweS5`gjc(T;;fY)|^{h9+8=l#wQ z-#U5Xq=yRas-u)c&djXV3Fu9(|1 zL2YAAf$pA%8N^T2gc7#sx1jNS%G}c0*}aI z1_m)D5N4DXYw8CIN|v}rlmzFem6RtIr7{#GX6BXX<)xM=nCKbk85w?5$ehZ+z{u?B z;usR)esq#;Hj|@3+tFi6PyB!U=e9pJXKw7}YM6^$W#?I-J%yzBCoNAgwx!;Hbx L)z4*}Q$iB}5vZIe diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_hand_icon.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_hand_icon.png deleted file mode 100644 index c5b586b89245b60bc09adb0aff5f113cd5e888b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_m)@5N13Xn2-$=lq_+LC<)F_D=AMbN@XZW%*-p%%S$a$Fwry6Gcx?BkU15o=$xmE zV@QPi(F=xLha3dl9^N^y_{poP84VFj1ax$cIC)s7O_QDY@NCjo=^q}S3hpRQp7~eQ zO|{2MVyb~wV#uKtErFbig`fgq(=LD9usO#|{A`#(*q;s8t2V!_%K!6oV@%S-o%8!Q zi}r}xYw(@_CGXwFX)lYXgj-C4V+*tRc&HA?wc0AuH*dw|>iE)3u{qcu- z=X(>@9AKKSf9Zbo;+tH@ymSOURsZ{|k7+T~CC8VUo9MsIXZ7mT1p17@)78&qol`;+ E01*p=$p8QV diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_leg_icon.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_leg_icon.png deleted file mode 100644 index ca32cb2a6a4d65692d8e419361c09d12998f952d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_m)j5N6!Ae(@uqpk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7io{`~4h0Li842+VV zE{-7)?oTK0<~rmc;L5u3vcABd|MdZmE-o83Z20JD@?iC+##`%VstP|UQa|`?S-}H` zZz_lH@OYlJ4A%@WYMjJ5#b-eZld7QfDycqISy>A%}{ zE3?DR>bCf+jSZKSB(F?sJpbYWGspL@_u4(ue>?3J3y5-QPBgPnx$Clb6T_}f6&K;J zQ4X1bA`UxrmF1P*Xft_niyWvI-W^;vE&b3wr3G6&uHBy4c&NNVS-m05&PA1R$+o@w zgTe~DWM4f+W4bs diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_arm_icon.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_arm_icon.png deleted file mode 100644 index 9fc357838191ce33611af5a224403cc5e563d54a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_m)D5N4DXYw8CIN|v}rlmzFem6RtIr7{#GX6BXX<)xM=nCKbk85w?5$ehZ+z*y?( z;usR)estBDTyrt}!2-9%_hMUEjY9fuC*Qj3wV6Cz)Ew1D8(*NwZ zFC*qU$eJ_xO-a97Z}8swDZc^4pXedkiAuOj$uja@iTrb~FXNS%G}c0*}aI z1_m)D5N4DXYw8CIN|v}rlmzFem6RtIr7{#GX6BXX<)xM=nCKbk85w?5$ehZ+z$oeI z;usR)e)Q5_FJ?!PwueWLIql(mzu&+!^9^e-i%-}QU6qbSZ6bj={pr(uBHF*diKykX zQThGu{2ZOkGjHM(Lk_KI3FKTX92Qw_v)Qf_slmry689OF~iKm z@6X=8nAouS@V?`&--UXTGa730b`-5XXt7L2K}t#fdV-8I^96yQ)x5_%wp5zQJX&wy zmc^{{QtE$j-KD=Q$tt!s+UEDR_J6A>&c1!Mx%6}P{yFml4@rECFMFkTiQ)a}(ET4@ zCuPR_>;HYe?{?rHGKc4>S5ju9FV5y?ryLZ18FD?6dcFOlF2|ZI*-@g*SeZQ#v n-`}%pVw%z14)u&|b{#|F-RtuIPcXg!h9rZhtDnm{r-UW|^S!EG diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_hand_icon.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_hand_icon.png deleted file mode 100644 index 342f4b4971e1eb6e7f669bb2f99851aca1b2b7c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_m)D5N4DXYw8CIN|v}rlmzFem6RtIr7{#GX6BXX<)xM=nCKbk85w?5$eapPbj;Jm zF(ktM=p{$4Lk1$Q7vCLNTJpNokhSoF6>Jfqe?ItHo4xks zEXhlHo=>#8W&M?D|FOF-#VhVlvw8I1WL^(g1KTatvc+$2)~i`bAC&N9{&{}8{2Je) r#$QiUckq6j|GU^7-8Q)O$J_L;{C!nqf4F}x&_@iOu6{1-oD!M diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_leg_icon.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_leg_icon.png deleted file mode 100644 index 9c3e6986d6f5169398fccae1f36932fdd0181935..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_m)j5N6!Ae(@uqpk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7io{`~4h0Li842&9{ zE{-7)?q?^T%{mky(AxUwoSoyr@Ad4#8cRhEwsMvduNxAu?Y?z#7NmYn)pq;|u# zkFRDzO`47SZy^l@9_7dmASl)Z} z=brAq7dPbxe?Zle#f|OjU3tR&t{P3_I6CjbI`%1YR*DZCn{_OfS5@*(e^kpdMNV@ElmWO z;~SCj_nY4FO?}5VKl-U3!~V9?;bx2IiG}}}kL6iS{+v|2o2e=<|46>wozD%MI(KVt zkoA9ZMlZpC|H5;2`Fk4{HEKS~ee*|ZK?;+qu*OUje?3v0EB|2XBbBSgDGz`F%i!ti K=d#Wzp$PyY@UeXW diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/meta.json index 7a4c38aeb59..a888fe88dd2 100644 --- a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/meta.json @@ -75,6 +75,15 @@ }, { "name": "vessel" + }, + { + "name": "appendix" + }, + { + "name": "appendix copy" + }, + { + "name": "appendix-inflamed" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json index d4e98e98bd8..15378d276aa 100644 --- a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json @@ -13,36 +13,120 @@ { "name": "skewer-meat" }, + { + "name": "skewer-meat1" + }, + { + "name": "skewer-meat2" + }, + { + "name": "skewer-meat3" + }, { "name": "skewer-meat-alpha" }, + { + "name": "skewer-meat-alpha1" + }, + { + "name": "skewer-meat-alpha2" + }, + { + "name": "skewer-meat-alpha3" + }, + { + "name": "skewer-meat-alpha4" + }, { "name": "skewer-mushroom" }, + { + "name": "skewer-mushroom1" + }, + { + "name": "skewer-mushroom2" + }, + { + "name": "skewer-mushroom3" + }, + { + "name": "skewer-mushroom4" + }, { "name": "skewer-pepper" }, + { + "name": "skewer-pepper1" + }, + { + "name": "skewer-pepper2" + }, + { + "name": "skewer-pepper3" + }, + { + "name": "skewer-pepper4" + }, { "name": "skewer-bluepepper" }, { "name": "skewer-tomato" }, + { + "name": "skewer-tomato1" + }, + { + "name": "skewer-tomato2" + }, + { + "name": "skewer-tomato3" + }, + { + "name": "skewer-tomato4" + }, { "name": "skewer-corn" }, + { + "name": "skewer-corn1" + }, + { + "name": "skewer-corn2" + }, { "name": "skewer-tail" }, + { + "name": "skewer-tail1" + }, + { + "name": "skewer-tail2" + }, { "name": "skewer-tail-cooked" }, + { + "name": "skewer-tail-cooked1" + }, + { + "name": "skewer-tail-cooked2" + }, { "name": "skewer-rat" }, + { + "name": "skewer-rat1" + }, + { + "name": "skewer-rat2" + }, { "name": "skewer-snake" }, + { + "name": "skewer-snake1" + }, { "name": "skewer-watermelon" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index e90503f6ef2..ee621296950 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -111,6 +111,9 @@ ] ] }, + { + "name": "pda-magistrate" + }, { "name": "pda-medical" }, diff --git a/Resources/Textures/Objects/Fun/Plushies/shark.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/meta.json index 33604c15fd1..d2774ce33ff 100644 --- a/Resources/Textures/Objects/Fun/Plushies/shark.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/meta.json @@ -18,9 +18,15 @@ "name": "blue-inhand-right", "directions": 4 }, + { + "name": "mopbucket_shark_blue" + }, { "name": "pink" }, + { + "name": "mopbucket_shark_pink" + }, { "name": "pink-inhand-left", "directions": 4 @@ -39,6 +45,9 @@ { "name": "grey-inhand-right", "directions": 4 + }, + { + "name": "mopbucket_shark_grey" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 7823d6eb200..2ee740a189c 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -227,6 +227,12 @@ }, { "name": "paper_stamp-wizard" + }, + { + "name": "paper_stamp-scp" + }, + { + "name": "paper_stamp-pocc" } ] } diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index 01083994273..2b5cf784538 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -268,6 +268,9 @@ { "name": "idwizard" }, + { + "name": "magistrate" + }, { "name": "gold-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json index a143a2bcfad..d100bdc2fd5 100644 --- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json @@ -36,6 +36,21 @@ { "name": "cover-icon" }, + { + "name": "red-icon" + }, + { + "name": "red-inhand-right", + "directions": 4 + }, + { + "name": "red-inhand-left", + "directions": 4 + }, + { + "name": "red-equipped-BELT", + "directions": 4 + }, { "name": "cover-equipped-BELT", "directions": 4 diff --git a/Resources/Textures/_RPSX/EnergyCores/sprnd/sprnd.rsi/meta.json b/Resources/Textures/_RPSX/EnergyCores/sprnd/sprnd.rsi/meta.json index 27c730eeec0..5e894ff8255 100644 --- a/Resources/Textures/_RPSX/EnergyCores/sprnd/sprnd.rsi/meta.json +++ b/Resources/Textures/_RPSX/EnergyCores/sprnd/sprnd.rsi/meta.json @@ -89,6 +89,9 @@ { "name": "sphere_off" }, + { + "name": "die" + }, { "name": "crutch" } diff --git a/Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/32x48.rsi/meta.json b/Resources/Textures/_RPSX/NewYear/Structures/Trees/32x48.rsi/meta.json similarity index 100% rename from Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/32x48.rsi/meta.json rename to Resources/Textures/_RPSX/NewYear/Structures/Trees/32x48.rsi/meta.json diff --git a/Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/32x48.rsi/tree1.png b/Resources/Textures/_RPSX/NewYear/Structures/Trees/32x48.rsi/tree1.png similarity index 100% rename from Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/32x48.rsi/tree1.png rename to Resources/Textures/_RPSX/NewYear/Structures/Trees/32x48.rsi/tree1.png diff --git a/Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/32x48.rsi/tree2.png b/Resources/Textures/_RPSX/NewYear/Structures/Trees/32x48.rsi/tree2.png similarity index 100% rename from Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/32x48.rsi/tree2.png rename to Resources/Textures/_RPSX/NewYear/Structures/Trees/32x48.rsi/tree2.png diff --git a/Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/64x64.rsi/Engineers_tree.png b/Resources/Textures/_RPSX/NewYear/Structures/Trees/64x64.rsi/Engineers_tree.png similarity index 100% rename from Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/64x64.rsi/Engineers_tree.png rename to Resources/Textures/_RPSX/NewYear/Structures/Trees/64x64.rsi/Engineers_tree.png diff --git a/Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/64x64.rsi/Engineers_tree_broken.png b/Resources/Textures/_RPSX/NewYear/Structures/Trees/64x64.rsi/Engineers_tree_broken.png similarity index 100% rename from Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/64x64.rsi/Engineers_tree_broken.png rename to Resources/Textures/_RPSX/NewYear/Structures/Trees/64x64.rsi/Engineers_tree_broken.png diff --git a/Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/64x64.rsi/meta.json b/Resources/Textures/_RPSX/NewYear/Structures/Trees/64x64.rsi/meta.json similarity index 100% rename from Resources/Textures/_RPSX/NewYear/Structures/Trees.rsi/64x64.rsi/meta.json rename to Resources/Textures/_RPSX/NewYear/Structures/Trees/64x64.rsi/meta.json From 8eb59a318ec24773f5423d3f149468d94d65ff33 Mon Sep 17 00:00:00 2001 From: Ledniky Date: Mon, 4 Aug 2025 16:26:09 +0300 Subject: [PATCH 3/5] =?UTF-8?q?2=20=D1=84=D0=B8=D0=BA=D1=81=20=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Head/Hardsuits/n7basehelm.rsi/.gitkeep | 0 .../Clothing/Head/Helmets/shlem.rsi/.gitkeep | 0 .../OuterClothing/Armor/rim.rsi/.gitkeep | 0 .../Hardsuits/n7base.rsi/.gitkeep | 0 .../Uniforms/Jumpsuit/underarmor.rsi/.gitkeep | 0 .../Cult/Interface/actions.rsi/meta.json | 72 ++++++++++++++++++ .../pontific.rsi/pontific_flame_old.png | Bin 7359 -> 0 bytes .../Ratvar/Clothing/cuirass.rsi/meta.json | 58 ++++++++------ .../Ratvar/Clothing/gloves.rsi/meta.json | 19 +++++ .../Clothing/judicial_visors.rsi/meta.json | 7 ++ .../Ratvar/Clothing/robe.rsi/meta.json | 6 ++ .../Weapons/brass_buckler.rsi/meta.json | 11 +++ .../Customization/fox_parts.rsi/meta.json | 10 +++ .../MainGame/Mobs/Irc/organs.rsi/meta.json | 24 ++++++ .../Weapons/Melee/gladius.rsi/.gitkeep | 0 .../Melee/telescopicbaton.rsi/meta.json | 61 ++++++++------- .../Misc/Lights/love_lamp.rsi/meta.json | 16 ++++ .../Hydroponics/fieldflower.rsi/meta.json | 2 +- .../Specific/Hydroponics/lilie.rsi/meta.json | 3 + .../Interface/Misc/job_icons.rsi/meta.json | 3 + .../NewYear/giftsocks/redsock.rsi/meta.json | 3 + .../Consumable/Food/taco.rsi/meta.json | 3 + .../Objects/Storage/boxes.rsi/meta.json | 3 + .../Weapons/Melee/crusher.rsi/meta.json | 16 ++++ .../Melee/crusher_glaive.rsi/meta.json | 16 ++++ .../Doors/Windoors/windoor.rsi/meta.json | 8 ++ .../Structures/Furniture/chairs.rsi/meta.json | 4 + .../Machines/computers.rsi/meta.json | 3 + .../Singularity/emitter.rsi/meta.json | 4 + .../Specific/carp_statue.rsi/meta.json | 3 + .../Wallmounts/air_monitors.rsi/meta.json | 20 +++++ .../extinguisher_cabinet.rsi/meta.json | 15 ++++ .../Wallmounts/scp_sign.rsi/meta.json | 3 +- .../Windows/cracks_diagonal.rsi/meta.json | 3 + .../Windows/cracks_directional.rsi/meta.json | 12 +++ 35 files changed, 354 insertions(+), 54 deletions(-) delete mode 100644 Resources/Textures/DarkStation/MainGame/Clothing/Head/Hardsuits/n7basehelm.rsi/.gitkeep delete mode 100644 Resources/Textures/DarkStation/MainGame/Clothing/Head/Helmets/shlem.rsi/.gitkeep delete mode 100644 Resources/Textures/DarkStation/MainGame/Clothing/OuterClothing/Armor/rim.rsi/.gitkeep delete mode 100644 Resources/Textures/DarkStation/MainGame/Clothing/OuterClothing/Hardsuits/n7base.rsi/.gitkeep delete mode 100644 Resources/Textures/DarkStation/MainGame/Clothing/Uniforms/Jumpsuit/underarmor.rsi/.gitkeep delete mode 100644 Resources/Textures/DarkStation/MainGame/DarkForces/Pontific/pontiff/pontific.rsi/pontific_flame_old.png delete mode 100644 Resources/Textures/DarkStation/MainGame/Objects/Weapons/Melee/gladius.rsi/.gitkeep diff --git a/Resources/Textures/DarkStation/MainGame/Clothing/Head/Hardsuits/n7basehelm.rsi/.gitkeep b/Resources/Textures/DarkStation/MainGame/Clothing/Head/Hardsuits/n7basehelm.rsi/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Textures/DarkStation/MainGame/Clothing/Head/Helmets/shlem.rsi/.gitkeep b/Resources/Textures/DarkStation/MainGame/Clothing/Head/Helmets/shlem.rsi/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Textures/DarkStation/MainGame/Clothing/OuterClothing/Armor/rim.rsi/.gitkeep b/Resources/Textures/DarkStation/MainGame/Clothing/OuterClothing/Armor/rim.rsi/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Textures/DarkStation/MainGame/Clothing/OuterClothing/Hardsuits/n7base.rsi/.gitkeep b/Resources/Textures/DarkStation/MainGame/Clothing/OuterClothing/Hardsuits/n7base.rsi/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Textures/DarkStation/MainGame/Clothing/Uniforms/Jumpsuit/underarmor.rsi/.gitkeep b/Resources/Textures/DarkStation/MainGame/Clothing/Uniforms/Jumpsuit/underarmor.rsi/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Textures/DarkStation/MainGame/DarkForces/Cult/Interface/actions.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/DarkForces/Cult/Interface/actions.rsi/meta.json index 90f90f5cae7..961edf0dbdc 100644 --- a/Resources/Textures/DarkStation/MainGame/DarkForces/Cult/Interface/actions.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/DarkForces/Cult/Interface/actions.rsi/meta.json @@ -42,6 +42,78 @@ }, { "name": "blood_barrage" + }, + { + "name": "blood_dagger" + }, + { + "name": "equip" + }, + { + "name": "horror" + }, + { + "name": "cult_comms" + }, + { + "name": "hell_dagger" + }, + { + "name": "horror" + }, + { + "name": "transmute" + }, + { + "name": "death_dagger" + }, + { + "name": "carve" + }, + { + "name": "cultfist" + }, + { + "name": "shackles" + }, + { + "name": "manip" + }, + { + "name": "dominate" + }, + { + "name": "cultforcewall" + }, + { + "name": "bloodspear" + }, + { + "name": "cult_mark" + }, + { + "name": "lesserconstruct" + }, + { + "name": "revealing" + }, + { + "name": "veiling" + }, + { + "name": "blood_rites" + }, + { + "name": "abyssal_gaze" + }, + { + "name": "areaconvert" + }, + { + "name": "phaseshift" + }, + { + "name": "artificer" } ] } diff --git a/Resources/Textures/DarkStation/MainGame/DarkForces/Pontific/pontiff/pontific.rsi/pontific_flame_old.png b/Resources/Textures/DarkStation/MainGame/DarkForces/Pontific/pontiff/pontific.rsi/pontific_flame_old.png deleted file mode 100644 index 6fa34d4d077a24839eb874a03e96786f785123e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7359 zcmV;w96;lVP)|<6`oiA$>e`%LJSJZTGv-;pch|!k#LpoKP&W=93B6+*X$Im5`@YZ-|g!Q zy5OE?er;Yt(?rpa7C)FOrtX{{j|C+FgQ0zU_UsW?S&*H=bWPmy$BWLO3qMpo!um`b zL5`ZN{SK}8UD+>;agAFT>(rc&fWn_?&0oARRzs+S4+o5&2VD+;0WM#6dOq#g%ZC2) z#4!|pP{0uQ(0I;#@I%S`VE8Hf|ITo?dGBYqLiv#KC;+Yaa$x0047%`H^8m$b7Q(wd zg2o~8>nE?BBF^|zHCbc)S-AKJD0nCUxLo+bFoWfDK;geV-zo}!%KGwB(Cx3EeEIiL z>t`ItmpJ|Xz1AE@?{^>hv(0$qcj4l5lZR#oHUGnN_4L|687(!Z zQpZU%mFH*vF4Xi34dj{xL1Ya?jbCatUVpPE^CR^3*QPrN8M53}NUKBDf12;9_+v~= z%x@AB5`Kf

V0OwRmQ^yXe}}%N?TdtCIiGF<*6nmgPn#d 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 lWmrjOO-%qQ00008000000002eQT$BI+ diff --git a/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/cuirass.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/cuirass.rsi/meta.json index 0c3b9e0309a..756f1f839fa 100644 --- a/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/cuirass.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/cuirass.rsi/meta.json @@ -1,26 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "clockwork_cuirass_overlay_1" + }, + { + "name": "clockwork_cuirass_overlay_2" + }, + { + "name": "clockwork_cuirass_overlay_3" + }, + { + "name": "clockwork_cuirass_overlay_4" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/gloves.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/gloves.rsi/meta.json index d59f37604d8..bef1a297fb0 100644 --- a/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/gloves.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/gloves.rsi/meta.json @@ -10,6 +10,25 @@ { "name": "icon" }, + { + "name": "clockwork_gauntlets_overlay_1" + }, + { + "name": "clockwork_gauntlets_overlay_2" + }, + { + "name": "clockwork_gauntlets_overlay_3", + "delays": [ + [ + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "clockwork_gauntlets" + }, { "name": "equipped-HAND", "directions": 4 diff --git a/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/judicial_visors.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/judicial_visors.rsi/meta.json index 67f37c1aef4..c878fe81ba4 100644 --- a/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/judicial_visors.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/judicial_visors.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "judicial_visor_1" + }, { "name": "equipped-EYES", "directions": 4 @@ -21,6 +24,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "image2", + "directions": 4 } ] } diff --git a/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/robe.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/robe.rsi/meta.json index 688e220440d..d7cb6a43c42 100644 --- a/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/robe.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Clothing/robe.rsi/meta.json @@ -10,6 +10,12 @@ { "name": "icon" }, + { + "name": "clockwork_robe_overlay_1" + }, + { + "name": "clockwork_robe_overlay_2" + }, { "name": "equipped-OUTERCLOTHING", "directions": 4 diff --git a/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Weapons/brass_buckler.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Weapons/brass_buckler.rsi/meta.json index 4d79c511a49..b6bf049480e 100644 --- a/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Weapons/brass_buckler.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/DarkForces/Ratvar/Weapons/brass_buckler.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "brass-buckler" }, + { + "name": "brass_buckler_overlay_1" + }, { "name": "brass-inhand-right", "directions": 4 @@ -17,6 +20,14 @@ { "name": "brass-inhand-left", "directions": 4 + }, + { + "name": "Illustration10_10", + "directions": 4 + }, + { + "name": "Illustration13_9", + "directions": 4 } ] } diff --git a/Resources/Textures/DarkStation/MainGame/Mobs/Customization/fox_parts.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/Mobs/Customization/fox_parts.rsi/meta.json index 1360d16847f..6b44234f02e 100644 --- a/Resources/Textures/DarkStation/MainGame/Mobs/Customization/fox_parts.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/Mobs/Customization/fox_parts.rsi/meta.json @@ -46,6 +46,16 @@ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] + }, + { + "name": "tail", + "directions": 4, + "delays": [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] } ] } diff --git a/Resources/Textures/DarkStation/MainGame/Mobs/Irc/organs.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/Mobs/Irc/organs.rsi/meta.json index 2561ab10b7d..f92f8b4db51 100644 --- a/Resources/Textures/DarkStation/MainGame/Mobs/Irc/organs.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/Mobs/Irc/organs.rsi/meta.json @@ -19,6 +19,9 @@ { "name": "eyes" }, + { + "name": "brain-closed" + }, { "name": "eyes-animated", "delays": [ @@ -48,6 +51,27 @@ ] ] }, + { + "name": "heart-animated", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.4, + 0.4, + 0.5, + 0.6, + 0.6, + 0.5, + 0.4, + 0.4, + 0.3, + 0.3, + 0.2 + ] + ] + }, { "name": "kidneys" }, diff --git a/Resources/Textures/DarkStation/MainGame/Objects/Weapons/Melee/gladius.rsi/.gitkeep b/Resources/Textures/DarkStation/MainGame/Objects/Weapons/Melee/gladius.rsi/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Textures/DarkStation/MainGame/Objects/Weapons/Melee/telescopicbaton.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/Objects/Weapons/Melee/telescopicbaton.rsi/meta.json index 685bfdd5335..c0871fb56d5 100644 --- a/Resources/Textures/DarkStation/MainGame/Objects/Weapons/Melee/telescopicbaton.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/Objects/Weapons/Melee/telescopicbaton.rsi/meta.json @@ -3,35 +3,38 @@ "license": "CC-BY-SA-3.0", "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", "size": { - "x": 32, - "y": 32 + "x": 32, + "y": 32 }, "states": [ - { - "name": "telescopicbaton_off" - }, - { - "name": "telescopicbaton_on" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 - }, - { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "telescopicbaton_off" + }, + { + "name": "telescopicbaton_on" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } ] - } +} diff --git a/Resources/Textures/Exodus/Objects/Misc/Lights/love_lamp.rsi/meta.json b/Resources/Textures/Exodus/Objects/Misc/Lights/love_lamp.rsi/meta.json index 7cbd7a93321..1b809dac956 100644 --- a/Resources/Textures/Exodus/Objects/Misc/Lights/love_lamp.rsi/meta.json +++ b/Resources/Textures/Exodus/Objects/Misc/Lights/love_lamp.rsi/meta.json @@ -12,6 +12,22 @@ }, { "name": "lamp_heart-on" + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Exodus/Objects/Specific/Hydroponics/fieldflower.rsi/meta.json b/Resources/Textures/Exodus/Objects/Specific/Hydroponics/fieldflower.rsi/meta.json index 387fdd09409..c7e43fb401c 100644 --- a/Resources/Textures/Exodus/Objects/Specific/Hydroponics/fieldflower.rsi/meta.json +++ b/Resources/Textures/Exodus/Objects/Specific/Hydroponics/fieldflower.rsi/meta.json @@ -43,7 +43,7 @@ "name": "stage-5" }, { - "name": "stage-6" + "name": "разнотравье" } ] } \ No newline at end of file diff --git a/Resources/Textures/Exodus/Objects/Specific/Hydroponics/lilie.rsi/meta.json b/Resources/Textures/Exodus/Objects/Specific/Hydroponics/lilie.rsi/meta.json index 387fdd09409..b77ab76704c 100644 --- a/Resources/Textures/Exodus/Objects/Specific/Hydroponics/lilie.rsi/meta.json +++ b/Resources/Textures/Exodus/Objects/Specific/Hydroponics/lilie.rsi/meta.json @@ -44,6 +44,9 @@ }, { "name": "stage-6" + }, + { + "name": "цветок" } ] } \ No newline at end of file diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 4fda84f8aa9..a45f44f1876 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -261,6 +261,9 @@ }, { "name": "ParadoxClone" + }, + { + "name": "icon-magistrate" } ] } diff --git a/Resources/Textures/NewYear/giftsocks/redsock.rsi/meta.json b/Resources/Textures/NewYear/giftsocks/redsock.rsi/meta.json index 6a3ffdb3ea3..f06070c760a 100644 --- a/Resources/Textures/NewYear/giftsocks/redsock.rsi/meta.json +++ b/Resources/Textures/NewYear/giftsocks/redsock.rsi/meta.json @@ -13,6 +13,9 @@ { "name": "icon_full" }, + { + "name": "red-0" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json index 3358ad00ff8..a93a2ec2be2 100644 --- a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json @@ -27,6 +27,9 @@ }, { "name": "dragontaco" + }, + { + "name": "tacoshell" } ] } diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 32b8118aa82..07e2972afe1 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -241,6 +241,9 @@ }, { "name": "agrichemkit" + }, + { + "name": "box_id" } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json index 6074bd98753..8803c35e989 100644 --- a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json @@ -29,6 +29,22 @@ { "name": "equipped-SUITSTORAGE", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json index 6074bd98753..8803c35e989 100644 --- a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json @@ -29,6 +29,22 @@ { "name": "equipped-SUITSTORAGE", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json index 66954b66626..2dd1d171ee0 100644 --- a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json @@ -156,6 +156,10 @@ "name":"bolted_unlit", "directions":4 }, + { + "name":"bolted_open_unlit", + "directions":4 + }, { "name":"welded", "directions":4 @@ -167,6 +171,10 @@ { "name": "emergency_unlit", "directions": 4 + }, + { + "name": "emergency_open_unlit", + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json index 435b686c72b..3f9014d0c98 100644 --- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json @@ -102,6 +102,10 @@ { "name": "xeno-chair", "directions": 4 + }, + { + "name": "comfy_purple", + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json index 65cba1211e6..99ccf8ccf4d 100644 --- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json @@ -2030,6 +2030,9 @@ { "name": "wizard_key", "directions": 4 + }, + { + "name": "comm_icon" } ] } diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json index 148f158b40d..47aa8bb4d12 100644 --- a/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json @@ -23,6 +23,10 @@ "name": "unlocked", "directions": 4 }, + { + "name": "unlock", + "directions": 4 + }, { "name": "emitter", "directions": 4 diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json b/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json index fb1ed6a3ef3..82043705cf8 100644 --- a/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json +++ b/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json @@ -21,6 +21,9 @@ }, { "name": "teeth_unshaded" + }, + { + "name": "unshaded" } ] } diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json index db03c19deff..e2f0bbbbb54 100644 --- a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json @@ -185,6 +185,26 @@ { "name": "firex", "directions": 1 + }, + { + "name": "fire_overlay", + "directions": 4 + }, + { + "name": "fire_on", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] } ] } diff --git a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json index 3a8eeb4b496..771a5fe3da4 100644 --- a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json @@ -13,6 +13,21 @@ { "name": "extinguisher" }, + { + "name": "extinguisher_closed" + }, + { + "name": "extinguisher_empty" + }, + { + "name": "extinguisher_full" + }, + { + "name": "extinguisher_mini" + }, + { + "name": "extinguisher-mini" + }, { "name": "frame" }, diff --git a/Resources/Textures/Structures/Wallmounts/scp_sign.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/scp_sign.rsi/meta.json index c8a62a80c51..91d3478e206 100644 --- a/Resources/Textures/Structures/Wallmounts/scp_sign.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/scp_sign.rsi/meta.json @@ -1,6 +1,7 @@ { "version": 1, - "copyright": "Discord <@410474801350574080>", + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended (discord: @410474801350574080)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/cracks_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/cracks_diagonal.rsi/meta.json index ca012e8fc5c..e1d04b72ceb 100644 --- a/Resources/Textures/Structures/Windows/cracks_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/cracks_diagonal.rsi/meta.json @@ -7,8 +7,11 @@ "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit e06b82a7f4b2b09216fb28fd384c95a2e1dc50e5", "states": [ + {"name": "DamageOverlay_4", "directions": 1}, {"name": "DamageOverlay_5", "directions": 1}, + {"name": "DamageOverlay_8", "directions": 1}, {"name": "DamageOverlay_10", "directions": 1}, + {"name": "DamageOverlay_12", "directions": 1}, {"name": "DamageOverlay_20", "directions": 1} ] } diff --git a/Resources/Textures/Structures/Windows/cracks_directional.rsi/meta.json b/Resources/Textures/Structures/Windows/cracks_directional.rsi/meta.json index 9555aa5ab35..5ef85742712 100644 --- a/Resources/Textures/Structures/Windows/cracks_directional.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/cracks_directional.rsi/meta.json @@ -7,14 +7,26 @@ "license": "CC-BY-SA-3.0", "copyright": "Adapted from https://github.com/space-wizards/space-station-14/ at commit f57e8ec6b9b4b72ef56c8146be0bc159ed2691ee, originally added by Zumorica, and modified for directional use by Darkie", "states": [ + { + "name": "DamageOverlay_4", + "directions": 4 + }, { "name": "DamageOverlay_5", "directions": 4 }, + { + "name": "DamageOverlay_8", + "directions": 4 + }, { "name": "DamageOverlay_10", "directions": 4 }, + { + "name": "DamageOverlay_12", + "directions": 4 + }, { "name": "DamageOverlay_20", "directions": 4 From 5a4680897885315fa80d2251a4167a91076a87b2 Mon Sep 17 00:00:00 2001 From: Ledniky Date: Thu, 7 Aug 2025 13:43:53 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Head/Hardsuits/cburn.rsi/meta.json | 8 ++ .../Head/Hardsuits/deathsquad.rsi/meta.json | 8 ++ .../Head/Hats/redwizard.rsi/meta.json | 4 - .../Head/Hats/wizardhat.rsi/meta.json | 4 + .../Clothing/Head/Soft/qmsoft.rsi/meta.json | 8 ++ .../Clothing/Neck/Misc/pins.rsi/meta.json | 4 + .../OuterClothing/Coats/bomber.rsi/meta.json | 24 +++--- .../MainGame/Mobs/Irc/organs.rsi/meta.json | 42 +++++----- .../Objects/Devices/pda.rsi/meta.json | 4 + .../Guns/Rifles/n7avenger.rsi/.gitkeep | 0 .../Hardsuits/salvage_maximal.rsi/meta.json | 2 +- .../Vulpkanin/vulpkanin_arm.rsi/meta.json | 2 +- .../Vulpkanin/vulpkanin_ears.rsi/meta.json | 2 +- .../Vulpkanin/vulpkanin_foot.rsi/meta.json | 2 +- .../Vulpkanin/vulpkanin_hand.rsi/meta.json | 2 +- .../Vulpkanin/vulpkanin_leg.rsi/meta.json | 2 +- .../Vulpkanin/vulpkanin_snout.rsi/meta.json | 2 +- .../Vulpkanin/vulpkanin_torso.rsi/meta.json | 2 +- .../Exodus/Objects/Fun/toys.rsi/meta.json | 2 +- .../Hydroponics/fieldflower.rsi/meta.json | 3 + .../Medical/mechanical_injector.rsi/meta.json | 2 +- .../Decoration/elmosfire.rsi/meta.json | 2 +- .../Atmospherics/tiny_fan.rsi/meta.json | 2 +- .../Exodus/Tiles/Misc/floortrap.rsi/meta.json | 2 +- .../Mobs/Species/Skeleton/parts.rsi/meta.json | 12 +++ .../Textures/NewYear/posters.rsi/meta.json | 83 +++++++++++++++++++ .../Consumable/Food/skewer.rsi/meta.json | 8 +- .../Wallmounts/air_monitors.rsi/meta.json | 20 ++++- .../Structures/Windows/cracks.rsi/meta.json | 3 + .../Weapons/Guns/Rifles/flash.rsi/meta.json | 4 +- .../Guns/Rifles/hummingbird.rsi/meta.json | 4 +- .../Guns/Rifles/titmouse.rsi/meta.json | 4 +- 32 files changed, 213 insertions(+), 60 deletions(-) delete mode 100644 Resources/Textures/DarkStation/MainGame/Objects/Weapons/Guns/Rifles/n7avenger.rsi/.gitkeep create mode 100644 Resources/Textures/NewYear/posters.rsi/meta.json diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json index 0cd47572cbd..4f4dba7c525 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json @@ -21,6 +21,14 @@ "name": "off-equipped-HELMET", "directions": 4 }, + { + "name": "equipped-head-unshaded", + "directions": 4 + }, + { + "name": "equipped-head-unshaded-vox", + "directions": 4 + }, { "name": "icon-unshaded" }, diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json index 14dc571cdac..01fd44ae7ac 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "on-equipped-HELMET-vox", "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json index 200afa9a9fa..e5139b5b7b0 100644 --- a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json @@ -22,10 +22,6 @@ "name": "equipped-HELMET-vox", "directions": 4 }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json index 03229e284dc..c81ac55fa2c 100644 --- a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json @@ -22,6 +22,10 @@ "name": "equipped-HELMET-dog", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json index a29360acd8b..099200500a1 100644 --- a/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json @@ -17,6 +17,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -29,6 +33,10 @@ "name": "flipped-equipped-HELMET", "directions": 4 }, + { + "name": "flipped-equipped-HELMET-vox", + "directions": 4 + }, { "name": "flipped-inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index 9f2b30b15a3..eb95203a402 100644 --- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json @@ -91,6 +91,10 @@ "name": "non-equipped-NECK", "directions": 4 }, + { + "name": "non-equipped", + "directions": 4 + }, { "name": "pan" }, diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json index 359692e7ce5..4859ea04c35 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "icon-open" + }, { "name": "equipped-OUTERCLOTHING", "directions": 4 @@ -23,19 +26,16 @@ "directions": 4 }, { - "name": "open-icon" - }, - { "name": "open-equipped-OUTERCLOTHING", "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } ] } diff --git a/Resources/Textures/DarkStation/MainGame/Mobs/Irc/organs.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/Mobs/Irc/organs.rsi/meta.json index f92f8b4db51..0386e6bdc27 100644 --- a/Resources/Textures/DarkStation/MainGame/Mobs/Irc/organs.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/Mobs/Irc/organs.rsi/meta.json @@ -51,27 +51,6 @@ ] ] }, - { - "name": "heart-animated", - "delays": [ - [ - 0.2, - 0.3, - 0.3, - 0.4, - 0.4, - 0.5, - 0.6, - 0.6, - 0.5, - 0.4, - 0.4, - 0.3, - 0.3, - 0.2 - ] - ] - }, { "name": "kidneys" }, @@ -134,6 +113,27 @@ }, { "name": "stomach" + }, + { + "name": "brain-animated", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.3, + 0.3, + 0.3, + 0.4, + 0.4, + 0.3, + 0.3, + 0.3, + 0.2, + 0.2, + 0.2 + ] + ] } ] } diff --git a/Resources/Textures/DarkStation/MainGame/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DarkStation/MainGame/Objects/Devices/pda.rsi/meta.json index 06eaa567c01..ccc142722ee 100644 --- a/Resources/Textures/DarkStation/MainGame/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/DarkStation/MainGame/Objects/Devices/pda.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-BELT", "directions": 4 }, + { + "name": "equipped-IDCARD", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/DarkStation/MainGame/Objects/Weapons/Guns/Rifles/n7avenger.rsi/.gitkeep b/Resources/Textures/DarkStation/MainGame/Objects/Weapons/Guns/Rifles/n7avenger.rsi/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Textures/Exodus/Clothing/Head/Hardsuits/salvage_maximal.rsi/meta.json b/Resources/Textures/Exodus/Clothing/Head/Hardsuits/salvage_maximal.rsi/meta.json index 4bfd81a514c..bd10c2818b0 100644 --- a/Resources/Textures/Exodus/Clothing/Head/Hardsuits/salvage_maximal.rsi/meta.json +++ b/Resources/Textures/Exodus/Clothing/Head/Hardsuits/salvage_maximal.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & owned by Space Exodus, by Askolot (discord:788252896016990219)", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_arm.rsi/meta.json b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_arm.rsi/meta.json index cbeced704b4..3ee20de186d 100644 --- a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_arm.rsi/meta.json +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_arm.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & by Askolot, owned by Spase Exodus", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_ears.rsi/meta.json b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_ears.rsi/meta.json index a0f68d3e943..0b6b173d2fa 100644 --- a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_ears.rsi/meta.json +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_ears.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & by Askolot (discord:788252896016990219), owned by Space Exodus", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_foot.rsi/meta.json b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_foot.rsi/meta.json index fee6bf0d9dd..7c5da63331d 100644 --- a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_foot.rsi/meta.json +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_foot.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & by Askolot, owned by Space Exodus", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_hand.rsi/meta.json b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_hand.rsi/meta.json index 06b0706da3e..f7c5f48b03c 100644 --- a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_hand.rsi/meta.json +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_hand.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & by Askolot, owned by Space Exodus", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_leg.rsi/meta.json b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_leg.rsi/meta.json index 23d9fc4c213..19993c010f8 100644 --- a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_leg.rsi/meta.json +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_leg.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & by Askolot, owned by Space Exodus", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_snout.rsi/meta.json b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_snout.rsi/meta.json index 72a08419021..af3372f4f59 100644 --- a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_snout.rsi/meta.json +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_snout.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & by Askolot (discord:788252896016990219), owned by Space Exodus", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_torso.rsi/meta.json b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_torso.rsi/meta.json index 585c8fcdb21..115002bd40d 100644 --- a/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_torso.rsi/meta.json +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_torso.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & by Askolot, owned by Space Exodus", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Exodus/Objects/Fun/toys.rsi/meta.json index 61fdb4859d8..82742f822f3 100644 --- a/Resources/Textures/Exodus/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Exodus/Objects/Fun/toys.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & plush_heart by Piv2r (discord:716737363895648256), other by Askolot (discord:788252896016990219)", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Objects/Specific/Hydroponics/fieldflower.rsi/meta.json b/Resources/Textures/Exodus/Objects/Specific/Hydroponics/fieldflower.rsi/meta.json index c7e43fb401c..7221baab871 100644 --- a/Resources/Textures/Exodus/Objects/Specific/Hydroponics/fieldflower.rsi/meta.json +++ b/Resources/Textures/Exodus/Objects/Specific/Hydroponics/fieldflower.rsi/meta.json @@ -42,6 +42,9 @@ { "name": "stage-5" }, + { + "name": "stage-6" + }, { "name": "разнотравье" } diff --git a/Resources/Textures/Exodus/Objects/Specific/Medical/mechanical_injector.rsi/meta.json b/Resources/Textures/Exodus/Objects/Specific/Medical/mechanical_injector.rsi/meta.json index acb2a708457..b857d60fbce 100644 --- a/Resources/Textures/Exodus/Objects/Specific/Medical/mechanical_injector.rsi/meta.json +++ b/Resources/Textures/Exodus/Objects/Specific/Medical/mechanical_injector.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & owned by Space Exodus, made by Askolot (discord:788252896016990219)", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Structures/Lighting/Decoration/elmosfire.rsi/meta.json b/Resources/Textures/Exodus/Structures/Lighting/Decoration/elmosfire.rsi/meta.json index bba9abcaf11..8973097ff46 100644 --- a/Resources/Textures/Exodus/Structures/Lighting/Decoration/elmosfire.rsi/meta.json +++ b/Resources/Textures/Exodus/Structures/Lighting/Decoration/elmosfire.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & by Askolot (discord:788252896016990219), owned by Space Exodus", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Structures/Piping/Atmospherics/tiny_fan.rsi/meta.json b/Resources/Textures/Exodus/Structures/Piping/Atmospherics/tiny_fan.rsi/meta.json index 1e010bf8588..fc66b0cd36d 100644 --- a/Resources/Textures/Exodus/Structures/Piping/Atmospherics/tiny_fan.rsi/meta.json +++ b/Resources/Textures/Exodus/Structures/Piping/Atmospherics/tiny_fan.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & by Askolot, owned by Space Exodus (discord:788252896016990219), based on https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", "size": { "x": 32, diff --git a/Resources/Textures/Exodus/Tiles/Misc/floortrap.rsi/meta.json b/Resources/Textures/Exodus/Tiles/Misc/floortrap.rsi/meta.json index 8d4110eef52..a67c929c63f 100644 --- a/Resources/Textures/Exodus/Tiles/Misc/floortrap.rsi/meta.json +++ b/Resources/Textures/Exodus/Tiles/Misc/floortrap.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-NC-SA-4.0", "copyright": "RPS-eXtended & by Askolot (discord:788252896016990219), owned by Space Exodus", "size": { "x": 32, diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/meta.json index 78e0a89e04d..011a361171d 100644 --- a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/meta.json @@ -10,6 +10,18 @@ { "name": "full" }, + { + "name": "head_icon" + }, + { + "name": "head_opened_icon" + }, + { + "name": "torso_icon" + }, + { + "name": "torso_opened_icon" + }, { "name": "head_f", "directions": 4 diff --git a/Resources/Textures/NewYear/posters.rsi/meta.json b/Resources/Textures/NewYear/posters.rsi/meta.json new file mode 100644 index 00000000000..72990141dc6 --- /dev/null +++ b/Resources/Textures/NewYear/posters.rsi/meta.json @@ -0,0 +1,83 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended. Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster4_contraband edited, poster36_contraband and poster52_legit made by SlamBamActionman, poster53_legit and the original version by @RCOI on discord, modified by Spessmann, poster54_legit by hex_reject on Discord, poster64_contraband, poster65_contraband, poster66_contraband by JuneSzalkowska (Discord), poster55_legit by FairlySadPanda (Github), based on art and a character owned by Vytian (Discord).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "poster1_legit" + }, + { + "name": "poster4_contraband" + }, + { + "name": "poster5_contraband" + }, + { + "name": "poster6_contraband" + }, + { + "name": "poster7_contraband" + }, + { + "name": "poster8_legit" + }, + { + "name": "poster9_contraband" + }, + { + "name": "poster10_legit" + }, + { + "name": "poster11_contraband" + }, + { + "name": "poster12_legit" + }, + { + "name": "poster13_legit" + }, + { + "name": "poster14_legit" + }, + { + "name": "poster15_contraband" + }, + { + "name": "poster16_legit" + }, + { + "name": "poster17_legit" + }, + { + "name": "poster18_legit" + }, + { + "name": "poster20_contraband" + }, + { + "name": "poster29_legit" + }, + { + "name": "poster36_legit" + }, + { + "name": "poster40_legit" + }, + { + "name": "poster44_legit" + }, + { + "name": "poster45_legit" + }, + { + "name": "poster46_legit" + }, + { + "name": "poster47_legit" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json index 15378d276aa..ec9e549985b 100644 --- a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json @@ -20,7 +20,10 @@ "name": "skewer-meat2" }, { - "name": "skewer-meat3" + "name": "skewer-meat4" + }, + { + "name": "3" }, { "name": "skewer-meat-alpha" @@ -127,6 +130,9 @@ { "name": "skewer-snake1" }, + { + "name": "skewer-snake2" + }, { "name": "skewer-watermelon" }, diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json index e2f0bbbbb54..3040fa37aeb 100644 --- a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json @@ -200,11 +200,25 @@ 0.2, 0.2, 0.2, - 0.2, - 0.2, 0.2 ] ] - } + }, + { + "name": "fire_detected", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } ] } diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/meta.json b/Resources/Textures/Structures/Windows/cracks.rsi/meta.json index ca012e8fc5c..c327a9f2360 100644 --- a/Resources/Textures/Structures/Windows/cracks.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/cracks.rsi/meta.json @@ -7,8 +7,11 @@ "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit e06b82a7f4b2b09216fb28fd384c95a2e1dc50e5", "states": [ + {"name": "DamageOverlay_4", "directions": 1}, {"name": "DamageOverlay_5", "directions": 1}, + {"name": "DamageOverlay_8", "directions": 1} {"name": "DamageOverlay_10", "directions": 1}, + {"name": "DamageOverlay_12", "directions": 1}, {"name": "DamageOverlay_20", "directions": 1} ] } diff --git a/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/flash.rsi/meta.json b/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/flash.rsi/meta.json index 0647493ac72..3c6d7d4e75b 100644 --- a/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/flash.rsi/meta.json +++ b/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/flash.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "Собственная лицензия. Полный запрет на копирование и использование вне проекта Dark Station без одобрения текущего владельца проекта", - "copyright": "lukas DS", + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by lukas DS", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/hummingbird.rsi/meta.json b/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/hummingbird.rsi/meta.json index b3a46bcba3e..2640c4057cb 100644 --- a/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/hummingbird.rsi/meta.json +++ b/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/hummingbird.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "Собственная лицензия. Полный запрет на копирование и использование вне проекта Dark Station без одобрения текущего владельца проекта", - "copyright": "lukas DS", + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by lukas DS", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/titmouse.rsi/meta.json b/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/titmouse.rsi/meta.json index 4af64634e6a..4c02785658c 100644 --- a/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/titmouse.rsi/meta.json +++ b/Resources/Textures/_RPSX/Objects/Weapons/Guns/Rifles/titmouse.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "Собственная лицензия. Полный запрет на копирование и использование вне проекта Dark Station без одобрения текущего владельца проекта", - "copyright": "lukas DS", + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by lukas DS", "size": { "x": 32, "y": 32 From f709f3674a408bf8f902befaba4fdc1c81255ce8 Mon Sep 17 00:00:00 2001 From: Ledniky Date: Thu, 7 Aug 2025 18:57:41 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D1=91=D0=BA=D0=B0=D1=80=D0=BD=D1=8B=D0=B9?= =?UTF-8?q?=20=D0=B1=D0=B0=D0=B1=D0=B0=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/_RPSX/NewYear/Structures/trees.yml | 2 +- .../Specific/Janitorial/wirebrush.rsi/meta.json | 5 ----- .../Wallmounts/air_monitors.rsi/meta.json | 14 -------------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml b/Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml index 730824650d1..063cc70e456 100644 --- a/Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml +++ b/Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml @@ -43,7 +43,7 @@ parent: DecoratedFirTreeRPSX components: - type: Sprite - sprite: _RPSX/NewYear/Structures/Trees.rsi/64x64.rsi + sprite: _RPSX/NewYear/Structures/Trees/64x64.rsi layers: - state: Engineers_tree_broken diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json index 7800e88b653..4a9131da5e7 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json @@ -1,12 +1,7 @@ { "version": 1, -<<<<<<< HEAD:Resources/Textures/Exodus/Objects/Specific/Medical/mechanical_injector.rsi/meta.json - "license": "CC-BY-NC-SA-4.0", - "copyright": "RPS-eXtended & owned by Space Exodus, made by Askolot (discord:788252896016990219)", -======= "license": "CC-BY-SA-4.0", "copyright": "Sprites by TiniestShark (Github)", ->>>>>>> rpsx/develop:Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json index 3040fa37aeb..5b1936928fe 100644 --- a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json @@ -190,20 +190,6 @@ "name": "fire_overlay", "directions": 4 }, - { - "name": "fire_on", - "directions": 1, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, { "name": "fire_detected", "directions": 1,