diff --git a/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs index 7d057e0766..add360dcce 100644 --- a/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs @@ -1,8 +1,8 @@ using Content.Shared.GameObjects.Components.Atmos; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Graphics; using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.Graphics; using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Shared.GameObjects.Components.Renderable; @@ -10,7 +10,6 @@ using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Utility; using System; -using System.Collections.Generic; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Atmos diff --git a/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs new file mode 100644 index 0000000000..a4b8c9d3dd --- /dev/null +++ b/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs @@ -0,0 +1,85 @@ +using Content.Shared.GameObjects.Atmos; +using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; +using Robust.Shared.GameObjects.Components.Renderable; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Utility; +using System; +using YamlDotNet.RepresentationModel; + +namespace Content.Client.GameObjects.Components.Atmos +{ + [UsedImplicitly] + public class PumpVisualizer : AppearanceVisualizer + { + private RSI _pumpRSI; + + public override void LoadData(YamlMappingNode node) + { + base.LoadData(node); + + var rsiString = node.GetNode("pumpRSI").ToString(); + var rsiPath = SharedSpriteComponent.TextureRoot / rsiString; + try + { + var resourceCache = IoCManager.Resolve(); + var resource = resourceCache.GetResource(rsiPath); + _pumpRSI = resource.RSI; + } + catch (Exception e) + { + Logger.ErrorS("go.pumpvisualizer", "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e); + } + } + + public override void OnChangeData(AppearanceComponent component) + { + base.OnChangeData(component); + + if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) + { + return; + } + if (!component.TryGetData(PumpVisuals.VisualState, out PumpVisualState pumpVisualState)) + { + return; + } + var pumpBaseState = "pump"; + pumpBaseState += pumpVisualState.InletDirection.ToString(); + pumpBaseState += ((int) pumpVisualState.InletConduitLayer).ToString(); + pumpBaseState += pumpVisualState.OutletDirection.ToString(); + pumpBaseState += ((int) pumpVisualState.OutletConduitLayer).ToString(); + + sprite.LayerMapReserveBlank(Layer.PumpBase); + var basePumpLayer = sprite.LayerMapGet(Layer.PumpBase); + sprite.LayerSetRSI(basePumpLayer, _pumpRSI); + sprite.LayerSetState(basePumpLayer, pumpBaseState); + sprite.LayerSetVisible(basePumpLayer, true); + + + + var pumpEnabledAnimationState = "pumpEnabled"; + pumpEnabledAnimationState += pumpVisualState.InletDirection.ToString(); + pumpEnabledAnimationState += ((int) pumpVisualState.InletConduitLayer).ToString(); + pumpEnabledAnimationState += pumpVisualState.OutletDirection.ToString(); + pumpEnabledAnimationState += ((int) pumpVisualState.OutletConduitLayer).ToString(); + + sprite.LayerMapReserveBlank(Layer.PumpEnabled); + var pumpEnabledAnimationLayer = sprite.LayerMapGet(Layer.PumpEnabled); + sprite.LayerSetRSI(pumpEnabledAnimationLayer, _pumpRSI); + sprite.LayerSetState(pumpEnabledAnimationLayer, pumpEnabledAnimationState); + sprite.LayerSetVisible(pumpEnabledAnimationLayer, pumpVisualState.PumpEnabled); + } + + private enum Layer + { + PumpBase, + PumpEnabled, + } + } +} diff --git a/Content.Server/Chat/ChatCommands.cs b/Content.Server/Chat/ChatCommands.cs index a309a344f0..302d0add91 100644 --- a/Content.Server/Chat/ChatCommands.cs +++ b/Content.Server/Chat/ChatCommands.cs @@ -139,12 +139,15 @@ namespace Content.Server.Chat damageableComponent.ChangeDamage(kind switch { SuicideKind.Blunt => DamageType.Blunt, + SuicideKind.Slash => DamageType.Slash, SuicideKind.Piercing => DamageType.Piercing, SuicideKind.Heat => DamageType.Heat, - SuicideKind.Disintegration => DamageType.Disintegration, - SuicideKind.Cellular => DamageType.Cellular, - SuicideKind.DNA => DamageType.DNA, + SuicideKind.Shock => DamageType.Shock, + SuicideKind.Cold => DamageType.Cold, + SuicideKind.Poison => DamageType.Poison, + SuicideKind.Radiation => DamageType.Radiation, SuicideKind.Asphyxiation => DamageType.Asphyxiation, + SuicideKind.Bloodloss => DamageType.Bloodloss, _ => DamageType.Blunt }, 500, diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs index 23e9f63c33..24a44ae7d8 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs @@ -2,6 +2,8 @@ using Content.Server.GameObjects.Components.NodeContainer; using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Shared.GameObjects.Components.Atmos; +using Content.Shared.GameObjects.Atmos; +using Robust.Server.GameObjects; using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -14,6 +16,21 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping /// public abstract class BasePumpComponent : PipeNetDeviceComponent { + /// + /// If the pump is currently pumping. + /// + [ViewVariables(VVAccess.ReadWrite)] + public bool PumpEnabled + { + get => _pumpEnabled; + set + { + _pumpEnabled = value; + UpdateAppearance(); + } + } + private bool _pumpEnabled = true; + /// /// Needs to be same as that of a on this entity. /// @@ -32,6 +49,8 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping [ViewVariables] private PipeNode _outletPipe; + private AppearanceComponent _appearance; + public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); @@ -57,13 +76,23 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping Logger.Error($"{typeof(BasePumpComponent)} on entity {Owner.Uid} could not find compatible {nameof(PipeNode)}s on its {nameof(NodeContainerComponent)}."); return; } + Owner.TryGetComponent(out _appearance); + UpdateAppearance(); } public override void Update() { + if (!PumpEnabled) + return; + PumpGas(_inletPipe.Air, _outletPipe.Air); } protected abstract void PumpGas(GasMixture inletGas, GasMixture outletGas); + + private void UpdateAppearance() + { + _appearance?.SetData(PumpVisuals.VisualState, new PumpVisualState(_inletDirection, _outletDirection, _inletPipe.ConduitLayer, _outletPipe.ConduitLayer, PumpEnabled)); + } } } diff --git a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs b/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs index 3af194ba8d..9947e7d1e9 100644 --- a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs +++ b/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs @@ -246,9 +246,12 @@ namespace Content.Server.GameObjects.Components.Instruments public void HandSelected(HandSelectedEventArgs eventArgs) { - var session = eventArgs.User?.GetComponent()?.playerSession; + if (eventArgs.User == null || !eventArgs.User.TryGetComponent(out BasicActorComponent? actor)) + return; - if (session == null) return; + var session = actor.playerSession; + + if (session.Status != SessionStatus.InGame) return; InstrumentPlayer = session; } diff --git a/Content.Server/GameObjects/EntitySystems/BarotraumaSystem.cs b/Content.Server/GameObjects/EntitySystems/BarotraumaSystem.cs index 2210afb488..d607c3d984 100644 --- a/Content.Server/GameObjects/EntitySystems/BarotraumaSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/BarotraumaSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.GameObjects.EntitySystems [UsedImplicitly] public class BarotraumaSystem : EntitySystem { - private const float TimePerUpdate = 0.5f; + private const float TimePerUpdate = 3f; private float _timer = 0f; diff --git a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs index eb192dbea6..4569668edc 100644 --- a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs +++ b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs @@ -9,9 +9,14 @@ using Robust.Shared.Prototypes; using Robust.Shared.Random; using System.Collections.Generic; using System.Linq; +using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; +using Content.Server.GameObjects.Components.PDA; using Content.Server.GameObjects.Components.Suspicion; using Content.Server.Mobs.Roles; using Content.Server.Mobs.Roles.Suspicion; +using Content.Shared.GameObjects.Components.Inventory; +using Content.Shared.GameObjects.Components.PDA; using Content.Shared.Roles; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Configuration; @@ -32,6 +37,9 @@ namespace Content.Server.GameTicking.GamePresets public int MinTraitors { get; set; } public int PlayersPerTraitor { get; set; } + public int TraitorStartingBalance { get; set; } + + public override bool DisallowLateJoin => true; private static string TraitorID = "SuspicionTraitor"; @@ -42,6 +50,7 @@ namespace Content.Server.GameTicking.GamePresets cfg.RegisterCVar("game.suspicion_min_players", 5); cfg.RegisterCVar("game.suspicion_min_traitors", 2); cfg.RegisterCVar("game.suspicion_players_per_traitor", 5); + cfg.RegisterCVar("game.suspicion_starting_balance", 20); } public override bool Start(IReadOnlyList readyPlayers, bool force = false) @@ -49,6 +58,7 @@ namespace Content.Server.GameTicking.GamePresets MinPlayers = _cfg.GetCVar("game.suspicion_min_players"); MinTraitors = _cfg.GetCVar("game.suspicion_min_traitors"); PlayersPerTraitor = _cfg.GetCVar("game.suspicion_players_per_traitor"); + TraitorStartingBalance = _cfg.GetCVar("game.suspicion_starting_balance"); if (!force && readyPlayers.Count < MinPlayers) { @@ -109,6 +119,28 @@ namespace Content.Server.GameTicking.GamePresets var traitorRole = new SuspicionTraitorRole(mind, antagPrototype); mind.AddRole(traitorRole); traitors.Add(traitorRole); + // creadth: we need to create uplink for the antag. + // PDA should be in place already, so we just need to + // initiate uplink account. + var uplinkAccount = + new UplinkAccount(mind.OwnedEntity.Uid, + TraitorStartingBalance); + var inventory = mind.OwnedEntity.GetComponent(); + if (!inventory.TryGetSlotItem(EquipmentSlotDefines.Slots.IDCARD, out ItemComponent pdaItem)) + { + continue; + } + + var pda = pdaItem.Owner; + + var pdaComponent = pda.GetComponent(); + if (pdaComponent.IdSlotEmpty) + { + continue; + } + + pdaComponent.InitUplinkAccount(uplinkAccount); + } foreach (var player in list) @@ -127,6 +159,7 @@ namespace Content.Server.GameTicking.GamePresets return true; } + public override string ModeTitle => "Suspicion"; public override string Description => "Suspicion on the Space Station. There are traitors on board... Can you kill them before they kill you?"; } diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 19383c0f37..54407dca9a 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -861,17 +861,6 @@ namespace Content.Server.GameTicking var accessTags = access.Tags; accessTags.UnionWith(jobPrototype.Access); pdaComponent.SetPDAOwner(characterName); - var mindComponent = mob.GetComponent(); - if (mindComponent.HasMind) //Redundancy checks. - { - if (mindComponent.Mind.AllRoles.Any(role => role.Antagonist)) //Give antags a new uplinkaccount. - { - var uplinkAccount = - new UplinkAccount(mob.Uid, - 20); //TODO: make me into a variable based on server pop or something. - pdaComponent.InitUplinkAccount(uplinkAccount); - } - } } private void AddManifestEntry(string characterName, string jobId) diff --git a/Content.Server/Interfaces/GameObjects/ISuicideAct.cs b/Content.Server/Interfaces/GameObjects/ISuicideAct.cs index 78d0d9974f..a23353adac 100644 --- a/Content.Server/Interfaces/GameObjects/ISuicideAct.cs +++ b/Content.Server/Interfaces/GameObjects/ISuicideAct.cs @@ -14,12 +14,15 @@ namespace Content.Server.Interfaces.GameObjects //Damage type suicides Blunt, + Slash, Piercing, Heat, - Disintegration, - Cellular, - DNA, - Asphyxiation + Shock, + Cold, + Poison, + Radiation, + Asphyxiation, + Bloodloss } } diff --git a/Content.Shared/Damage/DamageClass.cs b/Content.Shared/Damage/DamageClass.cs index 393b999486..406dc8bb73 100644 --- a/Content.Shared/Damage/DamageClass.cs +++ b/Content.Shared/Damage/DamageClass.cs @@ -12,7 +12,8 @@ namespace Content.Shared.Damage Brute, Burn, Toxin, - Airloss + Airloss, + Genetic } public static class DamageClassExtensions @@ -20,10 +21,11 @@ namespace Content.Shared.Damage private static readonly ImmutableDictionary> ClassToType = new Dictionary> { - {DamageClass.Brute, new List {DamageType.Blunt, DamageType.Piercing}}, - {DamageClass.Burn, new List {DamageType.Heat, DamageType.Disintegration}}, - {DamageClass.Toxin, new List {DamageType.Cellular, DamageType.DNA}}, - {DamageClass.Airloss, new List {DamageType.Asphyxiation}} + {DamageClass.Brute, new List {DamageType.Blunt, DamageType.Slash, DamageType.Piercing}}, + {DamageClass.Burn, new List {DamageType.Heat, DamageType.Shock, DamageType.Cold}}, + {DamageClass.Toxin, new List {DamageType.Poison, DamageType.Radiation}}, + {DamageClass.Airloss, new List {DamageType.Asphyxiation, DamageType.Bloodloss}}, + {DamageClass.Genetic, new List {DamageType.Cellular}} }.ToImmutableDictionary(); public static List ToTypes(this DamageClass @class) diff --git a/Content.Shared/Damage/DamageType.cs b/Content.Shared/Damage/DamageType.cs index 96cfb2eecb..0de82925f7 100644 --- a/Content.Shared/Damage/DamageType.cs +++ b/Content.Shared/Damage/DamageType.cs @@ -10,12 +10,16 @@ namespace Content.Shared.Damage public enum DamageType { Blunt, + Slash, Piercing, Heat, - Disintegration, - Cellular, - DNA, - Asphyxiation + Shock, + Cold, + Poison, + Radiation, + Asphyxiation, + Bloodloss, + Cellular } public static class DamageTypeExtensions @@ -25,12 +29,17 @@ namespace Content.Shared.Damage new Dictionary { {DamageType.Blunt, DamageClass.Brute}, + {DamageType.Slash, DamageClass.Brute}, {DamageType.Piercing, DamageClass.Brute}, {DamageType.Heat, DamageClass.Burn}, - {DamageType.Disintegration, DamageClass.Burn}, - {DamageType.Cellular, DamageClass.Toxin}, - {DamageType.DNA, DamageClass.Toxin}, - {DamageType.Asphyxiation, DamageClass.Airloss} + {DamageType.Shock, DamageClass.Burn}, + {DamageType.Cold, DamageClass.Burn}, + {DamageType.Poison, DamageClass.Toxin}, + {DamageType.Radiation, DamageClass.Toxin}, + {DamageType.Asphyxiation, DamageClass.Airloss}, + {DamageType.Bloodloss, DamageClass.Airloss}, + {DamageType.Cellular, DamageClass.Genetic } + }.ToImmutableDictionary(); public static DamageClass ToClass(this DamageType type) diff --git a/Content.Shared/GameObjects/Atmos/SharedPumpComponent.cs b/Content.Shared/GameObjects/Atmos/SharedPumpComponent.cs new file mode 100644 index 0000000000..8546d9d071 --- /dev/null +++ b/Content.Shared/GameObjects/Atmos/SharedPumpComponent.cs @@ -0,0 +1,31 @@ +using Content.Shared.GameObjects.Components.Atmos; +using Robust.Shared.Serialization; +using System; + +namespace Content.Shared.GameObjects.Atmos +{ + [Serializable, NetSerializable] + public enum PumpVisuals + { + VisualState + } + + [Serializable, NetSerializable] + public class PumpVisualState + { + public readonly PipeDirection InletDirection; + public readonly PipeDirection OutletDirection; + public readonly ConduitLayer InletConduitLayer; + public readonly ConduitLayer OutletConduitLayer; + public readonly bool PumpEnabled; + + public PumpVisualState(PipeDirection inletDirection, PipeDirection outletDirection, ConduitLayer inletConduitLayer, ConduitLayer outletConduitLayer, bool pumpEnabled) + { + InletDirection = inletDirection; + OutletDirection = outletDirection; + InletConduitLayer = inletConduitLayer; + OutletConduitLayer = outletConduitLayer; + PumpEnabled = pumpEnabled; + } + } +} diff --git a/Resources/Prototypes/Damage/damage_containers.yml b/Resources/Prototypes/Damage/damage_containers.yml index bb950b47f1..5fad0c557c 100644 --- a/Resources/Prototypes/Damage/damage_containers.yml +++ b/Resources/Prototypes/Damage/damage_containers.yml @@ -5,6 +5,7 @@ - Burn - Toxin - Airloss + - Genetic - type: damageContainer id: metallicDamageContainer diff --git a/Resources/Prototypes/Damage/resistance_sets.yml b/Resources/Prototypes/Damage/resistance_sets.yml index 5b829d48df..47fe96ef92 100644 --- a/Resources/Prototypes/Damage/resistance_sets.yml +++ b/Resources/Prototypes/Damage/resistance_sets.yml @@ -2,55 +2,79 @@ id: defaultResistances coefficients: Blunt: 1.0 + Slash: 1.0 Piercing: 1.0 Heat: 1.0 - Disintegration: 1.0 - Cellular: 1.0 - DNA: 1.0 + Shock: 1.0 + Cold: 1.0 + Poison: 1.0 + Radiation: 1.0 Asphyxiation: 1.0 + Bloodloss: 1.0 + Cellular: 1.0 flatReductions: Blunt: 0 + Slash: 0 Piercing: 0 Heat: 0 - Disintegration: 0 + Shock: 0 + Cold: 0 + Poison: 0 + Radiation: 0 + Asphyxiation: 0 + Bloodloss: 0 Cellular: 0 - DNA: 0 - Asphyxiation: 0 - type: resistanceSet id: dionaResistances coefficients: Blunt: 0.5 + Slash: 1.2 Piercing: 0.7 Heat: 1.8 - Disintegration: 1.8 - Cellular: 1.0 - DNA: 1.0 + Shock: 0.5 + Cold: 1.5 + Poison: 0.8 + Radiation: 0 Asphyxiation: 1.0 + Bloodloss: 1.0 + Cellular: 1.0 flatReductions: Blunt: 0 + Slash: 0 Piercing: 0 Heat: 0 - Disintegration: 0 - Cellular: 0 - DNA: 0 + Shock: 0 + Cold: 0 + Poison: 0 + Radiation: 0 Asphyxiation: 0 + Bloodloss: 0 + Cellular: 0 - type: resistanceSet id: metallicResistances coefficients: Blunt: 0.7 + Slash: 0.5 Piercing: 0.7 Heat: 1.0 - Disintegration: 1.0 - Cellular: 0.0 - DNA: 0.0 - Asphyxiation: 0.0 + Shock: 1.2 + Cold: 0 + Poison: 0 + Radiation: 0 + Asphyxiation: 0 + Bloodloss: 0 + Cellular: 0 flatReductions: Blunt: 0 + Slash: 0 Piercing: 0 Heat: 0 - Disintegration: 0 - Cellular: 0 - DNA: 0 - Asphyxiation: 0 \ No newline at end of file + Shock: 0 + Cold: 0 + Poison: 0 + Radiation: 0 + Asphyxiation: 0 + Bloodloss: 0 + Cellular: 0 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml index d1f2ac0b5c..ff727b63f6 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml @@ -12,7 +12,12 @@ - type: Icon texture: Constructible/Power/eightdirwire.png - type: Sprite - sprite: Constructible/Power/mv_cable.rsi + - type: Appearance + visuals: + - type: PipeVisualizer + pipeRSI: Constructible/Atmos/pipe.rsi + - type: PumpVisualizer + pumpRSI: Constructible/Atmos/pressurepump.rsi - type: Destructible thresholdvalue: 100 @@ -21,8 +26,6 @@ parent: PumpBase id: NorthwardLongitudinalPump components: - - type: Sprite - state: mvcable_3 - type: NodeContainer nodes: - !type:PipeNode diff --git a/Resources/Textures/Constructible/Atmos/pressurepump.rsi/meta.json b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/meta.json new file mode 100644 index 0000000000..d8390a7ef9 --- /dev/null +++ b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version":1, + "size":{ + "x":32, + "y":32 + }, + "license":"CC-BY-SA-3.0", + "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da", + "states":[ + { + "name":"pumpEast2West2", + "directions":1, + "delays":[ [ 1.0 ] ] + }, + { + "name":"pumpNorth2South2", + "directions":1, + "delays":[ [ 1.0 ] ] + }, + { + "name":"pumpSouth2North2", + "directions":1, + "delays":[ [ 1.0 ] ] + }, + { + "name":"pumpWest2East2", + "directions":1, + "delays":[ [ 1.0 ] ] + }, + { + "name":"pumpEnabledEast2West2", + "directions":1, + "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ] + }, + { + "name":"pumpEnabledNorth2South2", + "directions":1, + "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ] + }, + { + "name":"pumpEnabledSouth2North2", + "directions":1, + "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ] + }, + { + "name":"pumpEnabledWest2East2", + "directions":1, + "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEast2West2.png b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEast2West2.png new file mode 100644 index 0000000000..dc07973864 Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEast2West2.png differ diff --git a/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledEast2West2.png b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledEast2West2.png new file mode 100644 index 0000000000..4e2d4e1a78 Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledEast2West2.png differ diff --git a/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledNorth2South2.png b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledNorth2South2.png new file mode 100644 index 0000000000..6e33ce9160 Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledNorth2South2.png differ diff --git a/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledSouth2North2.png b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledSouth2North2.png new file mode 100644 index 0000000000..fffb200483 Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledSouth2North2.png differ diff --git a/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledWest2East2.png b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledWest2East2.png new file mode 100644 index 0000000000..ddcd2cd54d Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpEnabledWest2East2.png differ diff --git a/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpNorth2South2.png b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpNorth2South2.png new file mode 100644 index 0000000000..3f26d407ea Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpNorth2South2.png differ diff --git a/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpSouth2North2.png b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpSouth2North2.png new file mode 100644 index 0000000000..d805b9df59 Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpSouth2North2.png differ diff --git a/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpWest2East2.png b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpWest2East2.png new file mode 100644 index 0000000000..789ad70f39 Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/pressurepump.rsi/pumpWest2East2.png differ diff --git a/RobustToolbox b/RobustToolbox index 6ffe2e1750..c5573c0d33 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 6ffe2e1750a2fc2fd30664b0ea393dc4325f5143 +Subproject commit c5573c0d333b1f50b740b48e135d202fe7158d42