diff --git a/Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml b/Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml index e1f7533e347..063cc70e456 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 @@ -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/Clothing/ExternalSources/Belt/rapier.rsi/Sprite-0003.aseprite b/Resources/Textures/Clothing/ExternalSources/Belt/rapier.rsi/Sprite-0003.aseprite deleted file mode 100644 index 77faf9d2200..00000000000 Binary files a/Resources/Textures/Clothing/ExternalSources/Belt/rapier.rsi/Sprite-0003.aseprite and /dev/null differ 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 cc2fa16917f..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png and /dev/null differ 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 98b9db46654..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png and /dev/null differ 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/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..e5139b5b7b0 100644 --- a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/redwizard.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/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/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/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/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/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 ac7d927d231..dcf6b40fe22 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" }, @@ -132,6 +136,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..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 @@ -21,6 +24,18 @@ { "name": "inhand-right", "directions": 4 + }, + { + "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 213562cf971..00000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png and /dev/null differ 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 7282eb27f63..00000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Corvax/Structures/Furniture/chairs.rsi/meta.json index be3f656037a..43507f29ce3 100644 --- a/Resources/Textures/Corvax/Structures/Furniture/chairs.rsi/meta.json +++ b/Resources/Textures/Corvax/Structures/Furniture/chairs.rsi/meta.json @@ -14,6 +14,10 @@ { "name": "carp-overlay", "directions": 4 + }, + { + "name": "brass", + "directions": 4 } ] } 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 6fa34d4d077..00000000000 Binary files a/Resources/Textures/DarkStation/MainGame/DarkForces/Pontific/pontiff/pontific.rsi/pontific_flame_old.png and /dev/null differ 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..0386e6bdc27 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": [ @@ -110,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/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/Clothing/Head/Hardsuits/salvage_maximal.rsi/meta.json b/Resources/Textures/Exodus/Clothing/Head/Hardsuits/salvage_maximal.rsi/meta.json new file mode 100644 index 00000000000..bd10c2818b0 --- /dev/null +++ b/Resources/Textures/Exodus/Clothing/Head/Hardsuits/salvage_maximal.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & owned by Space Exodus, by Askolot (discord:788252896016990219)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-unshaded" + }, + { + "name": "icon-flash" + }, + { + "name": "light-overlay" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "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/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_arm.rsi/meta.json b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_arm.rsi/meta.json new file mode 100644 index 00000000000..3ee20de186d --- /dev/null +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_arm.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by Askolot, owned by Spase Exodus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "arrowarm_l", + "directions": 4 + }, + { + "name": "arrowarm_r", + "directions": 4 + }, + { + "name": "mittens_l", + "directions": 4 + }, + { + "name": "mittens_r", + "directions": 4 + }, + { + "name": "shoulders_l", + "directions": 4 + }, + { + "name": "shoulders_r", + "directions": 4 + }, + { + "name": "stripesarm_l", + "directions": 4 + }, + { + "name": "stripesarm_r", + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..0b6b173d2fa --- /dev/null +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_ears.rsi/meta.json @@ -0,0 +1,79 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by Askolot (discord:788252896016990219), owned by Space Exodus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ears_cutoff_inner", + "directions": 4 + }, + { + "name": "ears_cutoff_outer", + "directions": 4 + }, + { + "name": "ears_fennec_inner", + "directions": 4 + }, + { + "name": "ears_fennec_outer", + "directions": 4 + }, + { + "name": "ears_hyena_inner", + "directions": 4 + }, + { + "name": "ears_hyena_outer", + "directions": 4 + }, + { + "name": "ears_linx_inner", + "directions": 4 + }, + { + "name": "ears_linx_outer", + "directions": 4 + }, + { + "name": "ears_round_inner", + "directions": 4 + }, + { + "name": "ears_round_outer", + "directions": 4 + }, + { + "name": "ears_sharp_inner", + "directions": 4 + }, + { + "name": "ears_sharp_outer", + "directions": 4 + }, + { + "name": "ears_skar_left_inner", + "directions": 4 + }, + { + "name": "ears_skar_left_outer", + "directions": 4 + }, + { + "name": "ears_skar_right_inner", + "directions": 4 + }, + { + "name": "ears_skar_right_outer", + "directions": 4 + }, + { + "name": "ears_spaniel", + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..7c5da63331d --- /dev/null +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_foot.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by Askolot, owned by Space Exodus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "trail_foot_l", + "directions": 4 + }, + { + "name": "trail_foot_r", + "directions": 4 + }, + { + "name": "dot_foot_l", + "directions": 4 + }, + { + "name": "dot_foot_r", + "directions": 4 + }, + { + "name": "foots_l", + "directions": 4 + }, + { + "name": "foots_r", + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..f7c5f48b03c --- /dev/null +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_hand.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by Askolot, owned by Space Exodus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "glovelett_l", + "directions": 4 + }, + { + "name": "glovelett_r", + "directions": 4 + }, + { + "name": "gloves_l", + "directions": 4 + }, + { + "name": "gloves_r", + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..19993c010f8 --- /dev/null +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_leg.rsi/meta.json @@ -0,0 +1,67 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by Askolot, owned by Space Exodus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inner_thigh_l", + "directions": 4 + }, + { + "name": "inner_thigh_r", + "directions": 4 + }, + { + "name": "kneesocks_l", + "directions": 4 + }, + { + "name": "kneesocks_r", + "directions": 4 + }, + { + "name": "long_stripes_leg_l", + "directions": 4 + }, + { + "name": "long_stripes_leg_r", + "directions": 4 + }, + { + "name": "socksleg_l", + "directions": 4 + }, + { + "name": "socksleg_r", + "directions": 4 + }, + { + "name": "bun_l", + "directions": 4 + }, + { + "name": "bun_r", + "directions": 4 + }, + { + "name": "hips_l", + "directions": 4 + }, + { + "name": "hips_r", + "directions": 4 + }, + { + "name": "incision_mark_l", + "directions": 4 + }, + { + "name": "incision_mark_r", + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..af3372f4f59 --- /dev/null +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_snout.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by Askolot (discord:788252896016990219), owned by Space Exodus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "throat", + "directions": 4 + }, + { + "name": "arrow", + "directions": 4 + }, + { + "name": "raccoon", + "directions": 4 + }, + { + "name": "arrows", + "directions": 4 + }, + { + "name": "belt", + "directions": 4 + }, + { + "name": "case", + "directions": 4 + }, + { + "name": "eyebrows", + "directions": 4 + }, + { + "name": "helmet", + "directions": 4 + }, + { + "name": "ladle", + "directions": 4 + }, + { + "name": "lantern", + "directions": 4 + }, + { + "name": "mask", + "directions": 4 + }, + { + "name": "siamisblurred", + "directions": 4 + }, + { + "name": "star", + "directions": 4 + }, + { + "name": "tear", + "directions": 4 + }, + { + "name": "tearsmall", + "directions": 4 + }, + { + "name": "thai", + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..115002bd40d --- /dev/null +++ b/Resources/Textures/Exodus/Mobs/Customization/Vulpkanin/vulpkanin_torso.rsi/meta.json @@ -0,0 +1,147 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by Askolot, owned by Space Exodus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "necklac_m", + "directions": 4 + }, + { + "name": "necklace_f", + "directions": 4 + }, + { + "name": "necklace2_f", + "directions": 4 + }, + { + "name": "necklace2_m", + "directions": 4 + }, + { + "name": "sections1_f", + "directions": 4 + }, + { + "name": "sections2_f", + "directions": 4 + }, + { + "name": "sheet_f", + "directions": 4 + }, + { + "name": "sheet_m", + "directions": 4 + }, + { + "name": "spot_f", + "directions": 4 + }, + { + "name": "spot_m", + "directions": 4 + }, + { + "name": "srite", + "directions": 4 + }, + { + "name": "stripes_are_fron_m", + "directions": 4 + }, + { + "name": "stripes_are_torn_f", + "directions": 4 + }, + { + "name": "belly_f", + "directions": 4 + }, + { + "name": "belly_m", + "directions": 4 + }, + { + "name": "belt", + "directions": 4 + }, + { + "name": "belt2", + "directions": 4 + }, + { + "name": "breast_f", + "directions": 4 + }, + { + "name": "breast_m", + "directions": 4 + }, + { + "name": "chest_and_throat_f", + "directions": 4 + }, + { + "name": "chest_and_throat_m", + "directions": 4 + }, + { + "name": "cross_f", + "directions": 4 + }, + { + "name": "cross_m", + "directions": 4 + }, + { + "name": "horza_f", + "directions": 4 + }, + { + "name": "horza_m", + "directions": 4 + }, + { + "name": "hyena", + "directions": 4 + }, + { + "name": "jackal1_f", + "directions": 4 + }, + { + "name": "jackal1_m", + "directions": 4 + }, + { + "name": "jackal2_f", + "directions": 4 + }, + { + "name": "jackal2_m", + "directions": 4 + }, + { + "name": "mane_f", + "directions": 4 + }, + { + "name": "mane_m", + "directions": 4 + }, + { + "name": "mantle_f", + "directions": 4 + }, + { + "name": "mantle_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Exodus/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Exodus/Objects/Fun/toys.rsi/meta.json new file mode 100644 index 00000000000..82742f822f3 --- /dev/null +++ b/Resources/Textures/Exodus/Objects/Fun/toys.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & plush_heart by Piv2r (discord:716737363895648256), other by Askolot (discord:788252896016990219)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plush_loxmat" + }, + { + "name": "plush_fragoler" + }, + { + "name": "plush_lokilife" + }, + { + "name": "plush_asler" + }, + { + "name": "plush_atima" + }, + { + "name": "plush_jidor" + }, + { + "name": "plush_heart" + } + ] +} 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 new file mode 100644 index 00000000000..1b809dac956 --- /dev/null +++ b/Resources/Textures/Exodus/Objects/Misc/Lights/love_lamp.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by Cog, (discord:834690530104967209)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lamp_heart" + }, + { + "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 new file mode 100644 index 00000000000..7221baab871 --- /dev/null +++ b/Resources/Textures/Exodus/Objects/Specific/Hydroponics/fieldflower.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by Askolot (discord: 788252896016990219)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "flower" + }, + { + "name": "flower-inhand-right", + "directions": 4 + }, + { + "name": "flower-inhand-left", + "directions": 4 + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "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 new file mode 100644 index 00000000000..b77ab76704c --- /dev/null +++ b/Resources/Textures/Exodus/Objects/Specific/Hydroponics/lilie.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by Askolot (discord: 788252896016990219)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "flower" + }, + { + "name": "flower-inhand-right", + "directions": 4 + }, + { + "name": "flower-inhand-left", + "directions": 4 + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "цветок" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Exodus/Structures/Lighting/Decoration/elmosfire.rsi/meta.json b/Resources/Textures/Exodus/Structures/Lighting/Decoration/elmosfire.rsi/meta.json new file mode 100644 index 00000000000..8973097ff46 --- /dev/null +++ b/Resources/Textures/Exodus/Structures/Lighting/Decoration/elmosfire.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by Askolot (discord:788252896016990219), owned by Space Exodus", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "base", + "directions": 4 + }, + { + "name": "glow", + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ], + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..fc66b0cd36d --- /dev/null +++ b/Resources/Textures/Exodus/Structures/Piping/Atmospherics/tiny_fan.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "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, + "y": 32 + }, + "states": [ + { + "name": "tinyfan-carcas" + }, + { + "name": "tinyfan-carcas-two" + } + ] + } diff --git a/Resources/Textures/Exodus/Tiles/Misc/floortrap.rsi/meta.json b/Resources/Textures/Exodus/Tiles/Misc/floortrap.rsi/meta.json new file mode 100644 index 00000000000..a67c929c63f --- /dev/null +++ b/Resources/Textures/Exodus/Tiles/Misc/floortrap.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended & by Askolot (discord:788252896016990219), owned by Space Exodus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "floortrap" + }, + { + "name": "floortrap_spikes" + } + ] +} 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/Mobs/Aliens/blob.rsi/meta.json b/Resources/Textures/Mobs/Aliens/blob.rsi/meta.json index 10a06621f70..4154623f8b8 100644 --- a/Resources/Textures/Mobs/Aliens/blob.rsi/meta.json +++ b/Resources/Textures/Mobs/Aliens/blob.rsi/meta.json @@ -1,5 +1,8 @@ { "version": 1, + + "license": "CC-BY-NC-SA-4.0", + "copyright": "RPS-eXtended", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json index 00047298e3a..8b3618fa41b 100644 --- a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json @@ -133,6 +133,18 @@ }, { "name": "wings_icon" + }, + { + "name": "maple", + "directions": 4 + }, + { + "name": "maple_primary", + "directions": 4 + }, + { + "name": "maple_secondary", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json b/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json index 78339d7b76d..372fc4dd1e9 100644 --- a/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json @@ -1 +1,25 @@ -{"version": 1, "license": "CC-BY-SA-3.0","copyright": "human_eyes taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", "size": {"x": 32, "y": 32}, "states": [{"name": "diona", "directions": 4}, {"name": "eyes", "directions": 4}, {"name":"no_eyes"}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "human_eyes taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "diona", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + }, + { + "name": "no_eyes" + }, + { + "name": "moth_eyes" + } + ] +} diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/icon.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/icon.png deleted file mode 100644 index 016d8ba5a76..00000000000 Binary files a/Resources/Textures/Mobs/Species/Moth/parts.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_arm_icon.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_arm_icon.png deleted file mode 100644 index d3be4bc96aa..00000000000 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_arm_icon.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_foot_icon.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_foot_icon.png deleted file mode 100644 index bed22b90474..00000000000 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_foot_icon.png and /dev/null differ 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 c5b586b8924..00000000000 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_hand_icon.png and /dev/null differ 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 ca32cb2a6a4..00000000000 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/l_leg_icon.png and /dev/null differ 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/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 9fc35783819..00000000000 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_arm_icon.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_foot_icon.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_foot_icon.png deleted file mode 100644 index f9134c3e580..00000000000 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_foot_icon.png and /dev/null differ 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 342f4b4971e..00000000000 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_hand_icon.png and /dev/null differ 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 9c3e6986d6f..00000000000 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/r_leg_icon.png and /dev/null differ 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/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/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 d4e98e98bd8..ec9e549985b 100644 --- a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json @@ -13,36 +13,126 @@ { "name": "skewer-meat" }, + { + "name": "skewer-meat1" + }, + { + "name": "skewer-meat2" + }, + { + "name": "skewer-meat4" + }, + { + "name": "3" + }, { "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-snake2" + }, { "name": "skewer-watermelon" }, 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/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/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/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/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..5b1936928fe 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_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/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.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/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 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 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