Merge branch 'master' into january-vanilla-upstream-merge

new-frontiers-14 · Feb 3, 2024 · da83d1a · da83d1a
2 parents b6fae8e + 8ae82b4
commit da83d1a
Show file tree

Hide file tree

Showing 57 changed files with 680 additions and 1,298 deletions.
diff --git a/Content.Server/Power/Generator/PortableGeneratorSystem.cs b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.DoAfter;
+using Content.Server.DoAfter;
 using Content.Server.Popups;
 using Content.Shared.DoAfter;
 using Content.Shared.Power.Generator;
@@ -39,6 +39,14 @@ public override void Initialize()
         SubscribeLocalEvent<PortableGeneratorComponent, PortableGeneratorSwitchOutputMessage>(GeneratorSwitchOutputMessage);
 
         SubscribeLocalEvent<FuelGeneratorComponent, SwitchPowerCheckEvent>(OnSwitchPowerCheck);
+
+        SubscribeLocalEvent<PortableGeneratorComponent, MapInitEvent>(GeneratorMapInit); // Frontier
+    }
+
+    private void GeneratorMapInit(EntityUid uid, PortableGeneratorComponent component, MapInitEvent args) // Frontier - Init on map generator
+    {
+        if (component.StartOnMapInit)
+            _generator.SetFuelGeneratorOn(uid, true);
     }
 
     private void GeneratorSwitchOutputMessage(EntityUid uid, PortableGeneratorComponent component, PortableGeneratorSwitchOutputMessage args)

diff --git a/Content.Shared/Power/Generator/FuelGeneratorComponent.cs b/Content.Shared/Power/Generator/FuelGeneratorComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Power.Generator;
 

diff --git a/Content.Shared/Power/Generator/SharedPortableGeneratorComponent.cs b/Content.Shared/Power/Generator/SharedPortableGeneratorComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power.Generator;
@@ -42,6 +42,12 @@ public sealed partial class PortableGeneratorComponent : Component
     [DataField("startSoundEmpty")]
     [ViewVariables(VVAccess.ReadWrite)]
     public SoundSpecifier? StartSoundEmpty { get; set; }
+
+    /// <summary>
+    /// Frontier - Start the generator with the map.
+    /// </summary>
+    [DataField("startOnMapInit")]
+    public bool StartOnMapInit { get; set; } = false;
 }
 
 /// <summary>

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -3174,3 +3174,21 @@ Entries:
       message: Updated (and slightly reworked) NR Sparrow to current mapping standards.
   id: 4799
   time: '2024-02-02T23:12:12.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: Added clown & mime gear to AutoDrob.
+  id: 4800
+  time: '2024-02-03T17:56:47.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: Added small gyro and thrusters to cargo and sci tech.
+  id: 4801
+  time: '2024-02-03T17:58:48.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: Emotional support cats can now swap hats (Mail, Pirate, Chef)
+  id: 4802
+  time: '2024-02-03T17:59:55.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl
@@ -3,3 +3,9 @@ ent-CrateThruster = { ent-BaseThruster }
 
 ent-CrateGyroscope = { ent-Gyroscope }
     .desc = { ent-Gyroscope.desc }
+
+ent-CrateSmallThruster = { ent-SmallThruster }
+    .desc = { ent-BaseThruster.desc }
+
+ent-CrateSmallGyroscope = { ent-SmallGyroscope }
+    .desc = { ent-Gyroscope.desc }
diff --git a/Resources/Locale/en-US/_NF/prototypes/entities/shuttles/thrusters.ftl b/Resources/Locale/en-US/_NF/prototypes/entities/shuttles/thrusters.ftl
@@ -0,0 +1,5 @@
+ent-SmallThruster = small thruster
+    .desc = { ent-BaseThruster.desc }
+
+ent-SmallGyroscope = small gyroscope
+    .desc = { ent-Gyroscope.desc }
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -7,8 +7,6 @@
     ClothingUniformJumpsuitJesterAlt: 8
     ClothingShoesJester: 8
     ClothingNeckBellCollar: 8
-    ClothingOuterWinterClown: 4
-    ClothingOuterWinterMime: 4
     ClothingOuterWinterMusician: 4
     ClothingMaskJoy: 2
     ClothingHeadHatCardborg: 2
@@ -39,9 +37,6 @@
     ClothingUniformJumpsuitDameDane: 2
     ClothingShoesDameDane: 2
     ClothingOuterDameDane: 2
-    ClothingOuterClownPriest: 1
-    ClothingMaskSadMime: 1
-    ClothingMaskScaredMime: 1
     ClothingUniformJumpsuitKimono: 1
     ClothingHeadHatCasa: 1
     ClothingHeadHatHairflower: 1
@@ -50,9 +45,6 @@
     ClothingUniformJumpskirtPerformer: 2
     ClothingShoesBootsPerformer: 2
     ClothingNeckCloakMoth: 2
-    ClothingMaskClown: 2
-    ClothingMaskMime: 2
-    ClothingShoesClown: 2
     ClothingUniformJumpskirtJanimaid: 2
     ClothingHeadBandRed: 1
     ClothingHeadHatPirate: 1
@@ -67,8 +59,29 @@
     ClothingHandsGlovesBoxingGreen: 2
     UniformShortsRed: 4
     UniformShortsRedWithTop: 4
+    ClothingBackpackClownFilled: 2
+    ClothingBackpackSatchelClown: 2
+    ClothingBackpackDuffelClown: 2
+    ClothingMaskClown: 2
+    ClothingShoesClown: 2
+    ClothingUniformJumpsuitClown: 2
+    ClothingOuterWinterClown: 2
+    ClothingOuterClownPriest: 1
     RubberStampClown: 1
+    ClothingBackpackMime: 2
+    ClothingBackpackSatchelMime: 2
+    ClothingBackpackDuffelMime: 2
+    ClothingHeadHatMimesoft: 2
+    ClothingMaskMime: 2
+    ClothingMaskSadMime: 1
+    ClothingMaskScaredMime: 1
+    ClothingUniformJumpsuitMime: 2
+    ClothingUniformJumpskirtMime: 2
+    ClothingOuterWinterMime: 2
+    ClothingBeltSuspenders: 2
     RubberStampMime: 1
+  contrabandInventory: # Frontier - Hidden inventory
+    ClothingHeadHatMimesoftFlipped: 1
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingOuterDogi: 1

diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -273,9 +273,6 @@
     sprite: Clothing/Ears/Headsets/service.rsi
   - type: Clothing
     sprite: Clothing/Ears/Headsets/service.rsi
-  - type: Tag
-    tags:
-      - PetWearableCat
 
 - type: entity
   parent: ClothingHeadset

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -222,6 +222,7 @@
     - ClothMade
     - HamsterWearable
     - WhitelistChameleon
+    - CatWearable # Frontier
 
 - type: entity
   parent: ClothingHeadBase
@@ -336,6 +337,11 @@
     sprite: Clothing/Head/Hats/pirate.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/pirate.rsi
+  - type: Tag # Frontier
+    tags:
+    - ClothMade
+    - WhitelistChameleon
+    - CatWearable
 
 - type: entity
   parent: ClothingHeadBase

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -694,7 +694,7 @@
 
 - type: entity
   id: ComputerCargoOrders
-  parent: BaseStructureComputer
+  parent: [BaseStructureUnanchorable, BaseStructureIndestructible, BaseStructureComputer] # Frontier
   name: cargo request computer
   description: Used to order supplies and approve requests.
   placement:
@@ -754,13 +754,6 @@
   - type: GuideHelp
     guides:
     - Cargo
-  - type: Anchorable # Frontier
-    delay: 999999
-  - type: Destructible  # Frontier
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 0
 
 - type: entity
   id: ComputerCargoBounty

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -455,6 +455,8 @@
       - StationMapElectronics
       - DeepFryerMachineCircuitboard
     # End Nyano additions
+      - SmallThrusterMachineCircuitboard # Frontier
+      - SmallGyroscopeMachineCircuitboard # Frontier
   - type: MaterialStorage
     whitelist:
       tags:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -138,7 +138,7 @@
     noRot: false
 
 - type: entity
-  parent: VendingMachine
+  parent: [BaseStructureUnanchorable, VendingMachine] # Frontier
   id: VendingMachineAmmo
   name: Liberation Station
   description: An overwhelming amount of ancient patriotism washes over you just by looking at the machine.
@@ -197,7 +197,7 @@
     - Bartender
 
 - type: entity
-  parent: VendingMachine
+  parent: [BaseStructureUnanchorable, VendingMachine] # Frontier
   id: VendingMachineCart
   name: PTech
   description: PTech vending! Providing a ROBUST selection of PDAs, cartridges, and anything else a dull paper pusher needs!
@@ -1757,7 +1757,7 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
 
 - type: entity
-  parent: VendingMachine
+  parent: [BaseStructureUnanchorable, VendingMachine] # Frontier
   id: VendingMachineSyndieDrobe
   name: SyndieDrobe
   description: Wardrobe machine encoded by the syndicate, contains elite outfits for various operations.
@@ -1855,7 +1855,7 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
 
 - type: entity
-  parent: VendingMachine
+  parent: [BaseStructureUnanchorable, VendingMachine] # Frontier
   id: VendingMachineCentDrobe
   name: CentDrobe
   description: A one-of-a-kind vending machine for all your centcom aesthetic needs!

diff --git a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: CargoTelepad
-  parent: BaseMachinePowered
+  parent: [BaseStructureUnanchorable, BaseStructureIndestructible, BaseMachinePowered] # Frontier
   name: cargo telepad
   description: Beam in the pizzas and dig in.
   components:
@@ -47,10 +47,3 @@
     board: CargoTelepadMachineCircuitboard
   - type: Appearance
   - type: CollideOnAnchor
-  - type: Destructible # Frontier
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 0
-  - type: Anchorable # Frontier
-    delay: 999999
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
@@ -149,6 +149,8 @@
   - ThrusterMachineCircuitboard
   - GyroscopeMachineCircuitboard
   - MiniGravityGeneratorCircuitboard
+  - SmallThrusterMachineCircuitboard # Frontier
+  - SmallGyroscopeMachineCircuitboard # Frontier
 
 - type: technology
   id: AdvancedAtmospherics

diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml
@@ -18,13 +18,22 @@
   category: Shuttle
   group: market
 
-# - type: cargoProduct
-  # id: ShuttlePowerKit
-  # icon:
-    # sprite: Structures/Machines/computers.rsi
-    # state: avionics-systems
-  # product: CrateEngineeringShuttle
-  # cost: 3000
-  # category: Shuttle
-  # group: market
-#  locked: true   # only the QM has permission to order by default
+- type: cargoProduct
+  id: ShuttleSmallThruster
+  icon:
+    sprite: Structures/Shuttles/thruster.rsi
+    state: base
+  product: CrateSmallThruster
+  cost: 500
+  category: Shuttle
+  group: market
+
+- type: cargoProduct
+  id: ShuttleSmallGyroscope
+  icon:
+    sprite: Structures/Shuttles/gyroscope.rsi
+    state: base
+  product: CrateSmallGyroscope
+  cost: 500
+  category: Shuttle
+  group: market
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml
@@ -13,3 +13,19 @@
   - type: StorageFill
     contents:
       - id: ThrusterUnanchored
+
+- type: entity
+  id: CrateSmallGyroscope
+  parent: CrateEngineering
+  components:
+  - type: StorageFill
+    contents:
+      - id: SmallGyroscopeUnanchored
+
+- type: entity
+  id: CrateSmallThruster
+  parent: CrateEngineering
+  components:
+  - type: StorageFill
+    contents:
+      - id: SmallThrusterUnanchored