diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 4739278200b..2161e32101e 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -96,6 +96,7 @@ flavor-complex-tomato = like tomatoes flavor-complex-corn = like corn flavor-complex-banana = like bananas flavor-complex-apple = like apples +flavor-complex-pear = like pears flavor-complex-bungo = like bungo flavor-complex-raisins = like dried grapes flavor-complex-orange = like oranges diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 05b1d52d538..eb90b1bfa87 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -22,6 +22,7 @@ OnionSeeds: 5 OnionRedSeeds: 5 OrangeSeeds: 5 + PearSeeds: 3 PoppySeeds: 3 PotatoSeeds: 5 RiceSeeds: 5 diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index 0391f583662..e13a9bad96d 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -65,7 +65,8 @@ MaterialReclaimerMachineCircuitboard: 1.0 CratePirateChest: 0.5 ClothingOuterArmorReflective: 0.5 - + MoneyTreeSeeds: 0.5 + - type: weightedRandom id: SalvageRewardEpic diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml new file mode 100644 index 00000000000..52d162b66e1 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml @@ -0,0 +1,22 @@ +- type: entity + name: pear + parent: FoodProduceBase + id: FoodPear + description: it's peary good. + components: + - type: FlavorProfile + flavors: + - pear + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 5 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/pear.rsi + - type: Produce + seedId: pear diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml new file mode 100644 index 00000000000..11f7152544d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -0,0 +1,33 @@ +- type: entity + parent: SeedBase + name: packet of money tree seeds + description: "these seeds seem like a miracle, but expert farmers get rich from the kitchen" + id: MoneytreeSeeds + components: + - type: Seed + seedId: moneytree + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/moneytree.rsi +#Description Is Sneaky KitchenFarms Tribute, LLKF, CentCom Owes Us a Million! =) + +# - type: entity +# parent: MoneytreeSeeds +# name: packet of money tree seeds +# suffix: "1000" +# description: "these seeds really are a miracle!" +# id: MoneytreeSeeds1000 +# components: +# - type: Seed +# seedId: moneytree1000 +# commented out at present, intended to be admin spawn item? can be changed easily. + +- type: entity + parent: SeedBase + name: packet of pear seeds + description: "they are peary good for you." + id: PearSeeds + components: + - type: Seed + seedId: pear + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/pear.rsi diff --git a/Resources/Prototypes/_NF/Hydroponics/seeds.yml b/Resources/Prototypes/_NF/Hydroponics/seeds.yml new file mode 100644 index 00000000000..6e852c3bf2e --- /dev/null +++ b/Resources/Prototypes/_NF/Hydroponics/seeds.yml @@ -0,0 +1,61 @@ +- type: seed + id: moneytree + name: money tree + noun: seeds-noun-seeds + displayName: money + plantRsi: _NF/Objects/Specific/Hydroponics/moneytree.rsi + packetPrototype: MoneytreeSeeds + productPrototypes: + - SpaceCash + harvestRepeat: Repeat + lifespan: 45 + maturation: 15 + production: 8 + yield: 3 + potency: 10 + growthStages: 2 + idealLight: 6 + +# - type: seed +# id: moneytree1000 +# name: money tree +# noun: seeds-noun-seeds +# displayName: money +# plantRsi: _NF/Objects/Specific/Hydroponics/moneytree.rsi +# packetPrototype: MoneytreeSeeds1000 +# productPrototypes: +# - SpaceCash1000 +# harvestRepeat: Repeat +# lifespan: 45 +# maturation: 15 +# production: 8 +# yield: 3 +# potency: 10 +# growthStages: 2 +# idealLight: 6 + +- type: seed + id: pear + name: pear + noun: seeds-noun-seeds + displayName: pear tree + plantRsi: _NF/Objects/Specific/Hydroponics/pear.rsi + packetPrototype: PearSeeds + productPrototypes: + - FoodPear + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + idealLight: 6 + chemicals: + Nutriment: + Min: 2 + Max: 10 + PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 5 + PotencyDivisor: 25 diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/dead.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/dead.png new file mode 100644 index 00000000000..d367f019cc2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/dead.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/harvest.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/harvest.png new file mode 100644 index 00000000000..6578d7d0187 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/harvest.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/meta.json new file mode 100644 index 00000000000..82f2a39f73c --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a edited by terezi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/seed.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/seed.png new file mode 100644 index 00000000000..1761bf54654 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/seed.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/stage-1.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/stage-1.png new file mode 100644 index 00000000000..7b7a145aace Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/stage-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/stage-2.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/stage-2.png new file mode 100644 index 00000000000..e1a595e72cd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/moneytree.rsi/stage-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/dead.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/dead.png new file mode 100644 index 00000000000..817c0f4bff1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/dead.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/harvest.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/harvest.png new file mode 100644 index 00000000000..2677f3d39b6 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/harvest.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/meta.json new file mode 100644 index 00000000000..d4469cef736 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken from https://ninjikin.itch.io/fruit edited by terezi4real github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "harvest" + }, + { + "name": "produce" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/produce.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/produce.png new file mode 100644 index 00000000000..4b8ec004ac0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/produce.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/seed.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/seed.png new file mode 100644 index 00000000000..fd1e43affc3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/seed.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-1.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-1.png new file mode 100644 index 00000000000..97245d27f2f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-2.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-2.png new file mode 100644 index 00000000000..02222142cee Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-3.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-3.png new file mode 100644 index 00000000000..37bd6d53d11 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-4.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-4.png new file mode 100644 index 00000000000..6826f6a32de Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-5.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-5.png new file mode 100644 index 00000000000..ca7b73d50aa Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-5.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-6.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-6.png new file mode 100644 index 00000000000..3cc0947e348 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-6.png differ