From 316ce0205136c4e50729fa71400a429154a5b433 Mon Sep 17 00:00:00 2001 From: vulppine Date: Mon, 22 Aug 2022 06:46:29 -0700 Subject: [PATCH] prototype changes --- .../Structures/Doors/Firelocks/firelock.yml | 6 ++-- .../Structures/Piping/Atmospherics/unary.yml | 32 +++++++++++++++++++ .../Specific/Atmospherics/sensor.yml | 5 +-- .../Structures/Wallmounts/air_alarm.yml | 9 +++++- .../Structures/Wallmounts/fire_alarm.yml | 9 +++++- Resources/Prototypes/tags.yml | 17 +++++++++- 6 files changed, 70 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index e096185907..963423c2bf 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -5,9 +5,9 @@ description: Apply crowbar. components: - type: AtmosAlarmable - alarmedBy: - - FireAlarm - - AirSensor + syncWith: + - FireAlarm + - AirSensor - type: ApcPowerReceiver - type: ExtensionCableReceiver - type: DeviceNetwork diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index 7ed0aa21af..a2f966d90d 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -34,6 +34,22 @@ sendBroadcastAttemptEvent: true - type: WiredNetworkConnection - type: AtmosDevice + - type: AtmosMonitor + temperatureThreshold: stationTemperature + pressureThreshold: stationPressure + gasThresholds: + Oxygen: stationOxygen + Nitrogen: ignore + CarbonDioxide: stationCO2 + Plasma: danger # everything below is usually bad + Tritium: danger + WaterVapor: danger + Miasma: danger + NitrousOxide: danger + Frezon: danger + - type: Tag + tags: + - GasVent - type: Sprite netsync: false drawdepth: FloorObjects @@ -107,6 +123,22 @@ receiveFrequencyId: AtmosMonitor transmitFrequencyId: AtmosMonitor prefix: device-address-prefix-scrubber + - type: AtmosMonitor + temperatureThreshold: stationTemperature + pressureThreshold: stationPressure + gasThresholds: + Oxygen: stationOxygen + Nitrogen: ignore + CarbonDioxide: stationCO2 + Plasma: danger # everything below is usually bad + Tritium: danger + WaterVapor: danger + Miasma: danger + NitrousOxide: danger + Frezon: danger + - type: Tag + tags: + - GasScrubber - type: Sprite netsync: false drawdepth: FloorObjects diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml index 81a950bdde..bd49e2793e 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml @@ -36,8 +36,6 @@ - type: DeviceList - type: WiredNetworkConnection - type: AtmosDevice - - type: AtmosAlarmable - alarmedBy: ["AirSensor"] - type: AtmosMonitor temperatureThreshold: stationTemperature pressureThreshold: stationPressure @@ -51,6 +49,9 @@ Miasma: danger NitrousOxide: danger Frezon: danger + - type: Tag + tags: + - AirSensor - type: AccessReader access: [ [ "Atmospherics" ] ] - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml index 7588231fa7..6674cd2ce0 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml @@ -17,7 +17,14 @@ - type: WiredNetworkConnection - type: DeviceList - type: AtmosAlarmable - alarmedBy: ["AirSensor"] + syncWith: + - AirAlarm + - AirSensor + - GasVent + - GasScrubber + - type: Tags + tags: + - AirAlarm - type: AtmosDevice - type: AirAlarm - type: Clickable diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml index fc6ebe558d..e736ad5f6f 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml @@ -19,7 +19,14 @@ displayMaxAlarmInNet: true - type: AtmosDevice - type: AtmosAlarmable - alarmedBy: ["FireAlarm"] # alarm itself, network effect + syncWith: + - FireAlarm + - AirSensor + - GasVent + - GasScrubber + - type: Tags + tags: + - FireAlarm - type: Clickable - type: InteractionOutline - type: FireAlarm diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index c012ad82ab..af626debe4 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1,8 +1,14 @@ # Alphabetical order is now apparently required. +- type: Tag + id: AirAlarm + - type: Tag id: AirAlarmElectronics +- type: Tag + id: AirSensor + - type: Tag id: ATVKeys @@ -180,6 +186,9 @@ - type: Tag id: ExplosivePassable +- type: Tag + id: FireAlarm + - type: Tag id: FireAlarmElectronics @@ -210,6 +219,12 @@ - type: Tag id: ForceNoFixRotations # fixrotations command WON'T target this +- type: Tag + id: GasScrubber + +- type: Tag + id: GasVent + - type: Tag id: Gauze @@ -307,7 +322,7 @@ - type: Tag id: MailingUnitElectronics - + - type: Tag id: Medkit