Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Port] Airlock / Шлюзы #42

Merged
merged 5 commits into from
Sep 9, 2024
Merged

[Port] Airlock / Шлюзы #42

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
719e76f
fix: The powered airlock are now glowing
Spatison Sep 1, 2024
3e593dc
fix: The powered airlock are now glowing
Spatison Sep 2, 2024
d85725d
add: WD Airlock texture
Spatison Sep 2, 2024
b408b19
fix
Spatison Sep 2, 2024
9ecc73f
fix: missing RSI
Spatison Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 4 additions & 2 deletions Content.Client/Doors/AirlockSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,14 @@ private void OnAppearanceChange(EntityUid uid, AirlockComponent comp, ref Appear
&& lights && (state == DoorState.Closed || state == DoorState.Welded);

emergencyLightsVisible = _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.EmergencyLights, out var eaLights, args.Component) && eaLights;

unlitVisible =
(state == DoorState.Closing
|| state == DoorState.Opening
|| state == DoorState.Denying
|| (state == DoorState.Open && comp.OpenUnlitVisible)
|| (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights))
|| state == DoorState.Open && comp.OpenUnlitVisible
|| state == DoorState.Closed && comp.OpenUnlitVisible // WD EDIT
|| _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights)
&& !boltedVisible && !emergencyLightsVisible;
}

Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Doors/Components/AirlockComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public sealed partial class AirlockComponent : Component
/// Whether the door lights should be visible.
/// </summary>
[DataField]
public bool OpenUnlitVisible = false;
public bool OpenUnlitVisible = true; // WD EDIT

/// <summary>
/// Whether the door should display emergency access lights.
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Species/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,11 @@
- CanPilot
- FootstepSound
- DoorBumpOpener
- type: InteractionPopup
Spatison marked this conversation as resolved.
Show resolved Hide resolved
successChance: 1
interactSuccessString: hugging-success-generic
interactSuccessSound: /Audio/Effects/thudswoosh.ogg
messagePerceivedByOthers: hugging-success-generic-others

- type: entity
save: false
Expand Down
54 changes: 27 additions & 27 deletions Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
suffix: Freezer
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/freezer.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/freezer.rsi # WD EDIT
- type: Wires
layoutId: AirlockService

Expand All @@ -14,7 +14,7 @@
suffix: Engineering
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/engineering.rsi # WD EDIT
- type: PaintableAirlock
department: Engineering
- type: Wires
Expand All @@ -26,15 +26,15 @@
suffix: Atmospherics
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/atmospherics.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/atmospherics.rsi # WD EDIT

- type: entity
parent: Airlock
id: AirlockCargo
suffix: Logistics # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/cargo.rsi # WD EDIT
- type: PaintableAirlock
department: Logistics
- type: Wires
Expand All @@ -46,7 +46,7 @@
suffix: Medical
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/medical.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/medical.rsi # WD EDIT
- type: PaintableAirlock
department: Medical
- type: Wires
Expand All @@ -58,7 +58,7 @@
suffix: Virology
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/virology.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/virology.rsi # WD EDIT

- type: entity
parent: AirlockMedical
Expand All @@ -71,7 +71,7 @@
suffix: Epistemics # DeltaV - Epistemics Department replacing Science
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/science.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/science.rsi # WD EDIT
- type: PaintableAirlock
department: Epistemics
- type: Wires
Expand All @@ -83,7 +83,7 @@
suffix: Command
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/command.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/command.rsi # WD EDIT
- type: WiresPanelSecurity
securityLevel: medSecurity
- type: PaintableAirlock
Expand All @@ -97,7 +97,7 @@
suffix: Security
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/security.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/security.rsi # WD EDIT
- type: PaintableAirlock
department: Security
- type: Wires
Expand All @@ -109,23 +109,23 @@
name: maintenance access
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/maint.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/maint.rsi # WD EDIT

- type: entity
parent: AirlockSecurity # if you get syndie door somehow it counts as sec
id: AirlockSyndicate
suffix: Syndicate
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/syndicate.rsi # WD EDIT

- type: entity
parent: AirlockCargo
id: AirlockMining
suffix: Mining(Salvage)
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/mining.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/mining.rsi # WD EDIT
- type: Wires
layoutId: AirlockCargo

Expand All @@ -135,23 +135,23 @@
suffix: Central Command
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/centcomm.rsi # WD EDIT

- type: entity
parent: Airlock
id: AirlockHatch
name: airtight hatch
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/hatch.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/hatch.rsi # WD EDIT

- type: entity
parent: Airlock
id: AirlockHatchMaintenance
name: maintenance hatch
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
sprite: _White/Structures/Doors/Airlocks/Standard/hatch_maint.rsi # WD EDIT

# Glass
- type: entity
Expand All @@ -160,7 +160,7 @@
suffix: Engineering
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/engineering.rsi # WD EDIT
- type: PaintableAirlock
department: Engineering
- type: Wires
Expand All @@ -172,23 +172,23 @@
suffix: Maintenance
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/maint.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/maint.rsi # WD EDIT

- type: entity
parent: AirlockEngineeringGlass
id: AirlockAtmosphericsGlass
suffix: Atmospherics
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/atmospherics.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/atmospherics.rsi # WD EDIT

- type: entity
parent: AirlockGlass
id: AirlockCargoGlass
suffix: Logistics # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/cargo.rsi # WD EDIT
- type: PaintableAirlock
department: Logistics
- type: Wires
Expand All @@ -200,7 +200,7 @@
suffix: Medical
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/medical.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/medical.rsi # WD EDIT
- type: PaintableAirlock
department: Medical
- type: Wires
Expand All @@ -217,15 +217,15 @@
suffix: Virology
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/virology.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/virology.rsi # WD EDIT

- type: entity
parent: AirlockGlass
id: AirlockScienceGlass
suffix: Epistemics # DeltaV - Epistemics Department replacing Science
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/science.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/science.rsi # WD EDIT
- type: PaintableAirlock
department: Epistemics
- type: Wires
Expand All @@ -237,7 +237,7 @@
suffix: Command
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/command.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/command.rsi # WD EDIT
- type: PaintableAirlock
department: Command
- type: WiresPanelSecurity
Expand All @@ -251,7 +251,7 @@
suffix: Security
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/security.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/security.rsi # WD EDIT
- type: PaintableAirlock
department: Security
- type: Wires
Expand All @@ -263,20 +263,20 @@
suffix: Syndicate
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/syndicate.rsi # WD EDIT

- type: entity
parent: AirlockCargoGlass
id: AirlockMiningGlass
suffix: Mining(Salvage)
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/mining.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/mining.rsi # WD EDIT

- type: entity
parent: AirlockCommandGlass # see standard
id: AirlockCentralCommandGlass
suffix: Central Command
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi
sprite: _White/Structures/Doors/Airlocks/Glass/centcomm.rsi # WD EDIT
Loading
Loading