station goal to centcom

Rxup · Feb 7, 2025 · 11c63ae · 11c63ae
1 parent 9341b8b
commit 11c63ae
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs b/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Server.Backmen.Arrivals;
 using Content.Server.Fax;
 using Content.Server.GameTicking.Events;
 using Content.Server.Station.Components;
@@ -25,6 +26,7 @@ public sealed class StationGoalPaperSystem : EntitySystem
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly StationSystem _station = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly CentcommSystem _centcomm = default!;
 
 
         public override void Initialize()
@@ -108,15 +110,19 @@ public bool SendStationGoal(EntityUid? ent, StationGoalPrototype goal)
 
                 var largestGrid = _station.GetLargestGrid(stationData);
                 var grid = Transform(faxUid).GridUid;
-                if (grid is not null && largestGrid == grid.Value)
+
+                if (grid is null)
+                    continue;
+
+                if(!(largestGrid == grid.Value || _centcomm.CentComGrid == largestGrid))
+                    continue;
+
+                _fax.Receive(faxUid, printout, null, fax);
+                foreach (var spawnEnt in goal.Spawns)
                 {
-                    _fax.Receive(faxUid, printout, null, fax);
-                    foreach (var spawnEnt in goal.Spawns)
-                    {
-                        SpawnAtPosition(spawnEnt, Transform(faxUid).Coordinates);
-                    }
-                    wasSent = true;
+                    SpawnAtPosition(spawnEnt, Transform(faxUid).Coordinates);
                 }
+                wasSent = true;
             }
             return wasSent;
         }

diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml
@@ -4518,11 +4518,6 @@ entities:
     - type: ArrivalsProtect
 - proto: BackmenVendingMachineChang
   entities:
-  - uid: 207
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 2
   - uid: 208
     components:
     - type: Transform
@@ -18414,8 +18409,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.151331,-12.650532
       parent: 2
-    - type: Physics
-      sleepTime: 0.48333287
   - uid: 2868
     components:
     - type: Transform
@@ -21775,6 +21768,13 @@ entities:
     - type: Transform
       pos: -14.5,12.5
       parent: 2
+- proto: ComputerWage
+  entities:
+  - uid: 207
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 2
 - proto: ConveyorBelt
   entities:
   - uid: 3463
@@ -23533,6 +23533,8 @@ entities:
     - type: Transform
       pos: 1.5,1.5
       parent: 2
+    - type: Pullable
+      prevFixedRotation: True
   - uid: 3746
     components:
     - type: Transform
@@ -28314,7 +28316,7 @@ entities:
     - type: AccessReader
       access:
       - - CCSecurity
-- proto: GunSafeSubMachineGunDrozd
+- proto: GunSafeSubMachineGunVector
   entities:
   - uid: 4390
     components:
@@ -28532,15 +28534,15 @@ entities:
     - type: Transform
       pos: 14.5,4.5
       parent: 2
-- proto: HolopadCentCommLongRange
+- proto: HolopadCentCommUnlimitedRange
   entities:
   - uid: 7060
     components:
     - type: Transform
       pos: -0.5,-0.5
       parent: 2
-- proto: HolopadCentCommUnlimitedRange
-  entities:
+    - type: Label
+      currentLabel: ЦК - Оператор
   - uid: 7066
     components:
     - type: MetaData
@@ -34375,7 +34377,7 @@ entities:
   - uid: 7057
     components:
     - type: Transform
-      pos: -20.513174,6.188437
+      pos: -20.471672,6.1512794
       parent: 2
 - proto: RubberStampDenied
   entities:

diff --git a/Resources/Prototypes/_Backmen/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/_Backmen/Entities/Structures/Machines/holopad.yml
@@ -11,15 +11,15 @@
 - type: entity
   parent: HolopadLongRange
   id: HolopadCentCommLongRange
-  suffix: Centcomm, Operator
+  suffix: Centcomm
   components:
   - type: Label
     currentLabel: holopad-centomm-base
 
 - type: entity
   parent: HolopadUnlimitedRange
   id: HolopadCentCommUnlimitedRange
-  suffix: CentComm
+  suffix: CentComm, Operator
   components:
   - type: Label
     currentLabel: holopad-centomm-base
@@ -46,4 +46,4 @@
   suffix: Centcomm, Evac room
   components:
   - type: Label
-    currentLabel: holopad-centomm-evac
+    currentLabel: holopad-centomm-evac