]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Layering for atmospheric pipes (#36124)
authorchromiumboy <50505512+chromiumboy@users.noreply.github.com>
Mon, 2 Jun 2025 05:01:43 +0000 (00:01 -0500)
committerGitHub <noreply@github.com>
Mon, 2 Jun 2025 05:01:43 +0000 (22:01 -0700)
commit45012cbe1d9a691da868c2a1096ab6e7d3b1a7d5
tree2ec5cc62e63ebcd17331e8ba7226c52469a4947e
parentaa5ca90a3b3de82df9f275f45352ce9b448c2477
Layering for atmospheric pipes (#36124)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
134 files changed:
Content.Client/Atmos/AlignAtmosPipeLayers.cs [new file with mode: 0644]
Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
Content.Client/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml.cs
Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
Content.Client/Atmos/EntitySystems/AtmosPipeLayersSystem.cs [new file with mode: 0644]
Content.Client/Atmos/UI/GasAnalyzerWindow.xaml.cs
Content.Client/Construction/ConstructionPlacementHijack.cs
Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
Content.Server/Atmos/EntitySystems/AtmosPipeLayersSystem.cs [new file with mode: 0644]
Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs
Content.Server/Atmos/Piping/Components/GasPipeManifoldComponent.cs [new file with mode: 0644]
Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs
Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs [new file with mode: 0644]
Content.Server/NodeContainer/Nodes/PipeNode.cs
Content.Shared/Atmos/Components/AtmosPipeLayersComponent.cs [new file with mode: 0644]
Content.Shared/Atmos/Components/PipeAppearanceComponent.cs
Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleDeviceComponent.cs
Content.Shared/Atmos/Consoles/SharedAtmosMonitoringConsoleSystem.cs
Content.Shared/Atmos/EntitySystems/SharedAtmosPipeAppearanceSystem.cs [new file with mode: 0644]
Content.Shared/Atmos/EntitySystems/SharedAtmosPipeLayersSystem.cs [new file with mode: 0644]
Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
Content.Shared/DrawDepth/DrawDepth.cs
Content.Shared/Prototypes/NavMapBlipPrototype.cs
Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
Content.Shared/Verbs/VerbCategory.cs
Resources/Locale/en-US/atmos/atmos-pipe-layers.ftl [new file with mode: 0644]
Resources/Locale/en-US/verbs/verb-system.ftl
Resources/Prototypes/Entities/Structures/Machines/Computers/nav_map_blips.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_pipes.yml
Resources/Prototypes/Recipes/Construction/utilities.yml
Resources/Textures/Interface/NavMap/attributions.yml
Resources/Textures/Interface/NavMap/beveled_rectangle_east_west.png [new file with mode: 0644]
Resources/Textures/Interface/NavMap/beveled_rectangle_east_west.png.yml [new file with mode: 0644]
Resources/Textures/Interface/NavMap/beveled_rectangle_north_south.png [new file with mode: 0644]
Resources/Textures/Interface/NavMap/beveled_rectangle_north_south.png.yml [new file with mode: 0644]
Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
Resources/Textures/Interface/VerbIcons/screwdriver.png [new file with mode: 0644]
Resources/Textures/Interface/VerbIcons/screwdriver.png.yml [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/condenser.rsi/meta.json
Resources/Textures/Structures/Piping/Atmospherics/condenser.rsi/pipe.png
Resources/Textures/Structures/Piping/Atmospherics/condenser_alt1.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/condenser_alt1.rsi/pipe.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/condenser_alt2.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/condenser_alt2.rsi/pipe.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/base.png
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/lights.png
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/meta.json
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi/base.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi/blank.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi/lights.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi/base.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi/blank.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi/lights.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/meta.json
Resources/Textures/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/pipe.png
Resources/Textures/Structures/Piping/Atmospherics/manifold.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/manifold.rsi/pipeConnector.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/manifold.rsi/pipeConnector_alt1.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/manifold.rsi/pipeConnector_alt2.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/manifold.rsi/pipeManifold.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/manifold.rsi/storageManifold.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeBinaryConnectors.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeUnaryConnectors.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageBend.png
Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageFourway.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageHalf.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageStraight.png
Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageTJunction.png
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/pipeBend.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/pipeBinaryConnectors.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/pipeBroken.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/pipeConnector.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/pipeFourway.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/pipeHalf.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/pipeStraight.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/pipeTJunction.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/pipeTrinaryConnectors.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt1.rsi/pipeUnaryConnectors.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/pipeBend.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/pipeBinaryConnectors.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/pipeBroken.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/pipeConnector.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/pipeFourway.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/pipeHalf.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/pipeStraight.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/pipeTJunction.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/pipeTrinaryConnectors.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pipe_alt2.rsi/pipeUnaryConnectors.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpDigitalValve.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpManualValve.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpManualValveOn.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPassiveGate.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPassiveGateOn.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureOn.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpSignalValve.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpSignalValveOn.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpVolume.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpVolumeBlocked.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpVolumeOn.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpDigitalValve.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpManualValve.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpManualValveOn.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPassiveGate.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPassiveGateOn.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureOn.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpSignalValve.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpSignalValveOn.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpVolume.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpVolumeBlocked.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpVolumeOn.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/meta.json
Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/pipe.png
Resources/Textures/Structures/Piping/Atmospherics/thermomachine_alt1.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/thermomachine_alt1.rsi/pipe.png [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/thermomachine_alt2.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Piping/Atmospherics/thermomachine_alt2.rsi/pipe.png [new file with mode: 0644]