Remove usages of texture: .rsi/*.png and such. (#12896)

2022-12-06 03:11:37 +01:00
parent 54397ca4a7
commit 10a99617b8
84 changed files with 406 additions and 343 deletions
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -32208,7 +32208,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -37941,7 +37941,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -41302,7 +41302,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -55835,7 +55835,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -55849,7 +55849,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -56128,7 +56128,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -63315,7 +63315,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -65320,7 +65320,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -67099,7 +67099,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -71451,7 +71451,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -87538,7 +87538,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -91879,7 +91879,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -121105,7 +121105,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -145117,7 +145117,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -145174,7 +145174,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -146095,7 +146095,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -150487,7 +150487,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -150869,7 +150869,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -157765,7 +157765,7 @@ entities:
    parent: 60
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -14062,7 +14062,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -35543,7 +35543,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -35700,7 +35700,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -42269,7 +42269,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -82554,7 +82554,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -84560,7 +84560,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -86446,7 +86446,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -88499,7 +88499,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -88529,7 +88529,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -95996,7 +95996,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -96014,7 +96014,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -96032,7 +96032,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -108072,7 +108072,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -118851,7 +118851,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -140354,7 +140354,7 @@ entities:
    parent: 8364
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -47076,7 +47076,7 @@ entities:
    parent: 127
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
--- a/Resources/Maps/infiltrator.yml
+++ b/Resources/Maps/infiltrator.yml
@@ -1338,7 +1338,7 @@ entities:
    parent: 73
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
--- a/Resources/Maps/kettle.yml
+++ b/Resources/Maps/kettle.yml
@@ -83495,7 +83495,7 @@ entities:
    parent: 82
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -55688,7 +55688,7 @@ entities:
    parent: 30
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -103432,7 +103432,7 @@ entities:
    parent: 30
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -30802,7 +30802,7 @@ entities:
    parent: 0
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -60817,7 +60817,7 @@ entities:
    parent: 0
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -61512,7 +61512,7 @@ entities:
    parent: 0
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -69096,7 +69096,7 @@ entities:
    parent: 0
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
--- a/Resources/Maps/origin.yml
+++ b/Resources/Maps/origin.yml
@@ -53519,7 +53519,7 @@ entities:
    parent: 1
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -57965,7 +57965,7 @@ entities:
    parent: 1
    type: Transform
  - toggleAction:
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      name: action-name-toggle-light
      description: action-description-toggle-light
@@ -231451,7 +231451,7 @@ entities:
    parent: 1
    type: Transform
  - content: >
-      Could someone please fix the damn HV wire break in Robotics. 
+      Could someone please fix the damn HV wire break in Robotics.
    type: Paper
 - uid: 28485
  type: CableApcExtension
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -18,7 +18,7 @@
  id: ToggleLight
  name: action-name-toggle-light
  description: action-description-toggle-light
-  icon: Objects/Tools/flashlight.rsi/flashlight.png
+  icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
  iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
  event: !type:ToggleActionEvent

@@ -92,7 +92,7 @@
  id: ToggleBlock
  name: action-name-blocking
  description: action-description-blocking
-  icon: Objects/Weapons/Melee/shields.rsi/teleriot-icon.png
+  icon: { sprite: Objects/Weapons/Melee/shields.rsi, state: teleriot-icon }
  iconOn: Objects/Weapons/Melee/shields.rsi/teleriot-on.png
  event: !type:ToggleActionEvent

@@ -100,14 +100,14 @@
  id: ClearNetworkLinkOverlays
  name: network-configurator-clear-network-link-overlays
  description: network-configurator-clear-network-link-overlays-desc
-  icon: Objects/Tools/multitool.rsi/icon.png
+  icon: { sprite: Objects/Tools/multitool.rsi, state: icon }
  event: !type:ClearAllOverlaysEvent

 - type: instantAction
  id: AnimalLayEgg
  name: action-name-lay-egg
  description: action-description-lay-egg
-  icon: Objects/Consumable/Food/egg.rsi/icon.png
+  icon: { sprite: Objects/Consumable/Food/egg.rsi, state: icon }
  useDelay: 60
  serverEvent: !type:EggLayInstantActionEvent

@@ -116,13 +116,13 @@
  name: action-name-sleep
  description: action-desc-sleep
  checkCanInteract: false
-  icon: Objects/Consumable/Food/egg.rsi/icon.png
+  icon: { sprite: Objects/Consumable/Food/egg.rsi, state: icon }
  event: !type:SleepActionEvent

 - type: instantAction
  id: Wake
  name: action-name-wake
  description: action-desc-wake
-  icon: Objects/Consumable/Food/egg.rsi/icon.png
+  icon: { sprite: Objects/Consumable/Food/egg.rsi, state: icon }
  checkCanInteract: false
  event: !type:WakeActionEvent
--- a/Resources/Prototypes/Catalog/Fills/Paper/salvage_lore.yml
+++ b/Resources/Prototypes/Catalog/Fills/Paper/salvage_lore.yml
@@ -23,7 +23,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Objects/Misc/bureaucracy.rsi/paper_words.png
+        - sprite: Objects/Misc/bureaucracy.rsi
+          state: paper_words
    - type: RandomSpawner
      prototypes:
        - PaperWrittenSalvageLoreGaming1
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -153,7 +153,7 @@
 # For the Inspector
 - type: listing
  id: UplinkSpeedLoaderMagnum
-  icon: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: base }
  productEntity: SpeedLoaderMagnum
  cost:
    Telecrystal: 2
@@ -176,7 +176,7 @@
  id: UplinkHoloparaKit
  name: Holoparasite Kit
  description: The pride and joy of Cybersun. Contains an injector that hosts a sentient metaphysical guardian made of hard light which resides in the user's body when not active. The guardian can punch rapidly and is immune to hazardous environments and bullets, but shares any damage it takes with the user.
-  icon: /Textures/Objects/Misc/guardian_info.rsi/icon.png
+  icon: { sprite: /Textures/Objects/Misc/guardian_info.rsi, state: icon }
  productEntity: BoxHoloparasite
  cost:
    Telecrystal: 14
@@ -233,7 +233,7 @@
  name: Reinforcement Teleporter
  description: Teleport in an agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it.
  productEntity: ReinforcementTeleporterSyndicate
-  icon: Objects/Devices/communication.rsi/old-radio.png
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
  cost:
    Telecrystal: 20
  categories:
@@ -284,7 +284,7 @@

 - type: listing
  id: UplinkStorageImplanter
-  icon: /Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png
+  icon: { sprite: /Textures/Clothing/Back/Backpacks/backpack.rsi, state: icon }
  name: Storage Implanter
  description: Hide goodies inside of yourself with new bluespace technology!
  productEntity: StorageImplanter
@@ -300,7 +300,7 @@

 - type: listing
  id: UplinkFreedomImplanter
-  icon: /Textures/Actions/Implants/implants.rsi/freedom.png
+  icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: freedom }
  name: Freedom Implanter
  description: Get away from those nasty sec officers with this three use implant!
  productEntity: FreedomImplanter
@@ -316,7 +316,7 @@

 - type: listing
  id: UplinkMacroBombImplanter
-  icon: /Textures/Actions/Implants/implants.rsi/explosive.png
+  icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: explosive }
  name: Macro Bomb Implanter
  description: Inject this and on death you'll create a large explosion. Huge team casualty cost, use at own risk. Replaces internal micro bomb.
  productEntity: MacroBombImplanter
@@ -338,7 +338,7 @@

 - type: listing
  id: UplinkC20RBundle
-  icon: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
+  icon: { sprite: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon }
  productEntity: ClothingBackpackDuffelSyndicateFilledSMG
  cost:
    Telecrystal: 25
@@ -347,7 +347,7 @@

 - type: listing
  id: UplinkBulldogBundle
-  icon: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon }
  productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
  cost:
    Telecrystal: 25
@@ -356,7 +356,7 @@

 - type: listing
  id: UplinkGrenadeLauncherBundle
-  icon: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon }
  productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
  cost:
    Telecrystal: 30
@@ -365,7 +365,7 @@

 - type: listing
  id: UplinkL6SawBundle
-  icon: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi/icon.png
+  icon: { sprite: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi, state: icon }
  productEntity: ClothingBackpackDuffelSyndicateFilledLMG
  cost:
    Telecrystal: 40
@@ -374,7 +374,7 @@

 - type: listing
  id: UplinkZombieBundle
-  icon: /Textures/Structures/Wallmounts/signs.rsi/bio.png
+  icon: { sprite: /Textures/Structures/Wallmounts/signs.rsi, state: bio }
  productEntity: ClothingBackpackDuffelZombieBundle
  cost:
    Telecrystal: 40
@@ -509,7 +509,7 @@
  name: Chameleon Kit
  description: A backpack full of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more!
  productEntity: ClothingBackpackChameleonFill
-  icon: /Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png
+  icon: { sprite: /Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi, state: icon }
  cost:
    Telecrystal: 6
  categories:
--- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
@@ -17,6 +17,6 @@
    toggleAction:
      name: action-name-mask
      description: action-description-mask-toggle
-      icon: Clothing/Mask/gas.rsi/icon.png
+      icon: { sprite: Clothing/Mask/gas.rsi, state: icon }
      iconOn: Interface/Default/blocked.png
      event: !type:ToggleMaskEvent
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -14,7 +14,7 @@
      sprite: Clothing/Shoes/Boots/magboots.rsi
    - type: Magboots
      toggleAction:
-        icon: Clothing/Shoes/Boots/magboots.rsi/icon.png
+        icon: { sprite: Clothing/Shoes/Boots/magboots.rsi, state: icon }
        iconOn: Clothing/Shoes/Boots/magboots.rsi/icon-on.png
        name: action-name-magboot-toggle
        description: action-decription-magboot-toggle
@@ -47,7 +47,7 @@
    sprite: Clothing/Shoes/Boots/magboots-advanced.rsi
  - type: Magboots
    toggleAction:
-      icon: Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png
+      icon: { sprite: Clothing/Shoes/Boots/magboots-advanced.rsi, state: icon }
      iconOn: Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png
      name: action-name-magboot-toggle
      description: action-decription-magboot-toggle
@@ -88,7 +88,7 @@
      sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi
    - type: Magboots
      toggleAction:
-        icon: Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png
+        icon: { sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi, state: icon }
        iconOn: Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png
        name: action-name-magboot-toggle
        description: action-decription-magboot-toggle
--- a/Resources/Prototypes/Entities/Debugging/rotation_marker.yml
+++ b/Resources/Prototypes/Entities/Debugging/rotation_marker.yml
@@ -47,6 +47,7 @@
  - type: Sprite
    netsync: false
    visible: true
-    texture: debugRotation.rsi/direction1.png
+    sprite: debugRotation.rsi
+    state: direction1
  placement:
    mode: AlignTileAny
--- a/Resources/Prototypes/Entities/Debugging/stress_test.yml
+++ b/Resources/Prototypes/Entities/Debugging/stress_test.yml
@@ -7,5 +7,6 @@
    tags:
      - Debug
  - type: Sprite
-    texture: Effects/explosion.rsi/explosion.png
+    sprite: Effects/explosion.rsi
+    state: explosion
  - type: StressTestMovement
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
@@ -6,7 +6,8 @@
    - type: Sprite
      layers:
        - state: blue
-        - texture: Mobs/Species/Human/parts.rsi/full.png
+        - sprite: Mobs/Species/Human/parts.rsi
+          state: full
        - state: ai
    - type: Timer
    - type: TimedSpawner
@@ -26,7 +27,8 @@
    - type: Sprite
      layers:
      - state: blue
-      - texture: Mobs/Aliens/Xenos/burrower.rsi/crit.png
+      - sprite: Mobs/Aliens/Xenos/burrower.rsi
+        state: crit
      - state: ai
    - type: Timer
    - type: TimedSpawner
@@ -45,7 +47,8 @@
    - type: Sprite
      layers:
        - state: blue
-        - texture: Mobs/Animals/mouse.rsi/icon-2.png
+        - sprite: Mobs/Animals/mouse.rsi
+          state: icon-2
        - state: timed
    - type: Timer
    - type: TimedSpawner
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml
@@ -6,7 +6,8 @@
    - type: Sprite
      layers:
        - state: blue
-        - texture: Structures/Machines/traitordm.rsi/redemption.png
+        - sprite: Structures/Machines/traitordm.rsi
+          state: redemption
    - type: ConditionalSpawner
      prototypes:
        - TraitorDMRedemptionMachine
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
@@ -6,7 +6,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Objects/Consumable/Food/Baked/donkpocket.rsi/box.png
+        - sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
+          state: box
    - type: RandomSpawner
      prototypes:
        - FoodBoxDonkpocket
@@ -18,4 +19,4 @@
        - FoodBoxDonkpocketHonk
        - FoodBoxDonkpocketDink
      chance: 0.5
-      offset: 0.0
+      offset: 0.0
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
@@ -9,7 +9,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Objects/Consumable/Drinks/ginbottle.rsi/icon.png 
+      - sprite: Objects/Consumable/Drinks/ginbottle.rsi
+        state: icon
  - type: RandomSpawner
  #small item
    prototypes:
@@ -35,4 +36,4 @@
    #rare
    rarePrototypes:
      - DrinkPoisonWinebottleFull
-    rareChance: 0.01
+    rareChance: 0.01
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -9,7 +9,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Objects/Consumable/Drinks/beerglass.rsi/icon.png 
+      - sprite: Objects/Consumable/Drinks/beerglass.rsi
+        state: icon
  - type: RandomSpawner
  #small item
    prototypes:
@@ -108,4 +109,4 @@
      - DrinkShakeRobo
      - DrinkHoochGlass
      - DrinkBeepskySmashGlass
-    rareChance: 0.05
+    rareChance: 0.05
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
@@ -9,7 +9,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Objects/Consumable/Food/Baked/pie.rsi/plain-slice.png 
+      - sprite: Objects/Consumable/Food/Baked/pie.rsi
+        state: plain-slice
  - type: RandomSpawner
    prototypes:
      - FoodBreadPlainSlice
@@ -75,4 +76,4 @@
      - FoodTartGapple
      - FoodBreadMeatXenoSlice
      - FoodPieXenoSlice
-    rareChance: 0.05
+    rareChance: 0.05
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
@@ -9,7 +9,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Objects/Consumable/Food/Baked/pie.rsi/plain.png 
+      - sprite: Objects/Consumable/Food/Baked/pie.rsi
+        state: plain
  - type: RandomSpawner
  #small item
    prototypes:
@@ -55,4 +56,4 @@
      - FoodPiePlump
      - FoodBreadMeatXeno
      - FoodPieXeno
-    rareChance: 0.05
+    rareChance: 0.05
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml
@@ -9,7 +9,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Objects/Consumable/Food/meals.rsi/cornedbeef.png
+      - sprite: Objects/Consumable/Food/meals.rsi
+        state: cornedbeef
  - type: RandomSpawner
    prototypes:
      - FoodMealPotatoLoaded
@@ -81,4 +82,4 @@
      - FoodSoupMonkey
      - FoodSoupEyeball
      - FoodSoupElectron
-    rareChance: 0.05
+    rareChance: 0.05
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
@@ -9,7 +9,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Objects/Consumable/Food/burger.rsi/plain.png
+      - sprite: Objects/Consumable/Food/burger.rsi
+        state: plain
  - type: RandomSpawner
    prototypes:
      - FoodBurgerJelly
@@ -63,4 +64,4 @@
      - FoodMeatRatKebab
      - FoodMeatRatdoubleKebab
      - FoodPizzaArnoldSlice
-    rareChance: 0.05
+    rareChance: 0.05
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
@@ -9,7 +9,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Objects/Consumable/Food/snacks.rsi/cheesiehonkers.png
+      - sprite: Objects/Consumable/Food/snacks.rsi
+        state: cheesiehonkers
  - type: RandomSpawner
  #small item
    prototypes:
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/altars.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/altars.yml
@@ -6,7 +6,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Structures/Furniture/Altars/Gods/nanotrasen.rsi/nanotrasen.png
+        - sprite: Structures/Furniture/Altars/Gods/nanotrasen.rsi
+          state: nanotrasen
    - type: RandomSpawner
      prototypes:
        - AltarNanotrasen
@@ -26,7 +27,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Structures/Furniture/Altars/Gods/convertaltar.rsi/convertaltar.png
+        - sprite: Structures/Furniture/Altars/Gods/convertaltar.rsi
+          state: convertaltar
    - type: RandomSpawner
      prototypes:
        - AltarConvert
@@ -48,7 +50,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Structures/Furniture/Altars/Cults/fangs.rsi/full.png
+        - sprite: Structures/Furniture/Altars/Cults/fangs.rsi
+          state: full
    - type: RandomSpawner
      prototypes:
        - AltarHeaven
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml
@@ -6,7 +6,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Structures/Machines/arcade.rsi/icon.png
+      - sprite: Structures/Machines/arcade.rsi
+        state: icon
  - type: RandomSpawner
    prototypes:
      - BlockGameArcade
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
@@ -6,7 +6,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi/ano01.png
+        - sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
+          state: ano01
    - type: RandomSpawner
      prototypes:
        - SimpleXenoArtifact
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/bedsheet.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/bedsheet.yml
@@ -6,7 +6,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Objects/Misc/bedsheets.rsi/random_bedsheet.png
+        - sprite: Objects/Misc/bedsheets.rsi
+          state: random_bedsheet
    - type: RandomSpawner
      rarePrototypes:
        - BedsheetIan
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -6,7 +6,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Structures/Storage/Crates/generic.rsi/icon.png
+        - sprite: Structures/Storage/Crates/generic.rsi
+          state: icon
    - type: RandomSpawner
      prototypes:
        - CrateGenericSteel
@@ -21,7 +22,7 @@
        - CrateScience
        - CrateSurgery
      chance: 0.7
-      
+
 - type: entity
  name: Filled Crate Spawner
  id: CrateFilledSpawner
@@ -31,7 +32,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Structures/Storage/Crates/o2.rsi/icon.png
+        - sprite: Structures/Storage/Crates/o2.rsi
+          state: icon
    - type: RandomSpawner
      prototypes:
        - CrateServiceReplacementLights
@@ -56,4 +58,4 @@
      rarePrototypes:
        - CrateMaterialPlasma
        - CrateHydroponicsSeedsExotic
-      rareChance: 0.1
+      rareChance: 0.1
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml
@@ -6,7 +6,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Objects/Fun/Instruments/h_synthesizer.rsi/icon.png
+      - sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+        state: icon
  - type: RandomSpawner
    prototypes:
      - AcousticGuitarInstrument
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -7,7 +7,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Clothing/Eyes/Glasses/gar.rsi/icon-super.png
+        - sprite: Clothing/Eyes/Glasses/gar.rsi
+          state: icon-super
    - type: RandomSpawner
      rarePrototypes:
        - CigarGold
@@ -87,7 +88,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Objects/Weapons/Melee/machete.rsi/icon.png
+        - sprite: Objects/Weapons/Melee/machete.rsi
+          state: icon
    - type: RandomSpawner
      rarePrototypes:
        - Machete
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml
@@ -6,7 +6,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Structures/Wallmounts/paintings.rsi/painting8.png
+      - sprite: Structures/Wallmounts/paintings.rsi
+        state: painting8
  - type: RandomSpawner
    offset: 0
    prototypes:
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
@@ -6,7 +6,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Structures/Wallmounts/posters.rsi/random_anything.png
+      - sprite: Structures/Wallmounts/posters.rsi
+        state: random_anything
  - type: RandomSpawner
    offset: 0
    prototypes:
@@ -25,7 +26,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Structures/Wallmounts/posters.rsi/random_contraband.png
+      - sprite: Structures/Wallmounts/posters.rsi
+        state: random_contraband
  - type: RandomSpawner
    offset: 0
    prototypes:
@@ -94,7 +96,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Structures/Wallmounts/posters.rsi/random_legit.png
+      - sprite: Structures/Wallmounts/posters.rsi
+        state: random_legit
  - type: RandomSpawner
    offset: 0
    prototypes:
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml
@@ -6,7 +6,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Structures/Furniture/potted_plants.rsi/random.png
+      - sprite: Structures/Furniture/potted_plants.rsi
+        state: random
  - type: RandomSpawner
    offset: 0
    prototypes:
@@ -44,7 +45,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Structures/Furniture/potted_plants.rsi/plant-26.png
+      - sprite: Structures/Furniture/potted_plants.rsi
+        state: plant-26
  - type: RandomSpawner
    offset: 0
    prototypes:
@@ -52,4 +54,4 @@
      - PottedPlant27
      - PottedPlant28
      - PottedPlant29
-    chance: 1
+    chance: 1
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
@@ -9,7 +9,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Structures/Storage/Crates/generic.rsi/icon.png
+        - sprite: Structures/Storage/Crates/generic.rsi
+          state: icon
    - type: RandomSpawner
      rarePrototypes:
        - SalvageHumanCorpse
@@ -33,7 +34,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Structures/Storage/canister.rsi/blue.png
+        - sprite: Structures/Storage/canister.rsi
+          state: blue
    - type: RandomSpawner
      rarePrototypes:
        - PlasmaCanister
@@ -56,7 +58,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Mobs/Aliens/Carps/space.rsi/icon.png
+        - sprite: Mobs/Aliens/Carps/space.rsi
+          state: icon
    - type: RandomSpawner
      prototypes:
        - MobCarpSalvage
@@ -81,7 +84,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Mobs/Aliens/Xenos/spacetick.rsi/icon.png
+        - sprite: Mobs/Aliens/Xenos/spacetick.rsi
+          state: icon
    - type: ConditionalSpawner
      prototypes:
        - MobTickSalvage
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/soap.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/soap.yml
@@ -6,7 +6,8 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Objects/Specific/Janitorial/soap.rsi/soap.png
+      - sprite: Objects/Specific/Janitorial/soap.rsi
+        state: soap
  - type: RandomSpawner
    prototypes:
      - Soap
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -6,7 +6,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Objects/Fun/toys.rsi/plushie_h.png
+        - sprite: Objects/Fun/toys.rsi
+          state: plushie_h
    - type: RandomSpawner
      rarePrototypes:
        - FoamBlade
@@ -40,7 +41,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Objects/Fun/toys.rsi/ripleytoy.png
+        - sprite: Objects/Fun/toys.rsi
+          state: ripleytoy
    - type: RandomSpawner
      prototypes:
        - ToyAi
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml
@@ -6,7 +6,8 @@
    - type: Sprite
      layers:
        - state: red
-        - texture: Objects/Consumable/Food/snacks.rsi/pistachio-trash.png
+        - sprite: Objects/Consumable/Food/snacks.rsi
+          state: pistachio-trash
    - type: RandomSpawner
      rarePrototypes:
        - PuddleVomit
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
@@ -6,15 +6,16 @@
  - type: Sprite
    layers:
      - state: red
-      - texture: Structures/Machines/VendingMachines/coffee.rsi/off.png
+      - sprite: Structures/Machines/VendingMachines/coffee.rsi
+        state: off
  - type: RandomSpawner
    prototypes:
      - VendingMachineCigs
-      - VendingMachineCoffee      
+      - VendingMachineCoffee
      - VendingMachineCola
      - VendingMachineDiscount
      - VendingMachineSnack
      - VendingMachineSovietSoda
      - VendingMachineChang
      - VendingMachineDonut
-    chance: 1
+    chance: 1
--- a/Resources/Prototypes/Entities/Markers/Spawners/bots.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/bots.yml
@@ -6,7 +6,8 @@
  - type: Sprite
    layers:
      - state: green
-      - texture: Mobs/Silicon/Bots/medibot.rsi/medibot.png
+      - sprite: Mobs/Silicon/Bots/medibot.rsi
+        state: medibot
  - type: ConditionalSpawner
    prototypes:
      - MobMedibot
@@ -19,7 +20,8 @@
  - type: Sprite
    layers:
      - state: green
-      - texture: Mobs/Silicon/Bots/cleanbot.rsi/cleanbot.png
+      - sprite: Mobs/Silicon/Bots/cleanbot.rsi
+        state: cleanbot
  - type: ConditionalSpawner
    prototypes:
      - MobCleanBot
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -13,7 +13,8 @@
    sprite: Markers/jobs.rsi
    layers:
      - state: green
-      - texture: Mobs/Animals/regalrat.rsi/icon.png
+      - sprite: Mobs/Animals/regalrat.rsi
+        state: icon

 - type: entity
  id: SpawnPointGhostRemilia
@@ -30,7 +31,8 @@
    sprite: Markers/jobs.rsi
    layers:
      - state: green
-      - texture: Mobs/Animals/bat.rsi/bat.png
+      - sprite: Mobs/Animals/bat.rsi
+        state: bat

 - type: entity
  id: SpawnPointGhostCerberus
@@ -47,7 +49,8 @@
    sprite: Markers/jobs.rsi
    layers:
      - state: green
-      - texture: Mobs/Pets/corgi.rsi/narsian.png
+      - sprite: Mobs/Pets/corgi.rsi
+        state: narsian

 - type: entity
  noSpawn: true
@@ -64,6 +67,7 @@
    sprite: Markers/jobs.rsi
    layers:
      - state: green
-      - texture: Structures/Wallmounts/signs.rsi/radiation.png
+      - sprite: Structures/Wallmounts/signs.rsi
+        state: radiation


--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -20,7 +20,8 @@
    sprite: Markers/jobs.rsi
    layers:
      - state: green
-      - texture: Mobs/Ghosts/ghost_human.rsi/icon.png
+      - sprite: Mobs/Ghosts/ghost_human.rsi
+        state: icon
    state: observer
  - type: SpawnPoint
    spawn_type: Observer
@@ -431,7 +432,7 @@
    layers:
      - state: green
      - state: ertleader
-      
+
 - type: entity
  id: SpawnPointERTEngineer
  parent: SpawnPointJobBase
@@ -443,7 +444,7 @@
    layers:
      - state: green
      - state: ertengineer
-      
+
 - type: entity
  id: SpawnPointERTMedical
  parent: SpawnPointJobBase
@@ -455,7 +456,7 @@
    layers:
      - state: green
      - state: ertmedical
-      
+
 - type: entity
  id: SpawnPointERTSecurity
  parent: SpawnPointJobBase
@@ -467,7 +468,7 @@
    layers:
      - state: green
      - state: ertsecurity
-      
+
 - type: entity
  id: SpawnPointERTJanitor
  parent: SpawnPointJobBase
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -8,7 +8,8 @@
  - type: Sprite
    layers:
      - state: green
-      - texture: Mobs/Animals/mouse.rsi/icon-2.png
+      - sprite: Mobs/Animals/mouse.rsi
+        state: icon-2
      - state: ai
  - type: ConditionalSpawner
    prototypes:
@@ -63,7 +64,8 @@
  - type: Sprite
    layers:
      - state: green
-      - texture: Mobs/Silicon/drone.rsi/shell.png
+      - sprite: Mobs/Silicon/drone.rsi
+        state: shell
  - type: ConditionalSpawner
    prototypes:
      - Drone
--- a/Resources/Prototypes/Entities/Markers/Spawners/vehicles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/vehicles.yml
@@ -6,7 +6,8 @@
  - type: Sprite
    layers:
      - state: green
-      - texture: Objects/Vehicles/secway.rsi/keys.png
+      - sprite: Objects/Vehicles/secway.rsi
+        state: keys
  - type: ConditionalSpawner
    prototypes:
      - VehicleSecway
@@ -19,7 +20,8 @@
  - type: Sprite
    layers:
      - state: green
-      - texture: Objects/Vehicles/pussywagon.rsi/keys.png
+      - sprite: Objects/Vehicles/pussywagon.rsi
+        state: keys
  - type: ConditionalSpawner
    prototypes:
      - VehiclePussyWagon
@@ -32,7 +34,8 @@
  - type: Sprite
    layers:
      - state: green
-      - texture: Objects/Vehicles/atv.rsi/keys.png
+      - sprite: Objects/Vehicles/atv.rsi
+        state: keys
  - type: ConditionalSpawner
    prototypes:
      - VehicleATV
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -46,7 +46,7 @@
        toggleAction:
          name: action-name-show-solar-console
          description: action-description-show-solar-console
-          icon: Structures/Machines/parts.rsi/box_0.png
+          icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
          iconOn: Structures/Machines/parts.rsi/box_2.png
          keywords: [ "AI", "console", "interface" ]
          priority: -10
@@ -55,7 +55,7 @@
        toggleAction:
          name: action-name-show-communications-console
          description: action-description-show-communications-console
-          icon: Structures/Machines/parts.rsi/box_0.png
+          icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
          iconOn: Structures/Machines/parts.rsi/box_2.png
          keywords: [ "AI", "console", "interface" ]
          priority: -10
@@ -64,7 +64,7 @@
        toggleAction:
          name: action-name-show-radar-console
          description: action-description-show-radar-console
-          icon: Structures/Machines/parts.rsi/box_0.png
+          icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
          iconOn: Structures/Machines/parts.rsi/box_2.png
          keywords: [ "AI", "console", "interface" ]
          priority: -10
@@ -73,7 +73,7 @@
        toggleAction:
          name: action-name-show-cargo-console
          description: action-description-show-cargo-console
-          icon: Structures/Machines/parts.rsi/box_0.png
+          icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
          iconOn: Structures/Machines/parts.rsi/box_2.png
          keywords: [ "AI", "console", "interface" ]
          priority: -10
@@ -82,7 +82,7 @@
        toggleAction:
          name: action-name-show-crew-monitoring-console
          description: action-description-crew-monitoring-console
-          icon: Structures/Machines/parts.rsi/box_0.png
+          icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
          iconOn: Structures/Machines/parts.rsi/box_2.png
          keywords: [ "AI", "console", "interface" ]
          priority: -10
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -154,7 +154,7 @@
    toggleAction:
      name: action-name-toggle-light
      description: action-description-toggle-light
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      event: !type:ToggleActionEvent
  - type: PointLight
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -33,7 +33,7 @@
    toggleAction:
      name: action-name-toggle-light
      description: action-description-toggle-light
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      event: !type:ToggleActionEvent
  - type: PointLight
--- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
@@ -45,13 +45,13 @@
  id: Credit
  name: spacebuck
  stack: Credit
-  icon: /Textures/Objects/Economy/cash.rsi/cash.png
+  icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
  price: 1

 - type: stack
  id: Credit
  name: spacebuck
-  icon: /Textures/Objects/Economy/cash.rsi/cash.png
+  icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
  spawn: SpaceCash

 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -53,7 +53,7 @@
      toggleAction:
        name: action-name-toggle-light
        description: action-description-toggle-light
-        icon: Objects/Tools/flashlight.rsi/flashlight.png
+        icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
        iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
        event: !type:ToggleActionEvent

--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -19,7 +19,7 @@
      blockingToggleAction:
        name: action-name-blocking
        description: action-description-blocking
-        icon: Objects/Weapons/Melee/shields.rsi/teleriot-icon.png
+        icon: { sprite: Objects/Weapons/Melee/shields.rsi, state: teleriot-icon }
        iconOn: Objects/Weapons/Melee/shields.rsi/teleriot-on.png
        event: !type:ToggleActionEvent
    - type: Damageable
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
@@ -9,7 +9,8 @@
    drawdepth: FloorTiles
    netsync: false
    layers:
-    - texture: Structures/catwalk.rsi/catwalk_preview.png
+    - sprite: Structures/catwalk.rsi
+      state: catwalk_preview
  - type: CollideOnAnchor
  - type: Physics
    canCollide: false
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -36,7 +36,7 @@
    toggleAction:
      name: action-name-toggle-light
      description: action-description-toggle-light
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      event: !type:ToggleActionEvent
  - type: ToggleableLightVisuals
--- a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
+++ b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
@@ -93,7 +93,7 @@
    toggleAction:
      name: action-name-toggle-light
      description: action-description-toggle-light
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      event: !type:ToggleActionEvent
  - type: PointLight
@@ -234,7 +234,7 @@
    toggleAction:
      name: action-name-toggle-light
      description: action-description-toggle-light
-      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
      event: !type:ToggleActionEvent
  - type: PointLight
@@ -322,12 +322,12 @@
      acceleration: 2
      friction: 1.5
      baseWalkSpeed: 4.5
-      baseSprintSpeed: 7 
+      baseSprintSpeed: 7
    - type: UnpoweredFlashlight
      toggleAction:
        name: action-name-toggle-light
        description: action-description-toggle-light
-        icon: Objects/Tools/flashlight.rsi/flashlight.png
+        icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
        iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
        event: !type:ToggleActionEvent
    - type: PointLight
@@ -348,4 +348,4 @@
          insertSound:
            path: /Audio/Effects/Vehicle/vehiclestartup.ogg
            params:
-              volume: -3
+              volume: -3
--- a/Resources/Prototypes/Reagents/Materials/glass.yml
+++ b/Resources/Prototypes/Reagents/Materials/glass.yml
@@ -2,7 +2,7 @@
  id: Glass
  stack: Glass
  name: materials-glass
-  icon: Objects/Materials/Sheets/glass.rsi/glass.png
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: glass }
  color: "#a8ccd7"
  price: 0.075

@@ -10,7 +10,7 @@
  id: ReinforcedGlass
  stack: ReinforcedGlass
  name: materials-reinforced-glass
-  icon: Objects/Materials/Sheets/glass.rsi/rglass.png
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rglass }
  color: "#549bb0"
  price: 0.22 # 2-1 mix of glass and metal.

@@ -18,7 +18,7 @@
  id: PlasmaGlass
  stack: PlasmaGlass
  name: materials-plasma-glass
-  icon: Objects/Materials/Sheets/glass.rsi/pglass.png
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: pglass }
  color: "#b35989"
  price: 0.30 # 1-1 mix of plasma and glass.

@@ -26,6 +26,6 @@
  id: ReinforcedPlasmaGlass
  stack: ReinforcedPlasmaGlass
  name: materials-reinforced-plasma-glass
-  icon: Objects/Materials/Sheets/glass.rsi/rpglass.png
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rpglass }
  color: "#8c4069"
  price: 0.66 # 2-2-1 mix of plasma, glass, and metal.
--- a/Resources/Prototypes/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -2,7 +2,7 @@
  id: Biomass
  stack: Biomass
  name: materials-biomass
-  icon: /Textures/Objects/Misc/monkeycube.rsi/cube.png
+  icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
  color: "#8A9A5B"
  price: 0.1

@@ -10,7 +10,7 @@
  id: Cloth
  stack: Cloth
  name: materials-cloth
-  icon: /Textures/Objects/Materials/materials.rsi/cloth.png
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
  color: "#e7e7de"
  price: 0.05

@@ -18,7 +18,7 @@
  id: Durathread
  stack: Durathread
  name: materials-durathread
-  icon: /Textures/Objects/Materials/materials.rsi/durathread.png
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
  color: "#8291a1"
  price: 0.15 # 1-1 mix of plastic and cloth.

@@ -26,7 +26,7 @@
  id: Plasma
  stack: Plasma
  name: materials-plasma
-  icon: Objects/Materials/Sheets/other.rsi/plasma.png
+  icon: { sprite: Objects/Materials/Sheets/other.rsi, state: plasma }
  color: "#7e009e"
  price: 0.2

@@ -34,7 +34,7 @@
  id: Plastic
  stack: Plastic
  name: materials-plastic
-  icon: Objects/Materials/Sheets/other.rsi/plastic.png
+  icon: { sprite: Objects/Materials/Sheets/other.rsi, state: plastic }
  color: "#d9d9d9"
  price: 0.1

@@ -42,7 +42,7 @@
  id: Wood
  stack: WoodPlank
  name: materials-wood
-  icon: Objects/Materials/materials.rsi/wood.png
+  icon: { sprite: Objects/Materials/materials.rsi, state: wood }
  color: "#966F33"
  price: 0.05

@@ -50,6 +50,6 @@
  id: Uranium
  stack: Uranium
  name: materials-uranium
-  icon: Objects/Materials/Sheets/other.rsi/uranium.png
+  icon: { sprite: Objects/Materials/Sheets/other.rsi, state: uranium }
  color: "#32a852"
  price: 0.2
--- a/Resources/Prototypes/Reagents/Materials/metals.yml
+++ b/Resources/Prototypes/Reagents/Materials/metals.yml
@@ -2,14 +2,14 @@
  id: Steel
  stack: Steel
  name: materials-steel
-  icon: Objects/Materials/Sheets/metal.rsi/steel.png
+  icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: steel }
  price: 0.05

 - type: material
  id: Gold
  stack: Gold
  name: materials-gold
-  icon: Objects/Materials/ingots.rsi/gold.png
+  icon: { sprite: Objects/Materials/ingots.rsi, state: gold }
  color: "#FFD700"
  price: 0.2

@@ -17,7 +17,7 @@
  id: Silver
  stack: Silver
  name: materials-silver
-  icon: Objects/Materials/ingots.rsi/silver.png
+  icon: { sprite: Objects/Materials/ingots.rsi, state: silver }
  color: "#C0C0C0"
  price: 0.15

@@ -25,6 +25,6 @@
  id: Plasteel
  stack: Plasteel
  name: materials-plasteel
-  icon: Objects/Materials/Sheets/metal.rsi/plasteel.png
+  icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plasteel }
  color: "#696969" #Okay, this is epic
  price: 0.28 # 1-1 mix of plasma and steel.
--- a/Resources/Prototypes/Recipes/Construction/materials.yml
+++ b/Resources/Prototypes/Recipes/Construction/materials.yml
@@ -6,7 +6,7 @@
  targetNode: MetalRod
  category: construction-category-materials
  description: A sturdy metal rod that can be used for various purposes.
-  icon: Objects/Materials/parts.rsi/rods.png
+  icon: { sprite: Objects/Materials/parts.rsi, state: rods }
  objectType: Item

 - type: construction
@@ -17,7 +17,7 @@
  startNode: start
  targetNode: SheetRGlass
  category: construction-category-materials
-  icon: Objects/Materials/Sheets/glass.rsi/rglass.png
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rglass }
  objectType: Item

 - type: construction
@@ -28,7 +28,7 @@
  startNode: start
  targetNode: SheetPGlass
  category: construction-category-materials
-  icon: Objects/Materials/Sheets/glass.rsi/pglass.png
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: pglass }
  objectType: Item

 - type: construction
@@ -39,7 +39,7 @@
  startNode: start
  targetNode: SheetRPGlass
  category: construction-category-materials
-  icon: Objects/Materials/Sheets/glass.rsi/rpglass.png
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rpglass }
  objectType: Item

 - type: construction
@@ -50,5 +50,5 @@
  targetNode: MaterialDurathread
  category: construction-category-materials
  description: A high-quality thread used to make durable clothes.
-  icon: Objects/Materials/materials.rsi/durathread.png
+  icon: { sprite: Objects/Materials/materials.rsi, state: durathread }
  objectType: Item
--- a/Resources/Prototypes/Recipes/Construction/tools.yml
+++ b/Resources/Prototypes/Recipes/Construction/tools.yml
@@ -6,5 +6,5 @@
  targetNode: torch
  category: construction-category-tools
  description: A torch fashioned from some wood.
-  icon: Objects/Misc/torch.rsi/icon.png
+  icon: { sprite: Objects/Misc/torch.rsi, state: icon }
  objectType: Item
--- a/Resources/Prototypes/Recipes/Construction/weapons.yml
+++ b/Resources/Prototypes/Recipes/Construction/weapons.yml
@@ -6,7 +6,7 @@
  targetNode: spear
  category: construction-category-weapons
  description: A crude spear for when you need to put holes in somebody.
-  icon: Objects/Weapons/Melee/spear.rsi/spear.png
+  icon: { sprite: Objects/Weapons/Melee/spear.rsi, state: spear }
  objectType: Item

 - type: construction
@@ -17,7 +17,7 @@
  targetNode: bola
  category: construction-category-weapons
  description: A simple weapon for tripping someone at a distance.
-  icon: Objects/Weapons/Throwable/bola.rsi/icon.png
+  icon: { sprite: Objects/Weapons/Throwable/bola.rsi, state: icon }
  objectType: Item

 - type: construction
@@ -28,7 +28,7 @@
  targetNode: woodenBuckler
  category: construction-category-weapons
  description: A nicely carved wooden shield!
-  icon: Objects/Weapons/Melee/shields.rsi/buckler-icon.png
+  icon: { sprite: Objects/Weapons/Melee/shields.rsi, state: buckler-icon }
  objectType: Item

 - type: construction
@@ -39,5 +39,5 @@
  targetNode: makeshiftShield
  category: construction-category-weapons
  description: Crude and falling apart. Why would you make this?
-  icon: Objects/Weapons/Melee/shields.rsi/makeshift-icon.png
+  icon: { sprite: Objects/Weapons/Melee/shields.rsi, state: makeshift-icon }
  objectType: Item
--- a/Resources/Prototypes/Recipes/Crafting/crates.yml
+++ b/Resources/Prototypes/Recipes/Crafting/crates.yml
@@ -6,7 +6,7 @@
  targetNode: cratelivestock
  category: construction-category-storage
  description: A wooden crate for holding livestock.
-  icon: Structures/Storage/Crates/livestock.rsi/base.png
+  icon: { sprite: Structures/Storage/Crates/livestock.rsi, state: base }
  objectType: Structure

 - type: construction
@@ -17,7 +17,7 @@
  targetNode: crategenericsteel
  category: construction-category-storage
  description: A metal crate for storing things.
-  icon: Structures/Storage/Crates/generic.rsi/icon.png
+  icon: { sprite: Structures/Storage/Crates/generic.rsi, state: icon }
  objectType: Structure

 - type: construction
@@ -28,5 +28,5 @@
  targetNode: crateplastic
  category: construction-category-storage
  description: A plastic crate for storing things.
-  icon: Structures/Storage/Crates/plastic.rsi/icon.png
+  icon: { sprite: Structures/Storage/Crates/plastic.rsi, state: icon }
  objectType: Structure
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -19,7 +19,7 @@
  targetNode: cuffscable
  category: construction-category-tools
  description: "Homemade handcuffs crafted from spare cables."
-  icon: Objects/Misc/cablecuffs.rsi/cuff.png
+  icon: { sprite: Objects/Misc/cablecuffs.rsi, state: cuff }
  objectType: Item

 - type: construction
--- a/Resources/Prototypes/Recipes/Crafting/smokeables.yml
+++ b/Resources/Prototypes/Recipes/Crafting/smokeables.yml
@@ -6,7 +6,7 @@
  targetNode: joint
  category: construction-category-misc
  description: "A roll of dried plant matter wrapped in thin paper."
-  icon: Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-icon.png
+  icon: { sprite: Objects/Consumable/Smokeables/Cannabis/joint.rsi, state: unlit-icon }
  objectType: Item

 - type: construction
@@ -17,7 +17,7 @@
  targetNode: blunt
  category: construction-category-misc
  description: "A roll of dried plant matter wrapped in a dried tobacco leaf."
-  icon: Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-icon.png
+  icon: { sprite: Objects/Consumable/Smokeables/Cannabis/blunt.rsi, state: unlit-icon }
  objectType: Item

 - type: construction
@@ -28,7 +28,7 @@
  targetNode: cigarette
  category: construction-category-misc
  description: "A roll of tobacco and nicotine."
-  icon: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-icon.png
+  icon: { sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi, state: unlit-icon }
  objectType: Item

 # I wanted to put a hand-grinder here but we need construction graphs that use non-consumed catalysts first.
@@ -41,7 +41,7 @@
  targetNode: ground
  category: construction-category-misc
  description: "Ground cannabis, ready to take you on a trip."
-  icon: Objects/Misc/reagent_fillings.rsi/powderpile.png
+  icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile }
 #    color: darkgreen
  objectType: Item

@@ -53,6 +53,6 @@
  targetNode: ground
  category: construction-category-misc
  description: "Ground tobacco, perfect for hand-rolled cigarettes."
-  icon: Objects/Misc/reagent_fillings.rsi/powderpile.png
+  icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile }
 #    color: brown
  objectType: Item
--- a/Resources/Prototypes/Recipes/Crafting/tiles.yml
+++ b/Resources/Prototypes/Recipes/Crafting/tiles.yml
@@ -8,7 +8,7 @@
  targetNode: steeltile
  category: construction-category-tiles
  description: "Four steel station tiles."
-  icon: Objects/Tiles/tile.rsi/steel.png
+  icon: { sprite: Objects/Tiles/tile.rsi, state: steel }
  objectType: Item

 - type: construction
@@ -19,7 +19,7 @@
  targetNode: woodtile
  category: construction-category-tiles
  description: "Four pieces of wooden station flooring."
-  icon: Objects/Tiles/tile.rsi/wood.png
+  icon: { sprite: Objects/Tiles/tile.rsi, state: wood }
  objectType: Item

 - type: construction
@@ -30,7 +30,7 @@
  targetNode: whitetile
  category: construction-category-tiles
  description: "Four white station tiles."
-  icon: Objects/Tiles/tile.rsi/white.png
+  icon: { sprite: Objects/Tiles/tile.rsi, state: white }
  objectType: Item

 - type: construction
@@ -41,7 +41,7 @@
  targetNode: darktile
  category: construction-category-tiles
  description: "Four dark station tiles."
-  icon: Objects/Tiles/tile.rsi/dark.png
+  icon: { sprite: Objects/Tiles/tile.rsi, state: dark }
  objectType: Item

 # - type: construction
@@ -52,7 +52,7 @@
 #   targetNode: techmainttile
 #   category: construction-category-tiles
 #   description: "A piece of techmaint flooring."
-#   icon: Objects/Tiles/tile.rsi/steel_techfloor_grid.png
+#   icon: { sprite: Objects/Tiles/tile.rsi, state: steel_techfloor_grid }
 #   objectType: Item
 #
 # - type: construction
@@ -63,7 +63,7 @@
 #   targetNode: freezertile
 #   category: construction-category-tiles
 #   description: "A freezer station tile."
-#   icon: Objects/Tiles/tile.rsi/showroom.png
+#   icon: { sprite: Objects/Tiles/tile.rsi, state: showroom }
 #   objectType: Item
 #
 # - type: construction
@@ -74,7 +74,7 @@
 #   targetNode: showroomtile
 #   category: construction-category-tiles
 #   description: "A showroom station tile."
-#   icon: Objects/Tiles/tile.rsi/showroom.png
+#   icon: { sprite: Objects/Tiles/tile.rsi, state: showroom }
 #   objectType: Item
 #
 # - type: construction
@@ -85,7 +85,7 @@
 #   targetNode: gcircuittile
 #   category: construction-category-tiles
 #   description: "A piece of green-circuit flooring."
-#   icon: Objects/Tiles/tile.rsi/gcircuit.png
+#   icon: { sprite: Objects/Tiles/tile.rsi, state: gcircuit }
 #   objectType: Item
 #
 # - type: construction
@@ -96,7 +96,7 @@
 #   targetNode: goldtile
 #   category: construction-category-tiles
 #   description: "A piece of gold flooring."
-#   icon: Objects/Tiles/tile.rsi/gold.png
+#   icon: { sprite: Objects/Tiles/tile.rsi, state: gold }
 #   objectType: Item
 #
 # - type: construction
@@ -107,7 +107,7 @@
 #   targetNode: reinforcedtile
 #   category: construction-category-tiles
 #   description: "A reinforced station tile."
-#   icon: Objects/Tiles/tile.rsi/reinforced.png
+#   icon: { sprite: Objects/Tiles/tile.rsi, state: reinforced }
 #   objectType: Item
 #
 # - type: construction
@@ -118,7 +118,7 @@
 #   targetNode: monotile
 #   category: construction-category-tiles
 #   description: "A mono station tile."
-#   icon: Objects/Tiles/tile.rsi/white_monofloor.png
+#   icon: { sprite: Objects/Tiles/tile.rsi, state: white_monofloor }
 #   objectType: Item
 #
 # - type: construction
@@ -129,7 +129,7 @@
 #   targetNode: linotile
 #   category: construction-category-tiles
 #   description: "A piece of linoleum flooring."
-#   icon: Objects/Tiles/tile.rsi/white_monofloor.png
+#   icon: { sprite: Objects/Tiles/tile.rsi, state: white_monofloor }
 #   objectType: Item
 #
 # - type: construction
@@ -140,7 +140,7 @@
 #   targetNode: hydrotile
 #   category: construction-category-tiles
 #   description: "A hydro station tile."
-#   icon: Objects/Tiles/tile.rsi/hydro.png
+#   icon: { sprite: Objects/Tiles/tile.rsi, state: hydro }
 #   objectType: Item
 #
 # - type: construction
@@ -151,5 +151,5 @@
 #   targetNode: dirtytile
 #   category: construction-category-tiles
 #   description: "A dirty station tile."
-#   icon: Objects/Tiles/tile.rsi/dirty.png
+#   icon: { sprite: Objects/Tiles/tile.rsi, state: dirty }
 #   objectType: Item
--- a/Resources/Prototypes/Recipes/Lathes/Parts.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Parts.yml
@@ -1,7 +1,7 @@
 #Rating 1
 - type: latheRecipe
  id: CapacitorStockPart
-  icon: Objects/Misc/stock_parts.rsi/capacitor.png
+  icon: { sprite: Objects/Misc/stock_parts.rsi, state: capacitor }
  result: CapacitorStockPart
  completetime: 1
  materials:
@@ -10,7 +10,7 @@

 - type: latheRecipe
  id: MatterBinStockPart
-  icon: Objects/Misc/stock_parts.rsi/matter_bin.png
+  icon: { sprite: Objects/Misc/stock_parts.rsi, state: matter_bin }
  result: MatterBinStockPart
  completetime: 1
  materials:
@@ -19,7 +19,7 @@

 - type: latheRecipe
  id: MicroLaserStockPart
-  icon: Objects/Misc/stock_parts.rsi/micro_laser.png
+  icon: { sprite: Objects/Misc/stock_parts.rsi, state: micro_laser }
  result: MicroLaserStockPart
  completetime: 1
  materials:
@@ -29,7 +29,7 @@

 - type: latheRecipe
  id: MicroManipulatorStockPart
-  icon: Objects/Misc/stock_parts.rsi/micro_mani.png
+  icon: { sprite: Objects/Misc/stock_parts.rsi, state: micro_mani }
  result: MicroManipulatorStockPart
  completetime: 1
  materials:
@@ -38,7 +38,7 @@

 - type: latheRecipe
  id: ScanningModuleStockPart
-  icon: Objects/Misc/stock_parts.rsi/scan_module_static.png
+  icon: { sprite: Objects/Misc/stock_parts.rsi, state: scan_module_static }
  result: ScanningModuleStockPart
  completetime: 1
  materials:
@@ -49,7 +49,7 @@
 #Rating 2
 - type: latheRecipe
  id: AdvancedCapacitorStockPart
-  icon: Objects/Misc/stock_parts.rsi/adv_capacitor.png
+  icon: { sprite: Objects/Misc/stock_parts.rsi, state: adv_capacitor }
  result: AdvancedCapacitorStockPart
  completetime: 3
  materials:
@@ -59,7 +59,7 @@

 - type: latheRecipe
  id: AdvancedMatterBinStockPart
-  icon: Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
+  icon: { sprite: Objects/Misc/stock_parts.rsi, state: advanced_matter_bin }
  result: AdvancedMatterBinStockPart
  completetime: 3
  materials:
@@ -69,7 +69,7 @@

 - type: latheRecipe
  id: HighPowerMicroLaserStockPart
-  icon: Objects/Misc/stock_parts.rsi/high_micro_laser.png
+  icon: { sprite: Objects/Misc/stock_parts.rsi, state: high_micro_laser }
  result: HighPowerMicroLaserStockPart
  completetime: 3
  materials:
@@ -80,7 +80,7 @@

 - type: latheRecipe
  id: NanoManipulatorStockPart
-  icon: Objects/Misc/stock_parts.rsi/nano_mani.png
+  icon: { sprite: Objects/Misc/stock_parts.rsi, state: nano_mani }
  result: NanoManipulatorStockPart
  completetime: 3
  materials:
@@ -90,7 +90,7 @@

 - type: latheRecipe
  id: AdvancedScanningModuleStockPart
-  icon: Objects/Misc/stock_parts.rsi/adv_scan_module_static.png
+  icon: { sprite: Objects/Misc/stock_parts.rsi, state: adv_scan_module_static }
  result: AdvancedScanningModuleStockPart
  completetime: 3
  materials:
--- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -53,7 +53,7 @@

 - type: latheRecipe
  id: PillCanister
-  icon: Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png
+  icon: { sprite: Objects/Specific/Chemistry/pills_canister.rsi, state: pill_canister }
  result: PillCanister
  completetime: 2
  materials:
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -1,6 +1,6 @@
 - type: latheRecipe
  id: FirelockElectronics
-  icon: Objects/Misc/module.rsi/mainboard.png
+  icon: { sprite: Objects/Misc/module.rsi, state: mainboard }
  result: FirelockElectronics
  completetime: 2
  materials:
@@ -9,7 +9,7 @@

 - type: latheRecipe
  id: MailingUnitElectronics
-  icon: Objects/Misc/module.rsi/net_wired.png
+  icon: { sprite: Objects/Misc/module.rsi, state: net_wired }
  result: MailingUnitElectronics
  completetime: 4
  materials:
@@ -18,7 +18,7 @@

 - type: latheRecipe
  id: DoorElectronics
-  icon: Objects/Misc/module.rsi/door_electronics.png
+  icon: { sprite: Objects/Misc/module.rsi, state: door_electronics }
  result: DoorElectronics
  completetime: 2
  materials:
@@ -27,7 +27,7 @@

 - type: latheRecipe
  id: AirAlarmElectronics
-  icon: Objects/Misc/module.rsi/airalarm_electronics.png
+  icon: { sprite: Objects/Misc/module.rsi, state: airalarm_electronics }
  result: AirAlarmElectronics
  completetime: 2
  materials:
@@ -36,7 +36,7 @@

 - type: latheRecipe
  id: FireAlarmElectronics
-  icon: Objects/Misc/module.rsi/door_electronics.png
+  icon: { sprite: Objects/Misc/module.rsi, state: door_electronics }
  result: FireAlarmElectronics
  completetime: 2
  materials:
@@ -45,7 +45,7 @@

 - type: latheRecipe
  id: CloningPodMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: CloningPodMachineCircuitboard
  completetime: 4
  materials:
@@ -55,7 +55,7 @@

 - type: latheRecipe
  id: ThermomachineFreezerMachineCircuitBoard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: ThermomachineFreezerMachineCircuitBoard
  completetime: 4
  materials:
@@ -65,7 +65,7 @@

 - type: latheRecipe
  id: PortableScrubberMachineCircuitBoard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: PortableScrubberMachineCircuitBoard
  completetime: 4
  materials:
@@ -75,7 +75,7 @@

 - type: latheRecipe
  id: MedicalScannerMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: MedicalScannerMachineCircuitboard
  completetime: 4
  materials:
@@ -84,7 +84,7 @@

 - type: latheRecipe
  id: ChemMasterMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: ChemMasterMachineCircuitboard
  completetime: 4
  materials:
@@ -93,7 +93,7 @@

 - type: latheRecipe
  id: ChemDispenserMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: ChemDispenserMachineCircuitboard
  completetime: 4
  materials:
@@ -103,7 +103,7 @@

 - type: latheRecipe
  id: BiomassReclaimerMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: BiomassReclaimerMachineCircuitboard
  completetime: 4
  materials:
@@ -113,7 +113,7 @@

 - type: latheRecipe
  id: HydroponicsTrayMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: HydroponicsTrayMachineCircuitboard
  completetime: 4
  materials:
@@ -122,7 +122,7 @@

 - type: latheRecipe
  id: AutolatheMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: AutolatheMachineCircuitboard
  completetime: 4
  materials:
@@ -131,7 +131,7 @@

 - type: latheRecipe
  id: ProtolatheMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: ProtolatheMachineCircuitboard
  completetime: 4
  materials:
@@ -140,7 +140,7 @@

 - type: latheRecipe
  id: CircuitImprinterMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: CircuitImprinterMachineCircuitboard
  completetime: 4
  materials:
@@ -149,7 +149,7 @@

 - type: latheRecipe
  id: ExosuitFabricatorMachineCircuitboard
-  icon: Objects/Misc/module.rsi/science.png
+  icon: { sprite: Objects/Misc/module.rsi, state: science }
  result: ExosuitFabricatorMachineCircuitboard
  completetime: 5
  materials:
@@ -158,7 +158,7 @@

 - type: latheRecipe
  id: UniformPrinterMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: UniformPrinterMachineCircuitboard
  completetime: 4
  materials:
@@ -167,7 +167,7 @@

 - type: latheRecipe
  id: VaccinatorMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: VaccinatorMachineCircuitboard
  completetime: 4
  materials:
@@ -177,7 +177,7 @@

 - type: latheRecipe
  id: DiagnoserMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: DiagnoserMachineCircuitboard
  completetime: 4
  materials:
@@ -187,7 +187,7 @@

 - type: latheRecipe
  id: ArtifactAnalyzerMachineCircuitboard
-  icon: Objects/Misc/module.rsi/science.png
+  icon: { sprite: Objects/Misc/module.rsi, state: science }
  result: ArtifactAnalyzerMachineCircuitboard
  completetime: 4
  materials:
@@ -197,7 +197,7 @@

 - type: latheRecipe
  id: TraversalDistorterMachineCircuitboard
-  icon: Objects/Misc/module.rsi/science.png
+  icon: { sprite: Objects/Misc/module.rsi, state: science }
  result: TraversalDistorterMachineCircuitboard
  completetime: 4
  materials:
@@ -207,7 +207,7 @@

 - type: latheRecipe
  id: ReagentGrinderMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: ReagentGrinderMachineCircuitboard
  completetime: 4
  materials:
@@ -216,7 +216,7 @@

 - type: latheRecipe
  id: AnalysisComputerCircuitboard
-  icon: Objects/Misc/module.rsi/cpu_science.png
+  icon: { sprite: Objects/Misc/module.rsi, state: cpu_science }
  result: AnalysisComputerCircuitboard
  completetime: 4
  materials:
@@ -226,7 +226,7 @@

 - type: latheRecipe
  id: CrewMonitoringComputerCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: CrewMonitoringComputerCircuitboard
  completetime: 4
  materials:
@@ -235,7 +235,7 @@

 - type: latheRecipe
  id: ShuttleConsoleCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: ShuttleConsoleCircuitboard
  completetime: 4
  materials:
@@ -245,7 +245,7 @@

 - type: latheRecipe
  id: RadarConsoleCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: RadarConsoleCircuitboard
  completetime: 4
  materials:
@@ -254,7 +254,7 @@

 - type: latheRecipe
  id: DawInstrumentMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: DawInstrumentMachineCircuitboard
  completetime: 4
  materials:
@@ -263,7 +263,7 @@

 - type: latheRecipe
  id: StasisBedMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: StasisBedMachineCircuitboard
  completetime: 4
  materials:
@@ -273,7 +273,7 @@

 - type: latheRecipe
  id: OreProcessorMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: OreProcessorMachineCircuitboard
  completetime: 4
  materials:
@@ -283,7 +283,7 @@
 # Power
 - type: latheRecipe
  id: APCElectronics
-  icon: Objects/Misc/module.rsi/charger_APC.png
+  icon: { sprite: Objects/Misc/module.rsi, state: charger_APC }
  result: APCElectronics
  completetime: 2
  materials:
@@ -292,7 +292,7 @@

 - type: latheRecipe
  id: SubstationMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: SubstationMachineCircuitboard
  completetime: 4
  materials:
@@ -301,7 +301,7 @@

 - type: latheRecipe
  id: WallmountSubstationElectronics
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: WallmountSubstationElectronics
  completetime: 4
  materials:
@@ -310,7 +310,7 @@

 - type: latheRecipe
  id: SMESMachineCircuitboard
-  icon: Objects/Misc/module.rsi/power_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: power_mod }
  result: SMESMachineCircuitboard
  completetime: 4
  materials:
@@ -319,7 +319,7 @@

 - type: latheRecipe
  id: GeneratorPlasmaMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: GeneratorPlasmaMachineCircuitboard
  completetime: 4
  materials:
@@ -328,7 +328,7 @@

 - type: latheRecipe
  id: GeneratorUraniumMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: GeneratorUraniumMachineCircuitboard
  completetime: 4
  materials:
@@ -337,7 +337,7 @@

 - type: latheRecipe
  id: WallmountGeneratorElectronics
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: WallmountGeneratorElectronics
  completetime: 4
  materials:
@@ -346,7 +346,7 @@

 - type: latheRecipe
  id: WallmountGeneratorAPUElectronics
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: WallmountGeneratorAPUElectronics
  completetime: 4
  materials:
@@ -355,7 +355,7 @@

 - type: latheRecipe
  id: SolarControlComputerCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: SolarControlComputerCircuitboard
  completetime: 4
  materials:
@@ -364,7 +364,7 @@

 - type: latheRecipe
  id: PowerComputerCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: PowerComputerCircuitboard
  completetime: 4
  materials:
@@ -373,7 +373,7 @@

 - type: latheRecipe
  id: CloningConsoleComputerCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: CloningConsoleComputerCircuitboard
  completetime: 4
  materials:
@@ -382,7 +382,7 @@

 - type: latheRecipe
  id: MicrowaveMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: MicrowaveMachineCircuitboard
  completetime: 4
  materials:
@@ -391,7 +391,7 @@

 - type: latheRecipe
  id: SurveillanceCameraRouterCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: SurveillanceCameraRouterCircuitboard
  completetime: 4
  materials:
@@ -400,7 +400,7 @@

 - type: latheRecipe
  id: SurveillanceCameraWirelessRouterCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: SurveillanceCameraWirelessRouterCircuitboard
  completetime: 4
  materials:
@@ -409,7 +409,7 @@

 - type: latheRecipe
  id: SurveillanceWirelessCameraAnchoredCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: SurveillanceWirelessCameraAnchoredCircuitboard
  completetime: 4
  materials:
@@ -418,7 +418,7 @@

 - type: latheRecipe
  id: SurveillanceWirelessCameraMovableCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: SurveillanceWirelessCameraMovableCircuitboard
  completetime: 4
  materials:
@@ -427,7 +427,7 @@

 - type: latheRecipe
  id: SurveillanceCameraMonitorCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: SurveillanceCameraMonitorCircuitboard
  completetime: 4
  materials:
@@ -436,7 +436,7 @@

 - type: latheRecipe
  id: SurveillanceWirelessCameraMonitorCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: SurveillanceWirelessCameraMonitorCircuitboard
  completetime: 4
  materials:
@@ -445,7 +445,7 @@

 - type: latheRecipe
  id: ComputerTelevisionCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: ComputerTelevisionCircuitboard
  completetime: 4
  materials:
@@ -454,7 +454,7 @@

 - type: latheRecipe
  id: EmitterCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: EmitterCircuitboard
  completetime: 4
  materials:
@@ -463,7 +463,7 @@

 - type: latheRecipe
  id: GasRecyclerMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: GasRecyclerMachineCircuitboard
  completetime: 4
  materials:
@@ -472,7 +472,7 @@

 - type: latheRecipe
  id: SeedExtractorMachineCircuitboard
-  icon: Objects/Misc/module.rsi/id_mod.png
+  icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
  result: SeedExtractorMachineCircuitboard
  completetime: 4
  materials:
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -1,6 +1,6 @@
 - type: latheRecipe
  id: Scalpel
-  icon: Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png
+  icon: { sprite: Objects/Specific/Medical/Surgery/scalpel.rsi, state: scalpel }
  result: Scalpel
  completetime: 2
  materials:
@@ -8,7 +8,7 @@

 - type: latheRecipe
  id: Retractor
-  icon: Objects/Specific/Medical/Surgery/scissors.rsi/retractor.png
+  icon: { sprite: Objects/Specific/Medical/Surgery/scissors.rsi, state: retractor }
  result: Scalpel
  completetime: 2
  materials:
@@ -16,7 +16,7 @@

 - type: latheRecipe
  id: Cautery
-  icon: Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png
+  icon: { sprite: Objects/Specific/Medical/Surgery/cautery.rsi, state: cautery }
  result: Cautery
  completetime: 2
  materials:
@@ -24,7 +24,7 @@

 - type: latheRecipe
  id: Drill
-  icon: Objects/Specific/Medical/Surgery/drill.rsi/drill.png
+  icon: { sprite: Objects/Specific/Medical/Surgery/drill.rsi, state: drill }
  result: Drill
  completetime: 2
  materials:
@@ -33,7 +33,7 @@

 - type: latheRecipe
  id: Saw
-  icon: Objects/Specific/Medical/Surgery/saw.rsi/saw.png
+  icon: { sprite: Objects/Specific/Medical/Surgery/saw.rsi, state: saw }
  result: Saw
  completetime: 2
  materials:
@@ -41,7 +41,7 @@

 - type: latheRecipe
  id: Hemostat
-  icon: Objects/Specific/Medical/Surgery/scissors.rsi/hemostat.png
+  icon: { sprite: Objects/Specific/Medical/Surgery/scissors.rsi, state: hemostat }
  result: Hemostat
  completetime: 2
  materials:
@@ -49,7 +49,7 @@

 - type: latheRecipe
  id: BodyBag
-  icon: Objects/Specific/Medical/Morgue/bodybags.rsi/bag_folded.png
+  icon: { sprite: Objects/Specific/Medical/Morgue/bodybags.rsi, state: bag_folded }
  result: BodyBag_Folded
  completetime: 2
  materials:
@@ -57,7 +57,7 @@

 - type: latheRecipe
  id: HandheldCrewMonitor
-  icon: Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png
+  icon: { sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi, state: icon }
  result: HandheldCrewMonitor
  completetime: 2
  materials:
@@ -67,7 +67,7 @@

 - type: latheRecipe
  id: HandheldHealthAnalyzer
-  icon: Objects/Specific/Medical/healthanalyzer.rsi/icon.png
+  icon: { sprite: Objects/Specific/Medical/healthanalyzer.rsi, state: icon }
  result: HandheldHealthAnalyzer
  completetime: 4
  materials:
@@ -76,7 +76,7 @@

 - type: latheRecipe
  id: ClothingHandsGlovesLatex
-  icon: Clothing/Hands/Gloves/latex.rsi/icon.png
+  icon: { sprite: Clothing/Hands/Gloves/latex.rsi, state: icon }
  result: ClothingHandsGlovesLatex
  completetime: 2
  materials:
@@ -84,7 +84,7 @@

 - type: latheRecipe
  id: ClothingHandsGlovesNitrile
-  icon: Clothing/Hands/Gloves/Color/blue.rsi/icon.png
+  icon: { sprite: Clothing/Hands/Gloves/Color/blue.rsi, state: icon }
  result: ClothingHandsGlovesNitrile
  completetime: 2
  materials:
@@ -93,7 +93,7 @@

 - type: latheRecipe
  id: ClothingMaskSterile
-  icon: Clothing/Mask/sterile.rsi/icon.png
+  icon: { sprite: Clothing/Mask/sterile.rsi, state: icon }
  result: ClothingMaskSterile
  completetime: 2
  materials:
@@ -101,7 +101,7 @@

 - type: latheRecipe
  id: DiseaseSwab
-  icon: Objects/Specific/Medical/mouth_swab.rsi/icon.png
+  icon: { sprite: Objects/Specific/Medical/mouth_swab.rsi, state: icon }
  result: DiseaseSwab
  completetime: 1
  materials:
@@ -110,7 +110,7 @@

 - type: latheRecipe
  id: Implanter
-  icon: Objects/Specific/Chemistry/syringe.rsi/syringe_base0.png
+  icon: { sprite: Objects/Specific/Chemistry/syringe.rsi, state: syringe_base0 }
  result: Implanter
  completetime: 1
  materials:
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -1,6 +1,6 @@
 - type: latheRecipe
  id: LightTube
-  icon: Objects/Power/light_tube.rsi/normal.png
+  icon: { sprite: Objects/Power/light_tube.rsi, state: normal }
  result: LightTube
  completetime: 2
  materials:
@@ -9,7 +9,7 @@

 - type: latheRecipe
  id: LightBulb
-  icon: Objects/Power/light_bulb.rsi/normal.png
+  icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
  result: LightBulb
  completetime: 2
  materials:
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -1,6 +1,6 @@
 - type: latheRecipe
  id: Wirecutter
-  icon: Objects/Tools/wirecutters.rsi/cutters-map.png
+  icon: { sprite: Objects/Tools/wirecutters.rsi, state: cutters-map }
  result: Wirecutter
  completetime: 2
  materials:
@@ -30,7 +30,7 @@

 - type: latheRecipe
  id: Wrench
-  icon: Objects/Tools/wrench.rsi/icon.png
+  icon: { sprite: Objects/Tools/wrench.rsi, state: icon }
  result: Wrench
  completetime: 2
  materials:
@@ -38,7 +38,7 @@

 - type: latheRecipe
  id: CableStack
-  icon: /Textures/Objects/Tools/cable-coils.rsi/coillv-30.png
+  icon: { sprite: /Textures/Objects/Tools/cable-coils.rsi, state: coillv-30 }
  result: CableApcStack1
  completetime: 2
  materials:
@@ -46,7 +46,7 @@

 - type: latheRecipe
  id: CableMVStack
-  icon: /Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png
+  icon: { sprite: /Textures/Objects/Tools/cable-coils.rsi, state: coilmv-30 }
  result: CableMVStack1
  completetime: 2
  materials:
@@ -54,7 +54,7 @@

 - type: latheRecipe
  id: CableHVStack
-  icon: /Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png
+  icon: { sprite: /Textures/Objects/Tools/cable-coils.rsi, state: coilhv-30 }
  result: CableHVStack1
  completetime: 2
  materials:
@@ -62,7 +62,7 @@

 - type: latheRecipe
  id: Crowbar
-  icon: Objects/Tools/crowbar.rsi/icon.png
+  icon: { sprite: Objects/Tools/crowbar.rsi, state: icon }
  result: Crowbar
  completetime: 2
  materials:
@@ -134,7 +134,7 @@

 - type: latheRecipe
  id: HandheldGPSBasic
-  icon: Objects/Devices/gps.rsi/icon.png
+  icon: { sprite: Objects/Devices/gps.rsi, state: icon }
  result: HandheldGPSBasic
  completetime: 2
  materials:
@@ -143,7 +143,7 @@

 - type: latheRecipe
  id: TRayScanner
-  icon: Objects/Tools/t-ray.rsi/tray-off.png
+  icon: { sprite: Objects/Tools/t-ray.rsi, state: tray-off }
  result: trayScanner
  completetime: 2
  materials:
@@ -152,7 +152,7 @@

 - type: latheRecipe
  id: GasAnalyzer
-  icon: Objects/Specific/Atmos/gasanalyzer.rsi/icon.png
+  icon: { sprite: Objects/Specific/Atmos/gasanalyzer.rsi, state: icon }
  result: GasAnalyzer
  completetime: 2
  materials:
@@ -161,7 +161,7 @@

 - type: latheRecipe
  id: AirlockPainter
-  icon: /Textures/Objects/Tools/airlock_painter.rsi/airlock_painter.png
+  icon: { sprite: /Textures/Objects/Tools/airlock_painter.rsi, state: airlock_painter }
  result: AirlockPainter
  completetime: 2
  materials:
@@ -170,7 +170,7 @@

 - type: latheRecipe
  id: UtilityBelt
-  icon: Clothing/Belt/utility.rsi/icon.png
+  icon: { sprite: Clothing/Belt/utility.rsi, state: icon }
  result: ClothingBeltUtility
  completetime: 2
  materials:
@@ -179,7 +179,7 @@

 - type: latheRecipe
  id: HolofanProjector
-  icon: 
+  icon:
    sprite: Objects/Devices/Holoprojectors/atmos.rsi
    state: icon
  result: HolofanProjector
--- a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
@@ -1,28 +1,28 @@
 - type: stack
  id: Glass
  name: glass
-  icon: /Textures/Objects/Materials/Sheets/glass.rsi/glass.png
+  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: glass }
  spawn: SheetGlass1
  maxCount: 30

 - type: stack
  id: ReinforcedGlass
  name: reinforced glass
-  icon: /Textures/Objects/Materials/Sheets/glass.rsi/rglass.png
+  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rglass }
  spawn: SheetRGlass1
  maxCount: 30

 - type: stack
  id: PlasmaGlass
  name: plasma glass
-  icon: /Textures/Objects/Materials/Sheets/glass.rsi/pglass.png
+  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: pglass }
  spawn: SheetPGlass1
  maxCount: 30

 - type: stack
  id: ReinforcedPlasmaGlass
  name: reinforced plasma glass
-  icon: /Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png
+  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rpglass }
  spawn: SheetRPGlass1
  maxCount: 30

--- a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
@@ -1,13 +1,13 @@
 - type: stack
  id: Steel
  name: steel
-  icon: /Textures/Objects/Materials/Sheets/metal.rsi/steel.png
+  icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: steel }
  spawn: SheetSteel1
  maxCount: 30

 - type: stack
  id: Plasteel
  name: plasteel
-  icon: /Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png
+  icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plasteel }
  spawn: SheetPlasteel1
  maxCount: 30
--- a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
@@ -1,27 +1,27 @@
 - type: stack
  id: Paper
  name: paper
-  icon: /Textures/Objects/Materials/Sheets/other.rsi/paper.png
+  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: paper }
  spawn: SheetPaper1
  maxCount: 30

 - type: stack
  id: Plasma
  name: plasma
-  icon: /Textures/Objects/Materials/Sheets/other.rsi/plasma.png
+  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plasma }
  spawn: SheetPlasma1
  maxCount: 30

 - type: stack
  id: Plastic
  name: plastic
-  icon: /Textures/Objects/Materials/Sheets/other.rsi/plastic.png
+  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plastic }
  spawn: SheetPlastic1
  maxCount: 30

 - type: stack
  id: Uranium
  name: uranium
-  icon: /Textures/Objects/Materials/Sheets/other.rsi/uranium.png
+  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: uranium }
  spawn: SheetUranium1
-  maxCount: 30
+  maxCount: 30
--- a/Resources/Prototypes/Stacks/Materials/ingots.yml
+++ b/Resources/Prototypes/Stacks/Materials/ingots.yml
@@ -1,13 +1,13 @@
 - type: stack
  id: Gold
  name: gold
-  icon: "/Textures/Objects/Materials/ingots.rsi/gold.png"
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
  spawn: IngotGold1
  maxCount: 30

 - type: stack
  id: Silver
  name: silver
-  icon: "/Textures/Objects/Materials/ingots.rsi/silver.png"
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
  spawn: IngotSilver1
  maxCount: 30
--- a/Resources/Prototypes/Stacks/Materials/materials.yml
+++ b/Resources/Prototypes/Stacks/Materials/materials.yml
@@ -1,41 +1,41 @@
 - type: stack
  id: Biomass
  name: biomass
-  icon: /Textures/Objects/Misc/monkeycube.rsi/cube.png
+  icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
  spawn: MaterialBiomass1
  maxCount: 100

 - type: stack
  id: WoodPlank
  name: wood plank
-  icon: /Textures/Objects/Materials/materials.rsi/wood.png
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
  spawn: MaterialWoodPlank1
  maxCount: 30

 - type: stack
  id: Cloth
  name: cloth
-  icon: /Textures/Objects/Materials/materials.rsi/cloth.png
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
  spawn: MaterialCloth1
  maxCount: 30

 - type: stack
  id: Durathread
  name: durathread
-  icon: /Textures/Objects/Materials/materials.rsi/durathread.png
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
  spawn: MaterialDurathread1
  maxCount: 30

 - type: stack
  id: Diamond
  name: diamond
-  icon: /Textures/Objects/Materials/materials.rsi/diamond.png
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
  spawn: MaterialDiamond1
  maxCount: 30

 - type: stack
  id: Cotton
  name: cotton
-  icon: /Textures/Objects/Materials/materials.rsi/cotton.png
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
  spawn: MaterialCotton1
  maxCount: 30
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -1,41 +1,41 @@
 - type: stack
  id: GoldOre
  name: gold ore
-  icon: /Textures/Objects/Materials/ore.rsi/gold.png
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
  spawn: GoldOre1
  maxCount: 30

 - type: stack
  id: SteelOre
  name: steel ore
-  icon: /Textures/Objects/Materials/ore.rsi/iron.png
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: iron }
  spawn: SteelOre1
  maxCount: 30

 - type: stack
  id: PlasmaOre
  name: plasma ore
-  icon: /Textures/Objects/Materials/ore.rsi/plasma.png
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: plasma }
  spawn: PlasmaOre1
  maxCount: 30

 - type: stack
  id: SilverOre
  name: silver ore
-  icon: /Textures/Objects/Materials/ore.rsi/silver.png
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: silver }
  spawn: SilverOre1
  maxCount: 30

 - type: stack
  id: SpaceQuartz
  name: space quartz
-  icon: /Textures/Objects/Materials/ore.rsi/spacequartz.png
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: spacequartz }
  spawn: SpaceQuartz1
  maxCount: 30

 - type: stack
  id: UraniumOre
  name: uranium ore
-  icon: /Textures/Objects/Materials/ore.rsi/uranium.png
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: uranium }
  spawn: UraniumOre1
-  maxCount: 30
+  maxCount: 30
--- a/Resources/Prototypes/Stacks/Materials/parts.yml
+++ b/Resources/Prototypes/Stacks/Materials/parts.yml
@@ -1,6 +1,6 @@
 - type: stack
  id: MetalRod
  name: rods
-  icon: /Textures/Objects/Materials/parts.rsi/rods.png
+  icon: { sprite: /Textures/Objects/Materials/parts.rsi, state: rods }
  spawn: PartRodMetal1
  maxCount: 30
--- a/Resources/Prototypes/Stacks/consumable_stacks.yml
+++ b/Resources/Prototypes/Stacks/consumable_stacks.yml
@@ -11,7 +11,7 @@
 - type: stack
  id: PizzaBox
  name: pizza box
-  icon: Objects/Consumable/Food/Baked/pizza.rsi/box.png
+  icon: { sprite: Objects/Consumable/Food/Baked/pizza.rsi, state: box }
  spawn: FoodBoxPizza
  maxCount: 30

@@ -20,41 +20,41 @@
 - type: stack
  id: PaperRolling
  name: rolling paper
-  icon: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpaper.png
+  icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigpaper }
  spawn: PaperRolling
  maxCount: 30

 - type: stack
  id: CigaretteFilter
  name: cigarette filter
-  icon: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigfilter.png
+  icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigfilter }
  spawn: CigaretteFilter
  maxCount: 30

 - type: stack
  id: GroundTobacco
  name: ground tobacco
-  icon: /Textures/Objects/Misc/reagent_fillings.rsi/powderpile.png
+  icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
  spawn: GroundTobacco
  maxCount: 5

 - type: stack
  id: GroundCannabis
  name: ground cannabis
-  icon: /Textures/Objects/Misc/reagent_fillings.rsi/powderpile.png
+  icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
  spawn: GroundCannabis
  maxCount: 5

 - type: stack
  id: LeavesTobaccoDried
  name: dried tobacco leaves
-  icon: /Textures/Objects/Specific/Hydroponics/tobacco.rsi/dried.png
+  icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
  spawn: LeavesTobaccoDried
  maxCount: 5

 - type: stack
  id: LeavesCannabisDried
  name: dried cannabis leaves
-  icon: /Textures/Objects/Specific/Hydroponics/tobacco.rsi/dried.png
+  icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
  spawn: LeavesCannabisDried
  maxCount: 5
--- a/Resources/Prototypes/Stacks/medical_stacks.yml
+++ b/Resources/Prototypes/Stacks/medical_stacks.yml
@@ -1,27 +1,27 @@
 - type: stack
  id: Ointment
  name: ointment
-  icon: "/Textures/Objects/Specific/Medical/medical.rsi/ointment.png"
+  icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: ointment }
  spawn: Ointment
  maxCount: 10

 - type: stack
  id: AloeCream
  name: aloe cream
-  icon: "/Textures/Objects/Specific/Hydroponics/aloe.rsi/cream.png"
+  icon: { sprite: "/Textures/Objects/Specific/Hydroponics/aloe.rsi", state: cream }
  spawn: AloeCream
  maxCount: 10

 - type: stack
  id: Gauze
  name: gauze
-  icon: "/Textures/Objects/Specific/Medical/medical.rsi/gauze.png"
+  icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
  spawn: Gauze
  maxCount: 10

 - type: stack
  id: Brutepack
  name: brutepack
-  icon: "/Textures/Objects/Specific/Medical/medical.rsi/gauze.png"
+  icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
  spawn: Brutepack
  maxCount: 10
--- a/Resources/Prototypes/Stacks/power_stacks.yml
+++ b/Resources/Prototypes/Stacks/power_stacks.yml
@@ -1,20 +1,20 @@
 - type: stack
  id: Cable
  name: lv cable
-  icon: "/Textures/Objects/Tools/cable-coils.rsi/coil-30.png"
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coil-30 }
  spawn: CableApcStack1
  maxCount: 30

 - type: stack
  id: CableMV
  name: mv cable
-  icon: "/Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png"
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilmv-30 }
  spawn: CableMVStack1
  maxCount: 30

 - type: stack
  id: CableHV
  name: hv cable
-  icon: "/Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png"
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 }
  spawn: CableHVStack1
  maxCount: 30
--- a/Resources/Prototypes/tool_qualities.yml
+++ b/Resources/Prototypes/tool_qualities.yml
@@ -3,53 +3,53 @@
  name: tool-quality-anchoring-name
  toolName: tool-quality-anchoring-tool-name
  spawn: Wrench
-  icon: Objects/Tools/wrench.rsi/icon.png
+  icon: { sprite: Objects/Tools/wrench.rsi, state: icon }

 - type: tool
  id: Prying
  name: tool-quality-prying-name
  toolName: tool-quality-prying-tool-name
  spawn: Crowbar
-  icon: Objects/Tools/crowbar.rsi/icon.png
+  icon: { sprite: Objects/Tools/crowbar.rsi, state: icon }

 - type: tool
  id: Screwing
  name: tool-quality-screwing-name
  toolName: tool-quality-screwing-tool-name
  spawn: Screwdriver
-  icon: Objects/Tools/screwdriver.rsi/screwdriver-map.png
+  icon: { sprite: Objects/Tools/screwdriver.rsi, state: screwdriver-map }

 - type: tool
  id: Cutting
  name: tool-quality-cutting-name
  toolName: tool-quality-cutting-tool-name
  spawn: Wirecutter
-  icon: Objects/Tools/wirecutters.rsi/cutters-map.png
+  icon: { sprite: Objects/Tools/wirecutters.rsi, state: cutters-map }

 - type: tool
  id: Welding
  name: tool-quality-welding-name
  toolName: tool-quality-welding-tool-name
  spawn: Welder
-  icon: Objects/Tools/welder.rsi/icon.png
+  icon: { sprite: Objects/Tools/welder.rsi, state: icon }

 - type: tool
  id: Pulsing
  name: tool-quality-pulsing-name
  toolName: tool-quality-pulsing-tool-name
  spawn: Multitool
-  icon: Objects/Tools/multitool.rsi/icon.png
+  icon: { sprite: Objects/Tools/multitool.rsi, state: icon }

 - type: tool
  id: Slicing
  name: tool-quality-slicing-name
  toolName: tool-quality-slicing-tool-name
  spawn: KitchenKnife
-  icon: Objects/Weapons/Melee/kitchen_knife.rsi/icon.png
+  icon: { sprite: Objects/Weapons/Melee/kitchen_knife.rsi, state: icon }

 - type: tool
  id: Sawing
  name: tool-quality-sawing-name
  toolName: tool-quality-sawing-tool-name
  spawn: Saw
-  icon: Objects/Specific/Medical/Surgery/saw.rsi/saw.png
+  icon: { sprite: Objects/Specific/Medical/Surgery/saw.rsi, state: saw }
--- a/Resources/Textures/Effects/explosion.rsi/meta.json
+++ b/Resources/Textures/Effects/explosion.rsi/meta.json
@@ -5,6 +5,9 @@
        "y": 96
    },
    "states": [
+        {
+            "name": "explosion"
+        },
        {
            "name": "explosionfast",
            "delays": [
--- a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
@@ -412,6 +412,9 @@
          1
        ]
      ]
+    },
+    {
+      "name": "scan_module_static"
    }
  ]
 }
--- a/Resources/Textures/Structures/Machines/arcade.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/arcade.rsi/meta.json
@@ -7,6 +7,9 @@
    "y": 32
  },
  "states": [
+    {
+      "name": "icon"
+    },
    {
      "name": "arcade",
      "directions": 4