forked from Simple-Station/Einstein-Engines
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mirror 26441: Fix atmos NaN error (Simple-Station#449)
## Mirror of PR #26441: [Fix atmos NaN error](space-wizards/space-station-14#26441) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `fdb4a61487db9fc67714c913832427063abdea42` PR opened by <img src="https://avatars.githubusercontent.com/u/60421075?v=4" width="16"/><a href="https://github.com/ElectroJr"> ElectroJr</a> at 2024-03-26 04:27:08 UTC - merged at 2024-03-26 04:44:56 UTC --- PR changed 16 files with 43 additions and 25 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > - Fixes a bug I introduced in #22521 that caused the temperature to be set to `NaN`. I don't know for sure, but I assume this is causing the current atmos issues > - Fixes `FixVacuum` not working after #22521 > - Removes some redundant yaml that was setting FixVacuum to its default value > > 🆑 > - fix: Fixed an atmos bug, which was (probably) causing atmospherics on the station to behave incorrectly. </details> Co-authored-by: SimpleStation14 <Unknown>
- Loading branch information
1 parent
32394b0
commit 2138b8a
Showing
16 changed files
with
147 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
209 changes: 104 additions & 105 deletions
209
Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,105 +1,104 @@ | ||
- type: entity | ||
id: HighSecDoor | ||
parent: BaseStructure | ||
name: high security door | ||
description: Keeps the bad out and keeps the good in. | ||
placement: | ||
mode: SnapgridCenter | ||
components: | ||
- type: InteractionOutline | ||
- type: Sprite | ||
sprite: Structures/Doors/Airlocks/highsec/highsec.rsi | ||
layers: | ||
- state: closed | ||
map: ["enum.DoorVisualLayers.Base"] | ||
- state: closed_unlit | ||
shader: unshaded | ||
map: ["enum.DoorVisualLayers.BaseUnlit"] | ||
- state: welded | ||
map: ["enum.WeldableLayers.BaseWelded"] | ||
- state: bolted_unlit | ||
shader: unshaded | ||
map: ["enum.DoorVisualLayers.BaseBolted"] | ||
- state: emergency_unlit | ||
map: ["enum.DoorVisualLayers.BaseEmergencyAccess"] | ||
shader: unshaded | ||
- state: panel_open | ||
map: ["enum.WiresVisualLayers.MaintenancePanel"] | ||
- type: AnimationPlayer | ||
- type: Physics | ||
- type: Fixtures | ||
fixtures: | ||
fix1: | ||
shape: | ||
!type:PhysShapeAabb | ||
bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close | ||
density: 100 | ||
mask: | ||
- FullTileMask | ||
layer: | ||
- WallLayer | ||
- type: ContainerFill | ||
containers: | ||
board: [ DoorElectronics ] | ||
- type: ContainerContainer | ||
containers: | ||
board: !type:Container | ||
- type: Door | ||
crushDamage: | ||
types: | ||
Blunt: 50 | ||
openSound: | ||
path: /Audio/Machines/airlock_open.ogg | ||
closeSound: | ||
path: /Audio/Machines/airlock_close.ogg | ||
denySound: | ||
path: /Audio/Machines/airlock_deny.ogg | ||
- type: Weldable | ||
time: 10 | ||
- type: Airlock | ||
- type: NavMapDoor | ||
- type: DoorBolt | ||
- type: AccessReader | ||
- type: Appearance | ||
- type: WiresVisuals | ||
- type: ApcPowerReceiver | ||
powerLoad: 20 | ||
- type: ExtensionCableReceiver | ||
- type: Electrified | ||
enabled: false | ||
usesApcPower: true | ||
- type: WiresPanel | ||
- type: WiresPanelSecurity | ||
securityLevel: maxSecurity | ||
- type: Wires | ||
boardName: wires-board-name-highsec | ||
layoutId: HighSec | ||
alwaysRandomize: true | ||
- type: UserInterface | ||
interfaces: | ||
- key: enum.WiresUiKey.Key | ||
type: WiresBoundUserInterface | ||
- type: Airtight | ||
fixVacuum: true | ||
- type: Occluder | ||
- type: Damageable | ||
damageContainer: StructuralInorganic | ||
damageModifierSet: StrongMetallic | ||
- type: Destructible | ||
thresholds: | ||
- trigger: | ||
!type:DamageTrigger | ||
damage: 1500 | ||
behaviors: | ||
- !type:DoActsBehavior | ||
acts: ["Destruction"] | ||
- type: IconSmooth | ||
key: walls | ||
mode: NoSprite | ||
- type: Construction | ||
graph: Airlock | ||
node: highSecDoor | ||
- type: Tag | ||
tags: | ||
- HighSecDoor | ||
# This tag is used to nagivate the Airlock construction graph. It's needed because this construction graph is shared between Airlock, AirlockGlass, and HighSecDoor | ||
- type: entity | ||
id: HighSecDoor | ||
parent: BaseStructure | ||
name: high security door | ||
description: Keeps the bad out and keeps the good in. | ||
placement: | ||
mode: SnapgridCenter | ||
components: | ||
- type: InteractionOutline | ||
- type: Sprite | ||
sprite: Structures/Doors/Airlocks/highsec/highsec.rsi | ||
layers: | ||
- state: closed | ||
map: ["enum.DoorVisualLayers.Base"] | ||
- state: closed_unlit | ||
shader: unshaded | ||
map: ["enum.DoorVisualLayers.BaseUnlit"] | ||
- state: welded | ||
map: ["enum.WeldableLayers.BaseWelded"] | ||
- state: bolted_unlit | ||
shader: unshaded | ||
map: ["enum.DoorVisualLayers.BaseBolted"] | ||
- state: emergency_unlit | ||
map: ["enum.DoorVisualLayers.BaseEmergencyAccess"] | ||
shader: unshaded | ||
- state: panel_open | ||
map: ["enum.WiresVisualLayers.MaintenancePanel"] | ||
- type: AnimationPlayer | ||
- type: Physics | ||
- type: Fixtures | ||
fixtures: | ||
fix1: | ||
shape: | ||
!type:PhysShapeAabb | ||
bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close | ||
density: 100 | ||
mask: | ||
- FullTileMask | ||
layer: | ||
- WallLayer | ||
- type: ContainerFill | ||
containers: | ||
board: [ DoorElectronics ] | ||
- type: ContainerContainer | ||
containers: | ||
board: !type:Container | ||
- type: Door | ||
crushDamage: | ||
types: | ||
Blunt: 50 | ||
openSound: | ||
path: /Audio/Machines/airlock_open.ogg | ||
closeSound: | ||
path: /Audio/Machines/airlock_close.ogg | ||
denySound: | ||
path: /Audio/Machines/airlock_deny.ogg | ||
- type: Weldable | ||
time: 10 | ||
- type: Airlock | ||
- type: NavMapDoor | ||
- type: DoorBolt | ||
- type: AccessReader | ||
- type: Appearance | ||
- type: WiresVisuals | ||
- type: ApcPowerReceiver | ||
powerLoad: 20 | ||
- type: ExtensionCableReceiver | ||
- type: Electrified | ||
enabled: false | ||
usesApcPower: true | ||
- type: WiresPanel | ||
- type: WiresPanelSecurity | ||
securityLevel: maxSecurity | ||
- type: Wires | ||
boardName: wires-board-name-highsec | ||
layoutId: HighSec | ||
alwaysRandomize: true | ||
- type: UserInterface | ||
interfaces: | ||
- key: enum.WiresUiKey.Key | ||
type: WiresBoundUserInterface | ||
- type: Airtight | ||
- type: Occluder | ||
- type: Damageable | ||
damageContainer: StructuralInorganic | ||
damageModifierSet: StrongMetallic | ||
- type: Destructible | ||
thresholds: | ||
- trigger: | ||
!type:DamageTrigger | ||
damage: 1500 | ||
behaviors: | ||
- !type:DoActsBehavior | ||
acts: ["Destruction"] | ||
- type: IconSmooth | ||
key: walls | ||
mode: NoSprite | ||
- type: Construction | ||
graph: Airlock | ||
node: highSecDoor | ||
- type: Tag | ||
tags: | ||
- HighSecDoor | ||
# This tag is used to nagivate the Airlock construction graph. It's needed because this construction graph is shared between Airlock, AirlockGlass, and HighSecDoor |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.