diff --git a/code/modules/roguetown/roguecrafting/alchemy.dm b/code/modules/roguetown/roguecrafting/alchemy.dm index 63d716e664..cc201d096f 100644 --- a/code/modules/roguetown/roguecrafting/alchemy.dm +++ b/code/modules/roguetown/roguecrafting/alchemy.dm @@ -1,8 +1,9 @@ -/datum/crafting_recipe/roguetown +/datum/crafting_recipe/roguetown/alchemy req_table = FALSE tools = list(/obj/item/reagent_containers/glass/mortar, /obj/item/pestle) verbage_simple = "mix" skillcraft = /datum/skill/misc/alchemy + subtype_reqs = TRUE /datum/crafting_recipe/roguetown/alchemy/bbomb name = "Bottle bomb" @@ -10,17 +11,17 @@ reqs = list(/obj/item/reagent_containers/glass/bottle = 1, /obj/item/ash = 2, /obj/item/rogueore/coal = 1, /obj/item/natural/cloth = 1) craftdiff = 2 -/datum/crafting_recipe/roguetown/alchemy/bbomb +/* /datum/crafting_recipe/roguetown/alchemy/bbomb_mana name = "Bottle bomb m" result = list(/obj/item/bomb) reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot = 1, /obj/item/ash = 2, /obj/item/rogueore/coal = 1, /obj/item/natural/cloth = 1) - craftdiff = 2 + craftdiff = 2 */ -/datum/crafting_recipe/roguetown/alchemy/bbomb +/* /datum/crafting_recipe/roguetown/alchemy/bbomb_health name = "Bottle bomb h" result = list(/obj/item/bomb) reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot = 1, /obj/item/ash = 2, /obj/item/rogueore/coal = 1, /obj/item/natural/cloth = 1) - craftdiff = 2 + craftdiff = 2 */ /datum/crafting_recipe/roguetown/alchemy/manna_pot name = "Manna Potion" @@ -28,17 +29,17 @@ reqs = list(/obj/item/reagent_containers/glass/bottle = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/fish/eel = 1) craftdiff = 4 -/datum/crafting_recipe/roguetown/alchemy/manna_pot +/* /datum/crafting_recipe/roguetown/alchemy/manna_pot_mana name = "Manna Potion m" result = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot) reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/fish/eel = 1) - craftdiff = 4 + craftdiff = 4 */ -/datum/crafting_recipe/roguetown/alchemy/manna_pot +/* /datum/crafting_recipe/roguetown/alchemy/manna_pot_health name = "Manna Potion h" result = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot) reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/fish/eel = 1) - craftdiff = 4 + craftdiff = 4 */ /datum/crafting_recipe/roguetown/alchemy/manna_pot_3x name = "3x Manna Potion" @@ -46,17 +47,17 @@ reqs = list(/obj/item/reagent_containers/glass/bottle = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/fish/eel = 2) craftdiff = 4 -/datum/crafting_recipe/roguetown/alchemy/manna_pot_3x +/* /datum/crafting_recipe/roguetown/alchemy/manna_pot_3x_mana name = "3x Manna Potion m" result = list(/datum/supply_pack/rogue/food/manapot) reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/fish/eel = 2) - craftdiff = 4 + craftdiff = 4 */ -/datum/crafting_recipe/roguetown/alchemy/manna_pot_3x +/* /datum/crafting_recipe/roguetown/alchemy/manna_pot_3x_health name = "3x Manna Potion h" result = list(/datum/supply_pack/rogue/food/manapot) reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/fish/eel = 2) - craftdiff = 4 + craftdiff = 4 */ /datum/crafting_recipe/roguetown/alchemy/health_pot name = "Health Potion" @@ -64,18 +65,18 @@ reqs = list(/obj/item/reagent_containers/glass/bottle = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 1, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1) craftdiff = 5 -/datum/crafting_recipe/roguetown/alchemy/health_pot +/* /datum/crafting_recipe/roguetown/alchemy/health_pot_mana name = "Health Potion m" result = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot) reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 1, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1) - craftdiff = 5 + craftdiff = 5 */ -/datum/crafting_recipe/roguetown/alchemy/health_pot +/* /datum/crafting_recipe/roguetown/alchemy/health_pot_health name = "Health Potion h" result = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot) reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 1, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1) - craftdiff = 5 + craftdiff = 5 */ /datum/crafting_recipe/roguetown/alchemy/health_pot_3x name = "3x Health Potion" @@ -83,14 +84,20 @@ reqs = list(/obj/item/reagent_containers/glass/bottle = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 4, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1) craftdiff = 5 -/datum/crafting_recipe/roguetown/alchemy/health_pot_3x +/* /datum/crafting_recipe/roguetown/alchemy/health_pot_3x_mana name = "3x Health Potion m" result = list(/datum/supply_pack/rogue/food/healthpot) reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 4, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1) - craftdiff = 5 + craftdiff = 5 */ -/datum/crafting_recipe/roguetown/alchemy/health_pot_3x +/* /datum/crafting_recipe/roguetown/alchemy/health_pot_3x_health name = "3x Health Potion h" result = list(/datum/supply_pack/rogue/food/healthpot) reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 4, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1) - craftdiff = 5 + craftdiff = 5 */ + +// Subtype potions apparently no longer needed apparently as subtype_reqs = TRUE already allows for all bottle subtypes (including potions) to be used interchangeably + +// in crafting recipes that require them. Upon local testing, apparently doesn't affect any other item requirements this way (i.e you cant use the fish interchangeably). + +// Confusing af, but happy accident I guess? Not gonna complain.