diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 869a28fc5d..4f16241904 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -63,6 +63,8 @@ id: PlushieArachind - !type:EntSelector id: PlushiePenguin + - !type:EntSelector + id: PlushieGrim - type: entity id: CrateFunPlushie diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml index 43e26db635..faefb195d8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml @@ -780,6 +780,8 @@ - id: PlushieMothBartender prob: 0.5 orGroup: Plushie + - id: PlushieGrim + orGroup: Plushie # Random snacks, replaces MailChocolate (lousy animal organs) - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index e07f0e0584..2e58bba7bf 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -104,6 +104,8 @@ orGroup: GiftPool - id: PlushieArachind orGroup: GiftPool + - id: PlushieGrim + orGroup: GiftPool - id: ClothingNeckCloakMoth orGroup: GiftPool - id: ToyMouse diff --git a/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml b/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml index 19aa6a3015..e5862a6f1d 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml @@ -319,6 +319,9 @@ - id: PlushieAbductor prob: 0.50 orGroup: Prize + - id: PlushieGrim + prob: 0.50 + orGroup: Prize - id: PlushieTrystan prob: 0.50 orGroup: Prize diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index dd9da0424b..07927ee906 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1560,6 +1560,7 @@ - CrazyGlue - PlushieRatvar - PlushieNar + - PlushieGrim - type: EmagLatheRecipes emagStaticRecipes: - PlushieGhost diff --git a/Resources/Prototypes/Recipes/Lathes/prizecounter.yml b/Resources/Prototypes/Recipes/Lathes/prizecounter.yml index 2ea2afc654..ff0b0f2e21 100644 --- a/Resources/Prototypes/Recipes/Lathes/prizecounter.yml +++ b/Resources/Prototypes/Recipes/Lathes/prizecounter.yml @@ -606,6 +606,14 @@ materials: PrizeTicket: 80 +- type: latheRecipe + id: PlushieGrim + result: PlushieGrim + applyMaterialDiscount: false + completeTime: 0.1 + materials: + PrizeTicket: 50 + # EMAG - type: latheRecipe