From d0df5ed5fa502baa87c53fae8b8ce43257c92ffe Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:00:35 +1100 Subject: [PATCH] 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 --- Resources/Maps/Test/dev_map.yml | 7 --- Resources/Maps/centcomm.yml | 7 --- .../Catalog/Fills/Lockers/heads.yml | 2 + .../Medical/handheld_crew_monitor.yml | 42 ++++++++++++++++++ .../Medical/handheldcrewmonitor.rsi/icon.png | Bin 0 -> 6577 bytes .../Medical/handheldcrewmonitor.rsi/meta.json | 25 +++++++++++ .../handheldcrewmonitor.rsi/scanner.png | Bin 0 -> 621 bytes .../syndihandheldcrewmonitor.rsi/meta.json | 21 +++++++++ .../syndiscanner.png | Bin 0 -> 670 bytes Resources/migration.yml | 2 - 10 files changed, 90 insertions(+), 16 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml create mode 100644 Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner.png create mode 100644 Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png 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 0000000000000000000000000000000000000000..4593188502707d4f325719e2682f90c159dbde70 GIT binary patch literal 6577 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2f97a86aba67d0f2cb9b46b50b4021c8ebfe9ff0 GIT binary patch literal 621 zcmV-z0+RiSP)O{k=69d^i(Q`2 z@7qda9-1#@CWI^i;QYcx>G>O!p1oM}T>bfltKZ+zJcvfFBV*tSG%b%Ff=O~xUYc22?aU4tj zGr4iUKr&r^`X5~+Q^0Xv3cl68 zE*1H`8@4XK)B?;vSmpCA&<;B05|E}T0C5lQGXdN9dr3g0QUS0z0YP^tB!K&MX&b*CbTAy8 z2?^_Kf}$s}LuZ?IT_w;v)L14yu}K+qiuZPBkw+xWx5nb4~8r4}GfQ&39b z` z4U94Tc=!r?M3kL)YWP=@!6pdIPi@L0C+c-+lT=RpDquRiQpiC3*VRk1bW?UZp8aC7>L(; zJs!J~t2C$V!oO&@W61YTCvKZItO)4!`;p()Y$dwIoTw-jfcFtwB&PuXPGUbvY>0{< z^`lX{AFD+W8NdV}Xk*`}tYdpbpHrv;kO0D`tV6rtTM0-010uIHu z-v#6f+?A+3A=d!83n2Rt(ou)$Ct8Cvd}JT*K51KMV*+rvX~{#*hOE{*f;z@=2!eku zd}9JIi698JK7jPIx%%OP|70l~_*T0Bg3&)f)P9!1CiznFbn=t_vv1tE0_bx%?LL6) z_JO)QBfnYWr(TF)vUDSZy&enBz8fJr7-ex8LPT-m8xcSg;kc6{-zNIl_$G7oHl6{` zfM?)OG4KtQbypdkT{7PQ000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$ Ef(H5|Y5)KL literal 0 HcmV?d00001 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 -- 2.51.2