Switches current PDAs to the /tg/ ones. (#1796)

* Switches PDAs with tg ones and renames flashlight component

* Which chucklefuck hid the ID cards in the clothing folder

* Removes Mime PDA as i'm gonna do that in another PR

* Moves EVERY SINGLE PDA over by exactly one pixel so they're aligned perfectly with the UI slot

* On second thought moves back the id-cards since I don't want to deal with conflicts

Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs

@@ -1,4 +1,4 @@
-using Content.Shared.GameObjects.Components.PDA;
+using Content.Shared.GameObjects.Components.PDA;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 
@@ -10,7 +10,7 @@ namespace Content.Client.GameObjects.Components.PDA
         private enum PDAVisualLayers
         {
             Base,
-            Unlit
+            Flashlight
         }
 
 
@@ -22,13 +22,13 @@ namespace Content.Client.GameObjects.Components.PDA
                 return;
             }
             var sprite = component.Owner.GetComponent<ISpriteComponent>();
-            sprite.LayerSetVisible(PDAVisualLayers.Unlit, false);
+            sprite.LayerSetVisible(PDAVisualLayers.Flashlight, false);
-            if(!component.TryGetData<bool>(PDAVisuals.ScreenLit, out var isScreenLit))
+            if(!component.TryGetData<bool>(PDAVisuals.FlashlightLit, out var isScreenLit))
             {
                 return;
             }
-            sprite.LayerSetState(PDAVisualLayers.Unlit, "unlit_pda_screen");
+            sprite.LayerSetState(PDAVisualLayers.Flashlight, "light_overlay");
-            sprite.LayerSetVisible(PDAVisualLayers.Unlit, isScreenLit);
+            sprite.LayerSetVisible(PDAVisualLayers.Flashlight, isScreenLit);
 
 
         }

Content.Server/GameObjects/Components/PDA/PDAComponent.cs

@@ -141,7 +141,7 @@ namespace Content.Server.GameObjects.Components.PDA
 
         private void UpdatePDAAppearance()
         {
-            _appearance?.SetData(PDAVisuals.ScreenLit, _lightOn);
+            _appearance?.SetData(PDAVisuals.FlashlightLit, _lightOn);
         }
 
         public async Task<bool> InteractUsing(InteractUsingEventArgs eventArgs)

Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.Serialization;
@@ -108,7 +108,7 @@ namespace Content.Shared.GameObjects.Components.PDA
     [NetSerializable, Serializable]
     public enum PDAVisuals
     {
-        ScreenLit,
+        FlashlightLit,
     }
 
     [NetSerializable, Serializable]

Resources/Prototypes/Entities/Clothing/Belt/identification_cards.yml

@@ -6,13 +6,13 @@
   abstract: true
   components:
   - type: Sprite
-    sprite: Clothing/Belt/id_cards.rsi
+    sprite: Objects/Misc/id_cards.rsi
   - type: Icon
-    sprite: Clothing/Belt/id_cards.rsi
+    sprite: Objects/Misc/id_cards.rsi
   - type: Clothing
     Slots:
     - idcard
-    sprite: Clothing/Belt/id_cards.rsi
+    sprite: Objects/Misc/id_cards.rsi
     HeldPrefix: default
   - type: Access
   - type: IdCard

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -21,7 +21,6 @@
       type: PDABoundUserInterface
   - type: LoopingSound
 
-
 - type: entity
   name: Assistant PDA
   parent: BasePDA
@@ -39,9 +38,9 @@
     layers:
     - state: pda
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: Chef PDA
@@ -53,16 +52,16 @@
     idCard: ChefIDCard
   - type: Icon
     sprite: Objects/Devices/pda.rsi
-    state: pda-chef
+    state: pda-cook
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
     layers:
-    - state: pda-chef
+    - state: pda-cook
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: Clown PDA
@@ -81,9 +80,9 @@
     layers:
     - state: pda-clown
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
   - type: Slippery
     paralyzeTime: 4
 
@@ -104,9 +103,9 @@
     layers:
     - state: pda-cargo
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: Bartender PDA
@@ -118,16 +117,16 @@
     idCard: BartenderIDCard
   - type: Icon
     sprite: Objects/Devices/pda.rsi
-    state: pda-bar
+    state: pda-bartender
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
     layers:
-    - state: pda-bar
+    - state: pda-bartender
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 
 - type: entity
@@ -140,16 +139,16 @@
     idCard: JanitorIDCard
   - type: Icon
     sprite: Objects/Devices/pda.rsi
-    state: pda-j
+    state: pda-janitor
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
     layers:
-    - state: pda-j
+    - state: pda-janitor
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: Captain PDA
@@ -161,16 +160,16 @@
     idCard: CaptainIDCard
   - type: Icon
     sprite: Objects/Devices/pda.rsi
-    state: pda-c
+    state: pda-captain
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
     layers:
-    - state: pda-c
+    - state: pda-captain
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: HoP PDA
@@ -188,9 +187,9 @@
     layers:
     - state: pda-hop
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: CE PDA
@@ -208,9 +207,9 @@
     layers:
     - state: pda-ce
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 
 - type: entity
@@ -222,16 +221,16 @@
     idCard: EngineeringIDCard
   - type: Icon
     sprite: Objects/Devices/pda.rsi
-    state: pda-e
+    state: pda-engineer
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
     layers:
-    - state: pda-e
+    - state: pda-engineer
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: CMO PDA
@@ -249,10 +248,9 @@
     layers:
     - state: pda-cmo
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
-
 
 - type: entity
   name: Medical PDA
@@ -263,16 +261,16 @@
     idCard: MedicalIDCard
   - type: Icon
     sprite: Objects/Devices/pda.rsi
-    state: pda-m
+    state: pda-medical
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
     layers:
-    - state: pda-m
+    - state: pda-medical
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: RnD PDA
@@ -290,9 +288,9 @@
     layers:
     - state: pda-rd
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: Science PDA
@@ -310,9 +308,9 @@
     layers:
     - state: pda-rd
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: HoS PDA
@@ -330,9 +328,9 @@
     layers:
     - state: pda-hos
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
 
 - type: entity
   name: Security PDA
@@ -343,13 +341,13 @@
     idCard: SecurityIDCard
   - type: Icon
     sprite: Objects/Devices/pda.rsi
-    state: pda-s
+    state: pda-security
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
     layers:
-    - state: pda-s
+    - state: pda-security
       map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
       shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

Resources/Textures/Objects/Devices/pda.rsi/meta.json

@@ -1 +1,367 @@
-{"version":1,"size":{"x":32,"y":32},"states":[{"name":"pda","directions":1,"delays":[[1]]},{"name":"unlit_pda_screen","directions":1,"delays":[[1]]},{"name":"pda-atmo","directions":1,"delays":[[1]]},{"name":"pda-bar","directions":1,"delays":[[1]]},{"name":"pda-c","directions":1,"delays":[[1]]},{"name":"pda-cargo","directions":1,"delays":[[1]]},{"name":"pda-ce","directions":1,"delays":[[1]]},{"name":"pda-chef","directions":1,"delays":[[1]]},{"name":"pda-chem","directions":1,"delays":[[1]]},{"name":"pda-clown","directions":1,"delays":[[1]]},{"name":"pda-cmo","directions":1,"delays":[[1]]},{"name":"pda-det","directions":1,"delays":[[1]]},{"name":"pda-e","directions":1,"delays":[[1]]},{"name":"pda-h","directions":1,"delays":[[1]]},{"name":"pda-holy","directions":1,"delays":[[1]]},{"name":"pda-hop","directions":1,"delays":[[1]]},{"name":"pda-hos","directions":1,"delays":[[1]]},{"name":"pda-hydro","directions":1,"delays":[[1]]},{"name":"pda-j","directions":1,"delays":[[1]]},{"name":"pda-lawyer","directions":1,"delays":[[1]]},{"name":"pda-lawyer-old","directions":1,"delays":[[1]]},{"name":"pda-libb","directions":1,"delays":[[1]]},{"name":"pda-libc","directions":1,"delays":[[0.1,0.1,0.1,0.1]]},{"name":"pda-m","directions":1,"delays":[[1]]},{"name":"pda-mime","directions":1,"delays":[[1]]},{"name":"pda-miner","directions":1,"delays":[[1]]},{"name":"pda-q","directions":1,"delays":[[1]]},{"name":"pda-r","directions":1,"delays":[[0.8,0.8]]},{"name":"pda-rd","directions":1,"delays":[[1]]},{"name":"pda-robot","directions":1,"delays":[[1]]},{"name":"pda-s","directions":1,"delays":[[1]]},{"name":"pda-syn","directions":1,"delays":[[1]]},{"name":"pda-tox","directions":1,"delays":[[1]]},{"name":"pda-transp","directions":1,"delays":[[1]]},{"name":"pda-v","directions":1,"delays":[[1]]},{"name":"pda-warden","directions":1,"delays":[[1]]},{"name":"pda_pen","directions":1,"delays":[[1]]},{"name":"pdabox","directions":1,"delays":[[1]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA 3.0",
+  "copyright": "https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d",
+  "states": [
+    {
+      "name": "id_overlay",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "insert_overlay",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "light_overlay",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pai_off_overlay",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pai_overlay",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-atmos",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-bartender",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-captain",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-cargo",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-ce",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-chaplain",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-chemistry",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-clear",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-clown",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-cmo",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-cook",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-detective",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-engineer",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-genetics",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-hop",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-hos",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-hydro",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-janitor",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-lawyer",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-library",
+      "directions": 1,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "pda-medical",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-mime",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-miner",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-qm",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-r",
+      "directions": 1,
+      "delays": [
+        [
+          0.8,
+          0.8
+        ]
+      ]
+    },
+    {
+      "name": "pda-r-library",
+      "directions": 1,
+      "delays": [
+        [
+          0.8,
+          0.8
+        ]
+      ]
+    },
+    {
+      "name": "pda-rd",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-roboticist",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-science",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-security",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-syndi",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-virology",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pda-warden",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}