Merge branch 'master' into 2025-10-01-PriceFixTyne

new-frontiers-14 · Jan 10, 2025 · cf15478 · cf15478
2 parents d168b38 + fd5e8dc
commit cf15478
Show file tree

Hide file tree

Showing 8 changed files with 215 additions and 43 deletions.
diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Materials;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
+using Content.Server.Storage.Components; // Frontier
 using Content.Server.Power.Components;
 using Content.Server.Stack;
 using Content.Shared.ActionBlocker;
@@ -81,6 +82,14 @@ private void OnEjectMessage(EjectMaterialMessage msg, EntitySessionEventArgs arg
         if (volume <= 0 || !TryChangeMaterialAmount(uid, msg.Material, -volume))
             return;
 
+        // Frontier
+        // If we made it this far, turn off the magnet before spawning materials
+        if (TryComp<MaterialStorageMagnetPickupComponent>(uid, out var magnet))
+        {
+            magnet.MagnetEnabled = false;
+        }
+        // end Frontier
+
         var mats = SpawnMultipleFromMaterial(volume, material, Transform(uid).Coordinates, out _);
         foreach (var mat in mats.Where(mat => !TerminatingOrDeleted(mat)))
         {

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -6282,3 +6282,19 @@ Entries:
       message: No longer possible to fly debris, wrecks, and salvage
   id: 5637
   time: '2025-01-07T16:01:29.0000000+00:00'
+- author: Alkheemist
+  changes:
+    - type: Tweak
+      message: Lathes now automatically disable their magnets when ejecting materials.
+  id: 5638
+  time: '2025-01-08T10:14:46.0000000+00:00'
+- author: blackknight954
+  changes: []
+  id: 5639
+  time: '2025-01-08T10:17:27.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Dresses added to contractor loadout.
+  id: 5640
+  time: '2025-01-09T19:55:37.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml
@@ -1847,7 +1847,6 @@ entities:
       parent: 1
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
   - uid: 840
@@ -1858,7 +1857,6 @@ entities:
       parent: 1
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
 - proto: BenchSofaCorpLeft
@@ -1869,8 +1867,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,9.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpMiddle
   entities:
   - uid: 528
@@ -1879,24 +1875,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,8.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 539
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,8.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 540
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,8.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpRight
   entities:
   - uid: 833
@@ -1905,8 +1895,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,9.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaLeft
   entities:
   - uid: 516
@@ -1915,8 +1903,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,13.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaRight
   entities:
   - uid: 510
@@ -1925,8 +1911,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,13.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BlastDoor
   entities:
   - uid: 79
@@ -3541,19 +3525,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-13.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-    - type: Physics
-      canCollide: False
-    - type: ItemSlots
 - proto: ConveyorBelt
   entities:
   - uid: 7
@@ -3969,16 +3940,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-10.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        ShipyardConsole-targetId: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: GasFilterFlipped
   entities:
   - uid: 89
@@ -5234,6 +5195,13 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+- proto: GasRecyclerMachineCircuitboard
+  entities:
+  - uid: 891
+    components:
+    - type: Transform
+      pos: -2.4430587,2.3822143
+      parent: 1
 - proto: GasThermoMachineFreezer
   entities:
   - uid: 414
@@ -7823,7 +7791,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,1.5
       parent: 1
-- proto: WarpPointShip
+- proto: WarpPoint
   entities:
   - uid: 818
     components:

diff --git a/Resources/Maps/_NF/Shuttles/lyrae.yml b/Resources/Maps/_NF/Shuttles/lyrae.yml
@@ -2419,8 +2419,8 @@ entities:
       pos: 3.5,-4.5
       parent: 2
     - type: GasMixer
-      inletTwoConcentration: 0.78
-      inletOneConcentration: 0.22
+      inletTwoConcentration: 0.21
+      inletOneConcentration: 0.79
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPassiveVent

diff --git a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
@@ -82,6 +82,8 @@
     - machine_parts
     - machine_board
     - board_slot
+  - type: MaterialStorageMagnetPickup # Frontier
+    range: 0.30 # Frontier
 #  - type: StaticPrice # Frontier
 #    price: 2000
 

diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
@@ -94,7 +94,7 @@
           sound:
             collection: MetalBreak
     - type: StaticPrice
-      price: 10000
+      price: 300 # Frontier 10000<300
     - type: Machine
       board: StationAnchorCircuitboard
     - type: ContainerContainer

diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
@@ -908,6 +908,166 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerGood
 
+- type: loadout
+  id: ContractorClothingUniformJumpskirtBlackElegantDress
+  name: black elegant dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtBlackElegantDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtRedElegantDress
+  name: red elegant dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtRedElegantDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtGreenElegantDress
+  name: green elegant dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtGreenElegantDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtBlueElegantDress
+  name: blue elegant dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtBlueElegantDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtPurpleElegantDress
+  name: purple elegant dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtPurpleElegantDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtCyanStripedDress
+  name: cyan striped dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtCyanStripedDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtRedStripedDress
+  name: red striped dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtRedStripedDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtGreenStripedDress
+  name: green striped dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtGreenStripedDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtPinkStripedDress
+  name: pink striped dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtPinkStripedDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtOrangeStripedDress
+  name: orange striped dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtOrangeStripedDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtPurpleTurtleneckDress
+  name: purple turtleneck dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtPurpleTurtleneckDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtRedTurtleneckDress
+  name: red turtleneck dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtRedTurtleneckDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtGreenTurtleneckDress
+  name: green turtleneck dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtGreenTurtleneckDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtBlueTurtleneckDress
+  name: blue turtleneck dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtBlueTurtleneckDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtYellowTurtleneckDress
+  name: yellow turtleneck dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtYellowTurtleneckDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtYellowOldDress
+  name: yellow old dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtYellowOldDress
+
 # Punk stuff
 - type: loadout
   id: ContractorClothingUniformRandomPunkCroptop

diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
@@ -176,6 +176,23 @@
   - ContractorClothingUniformJumpsuitMilitaryColorPurple
   - ContractorClothingUniformJumpsuitMilitaryColorLightBrown
   - ContractorClothingUniformJumpsuitMilitaryColorBrown
+  - ContractorClothingUniformJumpskirtBlackElegantDress
+  - ContractorClothingUniformJumpskirtRedElegantDress
+  - ContractorClothingUniformJumpskirtGreenElegantDress
+  - ContractorClothingUniformJumpskirtBlueElegantDress
+  - ContractorClothingUniformJumpskirtPurpleElegantDress
+  - ContractorClothingUniformJumpskirtCyanStripedDress
+  - ContractorClothingUniformJumpskirtRedStripedDress
+  - ContractorClothingUniformJumpskirtGreenStripedDress
+  - ContractorClothingUniformJumpskirtPinkStripedDress
+  - ContractorClothingUniformJumpskirtOrangeStripedDress
+  - ContractorClothingUniformJumpskirtPurpleTurtleneckDress
+  - ContractorClothingUniformJumpskirtRedTurtleneckDress
+  - ContractorClothingUniformJumpskirtGreenTurtleneckDress
+  - ContractorClothingUniformJumpskirtBlueTurtleneckDress
+  - ContractorClothingUniformJumpskirtYellowTurtleneckDress
+  - ContractorClothingUniformJumpskirtYellowOldDress
+
   fallbacks:
   - ContractorClothingUniformJumpsuitColorGrey
   - ContractorClothingUniformJumpskirtColorGrey