From: Spangs04 <40036609+Spangs04@users.noreply.github.com> Date: Sun, 18 May 2025 02:10:56 +0000 (-0600) Subject: Telecoms Resprite (#35811) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=9af1d69e3099775c9090a8a1af7a2b2c834d7895;p=space-station-14.git 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 --- diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml index e1c2da78be..b16b2e5942 100644 --- a/Resources/Maps/plasma.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 2d23885bca..1dd77a7a78 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/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 ] diff --git a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml index 64ad3a30da..369f068149 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml index 81a5988c2c..765249a933 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/research.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml index 9ab7fd992e..977adfd79c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml index 4a1b5a3560..4cfcbcd462 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml +++ b/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 diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 9f97fa8ed0..6da7b9ee13 100644 --- a/Resources/Prototypes/tags.yml +++ b/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 diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/icon.png b/Resources/Textures/Structures/Machines/telecomms.rsi/icon.png deleted file mode 100644 index 0f78e94bdd..0000000000 Binary files a/Resources/Textures/Structures/Machines/telecomms.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/meta.json b/Resources/Textures/Structures/Machines/telecomms.rsi/meta.json index d26455cea6..97c4a26cf1 100644 --- a/Resources/Textures/Structures/Machines/telecomms.rsi/meta.json +++ b/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" - } - ] -} \ No newline at end of file + "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" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/panel.png b/Resources/Textures/Structures/Machines/telecomms.rsi/panel.png deleted file mode 100644 index 1ab3cfb29c..0000000000 Binary files a/Resources/Textures/Structures/Machines/telecomms.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-nopower.png b/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-nopower.png new file mode 100644 index 0000000000..7a9d54293d Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-nopower.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-on.png b/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-on.png new file mode 100644 index 0000000000..c5d763a4be Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-on.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-open.png b/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-open.png new file mode 100644 index 0000000000..15d2ecd42f Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-open.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-stripe.png b/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-stripe.png new file mode 100644 index 0000000000..bdbad39373 Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/telecom-stripe.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/unlit.png b/Resources/Textures/Structures/Machines/telecomms.rsi/unlit.png deleted file mode 100644 index b804f4c6c8..0000000000 Binary files a/Resources/Textures/Structures/Machines/telecomms.rsi/unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-cargo.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-cargo.png new file mode 100644 index 0000000000..ff62282133 Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-cargo.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-command.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-command.png new file mode 100644 index 0000000000..8ff59d075f Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-command.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-common.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-common.png new file mode 100644 index 0000000000..7617fcb7fd Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-common.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-default.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-default.png new file mode 100644 index 0000000000..282b3d97bf Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-default.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-engineering.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-engineering.png new file mode 100644 index 0000000000..90bb1e5c19 Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-engineering.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-medical.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-medical.png new file mode 100644 index 0000000000..127954e13c Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-medical.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-multiple.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-multiple.png new file mode 100644 index 0000000000..282b3d97bf Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-multiple.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-nokey.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-nokey.png new file mode 100644 index 0000000000..e608ac47ad Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-nokey.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-science.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-science.png new file mode 100644 index 0000000000..c08a646f8f Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-science.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-sec.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-sec.png new file mode 100644 index 0000000000..e2d304b4cd Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-sec.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/variant-service.png b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-service.png new file mode 100644 index 0000000000..517b68c91b Binary files /dev/null and b/Resources/Textures/Structures/Machines/telecomms.rsi/variant-service.png differ