Merge branch 'master' into 2020-08-19-firelocks

# Conflicts:
#	Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
#	Content.Shared/Maps/TurfHelpers.cs
#	SpaceStation14.sln.DotSettings

Content.Server/GameObjects/Components/Doors/AirlockComponent.cs

@@ -8,6 +8,7 @@ using Content.Server.GameObjects.Components.VendingMachines;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects.Components.Doors;
 using Content.Shared.GameObjects.Components.Interactable;
+using Content.Shared.Interfaces;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;
@@ -26,7 +27,7 @@ namespace Content.Server.GameObjects.Components.Doors
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
     [ComponentReference(typeof(ServerDoorComponent))]
-    public class AirlockComponent : ServerDoorComponent, IWires, IInteractUsing
+    public class AirlockComponent : ServerDoorComponent, IWires
     {
         public override string Name => "Airlock";
 
@@ -305,6 +306,7 @@ namespace Content.Server.GameObjects.Components.Doors
                     case Wires.BackupPower:
                         PowerWiresPulsed = true;
                         _powerWiresPulsedTimerCancel.Cancel();
+                        _powerWiresPulsedTimerCancel = new CancellationTokenSource();
                         Timer.Spawn(PowerWiresTimeout,
                             () => PowerWiresPulsed = false,
                             _powerWiresPulsedTimerCancel.Token);
@@ -383,7 +385,7 @@ namespace Content.Server.GameObjects.Components.Doors
 
         public override bool CanOpen()
         {
-            return IsPowered() && !IsBolted();
+            return base.CanOpen() && IsPowered() && !IsBolted();
         }
 
         public override bool CanClose()
@@ -412,8 +414,11 @@ namespace Content.Server.GameObjects.Components.Doors
                    || receiver.Powered;
         }
 
-        public async Task<bool> InteractUsing(InteractUsingEventArgs eventArgs)
+        public override async Task<bool> InteractUsing(InteractUsingEventArgs eventArgs)
         {
+            if (await base.InteractUsing(eventArgs))
+                return true;
+
             if (!eventArgs.Using.TryGetComponent<ToolComponent>(out var tool))
                 return false;
 
@@ -435,16 +440,14 @@ namespace Content.Server.GameObjects.Components.Doors
             {
                 if (IsBolted())
                 {
-                    var notify = IoCManager.Resolve<IServerNotifyManager>();
-                    notify.PopupMessage(Owner, eventArgs.User,
+                    Owner.PopupMessage(eventArgs.User,
                         Loc.GetString("The airlock's bolts prevent it from being forced!"));
                     return false;
                 }
 
                 if (IsPowered())
                 {
-                    var notify = IoCManager.Resolve<IServerNotifyManager>();
-                    notify.PopupMessage(Owner, eventArgs.User, Loc.GetString("The powered motors block your efforts!"));
+                    Owner.PopupMessage(eventArgs.User, Loc.GetString("The powered motors block your efforts!"));
                     return false;
                 }
 

Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs

@@ -3,15 +3,18 @@ using System;
 using System.Linq;
 using System.Threading;
 using Content.Server.Atmos;
+using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.Access;
 using Content.Server.GameObjects.Components.Atmos;
 using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Interactable;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.GameObjects.Components.Body;
 using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Doors;
+using Content.Shared.GameObjects.Components.Interactable;
 using Content.Shared.GameObjects.Components.Movement;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;
@@ -30,7 +33,7 @@ namespace Content.Server.GameObjects.Components.Doors
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
-    public class ServerDoorComponent : Component, IActivate, ICollideBehavior
+    public class ServerDoorComponent : Component, IActivate, ICollideBehavior, IInteractUsing
     {
         public override string Name => "Door";
 
@@ -46,7 +49,7 @@ namespace Content.Server.GameObjects.Components.Doors
         protected bool AutoClose = true;
         protected const float AutoCloseDelay = 5;
         protected float CloseSpeed = AutoCloseDelay;
-
+        
         private CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
 
         protected virtual TimeSpan CloseTimeOne => TimeSpan.FromSeconds(0.3f);
@@ -63,11 +66,31 @@ namespace Content.Server.GameObjects.Components.Doors
 
         public bool Occludes => _occludes;
 
+        [ViewVariables]
+        public bool IsWeldedShut
+        {
+            get => _isWeldedShut;
+            set
+            {
+                if (_isWeldedShut == value)
+                {
+                    return;
+                }
+
+                _isWeldedShut = value;
+                SetAppearance(_isWeldedShut ? DoorVisualState.Welded : DoorVisualState.Closed);
+            }
+        }
+        private bool _isWeldedShut;
+
+        private bool _canWeldShut = true;
+
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
 
             serializer.DataField(ref _occludes, "occludes", true);
+            serializer.DataField(ref _isWeldedShut, "welded", false);
         }
 
         public override void OnRemove()
@@ -103,7 +126,7 @@ namespace Content.Server.GameObjects.Components.Doors
 
             // Disabled because it makes it suck hard to walk through double doors.
 
-            if (entity.HasComponent<IBodyManagerComponent>())
+            if (entity.HasComponent<ISharedBodyManagerComponent>())
             {
                 if (!entity.TryGetComponent<IMoverComponent>(out var mover)) return;
 
@@ -132,7 +155,7 @@ namespace Content.Server.GameObjects.Components.Doors
 
         public virtual bool CanOpen()
         {
-            return true;
+            return !_isWeldedShut;
         }
 
         public virtual bool CanOpen(IEntity user)
@@ -195,6 +218,7 @@ namespace Content.Server.GameObjects.Components.Doors
                 return;
             }
 
+            _canWeldShut = false;
             State = DoorState.Opening;
             SetAppearance(DoorVisualState.Opening);
             if (_occludes && Owner.TryGetComponent(out OccluderComponent? occluder))
@@ -379,6 +403,7 @@ namespace Content.Server.GameObjects.Components.Doors
 
                 await Timer.Delay(CloseTimeTwo, _cancellationTokenSource.Token);
 
+                _canWeldShut = true;
                 State = DoorState.Closed;
                 SetAppearance(DoorVisualState.Closed);
             }, _cancellationTokenSource.Token);
@@ -388,7 +413,7 @@ namespace Content.Server.GameObjects.Components.Doors
 
         public virtual void Deny()
         {
-            if (State == DoorState.Open)
+            if (State == DoorState.Open || _isWeldedShut)
             {
                 return;
             }
@@ -429,5 +454,20 @@ namespace Content.Server.GameObjects.Components.Doors
             Closing,
             Opening,
         }
+
+        public virtual async Task<bool> InteractUsing(InteractUsingEventArgs eventArgs)
+        {
+            if (!_canWeldShut)
+                return false;
+
+            if (!eventArgs.Using.TryGetComponent(out WelderComponent? tool))
+                return false;
+
+            if (!await tool.UseTool(eventArgs.User, Owner, 3f, ToolQuality.Welding, 3f, () => _canWeldShut))
+                return false;
+
+            IsWeldedShut ^= true;
+            return true;
+        }
     }
 }