Fixes a ton of sprite icons. (#2034)

* Icons + Sprites for Atmos pipes

* Fixes Mimic icon

* Fixes rsi for RnD point source

* RnD Point source prototype fix

* Centers Bike Horn icon

* Centers pirate hat sprite

* Centers a bunch of milkshake icons

* Moves light_bulb.yml to Constructibles

* Fixes light_tube icons

* Emergency Light icon fix

* Medical Scanner icon

* ID Rsi fixed

* ID cards now have proper icons

* Lockers have proper icons finally

* Default Icon Fixed

* Resolved lighting issues

Resources/Prototypes/Entities/Constructible/Ground/pipes.yml

@@ -10,7 +10,7 @@
   - type: SnapGrid
     offset: Center
   - type: Icon
-    texture: Constructible/Power/eightdirwire.png
+    texture: Constructible/Atmos/pipe.rsi/pipeLateral2.png
   - type: Sprite
   - type: Destructible
     thresholdvalue: 100
@@ -24,6 +24,8 @@
   id: FourwayPipe
   name: Fourway Pipe
   components:
+  - type: Icon
+    texture: Constructible/Atmos/pipe.rsi/pipeFourway2.png
   - type: NodeContainer
     nodes:
     - !type:PipeNode
@@ -35,6 +37,8 @@
   id: LongitudinalPipe
   name: Longitudinal Pipe
   components:
+  - type: Icon
+    texture: Constructible/Atmos/pipe.rsi/pipeLongitudinal2.png
   - type: NodeContainer
     nodes:
     - !type:PipeNode

Resources/Prototypes/Entities/Constructible/Ground/pumps.yml

@@ -10,7 +10,8 @@
   - type: SnapGrid
     offset: Center
   - type: Icon
-    texture: Constructible/Power/eightdirwire.png
+    sprite: Constructible/Atmos/pressurepump.rsi
+    state: pumpEnabledWest2East2
   - type: Sprite
   - type: Appearance
     visuals:
@@ -52,4 +53,3 @@
   - type: PressurePump
     inletDirection: South
     outletDirection: North
-    

Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml

@@ -10,8 +10,11 @@
   - type: SnapGrid
     offset: Center
   - type: Icon
-    texture: Constructible/Power/eightdirwire.png
+    sprite: Constructible/Atmos/pipeitems.rsi
+    state: scrubber
   - type: Sprite
+    sprite: Constructible/Atmos/pipeitems.rsi
+    state: scrubber
   - type: Appearance
     visuals:
     - type: PipeVisualizer

Resources/Prototypes/Entities/Constructible/Ground/vents.yml

@@ -10,8 +10,11 @@
   - type: SnapGrid
     offset: Center
   - type: Icon
-    texture: Constructible/Power/eightdirwire.png
+    sprite: Constructible/Atmos/pipeitems.rsi
+    state: vent
   - type: Sprite
+    sprite: Constructible/Atmos/pipeitems.rsi
+    state: vent
   - type: Appearance
     visuals:
     - type: PipeVisualizer

Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml

@@ -13,8 +13,7 @@
       map: ["enum.MedicalScannerVisualLayers.Terminal"]
   - type: PowerReceiver
   - type: Icon
-    sprite: Constructible/Power/medical_scanner.rsi
+    texture: Constructible/Power/medical_scanner.rsi/scanner_icon.png
-    state: scanner_open
   - type: Anchorable
   - type: Clickable
   - type: InteractionOutline

Resources/Prototypes/Entities/Constructible/Power/research.yml

@@ -26,15 +26,15 @@
   # We should make this abstract once there are actual point sources.
   components:
   - type: Sprite
-    sprite: Constructible/Power/tdopler.rsi
+    sprite: Constructible/Power/rndpointsource.rsi
     layers:
-    - state: tdoppler-off
+    - state: rndpointsource-off
-    - state: tdoppler
+    - state: rndpointsource
       shader: unshaded
       map: ["enum.PowerDeviceVisualLayers.Powered"]
   - type: Icon
-    sprite: Constructible/Power/tdopler.rsi
+    sprite: Constructible/Power/rndpointsource.rsi
-    state: tdoppler
+    state: rndpointsource
   - type: Clickable
   - type: InteractionOutline
   - type: Collidable

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml

@@ -8,5 +8,4 @@
     - type: StorageVisualizer
       state: cabinet
   - type: Icon
-    state: cabinet_door
+    state: cabinet_icon
-

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml

@@ -8,4 +8,4 @@
     - type: StorageVisualizer
       state: qm
   - type: Icon
-    state: qm_door
+    state: qm_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml

@@ -8,7 +8,7 @@
     - type: StorageVisualizer
       state: cap
   - type: Icon
-    state: cap_door
+    state: cap_icon
 
 - type: entity
   id: LockerHeadOfPersonnel
@@ -20,4 +20,4 @@
     - type: StorageVisualizer
       state: hop
   - type: Icon
-    state: hop_door
+    state: hop_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml

@@ -9,7 +9,7 @@
     - type: StorageVisualizer
       state: ce
   - type: Icon
-    state: ce_door
+    state: ce_icon
 
 # Electrical supplies
 - type: entity
@@ -23,7 +23,7 @@
       state: eng
       state_closed: eng_elec_door
   - type: Icon
-    state: eng_elec_door
+    state: eng_elec_icon
 
 # Welding supplies
 - type: entity
@@ -37,7 +37,7 @@
       state: eng
       state_closed: eng_weld_door
   - type: Icon
-    state: eng_weld_door
+    state: eng_weld_icon
 
 # Atmos tech
 - type: entity
@@ -50,7 +50,7 @@
     - type: StorageVisualizer
       state: atmos
   - type: Icon
-    state: atmos_door
+    state: atmos_icon
 
 # Engineer
 - type: entity
@@ -63,4 +63,4 @@
     - type: StorageVisualizer
       state: eng_secure
   - type: Icon
-    state: eng_secure_door
+    state: eng_secure_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml

@@ -8,4 +8,4 @@
     - type: StorageVisualizer
       state: freezer
   - type: Icon
-    state: freezer_door
+    state: freezer_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml

@@ -8,4 +8,4 @@
     - type: StorageVisualizer
       state: hydro
   - type: Icon
-    state: hydro_door
+    state: hydro_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml

@@ -10,7 +10,7 @@
     - type: StorageVisualizer
       state: med
   - type: Icon
-    state: med_door
+    state: med_icon
 
 # Medical doctor
 - type: entity
@@ -23,7 +23,7 @@
     - type: StorageVisualizer
       state: med_secure
   - type: Icon
-    state: med_secure_door
+    state: med_secure_icon
 
 # Chemical
 - type: entity
@@ -37,7 +37,7 @@
       state: med
       state_closed: chemical_door
   - type: Icon
-    state: chemical_door
+    state: chemical_icon
 
 # CMO
 - type: entity
@@ -50,4 +50,4 @@
     - type: StorageVisualizer
       state: cmo
   - type: Icon
-    state: cmo_door
+    state: cmo_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml

@@ -8,4 +8,4 @@
     - type: StorageVisualizer
       state: rd
   - type: Icon
-    state: rd_door
+    state: rd_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml

@@ -9,7 +9,7 @@
     - type: StorageVisualizer
       state: hos
   - type: Icon
-    state: hos_door
+    state: hos_icon
 
 # Warden
 - type: entity
@@ -22,7 +22,7 @@
     - type: StorageVisualizer
       state: warden
   - type: Icon
-    state: warden_door
+    state: warden_icon
 
 # Security Officer
 - type: entity
@@ -35,7 +35,7 @@
     - type: StorageVisualizer
       state: sec
   - type: Icon
-    state: sec_door
+    state: sec_icon
 
 # Detective
 - type: entity
@@ -48,4 +48,4 @@
         - type: StorageVisualizer
           state: cabinet
     - type: Icon
-      state: cabinet_door
+      state: cabinet_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml

@@ -15,7 +15,7 @@
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
     sprite: Constructible/Structures/closet.rsi
-    state: generic_door
+    state: generic_icon
   - type: Clickable
   - type: MovedByPressure
   - type: DamageOnHighSpeedImpact

Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml

@@ -10,7 +10,7 @@
       state: generic
       state_closed: red_door
   - type: Icon
-    state: red_door
+    state: red_icon
 
 # Atmospherics wardrobe
 - type: entity
@@ -24,5 +24,4 @@
       state: generic
       state_closed: atmos_wardrobe_door
   - type: Icon
-    state: atmos_door
+    state: atmos_icon
-

Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml

@@ -10,7 +10,7 @@
     - type: StorageVisualizer
       state: bio
   - type: Icon
-    state: bio_door
+    state: bio_icon
 
 # Virology variant
 - type: entity
@@ -22,7 +22,7 @@
     - type: StorageVisualizer
       state: bio_viro
   - type: Icon
-    state: bio_viro_door
+    state: bio_viro_icon
 
 # Security variant
 - type: entity
@@ -34,7 +34,7 @@
     - type: StorageVisualizer
       state: bio_sec
   - type: Icon
-    state: bio_sec_door
+    state: bio_sec_icon
 
 # Janitor variant
 - type: entity
@@ -46,4 +46,4 @@
     - type: StorageVisualizer
       state: bio_jan
   - type: Icon
-    state: bio_jan_door
+    state: bio_jan_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml

@@ -10,4 +10,4 @@
     - type: StorageVisualizer
       state: syndicate
   - type: Icon
-    state: syndicate_door
+    state: syndicate_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml

@@ -11,7 +11,7 @@
       state: eng
       state_closed: eng_tool_door
   - type: Icon
-    state: eng_tool_door
+    state: eng_tool_icon
 
 # Radiation suit closet
 - type: entity
@@ -26,7 +26,7 @@
       state: eng
       state_closed: eng_rad_door
   - type: Icon
-    state: eng_rad_door
+    state: eng_rad_icon
 
 # Emergency closet
 - type: entity
@@ -40,7 +40,7 @@
     - type: StorageVisualizer
       state: emergency
   - type: Icon
-    state: emergency_door
+    state: emergency_icon
 
 # Fire safety closet
 - type: entity
@@ -54,7 +54,7 @@
     - type: StorageVisualizer
       state: fire
   - type: Icon
-    state: fire_door
+    state: fire_icon
 
 # EOD closet
 - type: entity
@@ -68,4 +68,4 @@
     - type: StorageVisualizer
       state: bomb
   - type: Icon
-    state: bomb_door
+    state: bomb_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml

@@ -16,7 +16,7 @@
       state: generic
       state_closed: blue_door
   - type: Icon
-    state: blue_door
+    state: blue_icon
 
 # Pink wardrobe
 - type: entity
@@ -30,7 +30,7 @@
       state: generic
       state_closed: pink_door
   - type: Icon
-    state: pink_door
+    state: pink_icon
 
 # Black wardrobe
 - type: entity
@@ -44,7 +44,7 @@
       state: generic
       state_closed: black_door
   - type: Icon
-    state: black_door
+    state: black_icon
 
 # Green wardrobe
 - type: entity
@@ -58,7 +58,7 @@
       state: generic
       state_closed: green_door
   - type: Icon
-    state: green_door
+    state: green_icon
 
 # Prison wardrobe
 - type: entity
@@ -72,7 +72,7 @@
       state: generic
       state_closed: orange_door
   - type: Icon
-    state: orange_door
+    state: orange_icon
 
 # Yellow wardrobe
 - type: entity
@@ -86,7 +86,7 @@
       state: generic
       state_closed: yellow_door
   - type: Icon
-    state: yellow_door
+    state: yellow_icon
 
 # White wardrobe
 - type: entity
@@ -100,7 +100,7 @@
       state: generic
       state_closed: white_door
   - type: Icon
-    state: white_door
+    state: white_icon
 
 # Grey wardrobe
 - type: entity
@@ -114,7 +114,7 @@
       state: generic
       state_closed: grey_door
   - type: Icon
-    state: grey_door
+    state: grey_icon
 
 # Mixed wardrobe
 - type: entity
@@ -128,4 +128,4 @@
       state: generic
       state_closed: mixed_door
   - type: Icon
-    state: mixed_door
+    state: mixed_icon

Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml

@@ -21,7 +21,7 @@
     state: emergency_light_off
   - type: Icon
     sprite: Constructible/Lighting/emergency_light.rsi
-    state: emergency_light_off
+    state: emergency_light_icon
   placement:
     snap:
     - Wallmount

Resources/Prototypes/Entities/Constructible/Walls/lighting.yml

@@ -11,7 +11,7 @@
     state: on
   - type: Icon
     sprite: Constructible/Lighting/light_tube.rsi
-    state: on
+    state: onicon
   - type: PointLight
     radius: 8
     energy: 1.2
@@ -32,7 +32,7 @@
     state: off
   - type: Icon
     sprite: Constructible/Lighting/light_tube.rsi
-    state: off
+    state: onicon
   - type: PointLight
     enabled: false
   - type: PoweredLight

Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml

@@ -22,7 +22,7 @@
     state: normal
   - type: Icon
     sprite: Constructible/Power/VendingMachines/cola.rsi
-    state: normal
+    state: off
   - type: Physics
     mass: 85
   - type: Collidable

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -45,7 +45,7 @@
     - state: assigned
     - state: idcaptain
   - type: Icon
-    state: gold
+    state: idcaptain_icon
   - type: Clothing
     HeldPrefix: gold
   - type: PresetIdCard
@@ -62,7 +62,7 @@
     - state: assigned
     - state: idsecurityofficer
   - type: Icon
-    state: idsecurityofficer
+    state: idsecurityofficer_icon
   - type: PresetIdCard
     job: SecurityOfficer
 
@@ -77,7 +77,7 @@
     - state: assigned
     - state: idstationengineer
   - type: Icon
-    state: idstationengineer
+    state: idstationengineer_icon
   - type: PresetIdCard
     job: StationEngineer
 
@@ -92,7 +92,7 @@
     - state: assigned
     - state: idmedicaldoctor
   - type: Icon
-    state: idmedicaldoctor
+    state: idmedicaldoctor_icon
   - type: PresetIdCard
     job: MedicalDoctor
 
@@ -107,7 +107,7 @@
     - state: assigned
     - state: idcargotechnician
   - type: Icon
-    state: idcargotechnician
+    state: idcargotechnician_icon
   - type: PresetIdCard
     job: CargoTechnician
 
@@ -122,7 +122,7 @@
     - state: assigned
     - state: idscientist
   - type: Icon
-    state: idscientist
+    state: idscientist_icon
   - type: PresetIdCard
     job: Scientist
 
@@ -137,7 +137,7 @@
     - state: assigned
     - state: idclown
   - type: Icon
-    state: idclown
+    state: idclown_icon
   - type: PresetIdCard
     job: Clown
 
@@ -152,7 +152,7 @@
     - state: assigned
     - state: idmime
   - type: Icon
-    state: idmime
+    state: idmime_icon
   - type: PresetIdCard
     job: Mime
 
@@ -167,7 +167,7 @@
     - state: assigned
     - state: idjanitor
   - type: Icon
-    state: idjanitor
+    state: idjanitor_icon
   - type: PresetIdCard
     job: Janitor
 
@@ -182,7 +182,7 @@
     - state: assigned
     - state: idbartender
   - type: Icon
-    state: idbartender
+    state: idbartender_icon
   - type: PresetIdCard
     job: Bartender
 
@@ -197,7 +197,7 @@
     - state: assigned
     - state: idcook
   - type: Icon
-    state: idcook
+    state: idcook_icon
   - type: PresetIdCard
     job: Chef
 
@@ -212,7 +212,7 @@
     - state: assigned
     - state: idheadofpersonnel
   - type: Icon
-    state: idheadofpersonnel
+    state: idheadofpersonnel_icon
   - type: Clothing
     HeldPrefix: silver
   - type: PresetIdCard
@@ -229,7 +229,7 @@
     - state: assigned
     - state: idchiefengineer
   - type: Icon
-    state: idchiefengineer
+    state: idchiefengineer_icon
   - type: Clothing
     HeldPrefix: silver
   - type: PresetIdCard
@@ -246,7 +246,7 @@
     - state: assigned
     - state: idchiefmedicalofficer
   - type: Icon
-    state: idchiefmedicalofficer
+    state: idchiefmedicalofficer_icon
   - type: Clothing
     HeldPrefix: silver
   - type: PresetIdCard
@@ -263,7 +263,7 @@
     - state: assigned
     - state: idresearchdirector
   - type: Icon
-    state: idresearchdirector
+    state: idresearchdirector_icon
   - type: Clothing
     HeldPrefix: silver
   - type: PresetIdCard
@@ -280,7 +280,7 @@
     - state: assigned
     - state: idheadofsecurity
   - type: Icon
-    state: idheadofsecurity
+    state: idheadofsecurity_icon
   - type: Clothing
     HeldPrefix: silver
   - type: PresetIdCard
@@ -297,7 +297,7 @@
     - state: assigned
     - state: idcentcom
   - type: Icon
-    state: idcentcom
+    state: idcentcom_icon
   - type: Clothing
     HeldPrefix: gold
   - type: IdCard

Resources/Prototypes/Entities/Objects/Power/lights.yml

@@ -6,11 +6,9 @@
   components:
   - type: LightBulb
     bulb: Bulb
-
   - type: Sprite
     sprite: Objects/Power/light_bulb.rsi
     state: normal
-
   - type: Icon
     sprite: Objects/Power/light_bulb.rsi
     state: normal
@@ -31,11 +29,9 @@
   components:
   - type: LightBulb
     bulb: Tube
-
   - type: Sprite
     sprite:  Objects/Power/light_tube.rsi
     state: normal
-
   - type: Icon
     sprite:  Objects/Power/light_tube.rsi
     state: normal

Resources/Textures/Constructible/Atmos/pipeitems.rsi/meta.json

@@ -0,0 +1,47 @@
+{
+   "version":1,
+   "size":{
+      "x":32,
+      "y":32
+   },
+   "license":"CC-BY-SA-3.0",
+   "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
+   "states":[
+     {
+       "name": "scrubber",
+       "directions": 4,
+       "delays": [
+         [
+           1
+         ],
+         [
+           1
+         ],
+         [
+           1
+         ],
+         [
+           1
+         ]
+       ]
+     },
+     {
+       "name": "vent",
+       "directions": 4,
+       "delays": [
+         [
+           1
+         ],
+         [
+           1
+         ],
+         [
+           1
+         ],
+         [
+           1
+         ]
+       ]
+     }
+   ]
+}

Resources/Textures/Constructible/Lighting/emergency_light.rsi/meta.json

@@ -24,6 +24,15 @@
                 ]
             ]
         },
+        {
+            "name": "emergency_light_icon",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
         {
             "name": "emergency_light_on",
             "directions": 4,

Resources/Textures/Constructible/Lighting/light_tube.rsi/meta.json

@@ -1 +1,119 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi", "states": [{"name": "broken", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "burned", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "empty", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "off", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "on", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi",
+  "states": [
+    {
+      "name": "onicon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "officon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "broken",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "burned",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "empty",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "on",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Constructible/Power/tdopler.rsi/meta.json

@@ -8,7 +8,7 @@
     "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765",
     "states": [
         {
-            "name": "tdoppler",
+            "name": "rndpointsource",
             "directions": 4,
             "delays": [
                 [
@@ -30,7 +30,7 @@
             ]
         },
         {
-            "name": "tdoppler-broken",
+            "name": "rndpointsource-broken",
             "directions": 1,
             "delays": [
                 [
@@ -41,7 +41,16 @@
             ]
         },
         {
-            "name": "tdoppler-off",
+            "name": "rndpointsource-off",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "rndpointsource-icon",
             "directions": 1,
             "delays": [
                 [