diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 3da049082b5..f4825b92252 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -17,7 +17,6 @@ using Robust.Shared.Map.Components; using Robust.Shared.Prototypes; using Content.Shared.Station.Components; -using FastAccessors; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; using Content.IntegrationTests.Tests._NF; @@ -45,7 +44,7 @@ public sealed class PostMapInitTest "/Maps/_NF/Shuttles/Bus/publicts.yml", }; - private static readonly string[] GameMaps = FrontierConstants.GameMapPrototypes; // Frontier: use test constants + private static readonly string[] GameMaps = FrontierConstants.GameMapPrototypes; // Frontier: not inline constants /// /// Asserts that specific files have been saved as grids and not maps. diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 5398a275a7b..66afa635dad 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4618,3 +4618,9 @@ Entries: message: Adds medical pen recipes to the medical assembler. id: 5410 time: '2024-10-16T10:18:31.0000000+00:00' +- author: MisterMecky + changes: + - type: Tweak + message: Ice and sandstone walls no longer spawn a girder upon their destruction + id: 5411 + time: '2024-10-16T16:15:50.0000000+00:00' diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 463efc82450..a9cb2d4fc89 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -400,6 +400,12 @@ damage: types: Piercing: 0 + - type: TriggerOnBeingGibbed # Frontier + - type: GibOnTrigger # Frontier + deleteItems: true # Frontier + deleteOrgans: true # Frontier + gib: false # Frontier + useArgumentEntity: true # Frontier - type: entity name: glockroach @@ -522,6 +528,9 @@ spawned: - id: FoodMeatSlime amount: 2 + - id: HideMothroach # Frontier + amount: 1 # Frontier + prob: 0.3 # Frontier - type: Extractable grindableSolutionName: food - type: ReplacementAccent diff --git a/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml b/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml index c38259dd816..a17761682f6 100644 --- a/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml +++ b/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml @@ -3,56 +3,56 @@ - type: latheRecipe id: MonkeyCube result: MonkeyCube - completetime: 30 + completetime: 300 # Frontier 30<300 materials: Biomass: 16 - type: latheRecipe id: KoboldCube result: KoboldCube - completetime: 30 + completetime: 300 # Frontier 30<300 materials: Biomass: 16 - type: latheRecipe id: CowCube result: CowCube - completetime: 30 + completetime: 300 # Frontier 30<300 materials: Biomass: 120 - type: latheRecipe id: GoatCube result: GoatCube - completetime: 30 + completetime: 300 # Frontier 30<300 materials: Biomass: 35 - type: latheRecipe id: MothroachCube result: MothroachCube - completetime: 45 # prevent biblical floods + completetime: 450 # prevent biblical floods, Frontier 45<450 materials: Biomass: 20 # a lot of materials wasted due to complex genetics - type: latheRecipe id: MouseCube result: MouseCube - completetime: 15 + completetime: 150 # Frontier 15<150 materials: Biomass: 12 - type: latheRecipe id: CockroachCube result: CockroachCube - completetime: 15 + completetime: 150 # Frontier 15<150 materials: Biomass: 16 - type: latheRecipe id: SpaceCarpCube result: SpaceCarpCube - completetime: 30 + completetime: 300 # Frontier 30<300 materials: Biomass: 24 Plasma: 600 @@ -60,7 +60,7 @@ - type: latheRecipe id: SpaceTickCube result: SpaceTickCube - completetime: 15 + completetime: 150 # Frontier 15<150 materials: Biomass: 8 Plasma: 300 # less biomass but more plasma @@ -68,7 +68,7 @@ - type: latheRecipe id: AbominationCube result: AbominationCube - completetime: 30 + completetime: 300 # Frontier 30<300 materials: # abominations are slow and essentially worse than even carp Biomass: 28 Plasma: 500 # more biomass but less plasma diff --git a/Resources/Prototypes/_NF/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_NF/Entities/Structures/Walls/walls.yml index d9106f047e2..de2501b8867 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Walls/walls.yml @@ -9,6 +9,14 @@ spread: 10 # Narrow spread, need to balance vs. max projectile distance reflects: - ShuttleKinetic # Only reflects PTK (otherwise RIP miners) + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1000 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] - type: entity parent: [AsteroidWallNF, WallIce]