PDA Cleanup and fix

new-frontiers-14 · Jan 10, 2025 · c1c8d31 · c1c8d31
1 parent fe3a4c1
commit c1c8d31
Show file tree

Hide file tree

Showing 58 changed files with 215 additions and 190 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -11,7 +11,7 @@
        !type:String
        pda
   - type: Sprite
-    sprite: Objects/Devices/pda.rsi
+    sprite: _NF/Objects/Devices/pda.rsi # Frontier
     layers:
     - map: [ "enum.PdaVisualLayers.Base" ]
       state: "pda"
@@ -24,7 +24,7 @@
       shader: "unshaded"
       visible: false
   - type: Icon
-    sprite: Objects/Devices/pda.rsi
+    sprite: _NF/Objects/Devices/pda.rsi # Frontier
     state: pda
   - type: Pda
     paiSlot:
@@ -1433,7 +1433,7 @@
 - type: entity
   parent: BasePDA
   id: ChameleonPDA
-  name: passenger PDA
+  name: contractor PDA # Frontier passenger<contractor
   description: Why isn't it gray?
   suffix: Chameleon
   components:
@@ -1444,7 +1444,7 @@
     - DoorBumpOpener
   - type: ChameleonClothing
     slot: [idcard]
-    default: PassengerPDA
+    default: ContractorPDA # Frontier PassengerPDA<ContractorPDA
     requireTag: WhitelistChameleonPDA
   - type: UserInterface
     interfaces:

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
@@ -30,20 +30,7 @@
   - type: PdaBorderColor
     borderColor: "#860000"
     accentVColor: "#F2F2F2"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-valet
 
 - type: entity
@@ -63,5 +50,4 @@
     borderColor: "#A32D26"
     accentVColor: "#DFDFDF"
 #  - type: Icon
-#    sprite: _NF/Objects/Devices/pda.rsi
 #    state: pda-guard
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
@@ -42,20 +42,7 @@
   - type: PdaBorderColor
     borderColor: "#717059"
     accentVColor: "#A32D26"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-mercenary
 
 - type: entity
@@ -74,20 +61,7 @@
   - type: PdaBorderColor
     borderColor: "#717059"
     accentVColor: "#A32D26"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-pilot
 
 - type: entity
@@ -106,20 +80,7 @@
   - type: PdaBorderColor
     borderColor: "#F2F2F2"
     accentVColor: "#FE4900"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-stc
 
 - type: entity
@@ -177,20 +138,7 @@
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-sheriff
   - type: CartridgeLoader # Extended with the ledger
     preinstalled:
@@ -225,20 +173,7 @@
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-cadet
 
 - type: entity
@@ -264,20 +199,7 @@
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-deputy
 
 - type: entity
@@ -303,20 +225,7 @@
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-brigmed
 
 - type: entity
@@ -342,20 +251,7 @@
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-sergeant
 
 - type: entity
@@ -381,20 +277,7 @@
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-bailiff
 
 - type: entity
@@ -419,20 +302,7 @@
         pda-nfdetective
   - type: PdaBorderColor
     borderColor: "#774705"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-nfdetective
 
 - type: entity
@@ -464,20 +334,7 @@
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-pal
 
 - type: entity
@@ -502,20 +359,7 @@
   - type: PdaBorderColor
     borderColor: "#789876"
     accentHColor: "#447987"
-  - type: Sprite
-    sprite: _NF/Objects/Devices/pda.rsi
-    layers:
-    - map: [ "enum.PdaVisualLayers.Base" ]
-    - state: "light_overlay"
-      map: [ "enum.PdaVisualLayers.Flashlight" ]
-      shader: "unshaded"
-      visible: false
-    - state: "id_overlay"
-      map: [ "enum.PdaVisualLayers.IdLight" ]
-      shader: "unshaded"
-      visible: false
   - type: Icon
-    sprite: _NF/Objects/Devices/pda.rsi
     state: pda-sr
   - type: CartridgeLoader
     preinstalled: