Small fix

new-frontiers-14 · Dec 28, 2024 · 3fe4006 · 3fe4006
1 parent 6825d15
commit 3fe4006
Show file tree

Hide file tree

Showing 83 changed files with 334 additions and 17 deletions.
diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
@@ -29,7 +29,6 @@
 using Content.Server.StationRecords.Systems;
 using Content.Shared.Database;
 using Content.Shared.Preferences;
-using Content.Shared.Shuttles.Components;
 using static Content.Shared.Shipyard.Components.ShuttleDeedComponent;
 using Content.Server.Shuttles.Components;
 using Content.Server.Station.Components;
@@ -38,7 +37,6 @@
 using Content.Shared.UserInterface;
 using Robust.Shared.Audio.Systems;
 using Content.Shared.Access;
-using Content.Shared.Tiles;
 using Content.Server._NF.Smuggling.Components;
 using Content.Shared._NF.ShuttleRecords;
 using Content.Server.StationEvents.Components;
@@ -203,14 +201,6 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp
             shuttleStation = _station.InitializeNewStation(stationProto.Stations[vessel.ID], gridUids);
             var metaData = MetaData((EntityUid)shuttleStation);
             name = metaData.EntityName;
-            _shuttle.SetIFFColor(shuttleUid, new Color
-            {
-                R = 10,
-                G = 50,
-                B = 100,
-                A = 100
-            });
-            _shuttle.AddIFFFlag(shuttleUid, IFFFlags.IsPlayerShuttle);
         }
 
         if (TryComp<AccessComponent>(targetId, out var newCap))

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml
@@ -22,6 +22,10 @@
   - Atmospherics
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Ambition

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
@@ -22,6 +22,10 @@
   - Civilian
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Anchor

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml
@@ -21,6 +21,10 @@
   - Expedition
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Brigand

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml
@@ -23,7 +23,11 @@
   guidebookPage: ShipyardCharon
   class:
   - Expedition
-
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
+
 - type: gameMap
   id: Charon
   mapName: 'Charon'

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml
@@ -21,6 +21,10 @@
   - Expedition
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: DecadeDove

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml
@@ -21,6 +21,10 @@
   - Expedition
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Dragonfly

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml
@@ -22,6 +22,10 @@
   - Atmospherics
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Gasbender

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml
@@ -23,6 +23,10 @@
   - Civilian
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Gourd

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml
@@ -21,6 +21,10 @@
   - Expedition
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Pathfinder

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
@@ -21,6 +21,10 @@
   - Expedition
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Sprinter

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml
@@ -22,6 +22,10 @@
   - Detective
   engine:
   - Uranium
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Broadhead

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml
@@ -13,6 +13,10 @@
   - Medical
   engine:
   - APU
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Cleric

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
@@ -12,6 +12,14 @@
   - Capital
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Empress
@@ -28,9 +36,4 @@
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
         - type: StationJobs
-          availableJobs:
-#            PrisonGuard: [ 0, 0 ]
-#            SecurityOfficer: [ 0, 0 ]
-#            Warden: [ 0, 0 ]
-#            Brigmedic: [ 0, 0 ]
-            Chef: [ 0, 0 ]
+          availableJobs: {} # Removed the chef since we dont have a real loadout for it
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml
@@ -13,6 +13,10 @@
   - Fighter
   engine:
   - APU
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Fighter

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml
@@ -12,6 +12,10 @@
   - Medical
   engine:
   - APU
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Hospitaller

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml
@@ -12,6 +12,10 @@
   - Detective
   engine:
   - Plasma
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Interceptor

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/paladin.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/paladin.yml
@@ -10,6 +10,10 @@
   guidebookPage: Null
   class:
   - Fighter
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Paladin

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
@@ -12,6 +12,10 @@
   - Patrol
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Prowler

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml
@@ -13,6 +13,10 @@
   - Fighter
   engine:
   - APU
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Rogue

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml
@@ -12,6 +12,10 @@
   - Pursuit
   engine:
   - APU
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Templar

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml
@@ -14,6 +14,10 @@
   - Expedition
   engine:
   - AME
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Wasp

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml
@@ -21,6 +21,10 @@
   - Pursuit
   engine:
   - Uranium
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Wendigo

diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml
@@ -13,6 +13,10 @@
   - Civilian
   engine:
   - Plasma
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Bison

diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml
@@ -16,6 +16,10 @@
   - Civilian
   engine:
   - Plasma
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Canister

diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml
@@ -22,6 +22,10 @@
   - Civilian
   engine:
   - Plasma
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Disciple

diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml
@@ -22,6 +22,10 @@
   - Kitchen
   engine:
   - Plasma
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Nugget

diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
@@ -13,6 +13,10 @@
   - Salvage
   engine:
   - Uranium
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Orange

diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml
@@ -12,6 +12,10 @@
   - Science
   engine:
   - Plasma
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Point

diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
@@ -12,6 +12,10 @@
   - Civilian
   engine:
   - Plasma
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Tide

diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml
@@ -22,6 +22,10 @@
   - Civilian
   engine:
   - Plasma
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Bottleneck

diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml
@@ -22,6 +22,10 @@
   - Civilian
   engine:
   - Plasma
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Broom

diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml
@@ -23,6 +23,10 @@
   - Civilian
   engine:
   - Plasma
+  addComponents:
+  - type: IFF
+    color: '#FFFFFFFF'
+    flags: [IsPlayerShuttle]
 
 - type: gameMap
   id: Chauffeur