Немного "фикса" от меня

Corvax-Frontier · Oct 26, 2024 · 6c22771 · 6c22771
1 parent 9de2577
commit 6c22771
Show file tree

Hide file tree

Showing 94 changed files with 12,731 additions and 10,212 deletions.
diff --git a/Content.Server/Corvax/Inflation/InflationCargoCrateComponent.cs b/Content.Server/Corvax/Inflation/InflationCargoCrateComponent.cs
@@ -1,4 +1,4 @@
-[RegisterComponent]
+[RegisterComponent]
 [AutoGenerateComponentState]
 public sealed partial class InflationCargoCrateComponent : Component
 {

diff --git a/Content.Server/Corvax/Inflation/InflationCargoCrateSystem.cs b/Content.Server/Corvax/Inflation/InflationCargoCrateSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Timing;
+using Robust.Shared.Timing;
 using Content.Server.Chat.Systems;
 using Content.Shared._NF.Trade.Components;
 using Content.Shared.Cargo.Components;

diff --git a/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml b/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml
@@ -5827,7 +5827,6 @@ entities:
       id: corvaxFrontier
     - type: StationTransit
     - type: ProtectedGrid
-    - type: StationEmpImmune
     - type: IFF
   - uid: 4826
     components:

diff --git a/Resources/Maps/Corvax/POI/Hospital.yml b/Resources/Maps/Corvax/POI/Hospital.yml
@@ -1206,6 +1206,8 @@ entities:
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: StationTransit
+    - type: BecomesStation
+      id: Hospital
 - proto: AirAlarm
   entities:
   - uid: 795

diff --git a/Resources/Maps/Corvax/POI/charlie.yml b/Resources/Maps/Corvax/POI/charlie.yml
@@ -19599,262 +19599,6 @@ entities:
           ent: null
     missingComponents:
     - Weldable
-- proto: CrateTradeContrabandSecureCyberSunFilled
-  entities:
-  - uid: 92
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2808
-    components:
-    - type: Transform
-      pos: -9.5,-2.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2819
-    components:
-    - type: Transform
-      pos: 2.5,9.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2826
-    components:
-    - type: Transform
-      pos: 10.5,7.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2827
-    components:
-    - type: Transform
-      pos: -6.5,1.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2831
-    components:
-    - type: Transform
-      pos: -3.5,-7.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2832
-    components:
-    - type: Transform
-      pos: 7.5,-12.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 7839
-    components:
-    - type: Transform
-      pos: -28.5,26.5
-      parent: 2
-    missingComponents:
-    - Weldable
-  - uid: 7842
-    components:
-    - type: Transform
-      pos: -22.5,30.5
-      parent: 2
-    missingComponents:
-    - Weldable
-- proto: CrateTradeContrabandSecureDonkFilled
-  entities:
-  - uid: 322
-    components:
-    - type: Transform
-      pos: -5.5,4.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 889
-    components:
-    - type: Transform
-      pos: -7.5,-2.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2809
-    components:
-    - type: Transform
-      pos: 3.5,9.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2818
-    components:
-    - type: Transform
-      pos: -9.5,-1.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2825
-    components:
-    - type: Transform
-      pos: 10.5,4.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2830
-    components:
-    - type: Transform
-      pos: -3.5,-10.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2833
-    components:
-    - type: Transform
-      pos: 11.5,-9.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2834
-    components:
-    - type: Transform
-      pos: 9.5,-7.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 7837
-    components:
-    - type: Transform
-      pos: -31.5,23.5
-      parent: 2
-    missingComponents:
-    - Weldable
-  - uid: 7840
-    components:
-    - type: Transform
-      pos: -26.5,26.5
-      parent: 2
-    missingComponents:
-    - Weldable
-- proto: CrateTradeContrabandSecureNormalFilled
-  entities:
-  - uid: 1333
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 1596
-    components:
-    - type: Transform
-      pos: 1.5,7.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2791
-    components:
-    - type: Transform
-      pos: -7.5,-3.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2792
-    components:
-    - type: Transform
-      pos: -7.5,-0.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2820
-    components:
-    - type: Transform
-      pos: -4.5,7.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2821
-    components:
-    - type: Transform
-      pos: -2.5,4.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2823
-    components:
-    - type: Transform
-      pos: 7.5,8.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2824
-    components:
-    - type: Transform
-      pos: 8.5,5.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2828
-    components:
-    - type: Transform
-      pos: -6.5,-6.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2829
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 2835
-    components:
-    - type: Transform
-      pos: 13.5,-6.5
-      parent: 2
-    missingComponents:
-    - TradeCrate
-    - Weldable
-  - uid: 7838
-    components:
-    - type: Transform
-      pos: -28.5,24.5
-      parent: 2
-    missingComponents:
-    - Weldable
-  - uid: 7841
-    components:
-    - type: Transform
-      pos: -25.5,29.5
-      parent: 2
-    missingComponents:
-    - Weldable
 - proto: CyberPen
   entities:
   - uid: 753
@@ -21679,13 +21423,6 @@ entities:
     - type: Transform
       pos: 43.52346,2.779852
       parent: 2
-- proto: GunSafeShuttleT3Spawner
-  entities:
-  - uid: 3002
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 2
 - proto: HappyHonkNukieSnacks
   entities:
   - uid: 1698