Merge pull request #1111 from AftrLite/sprite-tweaks

Sprite Tweaks & Da Big Vape
impstation · Dec 24, 2024 · fb125f9 · fb125f9
2 parents 5b06c32 + 4419115
commit fb125f9
Show file tree

Hide file tree

Showing 48 changed files with 28 additions and 6 deletions.
diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml
@@ -35,7 +35,7 @@
   heatCapacityRatio: 1.7
   molarMass: 120
   gasOverlaySprite: /Textures/Effects/atmospherics.rsi
-  gasOverlayState: plasma
+  gasOverlayState: plasma_atmos
   color: FF3300
   reagent: Plasma
   pricePerMole: 0
@@ -47,7 +47,7 @@
   heatCapacityRatio: 1.3
   molarMass: 6
   gasOverlaySprite: /Textures/Effects/atmospherics.rsi
-  gasOverlayState: tritium
+  gasOverlayState: tritium_atmos
   color: 13FF4B
   reagent: Tritium
   pricePerMole: 2
@@ -59,7 +59,7 @@
   heatCapacityRatio: 1.33
   molarMass: 18
   gasOverlaySprite: /Textures/Effects/atmospherics.rsi
-  gasOverlayState: water_vapor
+  gasOverlayState: water_vapor_atmos
   color: bffffd
   reagent: Water
   pricePerMole: 0
@@ -71,7 +71,7 @@
   heatCapacityRatio: 1.4
   molarMass: 44
   gasOverlaySprite: /Textures/Effects/atmospherics.rsi
-  gasOverlayState: miasma
+  gasOverlayState: miasma_atmos
   gasMolesVisible: 2
   gasVisbilityFactor: 3.5
   color: 56941E
@@ -95,7 +95,7 @@
   heatCapacityRatio: 1.33
   molarMass: 50
   gasOverlaySprite: /Textures/Effects/atmospherics.rsi
-  gasOverlayState: frezon
+  gasOverlayState: frezon_atmos
   gasMolesVisible: 0.6
   color: 3a758c
   reagent: Frezon

diff --git a/Resources/Textures/Effects/atmospherics.rsi/frezon_atmos.png b/Resources/Textures/Effects/atmospherics.rsi/frezon_atmos.png
diff --git a/Resources/Textures/Effects/atmospherics.rsi/meta.json b/Resources/Textures/Effects/atmospherics.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd. New tritium, plasma, water vapor, miasma, and frezon by AftrLite(Github)",
     "size": {
         "x": 32,
         "y": 32
@@ -69,6 +69,26 @@
         {
             "name": "water_vapor_old",
             "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]
+        },
+        {
+            "name": "plasma_atmos",
+            "delays": [[0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09]]
+        },
+        {
+            "name": "tritium_atmos",
+            "delays": [[0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09]]
+        },
+        {
+            "name": "frezon_atmos",
+            "delays": [[0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09]]
+        },
+        {
+            "name": "water_vapor_atmos",
+            "delays": [[0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09]]
+        },
+        {
+            "name": "miasma_atmos",
+            "delays": [[0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09]]
         }
     ]
 }
diff --git a/Resources/Textures/Effects/atmospherics.rsi/miasma_atmos.png b/Resources/Textures/Effects/atmospherics.rsi/miasma_atmos.png
diff --git a/Resources/Textures/Effects/atmospherics.rsi/plasma_atmos.png b/Resources/Textures/Effects/atmospherics.rsi/plasma_atmos.png
diff --git a/Resources/Textures/Effects/atmospherics.rsi/tritium_atmos.png b/Resources/Textures/Effects/atmospherics.rsi/tritium_atmos.png
diff --git a/Resources/Textures/Effects/atmospherics.rsi/water_vapor_atmos.png b/Resources/Textures/Effects/atmospherics.rsi/water_vapor_atmos.png
diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png
diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png
diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png
diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png
diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png
diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png
diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png
diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png
diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png
diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black-1.png b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black.png b/Resources/Textures/Structures/Storage/canister.rsi/black.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/blue.png b/Resources/Textures/Structures/Storage/canister.rsi/blue.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-open.png b/Resources/Textures/Structures/Storage/canister.rsi/can-open.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png b/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/frezon.png b/Resources/Textures/Structures/Storage/canister.rsi/frezon.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/green-1.png b/Resources/Textures/Structures/Storage/canister.rsi/green-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/green.png b/Resources/Textures/Structures/Storage/canister.rsi/green.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/greenys-1.png b/Resources/Textures/Structures/Storage/canister.rsi/greenys-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/greenys.png b/Resources/Textures/Structures/Storage/canister.rsi/greenys.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png b/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/grey.png b/Resources/Textures/Structures/Storage/canister.rsi/grey.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/locked.png b/Resources/Textures/Structures/Storage/canister.rsi/locked.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
@@ -32,6 +32,8 @@
       "name": "can-o0",
       "delays": [
         [
+          0.25,
+          0.25,
           0.25,
           0.25,
           0.25,

diff --git a/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/orange.png b/Resources/Textures/Structures/Storage/canister.rsi/orange.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/red-1.png b/Resources/Textures/Structures/Storage/canister.rsi/red-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/red.png b/Resources/Textures/Structures/Storage/canister.rsi/red.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png b/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws.png b/Resources/Textures/Structures/Storage/canister.rsi/redws.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/unlocked.png b/Resources/Textures/Structures/Storage/canister.rsi/unlocked.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/yellow.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,8 @@ @@
           "name": "can-o0",
           "delays": [
             [
+.25,
+.25,
 .25,
 .25,
 .25,
@@ Expand Down @@