diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 3308baf4d74..a69a8fa96e0 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -128,7 +128,7 @@ - type: entity name: Runtime - parent: MobCat + parent: MobCatGhost # DeltaV - Frontier Feature id: MobCatRuntime description: Professional mouse hunter. Escape artist. components: @@ -143,6 +143,10 @@ attributes: proper: true gender: female + - type: Butcherable # DeltaV - Frontier Feature + spawned: # DeltaV - Frontier Feature + - id: FoodMeatCat # DeltaV - Frontier Feature + amount: 1 # DeltaV - Frontier Feature - type: Tag tags: - CannotSuicide @@ -153,7 +157,7 @@ - type: entity name: Exception id: MobCatException - parent: MobCatCalico + parent: MobCatCalicoGhost # DeltaV - Frontier Feature description: Ask nicely, and maybe they'll give you one of their spare lives. components: - type: NpcFactionMember @@ -164,6 +168,10 @@ attributes: proper: true gender: male + - type: Butcherable # DeltaV - Frontier Feature + spawned: # DeltaV - Frontier Feature + - id: FoodMeatCat # DeltaV - Frontier Feature + amount: 1 # DeltaV - Frontier Feature - type: Tag tags: - CannotSuicide @@ -174,7 +182,7 @@ - type: entity name: Floppa id: MobCatFloppa - parent: MobCatCaracal + parent: MobCatCaracalGhost # DeltaV - Frontier Feature description: He out here. components: - type: Fixtures diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml index 818a8dd4f2e..5068aa2d7a1 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml @@ -62,3 +62,55 @@ states: Alive: Base: cat + +- type: entity + suffix: Ghost + parent: [BaseEmotionalGhostCat, MobCatCalico] + id: MobCatCalicoGhost + components: + - type: RandomMetadata + nameSegments: [names_cat_calico] + - type: DamageStateVisuals + states: + Alive: + Base: cat2 + +- type: entity + suffix: Ghost + parent: [BaseEmotionalGhostCat, MobBingus] + id: MobBingusGhost + components: + - type: RandomMetadata + nameSegments: [names_cat_bingus] + - type: DamageStateVisuals + states: + Alive: + Base: bingus + +- type: entity + suffix: Ghost + parent: [BaseEmotionalGhostCat, MobCatCaracal] + id: MobCatCaracalGhost + components: + - type: RandomMetadata + nameSegments: [names_cat_caracal] + - type: DamageStateVisuals + states: + Alive: + Base: caracal_flop + - type: Inventory # Broken hats + templateId: nfpet # Broken hats + +- type: entity + suffix: Ghost + parent: [BaseEmotionalGhostCat, MobCatSpace] + id: MobCatSpaceGhost + components: + - type: RandomMetadata + nameSegments: [names_cat_space] + - type: DamageStateVisuals + states: + Alive: + Base: spacecat + - type: Inventory # Broken hats + templateId: nfpet # Broken hats diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 9dd1500c7d5..3a4636ca181 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -29,7 +29,7 @@ spawned: - id: FoodMeatCat amount: 1 -# - id: MaterialHideClippy # DeltaV - Comment Out +# - id: MaterialHideClippy # - type: IntrinsicRadioTransmitter # DeltaV - Comment out Radio Channels # channels: # - Service @@ -40,4 +40,4 @@ factions: - Cat - PetsNT - - type: ShowJobIcons +# - type: ShowJobIcons # DeltaV - Comment out diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat.yml new file mode 100644 index 00000000000..bda82a7ca92 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat.yml @@ -0,0 +1,26 @@ +# Raw + +- type: entity + name: prime-cut cat meat + # can't rot since that would be very bad for syndies + parent: FoodMeatBase + id: FoodMeatCat + description: The tainted gift of an evil crime. The meat may be delicious, but at what cost? + components: + - type: Tag + tags: + - Raw + - HighRiskItem + - Meat + - type: Sprite + state: corgi + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Bicaridine + Quantity: 20 + - type: StaticPrice + price: 750 +# - type: StealTarget +# stealGroup: FoodMeatCat