From 5d95ae80802cfd3564d944bfc08c790a36696183 Mon Sep 17 00:00:00 2001 From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com> Date: Wed, 8 Jan 2025 07:33:55 +0100 Subject: [PATCH 1/9] Fix Lyrae mixer setting (#2664) --- Resources/Maps/_NF/Shuttles/lyrae.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/lyrae.yml b/Resources/Maps/_NF/Shuttles/lyrae.yml index 48b4b9fcf78..4de1788a6b1 100644 --- 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 From ad5495cd62aec3145000c8990bcdfedc0983ef1d Mon Sep 17 00:00:00 2001 From: Havaren <49597412+Havaren@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:39:36 +0900 Subject: [PATCH 2/9] Update station anchor sell price (#2665) * Update station_anchor.yml * Update station_anchor.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Prototypes/Entities/Structures/Shuttles/station_anchor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml index f2c8e21dfc4..3df9fd100ac 100644 --- 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 From 74472c7636e2cbf2765114875d3201eed11ef8c3 Mon Sep 17 00:00:00 2001 From: Havaren <49597412+Havaren@users.noreply.github.com> Date: Wed, 8 Jan 2025 19:13:50 +0900 Subject: [PATCH 3/9] Add flatpacker Magnet (#2666) --- .../Prototypes/Entities/Structures/Machines/flatpacker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml index 8c95b09fb6b..c0e64b263ef 100644 --- 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 From a96c0eb05fb85577274593494dfc5c1da6698a04 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Wed, 8 Jan 2025 21:14:46 +1100 Subject: [PATCH 4/9] Automatically turn off magnet when ejecting materials from lathes (#2660) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Content.Server/Materials/MaterialStorageSystem.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs index 9f43a220493..e8f9ab52e63 100644 --- 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(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))) { From e8c20dd78b6281931eb32ffdcf190cd41ecd26cc Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 8 Jan 2025 10:15:22 +0000 Subject: [PATCH 5/9] Automatic Changelog (#2660) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 387b8c83557..08b74cdc0cc 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6282,3 +6282,9 @@ 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' From 4dd592a1ba14444b88bd268bd21e2bd79dee71b0 Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Wed, 8 Jan 2025 04:17:27 -0600 Subject: [PATCH 6/9] Gas Recycler For The Gasbender (#2659) --- .../_NF/Shuttles/Expedition/gasbender.yml | 48 ++++--------------- 1 file changed, 8 insertions(+), 40 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml index 3c3a5389532..b3f47d5bad3 100644 --- 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: From a773b4749b165e7acae325b2b97f275bf747dde7 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 8 Jan 2025 10:17:52 +0000 Subject: [PATCH 7/9] Automatic Changelog (#2659) --- Resources/Changelog/Frontier.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 08b74cdc0cc..960b27116ff 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6288,3 +6288,7 @@ Entries: 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' From a9a0beefcf889356776f9abb0832513852815066 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Thu, 9 Jan 2025 19:55:37 +0000 Subject: [PATCH 8/9] Adds dresses to contractor loadouts (#2647) --- .../_NF/Loadouts/Jobs/Contractor/jumpsuit.yml | 160 ++++++++++++++++++ .../Loadouts/contractor_loadout_groups.yml | 17 ++ 2 files changed, 177 insertions(+) diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml index 9c0a0d4b5f4..82a4096eadb 100644 --- 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 index 689dec9ac50..e3112b8fa0f 100644 --- 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 From fd5e8dc9f138ecab56ae22449b20a64c23b35dfa Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 9 Jan 2025 19:56:04 +0000 Subject: [PATCH 9/9] Automatic Changelog (#2647) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 960b27116ff..fe34170bc28 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6292,3 +6292,9 @@ Entries: 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'