From 6405ac6d9b938481695b84ce3803f4366167ffdd Mon Sep 17 00:00:00 2001 From: EmoGarbage404 <98561806+EmoGarbage404@users.noreply.github.com> Date: Mon, 28 Mar 2022 16:52:45 -0400 Subject: [PATCH] Corgi Meat Objective (#7304) --- .../Prototypes/Entities/Mobs/NPCs/pets.yml | 4 ++-- .../Entities/Objects/Consumable/Food/meat.yml | 18 ++++++++++++++++++ .../Objectives/traitorObjectives..yml | 13 +++++++++++++ .../Consumable/Food/meat.rsi/corgi.png | Bin 0 -> 6387 bytes .../Consumable/Food/meat.rsi/meta.json | 3 +++ 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/corgi.png diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index a64e83b8bc..fc8013a567 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -34,8 +34,8 @@ dead: corgi_dead - type: Butcherable spawned: - - id: FoodMeat - amount: 3 + - id: FoodMeatCorgi + amount: 2 - type: ReplacementAccent accent: dog - type: InteractionPopup diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index a142b11fe0..86b8ccae3a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -160,6 +160,24 @@ count: 3 slice: FoodMeatDuckCutlet +- type: entity + name: prime-cut corgi meat + parent: FoodMeatBase + id: FoodMeatCorgi + description: The tainted gift of an evil crime. The meat may be delicous, but at what cost? + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: corgi + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Bicaridine + Quantity: 20 + - type: entity name: raw crab meat parent: FoodMeatBase diff --git a/Resources/Prototypes/Objectives/traitorObjectives..yml b/Resources/Prototypes/Objectives/traitorObjectives..yml index df1ae1a01c..85884bc5d0 100644 --- a/Resources/Prototypes/Objectives/traitorObjectives..yml +++ b/Resources/Prototypes/Objectives/traitorObjectives..yml @@ -143,3 +143,16 @@ conditions: - !type:StealCondition prototype: SupplyComputerCircuitboard + +- type: objective + id: CorgiMeatStealObjective + issuer: syndicate + prob: 0.2 + requirements: + - !type:TraitorRequirement {} + - !type:IncompatibleConditionsRequirement + conditions: + - DieCondition + conditions: + - !type:StealCondition + prototype: FoodMeatCorgi diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/corgi.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/corgi.png new file mode 100644 index 0000000000000000000000000000000000000000..b9c6d4dfda7c55fcda4de78ba51524d652bd8bcf GIT binary patch literal 6387 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