From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 22 Feb 2024 11:00:35 +0000 (+1100) Subject: Revert "Remove handheld crew monitor (#24761)" (#25439) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d0df5ed5fa502baa87c53fae8b8ce43257c92ffe;p=space-station-14.git Revert "Remove handheld crew monitor (#24761)" (#25439) * Revert "Remove handheld crew monitor (#24761)" This reverts commit bbc6d29d21df618f7aaf51550da5d71d2e31da04. # Conflicts: # Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Research/biochemical.yml # Resources/migration.yml * changes * zeweh * dergs --- diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml index f00d7049a5..85f35719fb 100644 --- a/Resources/Maps/Test/dev_map.yml +++ b/Resources/Maps/Test/dev_map.yml @@ -3781,13 +3781,6 @@ entities: - type: Transform pos: -3.5805476,0.74100244 parent: 179 -- proto: HandheldCrewMonitor - entities: - - uid: 1184 - components: - - type: Transform - pos: 1.6819578,7.502847 - parent: 179 - proto: HandheldHealthAnalyzer entities: - uid: 513 diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml index b64158f08b..7cbbe67413 100644 --- a/Resources/Maps/centcomm.yml +++ b/Resources/Maps/centcomm.yml @@ -27185,13 +27185,6 @@ entities: - type: Transform pos: -25.604141,8.625723 parent: 1668 -- proto: HandheldCrewMonitor - entities: - - uid: 1461 - components: - - type: Transform - pos: 13.504195,-12.438507 - parent: 1668 - proto: HandLabeler entities: - uid: 2228 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index fb66b7349d..bd9b499af2 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -187,6 +187,7 @@ - id: ClothingHeadHatBeretCmo - id: ClothingOuterHardsuitMedical - id: Hypospray + - id: HandheldCrewMonitor - id: DoorRemoteMedical - id: RubberStampCMO - id: MedicalTechFabCircuitboard @@ -206,6 +207,7 @@ - id: ClothingBackpackDuffelSurgeryFilled - id: ClothingMaskSterile - id: Hypospray + - id: HandheldCrewMonitor - id: DoorRemoteMedical - id: RubberStampCMO - id: MedicalTechFabCircuitboard diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml new file mode 100644 index 0000000000..72e8373cab --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml @@ -0,0 +1,42 @@ +- type: entity + name: handheld crew monitor + parent: + - BaseItem + - PowerCellSlotSmallItem + # CMO-only bud, don't add more. + id: HandheldCrewMonitor + description: A hand-held crew monitor displaying the status of suit sensors. + components: + - type: Sprite + sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi + state: scanner + - type: PowerCellDraw + drawRate: 0 + useRate: 20 + - type: ActivatableUIRequiresPowerCell + - type: ActivatableUI + key: enum.CrewMonitoringUIKey.Key + closeOnHandDeselect: false + - type: UserInterface + interfaces: + - key: enum.CrewMonitoringUIKey.Key + type: CrewMonitoringBoundUserInterface + - type: CrewMonitoringConsole + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: CrewMonitor + - type: WirelessNetworkConnection + range: 500 + - type: StationLimitedNetwork + - type: StaticPrice + price: 500 + +- type: entity + id: HandheldCrewMonitorEmpty + parent: HandheldCrewMonitor + suffix: Empty + components: + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default diff --git a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png new file mode 100644 index 0000000000..4593188502 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json new file mode 100644 index 0000000000..93459edf34 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/ab4abf318f293a701754656dd4e9261eb70f8824#diff-9ab5c8a5e47ab7cfaeadd859a23e32b05de1fe839e99ea767fd7e340b6385d67", + "states": [ + { + "name": "scanner", + "directions": 1, + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "icon", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner.png b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner.png new file mode 100644 index 0000000000..2f97a86aba Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json new file mode 100644 index 0000000000..8a4d587e3a --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/ab4abf318f293a701754656dd4e9261eb70f8824#diff-9ab5c8a5e47ab7cfaeadd859a23e32b05de1fe839e99ea767fd7e340b6385d67,this sprite made(resprite) by Fazansen(https://github.com/Fazansen)", + "states": [ + { + "name": "syndiscanner", + "directions": 1, + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png new file mode 100644 index 0000000000..9fa8cba94f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index d220a8a19d..4591a44e5d 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -175,8 +175,6 @@ ClothingBackpackSatchelSecurityFilledDetective: ClothingBackpackSatchelFilledDet FoodBoxDonkpocketGondola: FoodBoxDonkpocketPizza # 2024-01-31 -HandheldCrewMonitorEmpty: null -HandheldCrewMonitor: null SpyCrewMonitor: null SpyCrewMonitorEmpty: null SyndiCrewMonitor: null