From: Doru991 <75124791+Doru991@users.noreply.github.com> Date: Tue, 31 Oct 2023 03:12:23 +0000 (+0200) Subject: Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e1440cb4931edc498d0686860fc5bbc47e65943d;p=space-station-14.git Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176) * Pumpkin textures * Pumpkin prototypes * Jack o lantern prototypes and pumpkin cake * Finishing touches * Arbitrageloose * Restore old pumpkin helmet sprites (God I hope it works) --- diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 8ecf4cb13e..2a0c39a0e4 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -92,6 +92,7 @@ flavor-complex-eggplant = like eggplant flavor-complex-carrot = like carrots flavor-complex-cabbage = like cabbages flavor-complex-potatoes = like potatoes +flavor-complex-pumpkin = like pumpkins flavor-complex-mushroom = like mushrooms flavor-complex-tomato = like tomatoes flavor-complex-corn = like corn diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl index a6b3cb5479..01c716787e 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl @@ -12,3 +12,6 @@ reagent-desc-protein = Found in certain meals, good for bodily health. reagent-name-cocoapowder = сocoa powder reagent-desc-cocoapowder = From the best varieties of cocoa beans + +reagent-name-pumpkin-flesh = pumpkin flesh +reagent-desc-pumpkin-flesh = The mushy, sweet remains of a pumpkin. \ No newline at end of file diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 2e0388ec52..1f4ac7e5f8 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -96,4 +96,6 @@ seeds-cocoa-display-name = cocoa plant seeds-berries-name = berries seeds-berries-display-name = berry bush seeds-bungo-name = bungo -seeds-bungo-display-name = bungo plant \ No newline at end of file +seeds-bungo-display-name = bungo plant +seeds-pumpkin-name = pumpkin +seeds-pumpkin-display-name = pumpkins \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 86f121fa18..fb635ae8b5 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -164,7 +164,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSeedsFilled - cost: 3000 + cost: 3125 category: Hydroponics group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 98de54dc52..28972e4913 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -24,6 +24,7 @@ OrangeSeeds: 5 PoppySeeds: 3 PotatoSeeds: 5 + PumpkinSeeds: 5 RiceSeeds: 5 SoybeanSeeds: 5 SugarcaneSeeds: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index d4dd657027..f3c108d72a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -24,7 +24,7 @@ ClothingOuterSuitChicken: 2 ClothingHeadHatChickenhead: 2 ClothingOuterSuitMonkey: 2 - ClothingHeadHatPumpkin: 2 + ClothingHeadHatPumpkin: 4 # Extra pumpkins for the season ClothingHeadHatShrineMaidenWig: 2 ClothingOuterSuitShrineMaiden: 2 Gohei: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 19fc25b233..ce1767b1bb 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -73,7 +73,7 @@ - type: PointLight enabled: false radius: 3 - energy: 2 + energy: 1 mask: /Textures/Effects/LightMasks/cone.png autoRot: true netsync: false diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 50e3da93fb..39e751b17d 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -62,7 +62,7 @@ node: hairflower - type: entity - parent: ClothingHeadBase + parent: ClothingHeadLightBase id: ClothingHeadHatPumpkin name: pumpkin hat description: A jack o' lantern! Believed to ward off evil spirits. @@ -73,6 +73,18 @@ sprite: Clothing/Head/Misc/pumpkin.rsi - type: IngestionBlocker - type: IdentityBlocker + - type: PointLight + enabled: false + radius: 3 + energy: 1 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + color: "#cc6600" + netsync: false + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 6439b2eb6c..9ce373d63d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1565,3 +1565,51 @@ seedId: bungo - type: SpaceGarbage - type: BadFood + +- type: entity + name: pumpkin + parent: FoodProduceBase + id: FoodPumpkin + description: A large, orange... berry. Seriously. + components: + - type: Item + size: 10 + - type: FlavorProfile + flavors: + - pumpkin + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: PumpkinFlesh + Quantity: 20 + - ReagentId: Vitamin + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/pumpkin.rsi + - type: Produce + seedId: pumpkin + - type: Damageable + damageContainer: Biological + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 16 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: desecration + - !type:SpillBehavior + solution: food + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Butcherable + butcheringType: Knife + spawned: + - id: CarvedPumpkin + - id: PumpkinSeeds + - type: Tag + tags: + - Fruit \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml b/Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml new file mode 100644 index 0000000000..1205c202e4 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml @@ -0,0 +1,61 @@ +- type: entity + parent: BaseItem + id: CarvedPumpkin + name: carved pumpkin + description: A traditional spooky decoration. + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/pumpkin.rsi + state: carved + - type: Item + size: 10 + - type: Construction + graph: PumpkinAddLight + node: start + +- type: entity + parent: CarvedPumpkin + id: PumpkinLantern + name: jack o' lantern + description: A carved pumpkin, emitting an eerie glow. + components: + - type: Sprite + state: lantern + - type: Appearance + - type: PointLight + enabled: true + color: "#cc6600" + radius: 2.0 + energy: 4.0 + +- type: entity + parent: CarvedPumpkin + id: CarvedPumpkinSmall + suffix: Small + components: + - type: Sprite + scale: 0.75, 0.75 + +- type: entity + parent: CarvedPumpkin + id: CarvedPumpkinLarge + suffix: Large + components: + - type: Sprite + scale: 1.5, 1.5 + +- type: entity + parent: PumpkinLantern + id: PumpkinLanternSmall + suffix: Small + components: + - type: Sprite + scale: 0.75, 0.75 + +- type: entity + parent: PumpkinLantern + id: PumpkinLanternLarge + suffix: Large + components: + - type: Sprite + scale: 1.5, 1.5 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/torch.yml b/Resources/Prototypes/Entities/Objects/Misc/torch.yml index 0fa918de74..f408d0d289 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/torch.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/torch.yml @@ -74,3 +74,6 @@ maxDuration: 4.0 startValue: 6.0 endValue: 1.0 + - type: Tag + tags: + - Torch \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 16d9fd1a64..2462c601e4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -497,4 +497,14 @@ - type: Seed seedId: bungo - type: Sprite - sprite: Objects/Specific/Hydroponics/bungo.rsi \ No newline at end of file + sprite: Objects/Specific/Hydroponics/bungo.rsi + +- type: entity + parent: SeedBase + name: packet of pumpkin seeds + id: PumpkinSeeds + components: + - type: Seed + seedId: pumpkin + - type: Sprite + sprite: Objects/Specific/Hydroponics/pumpkin.rsi diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index fc3b0ba577..ba8f2c3476 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -843,3 +843,8 @@ id: lostfriendship flavorType: Complex description: flavor-complex-lost-friendship + +- type: flavor + id: pumpkin + flavorType: Complex + description: flavor-complex-pumpkin \ No newline at end of file diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 8e1c6c9328..894f0f0202 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1302,3 +1302,29 @@ Min: 5 Max: 10 PotencyDivisor: 20 + +- type: seed + id: pumpkin + name: seeds-pumpkin-name + noun: seeds-noun-seeds + displayName: seeds-pumpkin-display-name + plantRsi: Objects/Specific/Hydroponics/pumpkin.rsi + packetPrototype: PumpkinSeeds + productPrototypes: + - FoodPumpkin + lifespan: 55 + maturation: 10 + production: 4 + yield: 2 + potency: 10 + idealHeat: 288 + growthStages: 3 + chemicals: + PumpkinFlesh: + Min: 1 + Max: 20 + PotencyDivisor: 5 + Vitamin: + Min: 1 + Max: 5 + PotencyDivisor: 20 \ No newline at end of file diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml index b9e565f5af..03ebf7cc32 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml @@ -93,3 +93,11 @@ amount: 2 - !type:PlantAdjustPests amount: 2 + +- type: reagent + id: PumpkinFlesh #Just so pumpkins spill orange stuff when smashed + parent: Nutriment + name: reagent-name-pumpkin-flesh + desc: reagent-desc-pumpkin-flesh + flavor: pumpkin + color: "#fc9300" \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml b/Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml new file mode 100644 index 0000000000..efd2007df6 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: PumpkinAddLight + start: start + graph: + - node: start + edges: + - to: lit + steps: + - tag: Torch + doAfter: 2 + + - node: lit + entity: PumpkinLantern \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 4ec4118177..0ebf88e892 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1175,6 +1175,15 @@ FoodCakePlain: 1 FoodCheeseSlice: 3 +- type: microwaveMealRecipe + id: RecipePumpkinCake + name: pumpkin cake recipe + result: FoodCakePumpkin + time: 5 + solids: + FoodCakePlain: 1 + FoodPumpkin: 1 + - type: microwaveMealRecipe id: RecipeClownCake name: clown cake recipe diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 67a27be416..8a120d7bf0 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1020,6 +1020,9 @@ - type: Tag id: Toolbox +- type: Tag + id: Torch + - type: Tag id: Trash diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-flash.png new file mode 100644 index 0000000000..21b898ab94 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json index f1c7bacf20..5e4c46c868 100644 --- a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json @@ -14,7 +14,10 @@ "name": "icon-on" }, { - "name": "equipped-HELMET", + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", "directions": 4 }, { @@ -22,11 +25,11 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "off-inhand-right", "directions": 4 }, { diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-inhand-right.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/carved.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/carved.png new file mode 100644 index 0000000000..6eb43adee1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/carved.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/dead.png new file mode 100644 index 0000000000..e66da2064a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/harvest.png new file mode 100644 index 0000000000..ea6a13ed31 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/lantern.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/lantern.png new file mode 100644 index 0000000000..e07dacbcc9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/lantern.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json new file mode 100644 index 0000000000..a6409ac1ff --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/5d507cfbad6f73d1beaba66d93f31f893adb3a84/icons/obj/hydroponics/harvest.dmi, carved sprites by ps3moira", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "carved" + }, + { + "name": "lantern", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png new file mode 100644 index 0000000000..6fa2ec1939 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/seed.png new file mode 100644 index 0000000000..a60957f895 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-1.png new file mode 100644 index 0000000000..762e986ae9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-2.png new file mode 100644 index 0000000000..22f418d571 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-3.png new file mode 100644 index 0000000000..eb08406899 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-3.png differ