Skip to content

Commit

Permalink
Смена времени атмос проектора до пяти минут, возвращение пультов атмо…
Browse files Browse the repository at this point in the history
…сов (#2323)

* Жизнь голо до адекватных значений

* Revert "remove firefighting remote and bolting firelocks (space-wizards#28330)"

This reverts commit 4e09743.

* mark added

---------

Co-authored-by: UrPrice <denis.korneevbk@gmail.com>
  • Loading branch information
Burenov and UrPrice authored Dec 10, 2024
1 parent 837421f commit fd9fb86
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 15 deletions.
8 changes: 8 additions & 0 deletions Resources/Prototypes/Access/engineering.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,11 @@
- ChiefEngineer
- Engineering
- Atmospherics

# SS220 revert "remove fire remote controller" begin
- type: accessGroup
id: FireFight
tags:
- Engineering
- Atmospherics
# SS220 revert "remove fire remote controller" end
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
- id: GasAnalyzer
- id: MedkitOxygenFilled
- id: HolofanProjector
- id: DoorRemoteFirefight # SS220 revert "remove fire remote controller"
- id: ClothingShoesBootsMag
- id: RCD
- id: RCDAmmo
Expand All @@ -113,6 +114,7 @@
- id: GasAnalyzer
- id: MedkitOxygenFilled
- id: HolofanProjector
- id: DoorRemoteFirefight # SS220 revert "remove fire remote controller"
- id: RCD
- id: RCDAmmo

Expand Down
20 changes: 20 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,26 @@
groups:
- Engineering

# SS220 revert "remove fire remote controller" begin
- type: entity
parent: DoorRemoteDefault
id: DoorRemoteFirefight
name: fire-fighting door remote
description: A gadget which can open and bolt FireDoors remotely.
components:
- type: Sprite
layers:
- state: door_remotebase
- state: door_remotelightscolour
color: "#ff9900"
- state: door_remotescreencolour
color: "#e02020"

- type: Access
groups:
- FireFight
# SS220 revert "remove fire remote controller" end

- type: entity
parent: [DoorRemoteDefault]
id: DoorRemoteAll
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
arc: 360
- type: StaticPrice
price: 150
- type: DoorBolt # SS220 revert "remove fire remote controller"
- type: AccessReader
access: [ [ "Engineering" ] ]
- type: PryUnpowered
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
name: holofan
description: A barrier of hard light that blocks air, but nothing else.
components:
#SS220 atmos holo buff, physics start
- type: Physics
bodyType: Static
canCollide: true
#SS220 atmos holo buff, physics end
- type: Sprite
sprite: Structures/Holo/holofan.rsi
state: icon
Expand All @@ -46,18 +41,10 @@
shape:
!type:PhysShapeAabb
bounds: "-0.5,-0.5,0.5,0.5"
#SS220 Atmos holo buff start
mask:
- TableMask
layer:
- TableLayer
#SS220 Atmos holo end
- type: TimedDespawn
lifetime: 10800 #3 hours IRL. SS220 Atmos Holo Buff
lifetime: 300 #5 minutes IRL. SS220 Atmos Holo Revert
- type: Airtight
noAirWhenFullyAirBlocked: false
- type: Climbable #SS220 Atmos holo buff
- type: Clickable #SS220 Atmos holo buff

- type: entity
id: HolosignSecurity
Expand Down
2 changes: 1 addition & 1 deletion Resources/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ chem_master: ChemMaster
CrateJanitorExplosive: ClosetJanitorBombFilled

# 2024-05-27
DoorRemoteFirefight: null
# DoorRemoteFirefight: null # SS220 revert "remove fire remote controller"

# 2024-06-03
AirlockServiceCaptainLocked: AirlockCaptainLocked
Expand Down

0 comments on commit fd9fb86

Please sign in to comment.