diff --git a/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs b/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs index 019bd03ae1..5ea8bbbbc1 100644 --- a/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs +++ b/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(); - sprite.LayerSetVisible(PDAVisualLayers.Unlit, false); - if(!component.TryGetData(PDAVisuals.ScreenLit, out var isScreenLit)) + sprite.LayerSetVisible(PDAVisualLayers.Flashlight, false); + if(!component.TryGetData(PDAVisuals.FlashlightLit, out var isScreenLit)) { return; } - sprite.LayerSetState(PDAVisualLayers.Unlit, "unlit_pda_screen"); - sprite.LayerSetVisible(PDAVisualLayers.Unlit, isScreenLit); + sprite.LayerSetState(PDAVisualLayers.Flashlight, "light_overlay"); + sprite.LayerSetVisible(PDAVisualLayers.Flashlight, isScreenLit); } diff --git a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs index 53f3543d62..91bc92bb3c 100644 --- a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs +++ b/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 InteractUsing(InteractUsingEventArgs eventArgs) diff --git a/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs b/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs index 8e24cbcd95..cb2fdcd60e 100644 --- a/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs +++ b/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] diff --git a/Resources/Prototypes/Entities/Clothing/Belt/identification_cards.yml b/Resources/Prototypes/Entities/Clothing/Belt/identification_cards.yml index 0364c3a024..8a2135e601 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/identification_cards.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index b2395af536..672db4b488 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/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"] diff --git a/Resources/Textures/Objects/Devices/pda.rsi/id_overlay.png b/Resources/Textures/Objects/Devices/pda.rsi/id_overlay.png new file mode 100644 index 0000000000..3f5d310e70 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/id_overlay.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/insert_overlay.png b/Resources/Textures/Objects/Devices/pda.rsi/insert_overlay.png new file mode 100644 index 0000000000..61ba781c1f Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/insert_overlay.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/light_overlay.png b/Resources/Textures/Objects/Devices/pda.rsi/light_overlay.png new file mode 100644 index 0000000000..286a6c3255 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/light_overlay.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index d3bb5b7f05..2ea705a466 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pai_off_overlay.png b/Resources/Textures/Objects/Devices/pda.rsi/pai_off_overlay.png new file mode 100644 index 0000000000..7d557d092e Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pai_off_overlay.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pai_overlay.png b/Resources/Textures/Objects/Devices/pda.rsi/pai_overlay.png new file mode 100644 index 0000000000..92d93851cf Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pai_overlay.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-atmo.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-atmo.png deleted file mode 100644 index b3977d4b42..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-atmo.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-atmos.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-atmos.png new file mode 100644 index 0000000000..b1eb54fe6b Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-atmos.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-bar.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-bar.png deleted file mode 100644 index 8b6942ceef..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-bar.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-bartender.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-bartender.png new file mode 100644 index 0000000000..c9348a7cf4 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-bartender.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-c.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-c.png deleted file mode 100644 index 67dd678967..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-c.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-captain.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-captain.png new file mode 100644 index 0000000000..c9880c57a6 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-captain.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-cargo.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-cargo.png index f43bcb2481..8477ee86da 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-cargo.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-cargo.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-ce.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-ce.png index 9ed242f17d..d1516cb24a 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-ce.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-ce.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-chaplain.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-chaplain.png new file mode 100644 index 0000000000..a1695844b2 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-chaplain.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-chef.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-chef.png deleted file mode 100644 index 00e98af427..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-chef.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-chem.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-chem.png deleted file mode 100644 index 1bafc8f3d0..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-chem.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-chemistry.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-chemistry.png new file mode 100644 index 0000000000..e8a4c7cec5 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-chemistry.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-clear.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-clear.png new file mode 100644 index 0000000000..02de198e99 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-clear.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-clown.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-clown.png index 7f31664a00..fd0b30f0b3 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-clown.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-clown.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-cmo.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-cmo.png index d22662c5b3..5d91356252 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-cmo.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-cmo.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-cook.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-cook.png new file mode 100644 index 0000000000..ab7feeab4c Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-cook.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-det.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-det.png deleted file mode 100644 index e93ec473b4..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-det.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-detective.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-detective.png new file mode 100644 index 0000000000..1e75195ec9 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-detective.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-e.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-e.png deleted file mode 100644 index d2caa6827e..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-e.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-engineer.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-engineer.png new file mode 100644 index 0000000000..42e81c0052 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-engineer.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-genetics.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-genetics.png new file mode 100644 index 0000000000..bce7b0f55f Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-genetics.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-h.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-h.png deleted file mode 100644 index 39b498c96d..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-h.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-holy.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-holy.png deleted file mode 100644 index bb433abdfe..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-holy.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-hop.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-hop.png index 040704ca53..05dca8a449 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-hop.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-hop.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-hos.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-hos.png index 1346ac1d2c..3a6c5e6078 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-hos.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-hos.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-hydro.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-hydro.png index 1cca5cea17..386ac64239 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-hydro.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-hydro.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-j.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-j.png deleted file mode 100644 index 5091e9fa04..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-j.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-janitor.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-janitor.png new file mode 100644 index 0000000000..85405e4df5 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-janitor.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer-old.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer-old.png deleted file mode 100644 index 4fe3013540..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer-old.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer.png index 6f9496648d..d18a4d2911 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-libb.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-libb.png deleted file mode 100644 index 579c665884..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-libb.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-libc.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-libc.png deleted file mode 100644 index 054b0a39f4..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-libc.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-library.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-library.png new file mode 100644 index 0000000000..6e8ed2bdf2 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-library.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-m.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-m.png deleted file mode 100644 index 3adb51ab57..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-m.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-medical.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-medical.png new file mode 100644 index 0000000000..53ca842166 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-medical.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-mime.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-mime.png index 3a97e0650c..3aaa225257 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-mime.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-mime.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-miner.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-miner.png index 42734a457d..a5c7fb5b5e 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-miner.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-miner.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-q.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-q.png deleted file mode 100644 index d90ee0c144..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-q.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-qm.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-qm.png new file mode 100644 index 0000000000..4b8ac99881 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-qm.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-r-library.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-r-library.png new file mode 100644 index 0000000000..4d36793ed9 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-r-library.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-r.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-r.png index 8382078b26..b6b37bfc7b 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-r.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-r.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-rd.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-rd.png index 99669734b1..1d84af29b7 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-rd.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-rd.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-robot.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-robot.png deleted file mode 100644 index 1923f8ee03..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-robot.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-roboticist.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-roboticist.png new file mode 100644 index 0000000000..c8df94faf0 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-roboticist.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-s.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-s.png deleted file mode 100644 index 005e75870e..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-s.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-science.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-science.png new file mode 100644 index 0000000000..c7b103cf24 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-science.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-security.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-security.png new file mode 100644 index 0000000000..0af0eafcce Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-security.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-syn.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-syn.png deleted file mode 100644 index cf21c285e7..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-syn.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png new file mode 100644 index 0000000000..51fa1bd294 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-tox.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-tox.png deleted file mode 100644 index 1425d9e5ae..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-tox.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-transp.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-transp.png deleted file mode 100644 index e140da7f04..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-transp.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-v.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-v.png deleted file mode 100644 index b5c169dde3..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-v.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-virology.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-virology.png new file mode 100644 index 0000000000..e259406b58 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-virology.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-warden.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-warden.png index a6ec69de0f..0eff588698 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-warden.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-warden.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda.png b/Resources/Textures/Objects/Devices/pda.rsi/pda.png index 0f0abfbe1e..8473ddaab1 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda_pen.png b/Resources/Textures/Objects/Devices/pda.rsi/pda_pen.png deleted file mode 100644 index 324a706220..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda_pen.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pdabox.png b/Resources/Textures/Objects/Devices/pda.rsi/pdabox.png deleted file mode 100644 index 4f5012c896..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pdabox.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/unlit_pda_screen.png b/Resources/Textures/Objects/Devices/pda.rsi/unlit_pda_screen.png deleted file mode 100644 index 93e998e3c7..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/unlit_pda_screen.png and /dev/null differ