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)
@@ -92,6 +92,7 @@ flavor-complex-eggplant = like eggplant
|
|||||||
flavor-complex-carrot = like carrots
|
flavor-complex-carrot = like carrots
|
||||||
flavor-complex-cabbage = like cabbages
|
flavor-complex-cabbage = like cabbages
|
||||||
flavor-complex-potatoes = like potatoes
|
flavor-complex-potatoes = like potatoes
|
||||||
|
flavor-complex-pumpkin = like pumpkins
|
||||||
flavor-complex-mushroom = like mushrooms
|
flavor-complex-mushroom = like mushrooms
|
||||||
flavor-complex-tomato = like tomatoes
|
flavor-complex-tomato = like tomatoes
|
||||||
flavor-complex-corn = like corn
|
flavor-complex-corn = like corn
|
||||||
|
|||||||
@@ -12,3 +12,6 @@ reagent-desc-protein = Found in certain meals, good for bodily health.
|
|||||||
|
|
||||||
reagent-name-cocoapowder = сocoa powder
|
reagent-name-cocoapowder = сocoa powder
|
||||||
reagent-desc-cocoapowder = From the best varieties of cocoa beans
|
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.
|
||||||
@@ -96,4 +96,6 @@ seeds-cocoa-display-name = cocoa plant
|
|||||||
seeds-berries-name = berries
|
seeds-berries-name = berries
|
||||||
seeds-berries-display-name = berry bush
|
seeds-berries-display-name = berry bush
|
||||||
seeds-bungo-name = bungo
|
seeds-bungo-name = bungo
|
||||||
seeds-bungo-display-name = bungo plant
|
seeds-bungo-display-name = bungo plant
|
||||||
|
seeds-pumpkin-name = pumpkin
|
||||||
|
seeds-pumpkin-display-name = pumpkins
|
||||||
@@ -164,7 +164,7 @@
|
|||||||
sprite: Objects/Specific/Service/vending_machine_restock.rsi
|
sprite: Objects/Specific/Service/vending_machine_restock.rsi
|
||||||
state: base
|
state: base
|
||||||
product: CrateVendingMachineRestockSeedsFilled
|
product: CrateVendingMachineRestockSeedsFilled
|
||||||
cost: 3000
|
cost: 3125
|
||||||
category: Hydroponics
|
category: Hydroponics
|
||||||
group: market
|
group: market
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
OrangeSeeds: 5
|
OrangeSeeds: 5
|
||||||
PoppySeeds: 3
|
PoppySeeds: 3
|
||||||
PotatoSeeds: 5
|
PotatoSeeds: 5
|
||||||
|
PumpkinSeeds: 5
|
||||||
RiceSeeds: 5
|
RiceSeeds: 5
|
||||||
SoybeanSeeds: 5
|
SoybeanSeeds: 5
|
||||||
SugarcaneSeeds: 5
|
SugarcaneSeeds: 5
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
ClothingOuterSuitChicken: 2
|
ClothingOuterSuitChicken: 2
|
||||||
ClothingHeadHatChickenhead: 2
|
ClothingHeadHatChickenhead: 2
|
||||||
ClothingOuterSuitMonkey: 2
|
ClothingOuterSuitMonkey: 2
|
||||||
ClothingHeadHatPumpkin: 2
|
ClothingHeadHatPumpkin: 4 # Extra pumpkins for the season
|
||||||
ClothingHeadHatShrineMaidenWig: 2
|
ClothingHeadHatShrineMaidenWig: 2
|
||||||
ClothingOuterSuitShrineMaiden: 2
|
ClothingOuterSuitShrineMaiden: 2
|
||||||
Gohei: 2
|
Gohei: 2
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
- type: PointLight
|
- type: PointLight
|
||||||
enabled: false
|
enabled: false
|
||||||
radius: 3
|
radius: 3
|
||||||
energy: 2
|
energy: 1
|
||||||
mask: /Textures/Effects/LightMasks/cone.png
|
mask: /Textures/Effects/LightMasks/cone.png
|
||||||
autoRot: true
|
autoRot: true
|
||||||
netsync: false
|
netsync: false
|
||||||
|
|||||||
@@ -62,7 +62,7 @@
|
|||||||
node: hairflower
|
node: hairflower
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: ClothingHeadBase
|
parent: ClothingHeadLightBase
|
||||||
id: ClothingHeadHatPumpkin
|
id: ClothingHeadHatPumpkin
|
||||||
name: pumpkin hat
|
name: pumpkin hat
|
||||||
description: A jack o' lantern! Believed to ward off evil spirits.
|
description: A jack o' lantern! Believed to ward off evil spirits.
|
||||||
@@ -73,6 +73,18 @@
|
|||||||
sprite: Clothing/Head/Misc/pumpkin.rsi
|
sprite: Clothing/Head/Misc/pumpkin.rsi
|
||||||
- type: IngestionBlocker
|
- type: IngestionBlocker
|
||||||
- type: IdentityBlocker
|
- 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
|
- type: entity
|
||||||
parent: ClothingHeadBase
|
parent: ClothingHeadBase
|
||||||
|
|||||||
@@ -1565,3 +1565,51 @@
|
|||||||
seedId: bungo
|
seedId: bungo
|
||||||
- type: SpaceGarbage
|
- type: SpaceGarbage
|
||||||
- type: BadFood
|
- 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
|
||||||
@@ -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
|
||||||
@@ -74,3 +74,6 @@
|
|||||||
maxDuration: 4.0
|
maxDuration: 4.0
|
||||||
startValue: 6.0
|
startValue: 6.0
|
||||||
endValue: 1.0
|
endValue: 1.0
|
||||||
|
- type: Tag
|
||||||
|
tags:
|
||||||
|
- Torch
|
||||||
@@ -497,4 +497,14 @@
|
|||||||
- type: Seed
|
- type: Seed
|
||||||
seedId: bungo
|
seedId: bungo
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Objects/Specific/Hydroponics/bungo.rsi
|
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
|
||||||
|
|||||||
@@ -843,3 +843,8 @@
|
|||||||
id: lostfriendship
|
id: lostfriendship
|
||||||
flavorType: Complex
|
flavorType: Complex
|
||||||
description: flavor-complex-lost-friendship
|
description: flavor-complex-lost-friendship
|
||||||
|
|
||||||
|
- type: flavor
|
||||||
|
id: pumpkin
|
||||||
|
flavorType: Complex
|
||||||
|
description: flavor-complex-pumpkin
|
||||||
@@ -1302,3 +1302,29 @@
|
|||||||
Min: 5
|
Min: 5
|
||||||
Max: 10
|
Max: 10
|
||||||
PotencyDivisor: 20
|
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
|
||||||
@@ -93,3 +93,11 @@
|
|||||||
amount: 2
|
amount: 2
|
||||||
- !type:PlantAdjustPests
|
- !type:PlantAdjustPests
|
||||||
amount: 2
|
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"
|
||||||
@@ -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
|
||||||
@@ -1175,6 +1175,15 @@
|
|||||||
FoodCakePlain: 1
|
FoodCakePlain: 1
|
||||||
FoodCheeseSlice: 3
|
FoodCheeseSlice: 3
|
||||||
|
|
||||||
|
- type: microwaveMealRecipe
|
||||||
|
id: RecipePumpkinCake
|
||||||
|
name: pumpkin cake recipe
|
||||||
|
result: FoodCakePumpkin
|
||||||
|
time: 5
|
||||||
|
solids:
|
||||||
|
FoodCakePlain: 1
|
||||||
|
FoodPumpkin: 1
|
||||||
|
|
||||||
- type: microwaveMealRecipe
|
- type: microwaveMealRecipe
|
||||||
id: RecipeClownCake
|
id: RecipeClownCake
|
||||||
name: clown cake recipe
|
name: clown cake recipe
|
||||||
|
|||||||
@@ -1020,6 +1020,9 @@
|
|||||||
- type: Tag
|
- type: Tag
|
||||||
id: Toolbox
|
id: Toolbox
|
||||||
|
|
||||||
|
- type: Tag
|
||||||
|
id: Torch
|
||||||
|
|
||||||
- type: Tag
|
- type: Tag
|
||||||
id: Trash
|
id: Trash
|
||||||
|
|
||||||
|
|||||||
BIN
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-flash.png
Normal file
|
After Width: | Height: | Size: 304 B |
@@ -14,7 +14,10 @@
|
|||||||
"name": "icon-on"
|
"name": "icon-on"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "equipped-HELMET",
|
"name": "icon-flash"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "off-equipped-HELMET",
|
||||||
"directions": 4
|
"directions": 4
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -22,11 +25,11 @@
|
|||||||
"directions": 4
|
"directions": 4
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "inhand-left",
|
"name": "off-inhand-left",
|
||||||
"directions": 4
|
"directions": 4
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "inhand-right",
|
"name": "off-inhand-right",
|
||||||
"directions": 4
|
"directions": 4
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 841 B After Width: | Height: | Size: 841 B |
|
Before Width: | Height: | Size: 731 B After Width: | Height: | Size: 731 B |
|
Before Width: | Height: | Size: 739 B After Width: | Height: | Size: 739 B |
|
After Width: | Height: | Size: 783 B |
|
After Width: | Height: | Size: 262 B |
|
After Width: | Height: | Size: 336 B |
|
After Width: | Height: | Size: 773 B |
@@ -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
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 306 B |
|
After Width: | Height: | Size: 195 B |
|
After Width: | Height: | Size: 235 B |
|
After Width: | Height: | Size: 284 B |
|
After Width: | Height: | Size: 305 B |