diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index c138eb716c..320724e9e5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -123,27 +123,18 @@ - type: StorageFill contents: - id: MedkitFilled - prob: 1 - id: ClothingHandsGlovesLatex - prob: 1 #- name: ClothingEyesHudMedical #Removed until working properly # prob: 1 - id: ClothingHeadsetAltMedical - prob: 1 - id: ClothingCloakCmo - prob: 1 - id: ClothingBackpackDuffelSurgeryFilled - prob: 1 - id: ClothingOuterCoatLabCmo - prob: 1 - id: ClothingMaskSterile - prob: 1 - id: ClothingHeadHelmetHardsuitMedical - prob: 1 - id: ClothingOuterHardsuitMedical - prob: 1 - id: Hypospray - prob: 1 + - id: HandheldCrewMonitor - type: entity id: LockerResearchDirectorFilled diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 3268bed49b..61ab251acf 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -116,6 +116,7 @@ - ChemMasterMachineCircuitboard - ChemDispenserMachineCircuitboard - CrewMonitoringComputerCircuitboard + - HandheldCrewMonitor # Security Technology Tree 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..0a8e5c3f92 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml @@ -0,0 +1,20 @@ +- type: entity + name: handheld crew monitor + parent: BaseItem + 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: ActivatableUI + key: enum.CrewMonitoringUIKey.Key + - type: UserInterface + interfaces: + - key: enum.CrewMonitoringUIKey.Key + type: CrewMonitoringBoundUserInterface + - type: CrewMonitoringConsole + - type: DeviceNetworkComponent + deviceNetId: Wireless + - type: WirelessNetworkConnection + range: 500 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d373fd4754..10b3e6f005 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -147,6 +147,7 @@ - HydroponicsToolScythe - HydroponicsToolHatchet - Shovel + - HandheldCrewMonitor - Scalpel - Retractor - Cautery diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index 19101570f4..4869ca37b5 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -62,3 +62,13 @@ completetime: 300 materials: Plastic: 200 + +- type: latheRecipe + id: HandheldCrewMonitor + icon: Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png + result: HandheldCrewMonitor + completetime: 5000 + materials: + Glass: 1200 + Steel: 1000 + Plastic: 1400 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