Merge branch 'master' into 2024-10-13-Workflows2

whatston3 · Oct 16, 2024 · 1c1f2be · 1c1f2be
2 parents d9330d7 + e671e95
commit 1c1f2be
Show file tree

Hide file tree

Showing 38 changed files with 169 additions and 131 deletions.
diff --git a/Content.IntegrationTests/Tests/MachineBoardTest.cs b/Content.IntegrationTests/Tests/MachineBoardTest.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Construction.Components;
 using Content.Shared.Construction.Components;
@@ -57,7 +57,7 @@ await server.WaitAssertion(() =>
                 Assert.Multiple(() =>
                 {
                     Assert.That(protoMan.TryIndex<EntityPrototype>(mId, out var mProto),
-                        $"Machine board {p.ID}'s corresponding machine has an invalid prototype."); // Frontier
+                        $"Machine board {p.ID}'s corresponding machine has an invalid prototype.");
                     Assert.That(mProto.TryGetComponent<MachineComponent>(out var mComp, compFact),
                         $"Machine board {p.ID}'s corresponding machine {mId} does not have MachineComponent");
                     Assert.That(mComp.Board, Is.EqualTo(p.ID),
@@ -93,6 +93,11 @@ await server.WaitAssertion(() =>
                     continue;
                 var cId = cbc.Prototype;
 
+                // Frontier: we accept null as board prototypes, but this will fail the assertions.
+                if (cId == "Null")
+                    continue;
+                // End Frontier
+
                 Assert.Multiple(() =>
                 {
                     Assert.That(cId, Is.Not.Null, $"Computer board \"{p.ID}\" does not have a corresponding computer.");

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -152,10 +152,8 @@
 
 - type: entity
   id: MobCarpSalvage
-  parent: MobCarp
+  parent: [NFMobRestrictions, MobCarp] # Frontier: add NFMobRestrictions, remove components
   suffix: "Salvage Ruleset"
-  components:
-    - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   name: space carp
@@ -244,7 +242,5 @@
 
 - type: entity
   id: MobSharkSalvage
-  parent: MobShark
+  parent: [NFMobRestrictions, MobShark] # Frontier: add NFMobRestrictions
   suffix: "Salvage Ruleset"
-  components:
-    - type: NFSalvageMobRestrictions
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -205,7 +205,7 @@
         Blunt: 10
 
 - type: entity
-  parent: [ SimpleSpaceMobBase, MobCombat ]
+  parent: [ NFMobRestrictions, SimpleSpaceMobBase, MobCombat ] # Frontier: add NFMobRestrictions
   id: BaseMobFleshSalvage #This one is immune to space!
   name: aberrant flesh
   suffix: "Salvage Ruleset"
@@ -261,7 +261,6 @@
         Slash: 6
   - type: ReplacementAccent
     accent: genericAggressive
-  - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   parent: BaseMobFleshSalvage

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -113,10 +113,8 @@
 
 - type: entity
   id: MobBearSpaceSalvage
-  parent: MobBearSpace
+  parent: [NFMobRestrictions, MobBearSpace] # Frontier: add NFMobRestrictions, remove components
   suffix: "Salvage Ruleset"
-  components:
-  - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   name: space kangaroo
@@ -268,10 +266,8 @@
 
 - type: entity
   id: MobSpiderSpaceSalvage
-  parent: MobSpiderSpace
+  parent: [NFMobRestrictions, MobSpiderSpace] # Frontier: add NFMobRestrictions, remove components
   suffix: "Salvage Ruleset"
-  components:
-  - type: NFSalvageMobRestrictions
 
 - type: entity
   name: space cobra
@@ -365,10 +361,8 @@
 
 - type: entity
   id: MobCobraSpaceSalvage
-  parent: MobCobraSpace
+  parent: [NFMobRestrictions, MobCobraSpace] # Frontier: add NFMobRestrictions, remove components
   suffix: "Salvage Ruleset"
-  components:
-    - type: NFSalvageMobRestrictions # Frontier: SalvageMobRestrictions<NFSalvageMobRestrictions
 
 - type: entity
   parent: SimpleSpaceMobBase

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -82,8 +82,6 @@
 
 - type: entity
   id: MobTickSalvage
-  parent: MobTick
+  parent: [NFMobRestrictions, MobTick] # Frontier: add NFMobRestrictions, remove components
   suffix: "Salvage Ruleset"
-  components:
-  - type: NFSalvageMobRestrictions # Frontier
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -2,7 +2,7 @@
 - type: entity
   name: burrower
   id: MobXeno
-  parent: SimpleSpaceMobBase
+  parent: [NFMobRestrictions, SimpleSpaceMobBase] # Frontier: add NFMobRestrictions
   description: They mostly come at night. Mostly.
   components:
   - type: Insulated
@@ -120,7 +120,6 @@
     molsPerSecondPerUnitMass: 0.0005
   - type: Speech
     speechVerb: LargeMob
-  - type: NFSalvageMobRestrictions # Frontier
   - type: ReplacementAccent # Frontier
     accent: genericAggressive # Frontier
 
@@ -364,7 +363,7 @@
 
 - type: entity
   name: space adder
-  parent: SimpleSpaceMobBase
+  parent: [NFMobRestrictions, SimpleSpaceMobBase] # Frontier: add NFMobRestrictions
   id: MobPurpleSnake
   description: A menacing purple snake from Kepler-283c.
   components:
@@ -430,7 +429,6 @@
     tags:
     - DoorBumpOpener
     - FootstepSound
-  - type: NFSalvageMobRestrictions # Frontier
   - type: ReplacementAccent # Frontier
     accent: genericAggressive # Frontier
 

diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -186,7 +186,7 @@
     projectileSpeed: 5
 
 - type: entity
-  parent: BaseMobDragon
+  parent: [NFMobRestrictions, BaseMobDragon] # Frontier: add NFMobRestrictions
   id: MobDragonDungeon
   suffix: Dungeon
   components:
@@ -218,7 +218,6 @@
   - type: ActionGun #Frontier
     action: ActionDragonsBreath #Frontier
     gunProto: DragonsBreathGun #Frontier
-  - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   id: ActionSpawnRift

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -444,19 +444,6 @@
     - type: ComputerTabletopBoard # Frontier
       prototype: ComputerTabletopIFFSyndicate # Frontier
 
-- type: entity
-  parent: BaseComputerCircuitboard
-  id: ShipyardComputerCircuitboard
-  name: shipyard computer board
-  description: A computer printed circuit board for a shipyard computer.
-  components:
-    - type: Sprite
-      state: cpu_supply
-    - type: ComputerBoard
-      prototype: ComputerShipyard
-    - type: ComputerTabletopBoard # Frontier
-      prototype: ComputerTabletopShipyard # Frontier
-
 - type: entity
   parent: BaseComputerCircuitboard
   id: ComputerMassMediaCircuitboard

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/corpses.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/corpses.yml
@@ -12,7 +12,6 @@
     factions:
     - SimpleHostile
   - type: Carriable # Carrying system from nyanotrasen.
-  #- type: NFSalvageMobRestrictions
   - type: Butcherable
     butcheringType: Spike
     spawned:

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/elemental.yml
@@ -139,13 +139,12 @@
 - type: entity
   abstract: true
   id: MobOreCrabNF
-  parent: MobOreCrab
+  parent: [MobOreCrab, NFMobRestrictions]
   components:
   - type: NpcFactionMember
     factions:
     - SimpleHostile # Because AI stupid ass hell right now
   - type: MovementIgnoreGravity # Or they just can't do something
-  - type: NFSalvageMobRestrictions
 
 - type: entity
   parent: MobOreCrabNF
@@ -366,7 +365,7 @@
   abstract: true
   id: MobOreGolem
   name: ore golem
-  parent: [ MobElementalBase, MobCombat ]
+  parent: [ MobElementalBase, MobCombat, NFMobRestrictions ]
   components:
   - type: Sprite
     sprite: /Textures/_NF/Mobs/Elemental/golems.rsi
@@ -390,7 +389,6 @@
   - type: Damageable
     damageContainer: StructuralInorganic
   - type: MovementIgnoreGravity # Or they just can't do something
-  - type: NFSalvageMobRestrictions
   - type: Appearance # Next three components make the mob fall over when dead
   - type: StandingState
   - type: RotationVisuals

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
@@ -83,6 +83,68 @@
     reflects:
       - Energy
 
+- type: entity
+  abstract: true
+  id: NFMobRestrictions
+  components:
+  - type: NFSalvageMobRestrictions
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn30
+  components:
+  - type: TimedDespawn
+    lifetime: 30
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn60
+  components:
+  - type: TimedDespawn
+    lifetime: 60
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn80
+  components:
+  - type: TimedDespawn
+    lifetime: 80
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn120
+  components:
+  - type: TimedDespawn
+    lifetime: 120
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn180
+  components:
+  - type: TimedDespawn
+    lifetime: 180
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn1200
+  components:
+  - type: TimedDespawn
+    lifetime: 1200
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn1800
+  components:
+  - type: TimedDespawn
+    lifetime: 1800
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn3000
+  components:
+  - type: TimedDespawn
+    lifetime: 3000
+
 - type: entity
   save: false
   id: MobEnhancedMovement
@@ -116,6 +178,7 @@
   parent:
   - MobEnhancedMovement
   - MobPassiveRegenWeak
+  - NFMobRestrictions
   components:
   - type: Hands
   - type: Puller
@@ -130,7 +193,6 @@
     - FootstepSound
     - DoorBumpOpener
     - CannotSuicide
-  - type: NFSalvageMobRestrictions
   - type: FTLKnockdownImmune
 
 # Inventories
@@ -267,7 +329,6 @@
     minimumWait: 120 # 1 * 2
     maximumWait: 240 # 2 * 60
     nextAdvertisementTime: 0
-  - type: NFSalvageMobRestrictions
   - type: FTLKnockdownImmune
   - type: Respirator
     updateInterval: 99999 # Shouldn't run often, if ever.
@@ -346,11 +407,10 @@
   - type: MobPrice
     price: 1500
     deathPenalty: 0.5
-  - type: NFSalvageMobRestrictions
   - type: Tag
     tags:
     - CanPilot
     - FootstepSound
     - DoorBumpOpener
     - CannotSuicide
-  - type: FTLKnockdownImmune
+  - type: FTLKnockdownImmune