From b1c7179e78054938d7ee388898bee1327a1b778b Mon Sep 17 00:00:00 2001 From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Mon, 8 Jan 2024 21:22:51 -0500 Subject: [PATCH] syndicate monkey changes, new nukeop monkey (#23744) * fix * fix uplink * add suffix --- .../Prototypes/Catalog/uplink_catalog.yml | 21 +++++++++++++++++++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 19 ++++++++++++++--- .../reinforcement_teleporter.yml | 10 ++++++++- 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index f6646e0bd4..31379f6f7f 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -456,6 +456,27 @@ Telecrystal: 8 categories: - UplinkUtility + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkReinforcementRadioSyndicateMonkeyNukeops # Version for Nukeops that spawns a syndicate monkey with the NukeOperative component. + name: uplink-reinforcement-radio-monkey-name + description: uplink-reinforcement-radio-monkey-desc + productEntity: ReinforcementRadioSyndicateMonkeyNukeops + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } + cost: + Telecrystal: 8 + categories: + - UplinkUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink - type: listing id: UplinkStealthBox diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 9ef49ff72a..481e7adb65 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1198,10 +1198,10 @@ - type: entity name: monkey - id: MobMonkeySyndicateAgent + id: MobBaseSyndicateMonkey parent: MobBaseAncestor description: New church of neo-darwinists actually believe that EVERY animal evolved from a monkey. Tastes like pork, and killing them is both fun and relaxing. - suffix: syndicate + suffix: syndicate base components: - type: NameIdentifier group: Monkey @@ -1222,11 +1222,24 @@ - type: GhostTakeoverAvailable - type: Loadout prototypes: [SyndicateOperativeGearMonkey] - # make the player a traitor once its taken + +- type: entity + id: MobMonkeySyndicateAgent + parent: MobBaseSyndicateMonkey + suffix: syndicate agent + components: + # make the player a traitor once its taken - type: AutoTraitor giveUplink: false giveObjectives: false +- type: entity + id: MobMonkeySyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink + parent: MobBaseSyndicateMonkey + suffix: NukeOps + components: + - type: NukeOperative + - type: entity name: kobold id: MobKobold diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index c791580ad3..f6d57f53a5 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -29,7 +29,7 @@ - type: entity parent: ReinforcementRadioSyndicate - id: ReinforcementRadioSyndicateMonkey # Reinforcement radio exclusive to nukeops uplink + id: ReinforcementRadioSyndicateMonkey name: syndicate monkey reinforcement radio description: Calls in a specially trained monkey to assist you. components: @@ -40,6 +40,14 @@ - type: GhostRoleMobSpawner prototype: MobMonkeySyndicateAgent +- type: entity + parent: ReinforcementRadioSyndicateMonkey + id: ReinforcementRadioSyndicateMonkeyNukeops # Reinforcement radio exclusive to nukeops uplink + suffix: NukeOps + components: + - type: GhostRoleMobSpawner + prototype: MobMonkeySyndicateAgentNukeops + - type: entity parent: ReinforcementRadioSyndicate id: ReinforcementRadioSyndicateCyborgAssault # Reinforcement radio exclusive to nukeops uplink -- 2.51.2