Telecoms Resprite (#35811)

* Medical and Science Servers

Resprited  medical and science servers

* Delete server-off-Recovered.png

* Telecoms and Camera Servers

* Add Copyright

* Fix Rsi

* Minor Stripe Displacement Fix

* Telecoms Sprites

* Telecoms Display Update

Partial Update of the Sprites, Copyright and some YML and JSON changes

* Fix Linter and YML and Finalize

* Remember Lost Router Child

Fix Linter Again (hopefully) and add sprite to entertainment and wireless camera routers

* Requested Review Changes and ect

Changed how the servers dictate how to display whether they have no keys or if they have a mix of keys.

* Re-Run Checks

* Handful of requested changes

* Fix?

* Revert Last

* old yeller

* pushforpr

* Remove Old Files

* Fix Json

* fix rsi for real...?

* Fix Camera Servers

Servers were still calling to telecoms instead of the server sprites

* New Telecom Darken Attempt #1

* Slight stripe change

* Random Whitespace fix

* Fix2boogaloo

Resources/Maps/plasma.yml

@@ -148880,26 +148880,6 @@ entities:
       parent: 2
     - type: PointLight
       color: '#FF3300FF'
-- proto: TelecomServer
-  entities:
-  - uid: 15019
-    components:
-    - type: MetaData
-      desc: An old server, stuck compiling an unknown program...
-      name: Computron
-    - type: Transform
-      pos: -57.5,-78.5
-      parent: 2
-    - type: ApcPowerReceiver
-      powerLoad: 500
-    missingComponents:
-    - Destructible
-    - Machine
-    - WiresPanel
-    - EncryptionKeyHolder
-    - TelecomServer
-    - ContainerContainer
-    - Construction
 - proto: TelecomServerCircuitboard
   entities:
   - uid: 4499

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

@@ -25,6 +25,9 @@
     layers:
     - state: crypt_gray
     - state: common_label
+  - type: Tag
+    tags:
+    - EncryptionCommon
 
 - type: entity
   parent: [ EncryptionKey, BaseCargoContraband ]
@@ -40,6 +43,9 @@
     layers:
     - state: crypt_gray
     - state: cargo_label
+  - type: Tag
+    tags:
+    - EncryptionCargo
 
 - type: entity
   parent: [ EncryptionKey, BaseCentcommContraband ]
@@ -92,6 +98,9 @@
     layers:
     - state: crypt_silver
     - state: com_label
+  - type: Tag
+    tags:
+    - EncryptionCommand
 
 - type: entity
   parent: [ EncryptionKey, BaseEngineeringContraband ]
@@ -107,6 +116,9 @@
     layers:
     - state: crypt_gray
     - state: eng_label
+  - type: Tag
+    tags:
+    - EncryptionEngineering
 
 - type: entity
   parent: [ EncryptionKey, BaseMedicalContraband ]
@@ -122,6 +134,9 @@
     layers:
     - state: crypt_gray
     - state: med_label
+  - type: Tag
+    tags:
+    - EncryptionMedical
 
 - type: entity
   parent: [ EncryptionKey, BaseMedicalScienceContraband ]
@@ -153,6 +168,9 @@
     layers:
     - state: crypt_gray
     - state: sci_label
+  - type: Tag
+    tags:
+    - EncryptionScience
 
 - type: entity
   parent: [ EncryptionKey, BaseScienceContraband ]
@@ -183,6 +201,9 @@
     layers:
     - state: crypt_gray
     - state: sec_label
+  - type: Tag
+    tags:
+    - EncryptionSecurity
 
 - type: entity
   parent: [ EncryptionKey, BaseCivilianContraband ]
@@ -198,6 +219,9 @@
     layers:
     - state: crypt_gray
     - state: service_label
+  - type: Tag
+    tags:
+    - EncryptionService
 
 - type: entity
   parent: [ EncryptionKey, BaseSyndicateContraband ]

Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml

@@ -1,14 +1,20 @@
-- type: entity
+- type: entity
   id: CrewMonitoringServer
-  parent: BaseMachinePowered
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
   name: crew monitoring server
   description: Receives and relays the status of all active suit sensors on the station.
   components:
     - type: Sprite
       sprite: Structures/Machines/server.rsi
+      snapCardinals: true
       layers:
-        - state: server
+        - state: server-off
+        - state: server-on
+          visible: false
+          map: [ "enum.PowerDeviceVisualLayers.Powered" ]
         - state: variant-crew
+        - state: server_o
+          map: ["enum.WiresVisualLayers.MaintenancePanel"]
     - type: Construction
       graph: Machine
       node: machine
@@ -34,6 +40,8 @@
     - type: ApcPowerReceiver
       powerLoad: 200
     - type: ExtensionCableReceiver
+    - type: WiresPanel
+    - type: WiresVisuals
     - type: Destructible
       thresholds:
         - trigger:
@@ -56,9 +64,20 @@
                 SheetSteel1:
                   min: 1
                   max: 2
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.PowerDeviceVisuals.Powered:
+          enum.PowerDeviceVisualLayers.Powered:
+            True: {visible: true}
+            False: {visible: false}
     - type: AmbientOnPowered
     - type: AmbientSound
       volume: -9
       range: 5
+      enabled: false
       sound:
         path: /Audio/Ambience/Objects/server_fans.ogg
+    - type: GuideHelp
+      guides:
+      - Medical

Resources/Prototypes/Entities/Structures/Machines/research.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: ResearchAndDevelopmentServer
   parent: [ BaseMachinePowered, ConstructibleMachine ]
   name: R&D server
@@ -6,11 +6,22 @@
   components:
   - type: Sprite
     sprite: Structures/Machines/server.rsi
+    snapCardinals: true
     layers:
-      - state: server
+      - state: server-off
+      - state: server-on
+        visible: false
+        map: ["enum.PowerDeviceVisualLayers.Powered"]
       - state: variant-research
       - state: server_o
         map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    enabled: false
+    castShadows: false
+    radius: 1.5
+    energy: 1.6
+    color: "#b211b2"
+  - type: LitOnPowered
   - type: ResearchServer
   - type: TechnologyDatabase
     supportedDisciplines:
@@ -48,10 +59,17 @@
             min: 1
             max: 2
   - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+        enum.PowerDeviceVisuals.Powered:
+          enum.PowerDeviceVisualLayers.Powered:
+            True: {visible: true}
+            False: {visible: false}
   - type: AmbientOnPowered
   - type: AmbientSound
     volume: -9
     range: 5
+    enabled: false
     sound:
       path: /Audio/Ambience/Objects/server_fans.ogg
   - type: GuideHelp

Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml

@@ -21,13 +21,28 @@
       sprite: Structures/Machines/server.rsi
       snapCardinals: true
       layers:
-        - state: server
+        - state: server-off
+        - state: server-on
+          visible: false
+          map: ["enum.PowerDeviceVisualLayers.Powered"]
+        - state: server_o
+          map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    - type: GenericVisualizer
+      visuals:
+        enum.PowerDeviceVisuals.Powered:
+          enum.PowerDeviceVisualLayers.Powered:
+            True: { visible: true }
+            False: { visible: false }
+    - type: Appearance
     - type: AmbientOnPowered
     - type: AmbientSound
       volume: -9
       range: 5
+      enabled: false
       sound:
         path: /Audio/Ambience/Objects/server_fans.ogg
+    - type: WiresVisuals
+    - type: WiresPanel
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -140,13 +155,28 @@
     - type: Sprite
       sprite: Structures/Machines/server.rsi
       layers:
-        - state: server
+        - state: server-off
+        - state: server-on
+          visible: false
+          map: ["enum.PowerDeviceVisualLayers.Powered"]
+        - state: server_o
+          map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    - type: GenericVisualizer
+      visuals:
+        enum.PowerDeviceVisuals.Powered:
+          enum.PowerDeviceVisualLayers.Powered:
+            True: { visible: true }
+            False: { visible: false }
+    - type: Appearance
     - type: AmbientOnPowered
     - type: AmbientSound
       volume: -9
       range: 5
+      enabled: false
       sound:
         path: /Audio/Ambience/Objects/server_fans.ogg
+    - type: WiresVisuals
+    - type: WiresPanel
 
 - type: entity
   parent: SurveillanceCameraWirelessRouterBase

Resources/Prototypes/Entities/Structures/Machines/telecomms.yml

@@ -8,23 +8,138 @@
     sprite: Structures/Machines/telecomms.rsi
     snapCardinals: true
     layers:
-    - state: icon
-    - state: unlit
+    - state: telecom-nopower
+    - state: telecom-stripe
+    - state: telecom-on
       shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
-    - state: panel
+      visible: false
+      map: ["telecom-on"]
+    - state: variant-nokey
+      map: ["variant-nokey"]
+    - state: variant-default
+      map: ["variant-default"]
+    - state: variant-common
+      map: ["variant-common"]
+    - state: variant-cargo
+      map: ["variant-cargo"]
+    - state: variant-engineering
+      map: ["variant-engineering"]
+    - state: variant-medical
+      map: ["variant-medical"]
+    - state: variant-science
+      map: ["variant-science"]
+    - state: variant-sec
+      map: ["variant-sec"]
+    - state: variant-service
+      map: ["variant-service"]
+    - state: variant-command
+      map: ["variant-command"]
+    - state: variant-multiple
+      map: ["variant-multiple"]
+    - state: telecom-open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: ItemMapper
+    sprite: Structures/Machines/telecomms.rsi
+    mapLayers:
+      variant-nokey:
+        whitelist:
+          components:
+          - EncryptionKey  #Shown when no keys are present
+        minCount: 0
+      variant-default:
+        whitelist:
+          components:
+          - EncryptionKey
+        minCount: 1
+      variant-common:
+        whitelist:
+          tags:
+          - EncryptionCommon
+      variant-cargo:
+        whitelist:
+          tags:
+          - EncryptionCargo
+      variant-engineering:
+        whitelist:
+          tags:
+          - EncryptionEngineering
+      variant-medical:
+        whitelist:
+          tags:
+          - EncryptionMedical
+      variant-science:
+        whitelist:
+          tags:
+          - EncryptionScience
+      variant-sec:
+        whitelist:
+          tags:
+          - EncryptionSecurity
+      variant-service:
+        whitelist:
+          tags:
+          - EncryptionService
+      variant-command:
+        whitelist:
+          tags:
+          - EncryptionCommand
+      variant-multiple:
+        whitelist:
+          components:
+          - EncryptionKey  #Shown when multiple keys are present
+        minCount: 2
+  - type: PointLight
+    enabled: false
+    castShadows: false
+    radius: 1.5
+    energy: 1.6
+    color: "#39b8ee"
+  - type: LitOnPowered
   - type: GenericVisualizer
     visuals:
       enum.PowerDeviceVisuals.Powered:
-        enum.PowerDeviceVisualLayers.Powered:
+        telecom-on:
           True: { visible: true }
           False: { visible: false }
+        variant-common:
+          True: { shader: unshaded }
+          False: { shader: shaded }
+        variant-cargo:
+          True: { shader: unshaded }
+          False: { shader: shaded }
+        variant-engineering:
+          True: { shader: unshaded }
+          False: { shader: shaded }
+        variant-medical:
+          True: { shader: unshaded }
+          False: { shader: shaded }
+        variant-science:
+          True: { shader: unshaded }
+          False: { shader: shaded }
+        variant-sec:
+          True: { shader: unshaded }
+          False: { shader: shaded }
+        variant-service:
+          True: { shader: unshaded }
+          False: { shader: shaded }
+        variant-command:
+          True: { shader: unshaded }
+          False: { shader: shaded }
+        variant-default:
+          True: { shader: unshaded }
+          False: { shader: shaded }
+        variant-multiple:
+          True: { shader: unshaded }
+          False: { shader: shaded }
+        variant-nokey:
+          True: { shader: unshaded }
+          False: { shader: shaded }
   - type: Appearance
   - type: AmbientOnPowered
   - type: AmbientSound
     volume: -9
     range: 5
+    enabled: false
     sound:
       path: /Audio/Ambience/Objects/server_fans.ogg
   - type: WiresVisuals

Resources/Prototypes/tags.yml

@@ -512,6 +512,33 @@
 - type: Tag
   id: EmitterBolt
 
+- type: Tag
+  id: EncryptionCargo
+
+- type: Tag
+  id: EncryptionCommand
+
+- type: Tag
+  id: EncryptionCommon
+
+- type: Tag
+  id: EncryptionElse
+
+- type: Tag
+  id: EncryptionEngineering
+
+- type: Tag
+  id: EncryptionMedical
+
+- type: Tag
+  id: EncryptionScience
+
+- type: Tag
+  id: EncryptionSecurity
+
+- type: Tag
+  id: EncryptionService
+
 - type: Tag
   id: Enzyme
 

Resources/Textures/Structures/Machines/telecomms.rsi/meta.json

@@ -1,34 +1,63 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/9c3494fd79e6bf8dc532300b9de4f688ff276ac9/icons/obj/machines/telecomms.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by Spangs04, based on servers taken from tgstation at commit https://github.com/tgstation/tgstation/blob/9c3494fd79e6bf8dc532300b9de4f688ff276ac9/icons/obj/machines/telecomms.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon"
-    },
-    {
-      "name": "panel"
-    }
-  ]
-}
+    "states": [
+        {
+            "name": "telecom-on",
+            "delays": [
+                [
+                    0.35,
+                    0.35,
+                    0.35
+                ]
+            ]
+        },
+        {
+            "name": "telecom-nopower"
+        },
+        {
+            "name": "telecom-stripe"
+        },
+        {
+            "name": "variant-cargo"
+        },
+        {
+            "name": "variant-common"
+        },
+        {
+            "name": "variant-engineering"
+        },
+        {
+            "name": "variant-service"
+        },
+        {
+            "name": "variant-medical"
+        },
+        {
+            "name": "variant-science"
+        },
+        {
+            "name": "variant-sec"
+        },
+        {
+            "name": "variant-command"
+        },
+        {
+            "name": "variant-default"
+        },
+        {
+            "name": "variant-multiple"
+        },
+        {
+            "name": "variant-nokey"
+        },
+        {
+            "name": "telecom-open"
+        }
+    ]
+}