diff --git a/Resources/Locale/en-US/Nuclear14/reagents.ftl b/Resources/Locale/en-US/Nuclear14/reagents.ftl index 21b03c0421e..62b13cc153d 100644 --- a/Resources/Locale/en-US/Nuclear14/reagents.ftl +++ b/Resources/Locale/en-US/Nuclear14/reagents.ftl @@ -20,11 +20,18 @@ reagent-desc-irradiated-nuka-cola = This Nuka-Cola gives off a slight tingle. ## Animals reagent-name-milk-brahmin = brahmin milk -reagent-desc-milk-brahmin = tasty brahmin milk +reagent-desc-milk-brahmin = Tasty brahmin milk. reagent-name-milk-bighorner = bighorner milk -reagent-desc-milk-bighorner = fatty bighorner milk +reagent-desc-milk-bighorner = Fatty bighorner milk. reagent-name-milk-radstag = radstag milk -reagent-desc-milk-radstag = protein rich radstag milk +reagent-desc-milk-radstag = Protein rich radstag milk. + +reagent-name-fireantnectar = Fire ant nectar +reagent-desc-fireantnectar = Crystals of fire ant nectar. +reagent-name-bloatflyacid = bloatfly acid +reagent-desc-bloatflyacid = Acid from the sac of a bloatfly. +reagent-name-cazadoracid = cazador acid +reagent-desc-cazadoracid = Acid from the sac of a cazador stinger. ## Extracts reagent-name-extract-agave-nectar = agave nectar extract @@ -70,6 +77,37 @@ reagent-desc-extract-white-horsenettle = A group of nettles and berries, they do reagent-name-extract-xander = xander extract reagent-desc-extract-xander = An edible root, it was obviously pulled from the ground at some point. Tastes similar to a potato, very starchy, but good to eat. +## Teas +reagent-name-tea-agave = agave tea +reagent-desc-tea-agave = Sweet and tangy tea. +reagent-name-tea-blackberry = blackberry tea +reagent-desc-tea-blackberry = Sweet yet tart. +reagent-name-tea-barrelcactus = barrel cactus tea +reagent-desc-tea-barrelcactus = Weak tea. +reagent-name-tea-broc = broc tea +reagent-desc-tea-broc = Medicinal but dull. +reagent-name-tea-datura = datura tea +reagent-desc-tea-datura = Bitter drink. +reagent-name-tea-honeymesquite = honey mesquite tea +reagent-desc-tea-honeymesquite = Oddly sweet. +reagent-name-tea-mutfruit = mutfruit tea +reagent-desc-tea-mutfruit = Dull but homely. +reagent-name-tea-nettle = nettle tea +reagent-desc-tea-nettle = Medicinal and warming. +reagent-name-tea-pricklypear = prickly pear tea +reagent-desc-tea-pricklypear = fruity. +reagent-name-tea-starlightberry = starlightberry tea +reagent-desc-tea-starlightberry = Bursting with flavor. +reagent-name-tea-tarberry = tarberry tea +reagent-desc-tea-tarberry = Bursting with flavor. +reagent-name-tea-whitehorsenettle = white horsenettle tea +reagent-desc-tea-whitehorsenettle = Tingly. +reagent-name-tea-xander = xander tea +reagent-desc-tea-xander = medicinal root tea. +reagent-name-tea-fireantnectar = fire ant nectar +reagent-desc-tea-fireantnectar = Crystalised nectar from a fire ant. Sugary. + + # Chems reagent-name-firetoxin = fire toxin reagent-desc-firetoxin = The hot stuff from firey creatures. diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/gatherables.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/gatherables.yml index 60f54d71b85..7fd6b21752f 100644 --- a/Resources/Prototypes/Nuclear14/Catalog/Fills/gatherables.yml +++ b/Resources/Prototypes/Nuclear14/Catalog/Fills/gatherables.yml @@ -235,6 +235,23 @@ prob: 0.75 amount: 1 maxAmount: 1 + + +- type: entityLootTable + id: WildNettleAll + entries: + - id: N14FloraProduceWildNettle + prob: 0.75 + amount: 1 + maxAmount: 3 + +- type: entityLootTable + id: WildNettleClippers + entries: + - id: N14FloraWildNettleClippingSeed + prob: 0.75 + amount: 1 + maxAmount: 1 - type: entityLootTable diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Drinks/drinks.yml new file mode 100644 index 00000000000..789f7ed1a91 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Drinks/drinks.yml @@ -0,0 +1,181 @@ +# Buckets +# Milk + +# Tea +## Other Teas +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaFireantNectar + name: fireant nectar tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaFireantNectar + Quantity: 20 + +- type: entity + parent: N14DrinkTeaFireantNectar + id: N14DrinkTeaFireantNectarJar + description: A jar of liquid. + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/jar.rsi + +## Plant Teas +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaAgave + name: agave tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaAgave + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaBlackberry + name: blackberry tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaBlackberry + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaBarrelCactus + name: barrel cactus tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaBarrelCactus + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaBroc + name: brocflower tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaBroc + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaDatura + name: datura tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaDatura + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaHoneyMesquite + name: honey mesquite tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaHoneyMesquite + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaMutrfruit + name: mutfruit tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaMutfruit + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaNettle + name: nettle tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaNettle + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaPricklypear + name: prickly pear tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaPricklypear + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaStarlightberry + name: starlightberry tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaStarlightberry + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaTarberry + name: tarberry tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaTarberry + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaWhiteHorsenettle + name: white horsenettle tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaWhiteHorsenettle + Quantity: 20 + +- type: entity + parent: DrinkGreenTea + id: N14DrinkTeaXander + name: xander root tea + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: TeaXander + Quantity: 20 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 136185a1fee..9635a626f8b 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -1,3 +1,69 @@ +# Base 50 units +- type: entity + parent: DrinkBottleBaseFull + id: DrinkBottleBaseFull50 + abstract: true + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + +# Milk +# Empty Bottle +- type: entity + parent: DrinkBottleBaseFull50 + id: N14DrinkBottleMilkEmpty + name: milk bottle + description: Looks good at holding milky substances. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola.rsi # N14TODO:SPRITE: Change this + +- type: entity + parent: N14DrinkBottleMilkEmpty + id: N14DrinkMilkBrahmin + name: brahmin milk + description: The glass bottle of brahmin milk. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: N14MilkBrahmin + Quantity: 50 + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola.rsi # N14TODO:SPRITE: Change this + +- type: entity + parent: N14DrinkMilkBrahmin + id: N14DrinkMilkBighorner + name: bighorner milk + description: The glass bottle of bighorner milk. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: N14MilkBighorner + Quantity: 50 + +- type: entity + parent: N14DrinkMilkBrahmin + id: N14DrinkMilkRadstag + name: radstag milk + description: The glass bottle of radstag milk. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: N14MilkRadstag + Quantity: 50 + # Soda - type: entity parent: DrinkBottleGlassBaseFull diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Flora/wastelandflora.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Flora/wastelandflora.yml index 989277f3ed7..70d4ff3f672 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Flora/wastelandflora.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Flora/wastelandflora.yml @@ -367,6 +367,26 @@ loot: All: WildMutfruitAll PlantSampleTaker: WildMutfruitClippers + +- type: entity + parent: N14WastelandFlora + id: N14WastelandFloraWildNettle + name: wild nettles + description: A wild nettle plant. It looks healthy. + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/nettle.rsi + - type: OreVein + currentOre: WildNettle + - type: Gatherable + whitelist: + components: + - Hands + tags: + - PlantSampleTaker + loot: + All: WildNettleAll + PlantSampleTaker: WildNettleClippers - type: entity parent: N14WastelandFlora @@ -1000,6 +1020,32 @@ Quantity: 10 - type: Produce seedId: N14WildMutfruit + +- type: entity + parent: N14FloraProduceFood + id: N14FloraProduceWildNettle + name: wild nettle + description: Wild nettles. Stingy. + components: + - type: Sprite + state: Objects/Specific/Hydroponics/nettle.rsi + - type: Stack + stackType: Nettles + count: 1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: ExtractNettle + Quantity: 10 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ExtractNettle + Quantity: 10 + - type: Produce + seedId: N14WildNettle - type: entity parent: N14FloraProduceFood diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Food/OtherAnimalParts.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Food/OtherAnimalParts.yml new file mode 100644 index 00000000000..459bab9f1de --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Food/OtherAnimalParts.yml @@ -0,0 +1,76 @@ + +- type: entity + parent: BaseItem + id: N14FoodFireantNectar + name: fire ant nectar + description: A small crystal of fire ant nectar. + components: + - type: Sprite + sprite: Objects/Consumable/Food/ingredients.rsi # N14TODO:SPRITE: Change me + state: flour-big + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: N14FireAntNectar + Quantity: 10 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: N14FireAntNectar + Quantity: 10 + - type: Spillable + solution: food + - type: MeleeWeapon + soundNoDamage: + path: "/Audio/Effects/Fluids/splat.ogg" + damage: + types: + Blunt: 0 + - type: TrashOnEmpty + solution: food + +- type: entity + parent: N14FoodFireantNectar + id: N14FoodBloatflyAcidSac + name: bloatfly acid sac + description: A small acid sac from a bloatfly. + components: + - type: Sprite + sprite: Objects/Consumable/Food/ingredients.rsi # N14TODO:SPRITE: Change me + state: flour-big + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: N14BloatflyAcid + Quantity: 10 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: N14BloatflyAcid + Quantity: 10 + +- type: entity + parent: N14FoodFireantNectar + id: N14FoodCazadorAcidSac + name: cazador acid sac + description: A small acid sac from a cazador. + components: + - type: Sprite + sprite: Objects/Consumable/Food/ingredients.rsi # N14TODO:SPRITE: Change me + state: flour-big + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: N14CazadorAcid + Quantity: 10 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: N14CazadorAcid + Quantity: 10 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Food/meat.yml index 0f575f2160a..86eb8563786 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Food/meat.yml @@ -6,7 +6,8 @@ components: - type: Food - type: Sprite - sprite: Objects/Consumable/Food/meat.rsi + sprite: Nuclear14/Objects/Consumable/Food/meat.rsi + state: meat netsync: false - type: SolutionContainerManager solutions: @@ -33,7 +34,7 @@ tags: - Raw - type: Sprite - state: bear + state: morsels - type: SolutionContainerManager solutions: food: @@ -48,14 +49,8 @@ description: A raw piece of rump brahmin. components: - type: Sprite - netsync: true - state: bacon - - type: RandomSprite - available: - - enum.DamageStateVisualLayers.Base: - bacon: "" - - enum.DamageStateVisualLayers.Base: - bacon2: "" + sprite: Nuclear14/Objects/Consumable/Food/meat.rsi + state: meat - type: SolutionContainerManager solutions: food: @@ -72,25 +67,12 @@ - type: entity name: raw bighorner steak - parent: N14FoodMeatRadRaw + parent: N14FoodMeatBrahmin id: N14FoodMeatBighorner description: A raw piece of rump bighorner. components: - type: Sprite - netsync: true - state: bacon - - type: RandomSprite - available: - - enum.DamageStateVisualLayers.Base: - bacon: "" - - enum.DamageStateVisualLayers.Base: - bacon2: "" - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: N14UncookedAnimalProteinsRad - Quantity: 9 + state: fatty - type: SliceableFood count: 3 slice: N14FoodMeatBighornerCutlet @@ -101,25 +83,12 @@ - type: entity name: raw radstag steak - parent: N14FoodMeatRadRaw + parent: N14FoodMeatBrahmin id: N14FoodMeatRadstag description: A raw piece of rump bighorner. components: - type: Sprite - netsync: true - state: bacon - - type: RandomSprite - available: - - enum.DamageStateVisualLayers.Base: - bacon: "" - - enum.DamageStateVisualLayers.Base: - bacon2: "" - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: N14UncookedAnimalProteinsRad - Quantity: 9 + state: porkchop - type: SliceableFood count: 3 slice: N14FoodMeatRadstagCutlet @@ -130,12 +99,12 @@ - type: entity name: raw yao-guai meat - parent: N14FoodMeatRadRaw + parent: N14FoodMeatBrahmin id: N14FoodMeatYaoguai description: A very muscular slab of raw yao-guai meat. components: - type: Sprite - state: bear + state: meat - type: SolutionContainerManager solutions: food: @@ -165,7 +134,7 @@ description: A slab of radscorpion meat. components: - type: Sprite - state: spider + state: scorpiontail - type: SolutionContainerManager solutions: food: @@ -183,7 +152,9 @@ description: A still twitching leg of a radscorpion... you don't really want to eat this, do you? components: - type: Sprite - state: spiderleg + sprite: Objects/Consumable/Food/meat.rsi + layers: + - state: spiderleg - type: entity name: raw radchicken @@ -191,12 +162,13 @@ id: N14FoodMeatRadchicken description: A raw piece of radchicken. Slimy and pale. components: - - type: Sprite - layers: - - state: bird - type: SliceableFood count: 3 slice: N14FoodMeatRadchickenCutlet + - type: Sprite + sprite: Objects/Consumable/Food/meat.rsi + layers: + - state: bird - type: entity name: raw gecko steak @@ -205,8 +177,7 @@ description: tough chunk of gecko meat. It glistens. components: - type: Sprite - layers: - - state: lizard + state: silvergecko - type: SliceableFood count: 3 slice: N14FoodMeatGeckoCutlet @@ -216,20 +187,22 @@ parent: N14FoodMeatRadRaw id: N14FoodMeatIguana description: morsels of a poor iguana. - components: - - type: Sprite - layers: - - state: lizard + # N14TODO: New sprite for this too? - type: entity name: raw squirrel bits parent: N14FoodMeatRadRaw id: N14FoodMeatSquirrel description: morsels of a poor squirrel. + +- type: entity + name: raw radroach fillet + parent: N14FoodMeatRadRaw + id: N14FoodMeatRadroachFillet + description: radroach fillet components: - type: Sprite - layers: - - state: lizard + state: radroach # Cooked - type: entity @@ -243,7 +216,7 @@ - Cooked - type: Sprite layers: - - state: plain-cooked + - state: meat_roasted - type: SolutionContainerManager solutions: food: @@ -261,9 +234,6 @@ id: N14FoodMeatBrahminCooked description: A cooked slab of meat. Smells primal. components: - - type: Sprite - layers: - - state: plain-cooked - type: SolutionContainerManager solutions: food: @@ -284,23 +254,13 @@ - type: entity name: bighorner steak - parent: N14FoodMeatCooked + parent: N14FoodMeatBrahminCooked id: N14FoodMeatBighornerCooked description: A cooked slab of meat. Smells primal. components: - type: Sprite layers: - - state: plain-cooked - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 5 - - ReagentId: N14RadParticleFood - Quantity: 3 + - state: fatty_roasted - type: SliceableFood count: 3 slice: N14FoodMeatBighornerCutletCooked @@ -311,23 +271,13 @@ - type: entity name: radstag steak - parent: N14FoodMeatCooked + parent: N14FoodMeatBrahminCooked id: N14FoodMeatRadstagCooked description: A cooked slab of meat. Smells primal. components: - type: Sprite layers: - - state: plain-cooked - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 5 - - ReagentId: N14RadParticleFood - Quantity: 3 + - state: porkchop_roasted - type: SliceableFood count: 3 slice: N14FoodMeatRadstagCutletCooked @@ -338,23 +288,10 @@ - type: entity name: cooked yao-guai - parent: N14FoodMeatCooked + parent: N14FoodMeatBrahminCooked id: N14FoodMeatYaoguaiCooked description: A well-cooked slab of yao-guai meat. Tough, but tasty with the right sides. components: - - type: Sprite - layers: - - state: product-cooked - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Protein - Quantity: 10 - - ReagentId: N14RadParticleFood - Quantity: 3 - type: SliceableFood count: 3 slice: N14FoodMeatYaoguaiCutletCooked @@ -366,6 +303,7 @@ description: A cooked piece of radchicken. Best used in other recipes. components: - type: Sprite + sprite: Objects/Consumable/Food/meat.rsi layers: - state: bird-cooked - type: SliceableFood @@ -380,7 +318,7 @@ components: - type: Sprite layers: - - state: lizard-cooked + - state: silvergecko_roasted - type: SliceableFood count: 3 slice: N14FoodMeatGeckoCutletCooked @@ -393,7 +331,7 @@ components: - type: Sprite layers: - - state: lizard-cooked + - state: morsels_roasted - type: SolutionContainerManager solutions: food: @@ -413,7 +351,27 @@ components: - type: Sprite layers: - - state: lizard-cooked + - state: silvergecko_roasted + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 2 + - ReagentId: N14RadParticleFood + Quantity: 1 + +- type: entity + name: radroach fillet + parent: N14FoodMeatCooked + id: N14FoodMeatRadroachFilletCooked + description: Cooked, hard radroach. + components: + - type: Sprite + layers: + - state: radroach_roasted - type: SolutionContainerManager solutions: food: @@ -424,6 +382,16 @@ Quantity: 2 - ReagentId: N14RadParticleFood Quantity: 1 + +- type: entity + name: radscorpion tail + parent: N14FoodMeatIguanaCooked + id: N14FoodMeatRadscorpionTailCooked + description: Cooked, chewy radscorpion tail. + components: + - type: Sprite + layers: + - state: scorpiontail_roasted # Cooked Boiled - type: entity @@ -433,8 +401,8 @@ description: A giant radscorpion leg that's had the life boiled out of it. components: - type: Sprite + sprite: Objects/Consumable/Food/meat.rsi layers: - - state: plate-meat - state: spiderleg-cooked - type: SolutionContainerManager solutions: @@ -445,8 +413,8 @@ - ReagentId: Protein Quantity: 5 -# Cutlets +# Cutlets # Raw - type: entity name: raw Rad cutlet @@ -459,6 +427,7 @@ - Raw - Cutlet - type: Sprite + sprite: Objects/Consumable/Food/meat.rsi state: cutlet - type: SolutionContainerManager solutions: @@ -565,6 +534,7 @@ - Cooked - Cutlet - type: Sprite + sprite: Objects/Consumable/Food/meat.rsi state: cutlet-cooked - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/craftingmaterials.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/craftingmaterials.yml new file mode 100644 index 00000000000..d6d394f19ff --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/craftingmaterials.yml @@ -0,0 +1,22 @@ +# Animal Parts +- type: entity + parent: BaseItem + id: N14MaterialRadscorpionTail + name: radscorpion tail + description: It's the stinger from a radscorpion. + components: + - type: Sprite + sprite: Nuclear14/Objects/Misc/crafting_material.rsi + state: radscorpiontail + +- type: entity + parent: BaseItem + id: N14MaterialBrahminHide + name: brahmin hide + description: The flesh of a brahmin. Leather-like and tough. + components: + - type: Sprite + sprite: Nuclear14/Objects/Misc/mob_drops.rsi + state: hide_brahmin + - type: Stack + stackType: BrahminHide \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Hydroponics/equipment.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Hydroponics/equipment.yml new file mode 100644 index 00000000000..543717b5d3b --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Hydroponics/equipment.yml @@ -0,0 +1,60 @@ +# Compost / Soil / Fertiliser + +- type: entity + parent: BaseItem + id: N14Sack + name: sack + descriptiion: A woven sack for storing things. + components: + - type: Sprite + sprite: Nuclear14/Objects/Specific/Hydroponics/equipment.rsi + state: daesack + netsync: true + scale: 0.75, 0.75 + - type: Item + size: 30 + - type: Storage + capacity: 30 + +- type: entity + parent: N14Sack + id: N14Sack4 + components: + - type: Sprite + sprite: Nuclear14/Objects/Specific/Hydroponics/equipment.rsi + state: daesack4 + +- type: entity + parent: N14Sack + id: N14Sack5 + components: + - type: Sprite + sprite: Nuclear14/Objects/Specific/Hydroponics/equipment.rsi + state: daesack5 + +- type: entity + parent: BaseItem + id: N14SackCompost + components: + - type: Sprite + sprite: Nuclear14/Objects/Specific/Hydroponics/equipment.rsi + state: daesack3 + netsync: true + scale: 0.75, 0.75 + - type: Item + size: 30 + +- type: entity + parent: N14SackCompost + id: N14SackFertiliser + components: + - type: Sprite + sprite: Nuclear14/Objects/Specific/Hydroponics/equipment.rsi + state: daesack4 + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + reagents: + - ReagentId: EZNutrient + Quantity: 100 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Hydroponics/seeds.yml index 71b1ad37cd8..5a6816f9e7e 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -153,6 +153,16 @@ - type: Sprite sprite: Nuclear14/Objects/Specific/Hydroponics/mutfruit.rsi +- type: entity + parent: N14SeedBase + id: N14FloraWildNettleClippingSeed + name: wild nettle clipping + components: + - type: Seed + seedId: N14WildNettle + - type: Sprite + sprite: Objects/Specific/Hydroponics/nettle.rsi + - type: entity parent: N14SeedBase id: N14FloraWildOnionClippingSeed diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Tools/tools.yml index 86422e3ff4b..710c97a8e06 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Tools/tools.yml @@ -51,4 +51,16 @@ layers: - state: icon - state: green-unlit - shader: unshaded \ No newline at end of file + shader: unshaded + +- type: entity + name: shovel + parent: Shovel + id: N14Shovel + description: A large tool for digging and moving dirt. + components: + - type: Tool + qualities: + - Shoveling + useSound: + path: /Audio/Items/crowbar.ogg \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Structures/planter.yml b/Resources/Prototypes/Nuclear14/Entities/Structures/planter.yml index fecfd287342..952712e6467 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Structures/planter.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Structures/planter.yml @@ -1,9 +1,22 @@ - type: entity parent: hydroponicsSoil - id: N14HydroponicsPlanter + id: N14Soil + components: + # - type: Construction + # graph: N14Soil + # node: Soil + + +- type: entity + parent: BaseStructure + id: N14HydroponicsPlanterEmpty name: planter - description: A wooden planter with soil for growing things in. + description: A wooden planter for growing things. Just needs soil. components: + - type: Sprite + layers: + - sprite: Nuclear14/Structures/Hydroponics/planterbox.rsi + state: empty - type: Fixtures fixtures: fix1: @@ -14,8 +27,27 @@ hard: true mask: - MachineMask - - type: Anchorable - - type: Pullable + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:ChangeConstructionNodeBehavior + node: machineFrame + - !type:DoActsBehavior + acts: ["Destruction"] + # - type: Construction + # graph: N14Planter + # node: box + + +- type: entity + parent: N14Soil + id: N14HydroponicsPlanter + name: planter + description: A wooden planter with soil for growing things in. + components: - type: Sprite layers: - sprite: Nuclear14/Structures/Hydroponics/planterbox.rsi @@ -63,8 +95,16 @@ harvest_alert: True: { visible: true } False: { visible: false } - - type: PlantHolder - drawWarnings: true + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.1" + density: 190 + hard: true + mask: + - MachineMask - type: Destructible thresholds: - trigger: @@ -75,8 +115,13 @@ node: machineFrame - !type:DoActsBehavior acts: ["Destruction"] + - type: PlantHolder + drawWarnings: true - type: AmbientSound volume: -9 range: 5 sound: path: /Audio/Ambience/Objects/flowing_water_open.ogg + # - type: Construction + # graph: N14Planter + # node: Planter \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Hydroponics/seeds.yml b/Resources/Prototypes/Nuclear14/Hydroponics/seeds.yml index 3af35d41af5..695505f67f3 100644 --- a/Resources/Prototypes/Nuclear14/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Nuclear14/Hydroponics/seeds.yml @@ -305,6 +305,29 @@ Max: 10 PotencyDivisor: 25 +- type: seed + id: N14WildNettle + name: seeds-nettle-name + noun: seeds-noun-seeds + displayName: seeds-nettle-display-name + plantRsi: Objects/Specific/Hydroponics/nettle.rsi + productPrototypes: + - N14FloraProduceWildNettle + lifespan: 25 + maturation: 8 + production: 6 + yield: 2 + potency: 20 + growthStages: 5 + idealLight: 8 + waterConsumption: 0.60 + idealHeat: 298 + chemicals: + Histamine: + Min: 1 + Max: 25 + PotencyDivisor: 4 + - type: seed id: N14WildOnion name: clipping-wild-onion-name diff --git a/Resources/Prototypes/Nuclear14/Mobs/NPCs/animals.yml b/Resources/Prototypes/Nuclear14/Mobs/NPCs/animals.yml index 82b0a80114f..636c1da08e5 100644 --- a/Resources/Prototypes/Nuclear14/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Nuclear14/Mobs/NPCs/animals.yml @@ -461,6 +461,9 @@ spawned: - id: N14FoodMeatBrahmin amount: 5 + - id: N14MaterialBrahminHide + amount: 1 + prob: 0.95 - type: SolutionContainerManager solutions: udder: diff --git a/Resources/Prototypes/Nuclear14/Mobs/NPCs/insects.yml b/Resources/Prototypes/Nuclear14/Mobs/NPCs/insects.yml index f75418867be..437f11227b7 100644 --- a/Resources/Prototypes/Nuclear14/Mobs/NPCs/insects.yml +++ b/Resources/Prototypes/Nuclear14/Mobs/NPCs/insects.yml @@ -45,6 +45,14 @@ fireRate: 0.5 selectedMode: FullAuto soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + prob: 0.75 + - id: N14FoodBloatflyAcidSac + amount: 1 + prob: 0.75 - type: entity @@ -88,9 +96,6 @@ spawned: - id: N14FoodMeatRadRaw amount: 3 -# - id: MaterialHideBear TODO: Add material drop -# amount: 1 -# prob: 0.3 - type: Bloodstream bloodMaxVolume: 500 - type: Temperature @@ -132,6 +137,13 @@ reagents: - ReagentId: FireToxin Quantity: 10 + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 3 + - id: N14FoodFireantNectar + amount: 1 + prob: 0.75 - type: entity name: radroach @@ -181,6 +193,91 @@ damage: groups: Brute: 2 + - type: Butcherable + spawned: + - id: N14FoodMeatRadroachFillet + amount: 1 + +- type: entity + name: radscorpion + parent: N14MobBaseHostileInsect + id: N14MobRadscorpion + description: It's a giant radscorpion! Stingy sting. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: radscorpion + sprite: Nuclear14/Mobs/Insects/radscorpion.rsi + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.3 + density: 400 + mask: + - MobMask + layer: + - MobLayer + - type: MobThresholds + thresholds: + 0: Alive + 150: Dead + - type: Stamina + critThreshold: 10 + - type: DamageStateVisuals + states: + Alive: + Base: radscorpion + Critical: + Base: radscorpion + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadscorpion + amount: 1 + - id: N14FoodMeatRadscorpionLeg + amount: 2 + prob: 0.8 + - id: N14MaterialRadscorpionTail + amount: 1 + prob: 0.8 + - type: Bloodstream + bloodMaxVolume: 500 + - type: Temperature + heatDamageThreshold: 500 + coldDamageThreshold: 0 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + angle: 0 + animation: WeaponArcClaw + damage: + types: + Piercing: 5 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: Toxin + Quantity: 3 + +- type: entity + name: barkscorpion + parent: N14MobRadscorpion + id: N14MobRadscorpionBark + description: It's a giant bark radscorpion! Stingy sting. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: radscorpion + sprite: Nuclear14/Mobs/Insects/radscorpionbark.rsi - type: entity name: cazador @@ -233,3 +330,10 @@ reagents: - ReagentId: Toxin Quantity: 5 + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + - id: N14FoodCazadorAcidSac + amount: 1 + prob: 0.75 diff --git a/Resources/Prototypes/Nuclear14/Mobs/NPCs/wavedefencemobs.yml b/Resources/Prototypes/Nuclear14/Mobs/NPCs/wavedefencemobs.yml index 0e162c0a789..949f0ac2ffb 100644 --- a/Resources/Prototypes/Nuclear14/Mobs/NPCs/wavedefencemobs.yml +++ b/Resources/Prototypes/Nuclear14/Mobs/NPCs/wavedefencemobs.yml @@ -1,11 +1,7 @@ -# TODO:RESET:WAVEDEFENCE - # Wave Defence Mobs # Ordered by difficulty # Animals - - # Block uncomment when wavedefence is fixed. - type: entity parent: [ N14MobMolerat, N14MobWaveAnimal ] id: N14MobMoleratWave @@ -137,4 +133,19 @@ components: - type: WaveMob difficulty: 7 - + +- type: entity + parent: [ N14MobRadscorpion, N14MobWaveInsect ] + id: N14MobRadscorpionWave + suffix: WaveMode + components: + - type: WaveMob + difficulty: 8 + +- type: entity + parent: [ N14MobRadscorpionBark, N14MobWaveInsect ] + id: N14MobRadscorpionBarkWave + suffix: WaveMode + components: + - type: WaveMob + difficulty: 8 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Nuclear14/Reagents/Consumable/Drink/drinks.yml index a21547a53d7..150654869e6 100644 --- a/Resources/Prototypes/Nuclear14/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Nuclear14/Reagents/Consumable/Drink/drinks.yml @@ -15,4 +15,128 @@ id: N14MilkRadstag parent: Milk name: reagent-name-milk-radstag - desc: reagent-desc-milk-radstag \ No newline at end of file + desc: reagent-desc-milk-radstag + +# Tea +## Plant Teas +- type: reagent + id: TeaAgave + parent: GreenTea + name: reagent-name-tea-agave + desc: reagent-desc-tea-agave + metabolisms: + Drink: + effects: + - !type:AdjustReagent + reagent: Sugar + amount: 0.4 + - !type:SatiateThirst + factor: 4 + +- type: reagent + id: TeaBlackberry + parent: TeaAgave + name: reagent-name-tea-blackberry + desc: reagent-desc-tea-blackberry + +- type: reagent + id: TeaBarrelCactus + parent: GreenTea + name: reagent-name-tea-barrelcactus + desc: reagent-desc-tea-barrelcactus + +- type: reagent + id: TeaBroc + parent: GreenTea + name: reagent-name-tea-broc + desc: reagent-desc-tea-broc + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Burn: -0.25 + Brute: -0.25 + +- type: reagent + id: TeaDatura + parent: GreenTea + name: reagent-name-tea-datura + desc: reagent-desc-tea-datura + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Asphyxiation: 2.5 + +- type: reagent + id: TeaHoneyMesquite + parent: TeaAgave + name: reagent-name-tea-honeymesquite + desc: reagent-desc-tea-honeymesquite + +- type: reagent + id: TeaMutfruit + parent: GreenTea + name: reagent-name-tea-mutfruit + desc: reagent-desc-tea-mutfruit + +- type: reagent + id: TeaNettle + parent: GreenTea + name: reagent-name-tea-nettle + desc: reagent-desc-tea-nettle + +- type: reagent + id: TeaPricklypear + parent: TeaAgave + name: reagent-name-tea-pricklypear + desc: reagent-desc-tea-pricklypear + +- type: reagent + id: TeaStarlightberry + parent: TeaAgave + name: reagent-name-tea-starlightberry + desc: reagent-desc-tea-starlightberry + +- type: reagent + id: TeaTarberry + parent: TeaAgave + name: reagent-name-tea-tarberry + desc: reagent-desc-tea-tarberry + +- type: reagent + id: TeaWhiteHorsenettle + parent: TeaDatura + name: reagent-name-tea-whitehorsenettle + desc: reagent-desc-tea-whitehorsenettle + +- type: reagent + id: TeaXander + parent: GreenTea + name: reagent-name-tea-xander + desc: reagent-desc-tea-xander + + ## Other Teas +- type: reagent + parent: TeaAgave + id: TeaFireantNectar + name: reagent-name-tea-fireantnectar + desc: reagent-desc-tea-fireantnectar + metabolisms: + Drink: + effects: + - !type:AdjustReagent + reagent: Sugar + amount: 0.4 + - !type:SatiateThirst + factor: 4 + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Burn: -1.5 diff --git a/Resources/Prototypes/Nuclear14/Reagents/Consumable/extracts.yml b/Resources/Prototypes/Nuclear14/Reagents/Consumable/extracts.yml index ff170325cdd..b237b1c555c 100644 --- a/Resources/Prototypes/Nuclear14/Reagents/Consumable/extracts.yml +++ b/Resources/Prototypes/Nuclear14/Reagents/Consumable/extracts.yml @@ -183,6 +183,16 @@ flavor: fiber color: "#6ab854" +- type: reagent + parent: BaseDrink + id: ExtractNettle + name: reagent-name-extract-nettle + group: Juices + desc: reagent-desc-extract-nettle + physicalDesc: reagent-physical-desc-chalky + flavor: bitter + color: "#009900" + # No reagent for pinyon...yet? - type: reagent diff --git a/Resources/Prototypes/Nuclear14/Reagents/Consumable/food.yml b/Resources/Prototypes/Nuclear14/Reagents/Consumable/food.yml index 51c6afca8d3..2c54a569bad 100644 --- a/Resources/Prototypes/Nuclear14/Reagents/Consumable/food.yml +++ b/Resources/Prototypes/Nuclear14/Reagents/Consumable/food.yml @@ -28,4 +28,75 @@ desc: reagent-desc-rad-particle-food physicalDesc: reagent-physical-desc-metallic color: "#FFFFE5" - parent: Uranium \ No newline at end of file + parent: Uranium + + +- type: reagent + id: N14ScorpionTail + name: reagent-name-scorpiontail + desc: reagent-desc-scorpiontail + physicalDesc: reagent-physical-desc-clumpy + color: "#FFFFE5" + metabolisms: + Poison: + effects: + - !type:HealthChange + conditions: + - !type:OrganType + type: Human + damage: + types: + Poison: 2 + +- type: reagent + id: N14FireAntNectar + name: reagent-name-fireantnectar + desc: reagent-desc-fireantnectar + physicalDesc: reagent-physical-desc-clumpy + color: "#cc4814" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Burn: -1 + Food: + effects: + - !type:AdjustReagent + reagent: Sugar + amount: 0.4 + +- type: reagent + id: N14BloatflyAcid + name: reagent-name-bloatflyacid + desc: reagent-desc-bloatflyacid + physicalDesc: reagent-physical-desc-clumpy + color: "#9ceb4d" + metabolisms: + Poison: + effects: + - !type:HealthChange + conditions: + - !type:OrganType + type: Human + damage: + types: + Poison: 1 + +- type: reagent + id: N14CazadorAcid + name: reagent-name-cazadoracid + desc: reagent-desc-cazadoracid + physicalDesc: reagent-physical-desc-clumpy + color: "#9ceb4d" + metabolisms: + Poison: + effects: + - !type:HealthChange + conditions: + - !type:OrganType + type: Human + damage: + types: + Poison: 2 diff --git a/Resources/Prototypes/Nuclear14/Recipes/Construction/Graphs/hydroponics.yml b/Resources/Prototypes/Nuclear14/Recipes/Construction/Graphs/hydroponics.yml new file mode 100644 index 00000000000..833ae25b184 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Recipes/Construction/Graphs/hydroponics.yml @@ -0,0 +1,74 @@ +# - type: constructionGraph + # id: N14Soil + # start: start + # graph: + # - node: start + # edges: + # - to: Soil + # steps: + # - prototype: N14SackCompost # consider changing this to material step as seems to be broken + # name: Compost Sack + # icon: + # sprite: Nuclear14/Objects/Specific/Hydroponics/equipment.rsi + # state: daesack3 + # - node: Soil + # entity: N14Soil + # edges: + # - to: start + # completed: + # - !type:SpawnPrototype + # prototype: N14SackCompost + # amount: 1 + # - !type:DeleteEntity {} + # steps: + # - tool: Screwing + # doAfter: 3 + + +# - type: constructionGraph + # id: N14Planter + # start: start + # graph: + # - node: start + # edges: + # - to: box + # completed: + # - !type:SnapToGrid + # southRotation: true + # steps: + # - material: WoodPlank + # amount: 4 + # doAdfter: 5 + + # - node: box + # entity: N14HydroponicsPlanterEmpty + # edges: + # - to: Planter + # steps: + # - prototype: N14SackCompost + # name: Compost Sack + # icon: + # sprite: Nuclear14/Objects/Specific/Hydroponics/equipment.rsi + # state: daesack3 + + # - to: start + # completed: + # - !type:SpawnPrototype + # prototype: MaterialWoodPlank1 + # amount: 4 + # - !type:DeleteEntity {} + # steps: + # - tool: Prying + # doAfter: 3 + + # - node: Planter + # entity: N14HydroponicsPlanter + # edges: + # - to: box + # completed: + # - !type:SpawnPrototype + # prototype: N14Soil + # amount: 1 + # doAfter: 2 + # steps: + # - tool: Shoveling \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Recipes/Construction/hydroponics.yml b/Resources/Prototypes/Nuclear14/Recipes/Construction/hydroponics.yml new file mode 100644 index 00000000000..47320023c3f --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Recipes/Construction/hydroponics.yml @@ -0,0 +1,34 @@ +#chairs +- type: construction + name: soil + id: N14Soil + graph: N14Soil + startNode: start + targetNode: Soil + category: construction-category-utility + description: A patch of soil for growing things. + icon: + sprite: Structures/Hydroponics/misc.rsi + state: soil + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: planter + id: N14Planter + graph: N14Planter + startNode: start + targetNode: Planter + category: construction-category-utility + description: A planter for growing things in. + icon: + sprite: Nuclear14/Structures/Hydroponics/planterbox.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Nuclear14/Recipes/Cooking/meal_recipes.yml index 133213112d8..5cdb0402d06 100644 --- a/Resources/Prototypes/Nuclear14/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Nuclear14/Recipes/Cooking/meal_recipes.yml @@ -20,4 +20,28 @@ result: N14FoodMeatRadstagCooked time: 15 solids: - N14FoodMeatRadstag: 1 \ No newline at end of file + N14FoodMeatRadstag: 1 + +- type: microwaveMealRecipe + id: N14RecipeRadroachFillet + name: radroach fillet recipe + result: N14FoodMeatRadroachFilletCooked + time: 15 + solids: + N14FoodMeatRadroachFillet: 1 + +- type: microwaveMealRecipe + id: N14RecipeRadscorpionTail + name: radscorpion tail recipe + result: N14FoodMeatRadscorpionTailCooked + time: 15 + solids: + N14FoodMeatRadscorpion: 1 + +- type: microwaveMealRecipe + id: N14RecipeRadscorpionLeg + name: boiled radscorpion leg recipe + result: N14FoodMeatRadscorpionLegBoiled # boiled in its own juices? + time: 15 + solids: + N14FoodMeatRadscorpionLeg: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Nuclear14/Recipes/Reactions/drinks.yml new file mode 100644 index 00000000000..2cb45bfddd1 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Recipes/Reactions/drinks.yml @@ -0,0 +1,161 @@ +# Water Purification + +# Filtered Water + Boiling = Water +# Dirty Water + Charcoal = FilteredWater +# Irradiated Water + Iodide Tablets = DirtyWater (Do we have a fallout in world product to substitute for iodide)? Abraxo Cleaner? + +# Plant Teas +- type: reaction + id: TeaAgave + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractAgaveNectar: + amount: 1 + Water: + amount: 1 + products: + TeaAgave: 2 + +- type: reaction + id: TeaBlackberry + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractBlackberries: + amount: 1 + Water: + amount: 1 + products: + TeaBlackberry: 2 + +- type: reaction + id: TeaBarrelCactus + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractCactusWater: + amount: 1 + Water: + amount: 1 + products: + TeaBarrelCactus: 2 + +- type: reaction + id: TeaBroc + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractBroc: + amount: 1 + Water: + amount: 1 + products: + TeaBroc: 2 + +- type: reaction + id: TeaDatura + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractDatura: + amount: 1 + Water: + amount: 1 + products: + TeaDatura: 2 + +- type: reaction + id: TeaHoneyMesquite + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractHoneyMesquitePod: + amount: 1 + Water: + amount: 1 + products: + TeaHoneyMesquite: 2 + +- type: reaction + id: TeaMutfruit + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractMutfruit: + amount: 1 + Water: + amount: 1 + products: + TeaMutfruit: 2 + +- type: reaction + id: TeaNettle + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractNettle: + amount: 1 + Water: + amount: 1 + products: + TeaNettle: 2 + +- type: reaction + id: TeaPricklyPear + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractPricklyPearFruit: + amount: 1 + Water: + amount: 1 + products: + TeaPricklypear: 2 + +- type: reaction + id: TeaStarlightberry + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractStarlightBerries: + amount: 1 + Water: + amount: 1 + products: + TeaStarlightberry: 2 + +- type: reaction + id: TeaTarberry + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractTarberries: + amount: 1 + Water: + amount: 1 + products: + TeaTarberry: 2 + +- type: reaction + id: TeaWhiteHorsenettle + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractWhiteHorsenettle: + amount: 1 + Water: + amount: 1 + products: + TeaWhiteHorsenettle: 2 + +- type: reaction + id: TeaXander + minTemp: 353.15 # 80 degrees Celcius. + reactants: + ExtractXander: + amount: 1 + Water: + amount: 1 + products: + TeaXander: 2 + +# Other Teas +- type: reaction + id: TeaFireantNectar + minTemp: 353.15 # 80 degrees Celcius. + reactants: + N14FireantNectar: + amount: 1 + Water: + amount: 1 + products: + TeaFireantNectar: 2 diff --git a/Resources/Prototypes/Nuclear14/Recipes/Reactions/food.yml b/Resources/Prototypes/Nuclear14/Recipes/Reactions/food.yml new file mode 100644 index 00000000000..198766403ab --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Recipes/Reactions/food.yml @@ -0,0 +1,104 @@ +- type: reaction + id: N14Curdling + impact: Low + quantized: true + conserveEnergy: false + reactants: + N14MilkBrahmin: + amount: 40 + Enzyme: #N14TODO: Replace this + amount: 5 + catalyst: true + effects: + - !type:CreateEntityReactionEffect + entity: FoodCheese #N14TODO: Replace this + +- type: reaction + id: N14RazorgrainDough + impact: Low + quantized: true + conserveEnergy: false + reactants: + ExtractRazorgrainFlour: + amount: 15 + Water: + amount: 10 + effects: + - !type:CreateEntityReactionEffect + entity: FoodDough #N14TODO: Replace this + +- type: reaction + id: N14MaizeDough + impact: Low + quantized: true + conserveEnergy: false + reactants: + ExtractMaize: + amount: 15 + Water: + amount: 10 + effects: + - !type:CreateEntityReactionEffect + entity: FoodDoughCornmeal #N14TODO: Replace this + +- type: reaction + id: N14SweetBatter + impact: Low + quantized: true + conserveEnergy: false + reactants: + Flour: + amount: 15 + Egg: + amount: 12 + Sugar: + amount: 5 + effects: + - !type:CreateEntityReactionEffect + entity: FoodCakeBatter + +- type: reaction + id: N14BrahminButter + impact: Low + quantized: true + conserveEnergy: false + reactants: + N14MilkBrahmin: + amount: 30 + TableSalt: + amount: 5 + catalyst: true + effects: + - !type:CreateEntityReactionEffect + entity: FoodButter #N14TODO: Replace this + +- type: reaction + id: N14PieDough + impact: Low + quantized: true + conserveEnergy: false + reactants: + Flour: + amount: 15 + Egg: + amount: 12 + TableSalt: + amount: 5 + effects: + - !type:CreateEntityReactionEffect + entity: FoodDoughPie #N14TODO: Replace this + +# -- N14TODO: Replace -- +- type: reaction + id: N14CreateMeatball + impact: Low + quantized: true + conserveEnergy: false + reactants: + N14UncookedAnimalProteinsRad: + amount: 5 + Egg: + amount: 6 + effects: + - !type:CreateEntityReactionEffect + entity: FoodMeatMeatball #N14TODO: Replace this \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Nuclear14/Recipes/Reactions/medicine.yml new file mode 100644 index 00000000000..5c0701c581f --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Recipes/Reactions/medicine.yml @@ -0,0 +1,9 @@ +- type: reaction + id: AntidoteMixture + reactants: + Ethanol: + amount: 1 + N14ScorpionTail: + amount: 1 + products: + AntidoteMixture: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Stacks/consumable_stacks.yml b/Resources/Prototypes/Nuclear14/Stacks/consumable_stacks.yml index 8213a7d0517..d5481fe043a 100644 --- a/Resources/Prototypes/Nuclear14/Stacks/consumable_stacks.yml +++ b/Resources/Prototypes/Nuclear14/Stacks/consumable_stacks.yml @@ -109,6 +109,13 @@ icon: { sprite: Nuclear14/Objects/Consumable/Flora/wastelandflora.rsi, state: Mutfruit } spawn: N14FloraProduceWildMutfruit maxCount: 2 + +- type: stack + id: Nettles + name: nettles + icon: { sprite: Objects/Specific/Hydroponics/nettle.rsi, state: produce } + spawn: N14FloraProduceWildNettle + maxCount: 5 - type: stack id: WildOnion diff --git a/Resources/Prototypes/Nuclear14/Stacks/material_stacks.yml b/Resources/Prototypes/Nuclear14/Stacks/material_stacks.yml index 2c62a60e93e..f90f53cbc68 100644 --- a/Resources/Prototypes/Nuclear14/Stacks/material_stacks.yml +++ b/Resources/Prototypes/Nuclear14/Stacks/material_stacks.yml @@ -3,4 +3,10 @@ name: circuitry icon: { sprite: Nuclear14/Objects/Misc/materials.rsi, state: circuits_3 } spawn: N14MaterialCircuitry1 - maxCount: 15 \ No newline at end of file + maxCount: 15 + + id: BrahminHide + name: brahmin hides + icon: { sprite: Nuclear14/Objects/Misc/mob_drops.rsi, state: brahmin_hide_2 } + spawn: N14MaterialBrahminHide + maxCount: 3 \ No newline at end of file diff --git a/Resources/Prototypes/tool_qualities.yml b/Resources/Prototypes/tool_qualities.yml index ff55d9fcf14..a24741de6a1 100644 --- a/Resources/Prototypes/tool_qualities.yml +++ b/Resources/Prototypes/tool_qualities.yml @@ -67,3 +67,16 @@ toolName: tool-quality-rolling-tool-name spawn: RollingPin icon: { sprite: Objects/Tools/rolling_pin.rsi, state: icon } + + id: Crushing + name: tool-quality-crushing-name # TODO: Localisation here + toolName: tool-quality-crushing-tool-name # TODO: Localisation here + spawn: N14SledgeHammer # TODO: Replace with hammer + icon: { sprite: Nuclear14/Objects/Weapons/Melee/sledgehammer.rsi, state: icon } # TODO: Replace with hammer + +- type: tool + id: Shoveling + name: tool-quality-shoveling-name + toolName: tool-quality-shoveling-tool-name + spawn: Shovel + icon: { sprite: Objects/Tools/shovel.rsi, state: icon } \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Mobs/Insects/radscorpion.rsi/dead.png b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpion.rsi/dead.png new file mode 100644 index 00000000000..a3b6004918c Binary files /dev/null and b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpion.rsi/dead.png differ diff --git a/Resources/Textures/Nuclear14/Mobs/Insects/radscorpion.rsi/meta.json b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpion.rsi/meta.json new file mode 100644 index 00000000000..5d1eec2658d --- /dev/null +++ b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpion.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA 3.0", + "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/3c9fc470595d3106ca57e858239e8f0822630137", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "radscorpion", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Mobs/Insects/radscorpion.rsi/radscorpion.png b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpion.rsi/radscorpion.png new file mode 100644 index 00000000000..2ede0f7bc88 Binary files /dev/null and b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpion.rsi/radscorpion.png differ diff --git a/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionbark.rsi/dead.png b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionbark.rsi/dead.png new file mode 100644 index 00000000000..36322c0be18 Binary files /dev/null and b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionbark.rsi/dead.png differ diff --git a/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionbark.rsi/meta.json b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionbark.rsi/meta.json new file mode 100644 index 00000000000..5d1eec2658d --- /dev/null +++ b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionbark.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA 3.0", + "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/3c9fc470595d3106ca57e858239e8f0822630137", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "radscorpion", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionbark.rsi/radscorpion.png b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionbark.rsi/radscorpion.png new file mode 100644 index 00000000000..9d4f6d2e0a2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionbark.rsi/radscorpion.png differ diff --git a/Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/dead-1.png b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/dead-1.png similarity index 100% rename from Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/dead-1.png rename to Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/dead-1.png diff --git a/Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/dead-2.png b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/dead-2.png similarity index 100% rename from Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/dead-2.png rename to Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/dead-2.png diff --git a/Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/dead-3.png b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/dead-3.png similarity index 100% rename from Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/dead-3.png rename to Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/dead-3.png diff --git a/Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/meta.json b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/meta.json similarity index 100% rename from Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/meta.json rename to Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/meta.json diff --git a/Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/radscorpion-1.png b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/radscorpion-1.png similarity index 100% rename from Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/radscorpion-1.png rename to Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/radscorpion-1.png diff --git a/Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/radscorpion-2.png b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/radscorpion-2.png similarity index 100% rename from Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/radscorpion-2.png rename to Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/radscorpion-2.png diff --git a/Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/radscorpion-3.png b/Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/radscorpion-3.png similarity index 100% rename from Resources/Textures/Nuclear14/Mobs/Animals/radscorpion.rsi/radscorpion-3.png rename to Resources/Textures/Nuclear14/Mobs/Insects/radscorpionold.rsi/radscorpion-3.png diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/barkscorpiontail.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/barkscorpiontail.png new file mode 100644 index 00000000000..3e62ce4abb0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/barkscorpiontail.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/barkscorpiontail_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/barkscorpiontail_roasted.png new file mode 100644 index 00000000000..ec975ac56dd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/barkscorpiontail_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/fatty.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/fatty.png new file mode 100644 index 00000000000..0171afba781 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/fatty.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/fatty_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/fatty_roasted.png new file mode 100644 index 00000000000..be9dd862f5b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/fatty_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/glowroach.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/glowroach.png new file mode 100644 index 00000000000..5b8b6c196f1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/glowroach.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/glowroach_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/glowroach_roasted.png new file mode 100644 index 00000000000..2ee693ae3fe Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/glowroach_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/goldengecko.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/goldengecko.png new file mode 100644 index 00000000000..05048735939 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/goldengecko.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/goldengecko_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/goldengecko_roasted.png new file mode 100644 index 00000000000..23d817976dd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/goldengecko_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/icegecko.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/icegecko.png new file mode 100644 index 00000000000..f07630e33db Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/icegecko.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/icegecko_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/icegecko_roasted.png new file mode 100644 index 00000000000..01b3cf3ada7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/icegecko_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meat.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meat.png new file mode 100644 index 00000000000..628c5362150 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meat.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meat_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meat_roasted.png new file mode 100644 index 00000000000..ea585d828de Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meat_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meatcube.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meatcube.png new file mode 100644 index 00000000000..1a9b6c06581 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meatcube.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meatcube_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meatcube_roasted.png new file mode 100644 index 00000000000..39fa1651ed1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meatcube_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meta.json new file mode 100644 index 00000000000..43279ac7442 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/meta.json @@ -0,0 +1,98 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA 3.0", + "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/5e2e8ebe440947bcf947189d5a46bfbb5ae2e8e8, morsels_roasted modified by Peptide90", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "meatcube" + }, + { + "name": "meatcube_roasted" + }, + { + "name": "meat" + }, + { + "name": "meat_roasted" + }, + { + "name": "fatty" + }, + { + "name": "fatty_roasted" + }, + { + "name": "morsels" + }, + { + "name": "morsels_roasted" + }, + { + "name": "ribs" + }, + { + "name": "radroach" + }, + { + "name": "radroach_roasted" + }, + { + "name": "glowroach" + }, + { + "name": "glowroach_roasted" + }, + { + "name": "icegecko" + }, + { + "name": "icegecko_roasted" + }, + { + "name": "silvergecko" + }, + { + "name": "silvergecko_roasted" + }, + { + "name": "goldengecko" + }, + { + "name": "goldengecko_roasted" + }, + { + "name": "mirelurk" + }, + { + "name": "mirelurk_roasted" + }, + { + "name": "radlurk" + }, + { + "name": "radlurk_roasted" + }, + { + "name": "scorpiontail" + }, + { + "name": "scorpiontail_roasted" + }, + { + "name": "barkscorpiontail" + }, + { + "name": "barkscorpiontail_roasted" + }, + { + "name": "porkchop" + }, + { + "name": "porkchop_roasted" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/mirelurk.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/mirelurk.png new file mode 100644 index 00000000000..9d3a9640bab Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/mirelurk.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/mirelurk_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/mirelurk_roasted.png new file mode 100644 index 00000000000..1b026018bea Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/mirelurk_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/morsels.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/morsels.png new file mode 100644 index 00000000000..66f6fa7a5c7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/morsels.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/morsels_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/morsels_roasted.png new file mode 100644 index 00000000000..4f06165f5cf Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/morsels_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/porkchop.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/porkchop.png new file mode 100644 index 00000000000..7c557d28975 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/porkchop.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/porkchop_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/porkchop_roasted.png new file mode 100644 index 00000000000..413c130cb2f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/porkchop_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radlurk.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radlurk.png new file mode 100644 index 00000000000..0e4d9c72749 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radlurk.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radlurk_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radlurk_roasted.png new file mode 100644 index 00000000000..1b026018bea Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radlurk_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radroach.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radroach.png new file mode 100644 index 00000000000..12647debcd1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radroach.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radroach_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radroach_roasted.png new file mode 100644 index 00000000000..2374d62c69f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/radroach_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/ribs.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/ribs.png new file mode 100644 index 00000000000..c80692a429d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/ribs.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/scorpiontail.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/scorpiontail.png new file mode 100644 index 00000000000..02ee1f4aa30 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/scorpiontail.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/scorpiontail_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/scorpiontail_roasted.png new file mode 100644 index 00000000000..42b060a8410 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/scorpiontail_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/silvergecko.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/silvergecko.png new file mode 100644 index 00000000000..c965c088b50 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/silvergecko.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/silvergecko_roasted.png b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/silvergecko_roasted.png new file mode 100644 index 00000000000..df4962e6d7a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi/silvergecko_roasted.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/crafting_material.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Misc/crafting_material.rsi/meta.json new file mode 100644 index 00000000000..d39688866d6 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Misc/crafting_material.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA 3.0", + "copyright": "Created by Peptide90 for Nuclear14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "radscorpiontail" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Misc/crafting_material.rsi/radscorpiontail.png b/Resources/Textures/Nuclear14/Objects/Misc/crafting_material.rsi/radscorpiontail.png new file mode 100644 index 00000000000..30ec0406c75 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/crafting_material.rsi/radscorpiontail.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone.png new file mode 100644 index 00000000000..5781a3fd8eb Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone_2.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone_2.png new file mode 100644 index 00000000000..d3f7f479d1c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone_2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone_3.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone_3.png new file mode 100644 index 00000000000..26aa0b8efc2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone_3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone_claw.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone_claw.png new file mode 100644 index 00000000000..3607dd22ee5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/bone_claw.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/chitin.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/chitin.png new file mode 100644 index 00000000000..fa927467034 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/chitin.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/chitin_2.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/chitin_2.png new file mode 100644 index 00000000000..84263b7ab43 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/chitin_2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/chitin_3.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/chitin_3.png new file mode 100644 index 00000000000..593e0ae0329 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/chitin_3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg.png new file mode 100644 index 00000000000..8a26da66a3a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg_deathclaw.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg_deathclaw.png new file mode 100644 index 00000000000..31def0c27d5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg_deathclaw.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg_mirelurk.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg_mirelurk.png new file mode 100644 index 00000000000..44529704255 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg_mirelurk.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg_nightstalker.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg_nightstalker.png new file mode 100644 index 00000000000..1edfd4951be Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/egg_nightstalker.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_brahmin.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_brahmin.png new file mode 100644 index 00000000000..37c01003926 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_brahmin.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_brahmin_2.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_brahmin_2.png new file mode 100644 index 00000000000..980260b160f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_brahmin_2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_deathclaw.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_deathclaw.png new file mode 100644 index 00000000000..8853f1b9758 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_deathclaw.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_dog.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_dog.png new file mode 100644 index 00000000000..0b216dbea9a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_dog.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_gecko.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_gecko.png new file mode 100644 index 00000000000..69dfdee95ca Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_gecko.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_generic.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_generic.png new file mode 100644 index 00000000000..326a53f0bc1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_generic.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/meta.json new file mode 100644 index 00000000000..68c262a3241 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/meta.json @@ -0,0 +1,83 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from bigiron at commit https://github.com/Foundation-19/Big-Iron/commit/fa67bebd3e8f2ef3f4f25a9fcce3b83dc04fa43b", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hide_brahmin" + }, + { + "name": "hide_brahmin_2" + }, + { + "name": "hide_gecko" + }, + { + "name": "hide_dog" + }, + { + "name": "hide_generic" + }, + { + "name": "hide_deathclaw" + }, + { + "name": "skin_human" + }, + { + "name": "skin_human_2" + }, + { + "name": "skin_human_3" + }, + { + "name": "chitin" + }, + { + "name": "chitin_2" + }, + { + "name": "chitin_3" + }, + { + "name": "pelt_nightstalker" + }, + { + "name": "pelt_bighorner" + }, + { + "name": "sinew" + }, + { + "name": "sinewcuff" + }, + { + "name": "bone" + }, + { + "name": "bone_2" + }, + { + "name": "bone_3" + }, + { + "name": "bone_claw" + }, + { + "name": "egg_mirelurk" + }, + { + "name": "egg_nightstalker" + }, + { + "name": "egg" + }, + { + "name": "egg_deathclaw" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/pelt_bighorner.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/pelt_bighorner.png new file mode 100644 index 00000000000..1b028586e0a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/pelt_bighorner.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/pelt_nightstalker.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/pelt_nightstalker.png new file mode 100644 index 00000000000..95ef5119f35 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/pelt_nightstalker.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/sinew.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/sinew.png new file mode 100644 index 00000000000..d5847294a9a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/sinew.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/sinewcuff.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/sinewcuff.png new file mode 100644 index 00000000000..95ffb8fe011 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/sinewcuff.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human.png new file mode 100644 index 00000000000..bada7d94087 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human_2.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human_2.png new file mode 100644 index 00000000000..748c0275698 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human_2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human_3.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human_3.png new file mode 100644 index 00000000000..54a6e2db7cc Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human_3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/barrel.png b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/barrel.png new file mode 100644 index 00000000000..4b049836da3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/barrel.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/barrel_open.png b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/barrel_open.png new file mode 100644 index 00000000000..667cfe00e94 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/barrel_open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack.png b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack.png new file mode 100644 index 00000000000..7aa85abbcc1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack2.png b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack2.png new file mode 100644 index 00000000000..6c8bb06e12e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack3.png b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack3.png new file mode 100644 index 00000000000..f19d4a57ccc Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack4.png b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack4.png new file mode 100644 index 00000000000..fe097a3f272 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack5.png b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack5.png new file mode 100644 index 00000000000..370e7f72cb6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/daesack5.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/meta.json new file mode 100644 index 00000000000..84cb86cc3b0 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/c935466d94a1450d41b2b2a8a904b46d0f7dceab", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "barrel" + }, + { + "name": "barrel_open" + }, + { + "name": "daesack" + }, + { + "name": "daesack2" + }, + { + "name": "daesack3" + }, + { + "name": "daesack4" + }, + { + "name": "daesack5" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Structures/Hydroponics/planterbox.rsi/empty.png b/Resources/Textures/Nuclear14/Structures/Hydroponics/planterbox.rsi/empty.png new file mode 100644 index 00000000000..2f016f0a43d Binary files /dev/null and b/Resources/Textures/Nuclear14/Structures/Hydroponics/planterbox.rsi/empty.png differ diff --git a/Resources/Textures/Nuclear14/Structures/Hydroponics/planterbox.rsi/meta.json b/Resources/Textures/Nuclear14/Structures/Hydroponics/planterbox.rsi/meta.json index 047497e7a09..a7e6a333eca 100644 --- a/Resources/Textures/Nuclear14/Structures/Hydroponics/planterbox.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Structures/Hydroponics/planterbox.rsi/meta.json @@ -24,6 +24,9 @@ }, { "name": "yellowflag" + }, + { + "name": "empty" } ] } \ No newline at end of file