diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml index 39e68b63a78..c9fcf9b01d8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml @@ -51,6 +51,8 @@ - type: Flashable - type: NameIdentifier group: GenericNumber + - type: TimedDespawn # Frontier + lifetime: 3000 # Frontier: 50 mins (max blue space event duration involving these mobs - 40 mins) - type: entity parent: BaseMobArgocyte diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 6f4d3512b6e..4e39fafcdb8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -79,6 +79,8 @@ interactFailureString: petting-failure-carp interactFailureSound: path: /Audio/Effects/bite.ogg + - type: TimedDespawn # Frontier + lifetime: 10800 # Frontier: 3 hours (I believe asteroids and wrecks despawn after 3 hours hence the value) - type: entity parent: BaseMobCarp diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml index c15458ff394..13041865fe4 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml @@ -67,6 +67,8 @@ - type: GhostTakeoverAvailable - type: Speech speechVerb: LargeMob + - type: TimedDespawn # Frontier + lifetime: 10800 # Frontier: 3 hours (I believe asteroids and wrecks despawn after 3 hours hence the value) - type: entity name: space bear diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml index 0a2b4f80bbc..2af33d60c66 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml @@ -79,6 +79,8 @@ - type: Speech speechVerb: SmallMob - type: NonSpreaderZombie + - type: TimedDespawn # Frontier + lifetime: 10800 # Frontier: 3 hours (I believe asteroids and wrecks despawn after 3 hours hence the value) - type: entity id: MobTickSalvage diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/arcadiaindustries.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/arcadiaindustries.yml index 8d8308419e4..2c9ad9b720e 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/arcadiaindustries.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/arcadiaindustries.yml @@ -68,6 +68,8 @@ types: Bloodloss: 1 + - type: TimedDespawn + lifetime: 1800 # 30 mins (max blue space event duration involving these mobs - 20 mins) - type: entity name: Hijacked Hologuardian @@ -123,6 +125,8 @@ types: Bloodloss: 1 + - type: TimedDespawn + lifetime: 1800 # 30 mins (max blue space event duration involving these mobs - 20 mins) - type: entity name: Mobile Blaster Unit @@ -194,3 +198,5 @@ types: Bloodloss: 1 + - type: TimedDespawn + lifetime: 1800 # 30 mins (max blue space event duration involving these mobs - 20 mins) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml index 810ea1fba6a..4735bad2085 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml @@ -18,6 +18,8 @@ NextAdvertisementTime: 10 - type: AutoWakeUp - type: MovementAlwaysTouching + - type: TimedDespawn + lifetime: 3000 # 50 mins (max blue space event duration involving these mobs - 40 mins) # Humans # Blood Cult Priest, ranged mab, bolts deal 10 slash damage diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml index 3ec108980f1..9dce13e6c9b 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml @@ -29,6 +29,8 @@ - type: Buckle disable: true - type: AutoWakeUp + - type: TimedDespawn + lifetime: 3000 # 50 mins (max blue space event duration involving these mobs - 40 mins) # Humans # Syndicate Captain, "armed" with AP Python diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml index 87c8f17e244..80244f6371a 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml @@ -40,6 +40,8 @@ NextAdvertisementTime: 10 - type: AutoWakeUp - type: MovementAlwaysTouching + - type: TimedDespawn + lifetime: 1800 # 30 mins (max blue space event duration involving these mobs - 20 mins) # Humans # Blue Wizard, summons 2 Blue Curacao Elementals