McCargo (Update) (#1614)

* McEdit * McFix * Update mccargo.yml * McSprite * McFix * Update mccargo.yml * McFixed * Update mccargo.yml * McGuide * Update shipyard.yml * Update mccargo.yml * Update mccargo.yml * Update mccargo.yml * McFix * Update mccargo.yml
new-frontiers-14 · Aug 7, 2024 · c0fcf8b · c0fcf8b
1 parent a62ff4a
commit c0fcf8b
Show file tree

Hide file tree

Showing 19 changed files with 3,018 additions and 2,557 deletions.
diff --git a/...ation/Systems/StationRenameFaxesSystem.cs → ...ation/Systems/StationRenameFaxesSystem.cs b/...ation/Systems/StationRenameFaxesSystem.cs → ...ation/Systems/StationRenameFaxesSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.Fax;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
 using Content.Shared.Fax.Components;
@@ -39,7 +38,20 @@ private void SyncFaxesNames(EntityUid stationUid)
             if (faxStationUid != stationUid)
                 continue;
 
-            var stationName = Name(faxStationUid.Value);
+            var stationName = "";
+
+            if (!string.IsNullOrEmpty(fax.StationNamePrefix))
+            {
+                stationName += fax.StationNamePrefix + " ";
+            }
+
+            stationName += Name(faxStationUid.Value);
+
+            if (!string.IsNullOrEmpty(fax.StationNameSuffix))
+            {
+                stationName += " " + fax.StationNameSuffix;
+            }
+
             fax.FaxName = stationName;
         }
     }

diff --git a/Content.Shared/Fax/Components/FaxMachineComponent.cs b/Content.Shared/Fax/Components/FaxMachineComponent.cs
@@ -148,6 +148,20 @@ public sealed partial class FaxMachineComponent : Component
     [ViewVariables]
     [DataField]
     public bool UseStationName { get; set; }
+
+    /// <summary>
+    /// Frontier - If added with UseStationName will add a Prefix to the name
+    /// </summary>
+    [ViewVariables]
+    [DataField]
+    public string? StationNamePrefix { get; set; } = null;
+
+    /// <summary>
+    /// Frontier - If added with UseStationName will add a suffix to the name
+    /// </summary>
+    [ViewVariables]
+    [DataField]
+    public string? StationNameSuffix { get; set; } = null;
 }
 
 [DataDefinition]

diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
@@ -45,6 +45,8 @@ guide-entry-shipyard-lantern = Lantern
 guide-entry-shipyard-legman = Legman
 guide-entry-shipyard-liquidator = Liquidator
 guide-entry-shipyard-loader = Loader
+guide-entry-shipyard-mccargo = McCargo
+guide-entry-shipyard-mcdelivery = McDelivery
 guide-entry-shipyard-pathfinder = Pathfinder
 guide-entry-shipyard-pioneer = Pioneer
 guide-entry-shipyard-prospector = Prospector

diff --git a/Resources/Maps/_NF/Dungeon/virology_lab.yml b/Resources/Maps/_NF/Dungeon/virology_lab.yml
@@ -8503,7 +8503,7 @@ entities:
     - type: Transform
       pos: 29.5,38.5
       parent: 1653
-- proto: HappyHonkCargo
+- proto: HappyHonkMcCargo
   entities:
   - uid: 1666
     components:

diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml
diff --git a/Resources/Maps/_NF/Shuttles/mcdelivery.yml b/Resources/Maps/_NF/Shuttles/mcdelivery.yml
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
@@ -3,7 +3,7 @@
   startingInventory:
     HappyHonk: 10
     HappyHonkMime: 4
-    HappyHonkCargo: 10 # Frontier
+    HappyHonkMcCargo: 10 # Frontier
     ClothingHeadHatMcCrown: 10 # Frontier
     MysteryFigureBoxBulk: 5 # Frontier
   emaggedInventory:

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/food.yml
@@ -5,8 +5,8 @@
   components:
   - type: StorageFill
     contents:
-    - id: HappyHonkCargoFood
-    - id: HappyHonkCargoFood
+    - id: HappyHonkMcCargoFood
+    - id: HappyHonkMcCargoFood
       prob: 0.5
-    - id: HappyHonkCargoFood
+    - id: HappyHonkMcCargoFood
       prob: 0.5
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -1,13 +1,13 @@
 - type: entity
-  id: HappyHonkCargo
+  id: HappyHonkMcCargo
   parent: HappyHonk
   name: mccargo meal
   components:
   - type: Sprite
-    sprite: _NF/Objects/Storage/Happyhonk/cargo.rsi
+    sprite: _NF/Objects/Storage/Happyhonk/mccargo.rsi
     state: box
   - type: Item
-    sprite: _NF/Objects/Storage/Happyhonk/cargo.rsi
+    sprite: _NF/Objects/Storage/Happyhonk/mccargo.rsi
     heldPrefix: box
   - type: StorageFill
     contents:
@@ -24,8 +24,8 @@
     price: 40
 
 - type: entity
-  id: HappyHonkCargoFood
-  parent: HappyHonkCargo
+  id: HappyHonkMcCargoFood
+  parent: HappyHonkMcCargo
   noSpawn: true
   components:
   - type: StorageFill

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -48,5 +48,14 @@
   id: AirlockExternalGlassShuttleTransit
   suffix: External, PubTrans, Glass, Docking
   components:
-    - type: PriorityDock
-      tag: DockTransit
+  - type: PriorityDock
+    tag: DockTransit
+
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassShuttleMcCargo
+  suffix: External, McCargo, Glass, Docking
+  noSpawn: true
+  components:
+  - type: Docking
+    name: McDrive Thru
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/fax_machine.yml
@@ -181,4 +181,16 @@
   noSpawn: true
   components:
   - type: FaxMachine
-    name: "NFSD Outpost Lawyer"
+    name: "NFSD Outpost Lawyer"
+
+# Ships
+- type: entity
+  parent: FaxMachineBase
+  id: FaxMachineShipMcCargo
+  suffix: Ship, McCargo
+  noSpawn: true
+  components:
+  - type: FaxMachine
+    useStationName: true
+    stationNameSuffix: McDrive Thru
+  - type: PowerSwitch
diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml
@@ -29,6 +29,8 @@
   - ShipyardLegman
   - ShipyardLiquidator
   - ShipyardLoader
+  - ShipyardMcCargo
+  - ShipyardMcDelivery
   - ShipyardPathfinder
   - ShipyardPioneer
   - ShipyardProspector
@@ -156,6 +158,16 @@
   name: guide-entry-shipyard-loader
   text: "/ServerInfo/_NF/Guidebook/Shipyard/Loader.xml"
 
+- type: guideEntry
+  id: ShipyardMcCargo
+  name: guide-entry-shipyard-mccargo
+  text: "/ServerInfo/_NF/Guidebook/Shipyard/McCargo.xml"
+
+- type: guideEntry
+  id: ShipyardMcDelivery
+  name: guide-entry-shipyard-mcdelivery
+  text: "/ServerInfo/_NF/Guidebook/Shipyard/McDelivery.xml"
+
 - type: guideEntry
   id: ShipyardPathfinder
   name: guide-entry-shipyard-pathfinder

diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/McCargo.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/McCargo.xml
@@ -0,0 +1,73 @@
+<Document>
+  # MC-CARGO FRANCHISE SHUTTLE
+  <Box>
+  <GuideEntityEmbed Entity="ClothingHeadHatMcCrown"/>
+  <GuideEntityEmbed Entity="HappyHonkMcCargo"/>
+  <GuideEntityEmbed Entity="CrateFoodMcCargo"/>
+  <GuideEntityEmbed Entity="KitchenDeepFryer"/>
+  </Box>
+  [color=#a4885c]Ship Size:[/color] Medium
+
+  [color=#a4885c]Recommended Crew:[/color] 1-4
+
+  [color=#a4885c]Power Gen Type:[/color] Plasma
+
+  [color=#a4885c]Expeditions:[/color] None
+
+  [color=#a4885c]IFF Console:[/color] None
+
+  "Your very own McCargo Franchise"
+
+  # PREFLIGHT CHECKLIST
+
+  ## 1. Power supply
+
+  ## 1.1. Battery units
+  <Box>
+  <GuideEntityEmbed Entity="SubstationWallBasic"/>
+  <GuideEntityEmbed Entity="APCBasic"/>
+  </Box>
+
+  - Check that the substation unit is anchored to the floor.
+  - Check that the APC unit's Main Breaker is toggled on.
+  - Check the APC units current Load* (W).
+
+  ## 1.2. P.A.C.M.A.N. generator unit
+  <Box>
+  <GuideEntityEmbed Entity="PortableGeneratorPacmanShuttle"/>
+  <GuideEntityEmbed Entity="SheetPlasma"/>
+  </Box>
+
+  - Check that the P.A.C.M.A.N. generators units are anchored to the floor.
+  - Check that the P.A.C.M.A.N. generators units has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight.
+  - Check that the P.A.C.M.A.N. generators units are set to HV output.
+  - Start the P.A.C.M.A.N. generators units.
+
+  ## 2. Atmospherics
+
+  ## 2.1. Distribution Loop
+  <Box>
+  <GuideEntityEmbed Entity="AirCanister"/>
+  <GuideEntityEmbed Entity="GasPort"/>
+  </Box>
+
+  - Check that the canisters is anchored to connector port.
+
+  ## 2.2. Waste Loop
+  <Box>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  <GuideEntityEmbed Entity="AirAlarm"/>
+  </Box>
+
+  - Ensure that the waste loop pump is enabled.
+
+  ## 3. Other checks
+  <Box>
+  <GuideEntityEmbed Entity="SmallGyroscope"/>
+  <GuideEntityEmbed Entity="GravityGeneratorMini"/>
+  </Box>
+
+  - Check that the gyroscope is anchored, powered, and enabled.
+  - Check that the mini gravity generator is anchored, powered, and enabled.
+
+</Document>
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/McDelivery.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/McDelivery.xml
@@ -0,0 +1,76 @@
+<Document>
+  # MC-DELIVERY FRANCHISE SHUTTLE
+  <Box>
+  <GuideEntityEmbed Entity="hydroponicsTrayAnchored"/>
+  <GuideEntityEmbed Entity="KitchenMicrowave"/>
+  <GuideEntityEmbed Entity="KitchenDeepFryer"/>
+  <GuideEntityEmbed Entity="KitchenElectricGrill"/>
+  </Box>
+  <Box>
+  <GuideEntityEmbed Entity="ShuttleMapBocadillo" Caption=""/>
+  </Box>
+  [color=#a4885c]Ship Size:[/color] Small
+
+  [color=#a4885c]Recommended Crew:[/color] 1
+
+  [color=#a4885c]Power Gen Type:[/color] WeldFuel
+
+  [color=#a4885c]Expeditions:[/color] None
+
+  [color=#a4885c]IFF Console:[/color] None
+
+  "A delivey ship build for McCargo"
+
+  # PREFLIGHT CHECKLIST
+
+  ## 1. Power supply
+
+  ## 1.1. Battery units
+  <Box>
+  <GuideEntityEmbed Entity="SubstationWallBasic"/>
+  <GuideEntityEmbed Entity="APCBasic"/>
+  </Box>
+
+  - Check that the APC unit's Main Breaker is toggled on.
+  - Check the APC units current Load* (W).
+
+  ## 1.2. J.R.P.A.C.M.A.N. generator unit
+  <Box>
+  <GuideEntityEmbed Entity="PortableGeneratorJrPacmanShuttle"/>
+  <GuideEntityEmbed Entity="JerryCan"/>
+  </Box>
+
+  - Check that the J.R.P.A.C.M.A.N. generator unit is anchored to the floor.
+  - Check that the J.R.P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight.
+  - Check that the J.R.P.A.C.M.A.N. generator unit is set to LV output.
+  - Set Target Power to 5** [bold]kW[/bold].
+  - Start the J.R.P.A.C.M.A.N. generator unit.
+
+  ## 2. Atmospherics
+
+  ## 2.1. Distribution Loop
+  <Box>
+  <GuideEntityEmbed Entity="AirCanister"/>
+  <GuideEntityEmbed Entity="GasPort"/>
+  </Box>
+
+  - Check that the canisters is anchored to connector port.
+
+  ## 2.2. Waste Loop
+  <Box>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  <GuideEntityEmbed Entity="AirAlarm"/>
+  </Box>
+
+  - Ensure that the waste loop pump is enabled.
+
+  ## 3. Other checks
+  <Box>
+  <GuideEntityEmbed Entity="SmallGyroscope"/>
+  <GuideEntityEmbed Entity="GravityGeneratorMini"/>
+  </Box>
+
+  - Check that the gyroscope is anchored, powered, and enabled.
+  - Check that the mini gravity generator is anchored, powered, and enabled.
+
+</Document>
diff --git a/...e/Happyhonk/cargo.rsi/box-inhand-left.png → ...Happyhonk/mccargo.rsi/box-inhand-left.png b/...e/Happyhonk/cargo.rsi/box-inhand-left.png → ...Happyhonk/mccargo.rsi/box-inhand-left.png
diff --git a/.../Happyhonk/cargo.rsi/box-inhand-right.png → ...appyhonk/mccargo.rsi/box-inhand-right.png b/.../Happyhonk/cargo.rsi/box-inhand-right.png → ...appyhonk/mccargo.rsi/box-inhand-right.png
diff --git a/.../Storage/Happyhonk/cargo.rsi/box-open.png → ...torage/Happyhonk/mccargo.rsi/box-open.png b/.../Storage/Happyhonk/cargo.rsi/box-open.png → ...torage/Happyhonk/mccargo.rsi/box-open.png
diff --git a/...jects/Storage/Happyhonk/cargo.rsi/box.png → ...cts/Storage/Happyhonk/mccargo.rsi/box.png b/...jects/Storage/Happyhonk/cargo.rsi/box.png → ...cts/Storage/Happyhonk/mccargo.rsi/box.png
diff --git a/...cts/Storage/Happyhonk/cargo.rsi/meta.json → ...s/Storage/Happyhonk/mccargo.rsi/meta.json b/...cts/Storage/Happyhonk/cargo.rsi/meta.json → ...s/Storage/Happyhonk/mccargo.rsi/meta.json