Fixes for Integration Tests

Content.Shared/Stories/Force/ForceSystem.cs

@@ -57,7 +57,7 @@ public bool SetVolume(EntityUid uid, float volume, float passiveVolume, float ma
             return false;
         }
 
-        if (!Resolve(uid, ref component))
+        if (!Resolve(uid, ref component, false))
             return false;
 
         component.Volume = volume;
@@ -79,7 +79,7 @@ public bool TryTransferVolume(EntityUid uid, EntityUid toUid, float amount, Forc
             return false;
         }
 
-        if (!Resolve(uid, ref component) || !Resolve(toUid, ref toComponent))
+        if (!Resolve(uid, ref component, false) || !Resolve(toUid, ref toComponent))
             return false;
 
         if (component.Volume - amount < 0)
@@ -112,7 +112,7 @@ private bool TransferVolume(EntityUid uid, EntityUid toUid, float amount, ForceC
             return false;
         }
 
-        if (!Resolve(uid, ref component) || !Resolve(toUid, ref toComponent))
+        if (!Resolve(uid, ref component, false) || !Resolve(toUid, ref toComponent))
             return false;
 
         if (component.Volume - amount < 0)
@@ -136,7 +136,7 @@ public bool TryAddVolume(EntityUid uid, float toAdd, ForceComponent? component =
             DebugTools.Assert(toAdd == 0, "Attempted to add negative force volume");
             return false;
         }
-        if (!Resolve(uid, ref component))
+        if (!Resolve(uid, ref component, false))
             return false;
         if (component.Volume + toAdd > component.MaxVolume)
             return false;
@@ -162,7 +162,7 @@ public bool AddVolume(EntityUid uid, float toAdd, ForceComponent? component = nu
             DebugTools.Assert(toAdd == 0, "Attempted to add negative force volume");
             return false;
         }
-        if (!Resolve(uid, ref component))
+        if (!Resolve(uid, ref component, false))
             return false;
 
         var ev = new VolumeChangedEvent(uid, oldVolume: component.Volume, newVolume: component.Volume + toAdd, component.CurrentDebuff.Float(), component.MaxVolume);
@@ -186,7 +186,7 @@ public bool TryRemoveVolume(EntityUid uid, float toRemove, ForceComponent? compo
             DebugTools.Assert(toRemove == 0, "Attempted to remove negative force volume");
             return false;
         }
-        if (!Resolve(uid, ref component))
+        if (!Resolve(uid, ref component, false))
             return false;
         if (component.Volume - toRemove < 0)
             return false;
@@ -212,7 +212,7 @@ public bool RemoveVolume(EntityUid uid, float toRemove, ForceComponent? componen
             DebugTools.Assert(toRemove == 0, "Attempted to remove negative force volume");
             return false;
         }
-        if (!Resolve(uid, ref component))
+        if (!Resolve(uid, ref component, false))
             return false;
         if (component.Volume - toRemove < 0)
             return false;
@@ -229,7 +229,7 @@ public bool RemoveVolume(EntityUid uid, float toRemove, ForceComponent? componen
     #region Debuffs
     public void RefreshDebuffs(EntityUid uid, ForceComponent? component = null)
     {
-        if (!Resolve(uid, ref component))
+        if (!Resolve(uid, ref component, false))
             return;
         RaiseLocalEvent(uid, new RefreshDebuffsEvent(uid, component.CurrentDebuff.Float(), component.Volume.Float(), component.MaxVolume.Float()));
     }

Resources/ConfigPresets/Stories/develop.toml

@@ -5,7 +5,6 @@
 
 [whitelist]
 enabled = true
-reason = "Требуется разрешение на подключение к этому серверу."
 
 [adminlogs]
 enabled = false

Resources/ConfigPresets/Stories/furry.toml

@@ -5,7 +5,6 @@
 
 [whitelist]
 enabled = true
-reason = "Фрр... UwU... Рррр..."
 
 [adminlogs]
 enabled = false

Resources/ConfigPresets/Stories/mappers.toml

@@ -5,7 +5,6 @@
 
 [whitelist]
 enabled = true
-reason = "Требуется разрешение на подключение к этому серверу."
 
 [adminlogs]
 enabled = false

Resources/Prototypes/Maps/bagel.yml

@@ -49,7 +49,7 @@
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 2, 2 ]
+            # Lawyer: [ 2, 2 ] # Stories for Integration Tests
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

Resources/Prototypes/Maps/box.yml

@@ -48,7 +48,7 @@
             SecurityOfficer: [ 5, 5 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 2, 2 ]
+            # Lawyer: [ 2, 2 ]  # Stories for Integration Tests
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

Resources/Prototypes/Maps/cog.yml

@@ -28,7 +28,7 @@
             Reporter: [ 2, 2 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 3, 3 ]
-            Zookeeper: [ 1, 1 ] 
+            Zookeeper: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
@@ -51,7 +51,7 @@
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 2, 2 ]
+            # Lawyer: [ 2, 2 ] # Stories for Integration Tests
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

Resources/Prototypes/Maps/core.yml

@@ -48,7 +48,7 @@
             HeadOfSecurity: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
             Warden: [ 1, 1 ]
-            Lawyer: [ 1, 1 ]
+            # Lawyer: [ 1, 1 ] # Stories for Integration Tests
             SecurityCadet: [ 1, 1 ]
             Detective: [ 1, 1 ]
             #supply

Resources/Prototypes/Maps/fland.yml

@@ -49,7 +49,7 @@
             SecurityOfficer: [ 8, 8 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 2, 2 ]
+            # Lawyer: [ 2, 2 ] # Stories for Integration Tests
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

Resources/Prototypes/Maps/marathon.yml

@@ -49,7 +49,7 @@
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 2, 2 ]
+            # Lawyer: [ 2, 2 ]  # Stories for Integration Tests
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

Resources/Prototypes/Maps/meta.yml

@@ -47,7 +47,7 @@
             SecurityOfficer: [ 5, 7 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 3, 6 ]
-            Lawyer: [ 2, 2 ]
+            # Lawyer: [ 2, 2 ] # Stories for Integration Tests
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

Resources/Prototypes/Maps/oasis.yml

@@ -52,7 +52,7 @@
             SecurityOfficer: [ 8, 8 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 3, 3 ]
+            # Lawyer: [ 3, 3 ] # Stories for Integration Tests
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

Resources/Prototypes/Maps/omega.yml

@@ -48,7 +48,7 @@
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
-            Lawyer: [ 1, 1 ]
+            # Lawyer: [ 1, 1 ] # Stories for Integration Tests
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 2 ]

Resources/Prototypes/Maps/packed.yml

@@ -46,7 +46,7 @@
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
-            Lawyer: [ 1, 1 ]
+            # Lawyer: [ 1, 1 ] # Stories for Integration Tests
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 2 ]

Resources/Prototypes/Maps/train.yml

@@ -50,7 +50,7 @@
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 6, 6 ]
             SecurityCadet: [ 3, 3 ]
-            Lawyer: [ 1, 2 ]
+            # Lawyer: [ 1, 2 ] # Stories for Integration Tests
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

Resources/Prototypes/Stories/Entities/Structures/windows.yml

@@ -2,59 +2,16 @@
   id: PRISONShuttleWindow
   name: окно
   description: Смотри не заляпай.
-  parent: WindowRCDResistant
+  parent: ShuttleWindow
   components:
     - type: Sprite
       drawdepth: WallTops
       sprite: Stories/Structures/Windows/shuttle_window_sp.rsi
     - type: Icon
       sprite: Stories/Structures/Windows/shuttle_window_sp.rsi
-    - type: Repairable
-      fuelCost: 15
-      doAfterDelay: 3
-    - type: Damageable
-      damageContainer: StructuralInorganic
-      damageModifierSet: RGlass
-    - type: Destructible
-      thresholds:
-        - trigger: !type:DamageTrigger
-            damage: 1000
-          behaviors:
-            - !type:DoActsBehavior
-              acts: ["Destruction"]
-        - trigger: !type:DamageTrigger
-            damage: 500
-          behaviors:
-            - !type:PlaySoundBehavior
-              sound:
-                collection: WindowShatter
-            - !type:SpawnEntitiesBehavior
-              spawn:
-                ShardGlassReinforced:
-                  min: 1
-                  max: 2
-                PartRodMetal:
-                  min: 1
-                  max: 2
-            - !type:DoActsBehavior
-              acts: ["Destruction"]
-    - type: IconSmooth
-      base: swindow
-    - type: Construction
-      graph: Window
-      node: shuttleWindow
-    - type: Appearance
-    - type: DamageVisuals
-      thresholds: [4, 8, 12]
-      damageDivisor: 28
-      trackAllDamage: true
-      damageOverlay:
-        sprite: Structures/Windows/cracks.rsi
-    - type: StaticPrice
-      price: 100
 
 - type: entity
-  parent: PRISONShuttleWindow
+  parent: ShuttleWindowDiagonal
   id: PRISONShuttleWindowDiagonal
   name: окно
   description: Смотри не заляпай.
@@ -68,30 +25,6 @@
       drawdepth: WallTops
       sprite: Stories/Structures/Windows/shuttle_window_diagonal_sp.rsi
       state: state0
-    - type: IconSmooth
-      mode: Diagonal
-      key: walls
-      base: state
     - type: Icon
       sprite: Stories/Structures/Windows/shuttle_window_diagonal_sp.rsi
       state: state0
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape: !type:PolygonShape
-            vertices:
-              - "-0.5,-0.5"
-              - "0.5,0.5"
-              - "0.5,-0.5"
-          mask:
-            - FullTileMask
-          layer:
-            - GlassLayer
-    - type: Airtight
-      noAirWhenFullyAirBlocked: false
-      airBlockedDirection:
-        - South
-        - East
-    - type: DamageVisuals
-      damageOverlay:
-        sprite: Structures/Windows/cracks_diagonal.rsi