diff --git a/code/datums/components/crafting/_recipes.dm b/code/datums/components/crafting/_recipes.dm index 2ec01922e627..d314624313b2 100644 --- a/code/datums/components/crafting/_recipes.dm +++ b/code/datums/components/crafting/_recipes.dm @@ -78,6 +78,12 @@ /obj/item/wirecutters/cyborg, /obj/item/wrench/cyborg, )) + // DARKPACK EDIT ADD START - STORYTELER_STATS + /// Stat define/typepath required for this recipe. No check if null + var/datum/st_stat/skill_required_for_use = STAT_CRAFTS + /// You need ATLEAST this many dots in a skill to craft. + var/skill_dots_minimum = null // Null by default means it wont even try to get stats. as if its 0 or less, it only catches people with low stats AND a debuff and i dont really care. + // DARKPACK EDIT ADD END /datum/crafting_recipe/New() if(!name && result) @@ -133,5 +139,14 @@ // DARKPACK EDIT ADD START /datum/crafting_recipe/proc/is_recipe_available(mob/user) + SHOULD_CALL_PARENT(TRUE) + + if(skill_required_for_use && !isnull(skill_dots_minimum)) + var/mob/living/living_user = astype(user) + if(!living_user) + return FALSE + if(living_user.st_get_stat(skill_required_for_use) < skill_dots_minimum) + return FALSE + return TRUE // DARKPACK EDIT ADD END diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 0033e58669fb..e3b8803a5d8e 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -252,9 +252,12 @@ var/mob/living/carbon/human/human_crafter if(ishuman(crafter)) human_crafter = crafter - if(CONFIG_GET(flag/punishing_zero_dots) && human_crafter.st_get_stat(STAT_CRAFTS) < 1) - return ", you dont know how to craft!" - recipe_time = recipe_time / max(human_crafter.st_get_stat(STAT_CRAFTS), 1) + var/datum/st_stat/recipe_skill = recipe.skill_required_for_use + var/level_required = recipe.skill_dots_minimum + if(recipe_skill) + if(!isnull(level_required) && human_crafter.st_get_stat(recipe_skill) < level_required) + return ", you dont know how to craft! You need at least [level_required] in [recipe_skill::name]!" + recipe_time = recipe_time / max(human_crafter.st_get_stat(recipe_skill), 1) // DARKPACK EDIT ADD END if(!do_after(crafter, round(recipe_time, 0.1 SECONDS), target = crafter)) diff --git a/code/datums/components/crafting/doors.dm b/code/datums/components/crafting/doors.dm index d9ed708904e5..e8060be6d392 100644 --- a/code/datums/components/crafting/doors.dm +++ b/code/datums/components/crafting/doors.dm @@ -10,6 +10,7 @@ time = 10 SECONDS category = CAT_DOORS crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/blast_doors name = "Blast Door" @@ -23,3 +24,4 @@ time = 30 SECONDS category = CAT_DOORS crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS diff --git a/code/datums/components/crafting/entertainment.dm b/code/datums/components/crafting/entertainment.dm index de38f153a3f0..eeeefa6f3bbc 100644 --- a/code/datums/components/crafting/entertainment.dm +++ b/code/datums/components/crafting/entertainment.dm @@ -83,7 +83,8 @@ /datum/reagent/water/holywater = 10, ) category = CAT_ENTERTAINMENT - + skill_required_for_use = STAT_OCCULT // DARKPACK EDIT ADD - STORYTELER_STATS + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/skateboard name = "Skateboard" @@ -94,6 +95,7 @@ /obj/item/stack/rods = 10, ) category = CAT_ENTERTAINMENT + skill_dots_minimum = 1 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/scooter name = "Scooter" @@ -104,6 +106,7 @@ /obj/item/stack/rods = 12, ) category = CAT_ENTERTAINMENT + skill_dots_minimum = 1 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/headpike name = "Spike Head (Glass Spear)" diff --git a/code/datums/components/crafting/equipment.dm b/code/datums/components/crafting/equipment.dm index 4623739a1679..d1b22c85d973 100644 --- a/code/datums/components/crafting/equipment.dm +++ b/code/datums/components/crafting/equipment.dm @@ -24,6 +24,7 @@ time = 4 SECONDS category = CAT_EQUIPMENT +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/moonflowershield name = "Moonflower Shield" result = /obj/item/shield/buckler/moonflower @@ -33,6 +34,7 @@ ) time = 4 SECONDS category = CAT_EQUIPMENT +*/ /datum/crafting_recipe/radio_containing abstract_type = /datum/crafting_recipe/radio_containing @@ -88,6 +90,7 @@ tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH) time = 20 SECONDS category = CAT_EQUIPMENT + skill_dots_minimum = 3 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/secured_freezer_cabinet name = "Secure Freezer Cabinet" diff --git a/code/datums/components/crafting/melee_weapon.dm b/code/datums/components/crafting/melee_weapon.dm index 4237e89505c0..211f3efad5d8 100644 --- a/code/datums/components/crafting/melee_weapon.dm +++ b/code/datums/components/crafting/melee_weapon.dm @@ -8,6 +8,7 @@ ) time = 4 SECONDS category = CAT_WEAPON_MELEE + skill_dots_minimum = 2 // DARKPACK EDIT ADD - STORYTELER_STATS /* // DARKPACK EDIT REMOVE /datum/crafting_recipe/teleprod name = "Teleprod" @@ -124,7 +125,7 @@ */ /datum/crafting_recipe/chainsaw name = "Chainsaw" - result = /obj/item/chainsaw + result = /obj/item/chainsaw/vamp // DARKPACK EDIT CHANGE reqs = list( /obj/item/circular_saw = 1, /obj/item/stack/cable_coil = 3, @@ -133,6 +134,7 @@ tool_behaviors = list(TOOL_WELDER) time = 5 SECONDS category = CAT_WEAPON_MELEE + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/spear name = "Spear" @@ -144,6 +146,7 @@ ) time = 4 SECONDS category = CAT_WEAPON_MELEE + skill_dots_minimum = 1 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/wireprod name = "Wireprod assembly" @@ -172,6 +175,7 @@ time = 2 SECONDS reqs = list(/obj/item/stack/sheet/bone = 2) category = CAT_WEAPON_MELEE + skill_dots_minimum = 2 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/bonespear name = "Bone Spear" @@ -182,6 +186,7 @@ /obj/item/stack/sheet/sinew = 1, ) category = CAT_WEAPON_MELEE + skill_dots_minimum = 2 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/boneaxe name = "Bone Axe" @@ -192,6 +197,7 @@ /obj/item/stack/sheet/sinew = 3, ) category = CAT_WEAPON_MELEE + skill_dots_minimum = 2 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/house_edge name = "House Edge" @@ -253,6 +259,8 @@ ) time = 8 SECONDS category = CAT_WEAPON_MELEE + skill_dots_minimum = 2 // DARKPACK EDIT ADD - STORYTELER_STATS + /* // DARKPACK EDIT REMOVE /datum/crafting_recipe/sm_sword name = "Supermatter Sword" @@ -265,7 +273,6 @@ ) time = 120 SECONDS category = CAT_WEAPON_MELEE - */ /datum/crafting_recipe/dragonator_spear_untreated name = "Untreated Giant-Killer Spear" @@ -277,4 +284,4 @@ ) time = 5 SECONDS category = CAT_WEAPON_MELEE - +*/ diff --git a/code/datums/components/crafting/misc.dm b/code/datums/components/crafting/misc.dm index fa2f4f3bfdf7..a85aa565d59d 100644 --- a/code/datums/components/crafting/misc.dm +++ b/code/datums/components/crafting/misc.dm @@ -45,7 +45,7 @@ ) tool_behaviors = list(TOOL_WIRECUTTER) category = CAT_MISC -/* // DARKPACK EDIT REMOVE + /datum/crafting_recipe/cardboard_id name = "Cardboard ID Card" tool_behaviors = list(TOOL_WIRECUTTER) @@ -56,6 +56,7 @@ ) category = CAT_MISC +/* // DARKPACK EDIT REMOVE /datum/crafting_recipe/battery_match name = "Battery Match" result = /obj/item/match/battery diff --git a/code/datums/components/crafting/ranged_weapon.dm b/code/datums/components/crafting/ranged_weapon.dm index fcc39ce26399..f54318e4f690 100644 --- a/code/datums/components/crafting/ranged_weapon.dm +++ b/code/datums/components/crafting/ranged_weapon.dm @@ -18,7 +18,7 @@ ) time = 4 SECONDS category = CAT_WEAPON_RANGED - +*/ /datum/crafting_recipe/receiver name = "Modular Rifle Receiver" tool_behaviors = list(TOOL_WRENCH, TOOL_WELDER) @@ -31,6 +31,7 @@ ) time = 10 SECONDS category = CAT_WEAPON_RANGED + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/riflestock name = "Wooden Rifle Stock" @@ -42,6 +43,7 @@ ) time = 5 SECONDS category = CAT_WEAPON_RANGED + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/gun_maint_kit name = "Makeshift Gun Maintenance Kit" @@ -55,7 +57,9 @@ ) time = 5 SECONDS category = CAT_WEAPON_RANGED + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/advancedegun name = "Advanced Energy Gun" result = /obj/item/gun/energy/e_gun/nuclear @@ -158,7 +162,7 @@ ) time = 10 SECONDS category = CAT_WEAPON_RANGED - +*/ /datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but name = "Pneumatic Cannon" result = /obj/item/pneumatic_cannon/ghetto @@ -170,7 +174,8 @@ ) time = 5 SECONDS category = CAT_WEAPON_RANGED - + skill_dots_minimum = 5 // DARKPACK EDIT ADD - STORYTELER_STATS +/* /datum/crafting_recipe/flamethrower name = "Flamethrower" result = /obj/item/flamethrower @@ -186,6 +191,7 @@ tool_behaviors = list(TOOL_SCREWDRIVER) time = 1 SECONDS category = CAT_WEAPON_RANGED +*/ /datum/crafting_recipe/pipegun name = "Pipegun" @@ -200,6 +206,7 @@ tool_behaviors = list(TOOL_SCREWDRIVER) time = 5 SECONDS category = CAT_WEAPON_RANGED + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/pipepistol name = "Pipe Pistol" @@ -216,6 +223,7 @@ tool_behaviors = list(TOOL_SCREWDRIVER) time = 5 SECONDS category = CAT_WEAPON_RANGED + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/rebarxbow name = "Heated Rebar Crossbow" @@ -231,6 +239,7 @@ tool_behaviors = list(TOOL_WELDER) time = 5 SECONDS category = CAT_WEAPON_RANGED + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/rebarxbowforced name = "Forced Rebar Crossbow" @@ -246,7 +255,8 @@ tool_behaviors = list(TOOL_CROWBAR) time = 1 SECONDS category = CAT_WEAPON_RANGED -*/ + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS + /datum/crafting_recipe/pipegun_prime name = "Regal Pipegun" result = /obj/item/gun/ballistic/rifle/boltaction/pipegun/prime @@ -311,7 +321,7 @@ time = 5 SECONDS category = CAT_WEAPON_RANGED crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_MUST_BE_LEARNED -/* // DARKPACK EDIT REMOVE + /datum/crafting_recipe/pipe_organ_gun name = "Pipe Organ Gun" tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER) @@ -327,7 +337,9 @@ time = 15 SECONDS category = CAT_WEAPON_RANGED crafting_flags = CRAFT_CHECK_DENSITY + skill_dots_minimum = 5 // DARKPACK EDIT ADD - STORYTELER_STATS +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/ratvarian_repeater name = "Emplaced Ratvarian Repeater" tool_behaviors = list(TOOL_SCREWDRIVER,TOOL_WRENCH) @@ -368,6 +380,7 @@ time = 8 SECONDS category = CAT_WEAPON_RANGED crafting_flags = CRAFT_CHECK_DENSITY + skill_dots_minimum = 4 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/trash_cannon name = "Trash Cannon" diff --git a/code/datums/components/crafting/robot.dm b/code/datums/components/crafting/robot.dm index 0dc92b4f64f6..e283498d5ffe 100644 --- a/code/datums/components/crafting/robot.dm +++ b/code/datums/components/crafting/robot.dm @@ -179,7 +179,7 @@ /obj/item/reagent_containers/syringe = 1, ) category = CAT_ROBOT - */ + /datum/crafting_recipe/mod_core_soul name = "MOD core (Soul)" result = /obj/item/mod/core/soul @@ -192,3 +192,4 @@ /obj/item/soulstone = 1, ) category = CAT_ROBOT +*/ diff --git a/code/datums/components/crafting/weapon_ammo.dm b/code/datums/components/crafting/weapon_ammo.dm index 76b0528f97a1..3ce665c0ed28 100644 --- a/code/datums/components/crafting/weapon_ammo.dm +++ b/code/datums/components/crafting/weapon_ammo.dm @@ -89,6 +89,7 @@ tool_behaviors = list(TOOL_SCREWDRIVER) time = 0.5 SECONDS category = CAT_WEAPON_AMMO +*/ /datum/crafting_recipe/improvisedslug name = "Junk Shell" @@ -103,7 +104,7 @@ time = 1.2 SECONDS category = CAT_WEAPON_AMMO crafting_flags = CRAFT_SKIP_MATERIALS_PARITY - */ + skill_dots_minimum = 3 // DARKPACK EDIT ADD - STORYTELER_STATS /datum/crafting_recipe/trashball name = "Trashball" diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 0e96116ed3d1..d4328980022b 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -96,6 +96,7 @@ /obj/item/banner/security/mundane inspiration_available = FALSE +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/security_banner name = "Securistan Banner" result = /obj/item/banner/security/mundane @@ -103,6 +104,7 @@ reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/security/officer = 1) category = CAT_MISC +*/ /obj/item/banner/medical name = "meditopia banner" @@ -121,6 +123,7 @@ /obj/item/banner/medical/check_inspiration(mob/living/carbon/human/H) return H.stat //Meditopia is moved to help those in need +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/medical_banner name = "Meditopia Banner" result = /obj/item/banner/medical/mundane @@ -128,6 +131,7 @@ reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/medical/doctor = 1) category = CAT_MISC +*/ /obj/item/banner/medical/special_inspiration(mob/living/carbon/human/inspired_human) var/need_mob_update = FALSE @@ -154,6 +158,7 @@ /obj/item/banner/science/check_inspiration(mob/living/carbon/human/H) return H.on_fire //Sciencia is pleased by dedication to the art of Ordnance +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/science_banner name = "Sciencia Banner" result = /obj/item/banner/science/mundane @@ -161,6 +166,7 @@ reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/rnd/scientist = 1) category = CAT_MISC +*/ /obj/item/banner/cargo name = "cargonia banner" @@ -176,6 +182,7 @@ /obj/item/banner/cargo/mundane inspiration_available = FALSE +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/cargo_banner name = "Cargonia Banner" result = /obj/item/banner/cargo/mundane @@ -183,6 +190,7 @@ reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/cargo/tech = 1) category = CAT_MISC +*/ /obj/item/banner/engineering name = "engitopia banner" @@ -201,6 +209,7 @@ /obj/item/banner/engineering/special_inspiration(mob/living/carbon/human/H) qdel(H.GetComponent(/datum/component/irradiated)) +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/engineering_banner name = "Engitopia Banner" result = /obj/item/banner/engineering/mundane @@ -208,6 +217,7 @@ reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/engineering/engineer = 1) category = CAT_MISC +*/ /obj/item/banner/command name = "command banner" @@ -225,6 +235,7 @@ /obj/item/banner/command/check_inspiration(mob/living/carbon/human/H) return HAS_TRAIT(H, TRAIT_MINDSHIELD) //Command is stalwart but rewards their allies. +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/command_banner name = "Command Banner" result = /obj/item/banner/command/mundane @@ -232,6 +243,7 @@ reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/captain/parade = 1) category = CAT_MISC +*/ /obj/item/banner/red name = "red banner" diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 053b82708c08..dbf4d3c43615 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -31,12 +31,14 @@ RegisterSignal(src, COMSIG_BIBLE_SMACKED, PROC_REF(on_bible_smacked)) if(!base_name) base_name = initial(name) + /* // DARKPACK EDIT REMOVAL var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/mod_core_soul) AddElement( /datum/element/slapcrafting,\ slapcraft_recipes = slapcraft_recipe_list,\ ) + */ /obj/item/soulstone/grind_results() return list(/datum/reagent/hauntium = 25, /datum/reagent/silicon = 10) //can be ground into hauntium diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm index f1e53cbfa191..99aa6cacf191 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm @@ -99,6 +99,7 @@ //flask of unholy water is a beaker for some reason, I will try making it a bottle and add it here once the antag freeze is over. t. kryson +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/nothingbottle name = "Nothing Bottle" time = 3 SECONDS @@ -108,6 +109,7 @@ ) result = /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing category = CAT_DRINK +*/ /datum/crafting_recipe/smallcarton name = "Small Carton" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm index 6e28e6357b6e..f9c079225a94 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm @@ -48,7 +48,7 @@ qdel(chemical_reaction) ..() -/* // DARKPACK EDIT REMOVE* +/* * Sets up information for our recipe based on the chemical reaction we have set. */ /datum/crafting_recipe/food/reaction/proc/setup_chemical_reaction_details(datum/chemical_reaction/chemical_reaction) diff --git a/code/modules/vehicles/lavaboat.dm b/code/modules/vehicles/lavaboat.dm index 194c8377b4c5..3a3a1a6ee3b5 100644 --- a/code/modules/vehicles/lavaboat.dm +++ b/code/modules/vehicles/lavaboat.dm @@ -48,6 +48,7 @@ resistance_flags = LAVA_PROOF | FIRE_PROOF custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 2) +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/oar name = "Goliath Bone Oar" result = /obj/item/oar @@ -61,6 +62,7 @@ reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 3) time = 5 SECONDS category = CAT_TOOLS +*/ /obj/vehicle/ridden/lavaboat/plasma name = "plasma boat" @@ -70,10 +72,12 @@ resistance_flags = FREEZE_PROOF can_buckle = TRUE +/* // DARKPACK EDIT REMOVAL /datum/crafting_recipe/boat/plasma name = "Polar Bear Hide Boat" result = /obj/vehicle/ridden/lavaboat/plasma reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide = 3) +*/ // Dragon Boat /obj/item/ship_in_a_bottle diff --git a/modular_darkpack/modules/food/code/recipes.dm b/modular_darkpack/modules/food/code/recipes.dm index e33ef54333a2..76f451319168 100644 --- a/modular_darkpack/modules/food/code/recipes.dm +++ b/modular_darkpack/modules/food/code/recipes.dm @@ -6,11 +6,11 @@ category = CAT_CHEMISTRY /datum/crafting_recipe/typhon_brew/is_recipe_available(mob/user) + . = ..() + if(!ishuman(user)) return FALSE var/datum/splat/vampire/vampire = get_splat_with_discipline(user) - if(vampire?.get_discipline(/datum/discipline/serpentis)) - return TRUE - - return FALSE + if(!vampire?.get_discipline(/datum/discipline/serpentis)) + return FALSE diff --git a/modular_darkpack/modules/ritual_abyss_mysticism/code/abyss_tome.dm b/modular_darkpack/modules/ritual_abyss_mysticism/code/abyss_tome.dm index 1ac6c3267c99..91ce01951b3d 100644 --- a/modular_darkpack/modules/ritual_abyss_mysticism/code/abyss_tome.dm +++ b/modular_darkpack/modules/ritual_abyss_mysticism/code/abyss_tome.dm @@ -21,11 +21,12 @@ reqs = list(/obj/item/paper = 3, /obj/item/reagent_containers/blood = 1) result = /obj/item/ritual_tome/abyss category = CAT_MISC + skill_required_for_use = STAT_OCCULT + skill_dots_minimum = 1 /datum/crafting_recipe/mystome/is_recipe_available(mob/user) + . = ..() var/mob/living/living_user = astype(user) - if(living_user?.get_discipline(/datum/discipline/obtenebration)) - return TRUE - - return FALSE + if(!living_user?.get_discipline(/datum/discipline/obtenebration)) + return FALSE diff --git a/modular_darkpack/modules/ritual_necromancy/code/necromancy_tome.dm b/modular_darkpack/modules/ritual_necromancy/code/necromancy_tome.dm index 819915a921d5..241232dd1b16 100644 --- a/modular_darkpack/modules/ritual_necromancy/code/necromancy_tome.dm +++ b/modular_darkpack/modules/ritual_necromancy/code/necromancy_tome.dm @@ -66,10 +66,11 @@ reqs = list(/obj/item/paper = 3, /obj/item/ectoplasm = 1) result = /obj/item/ritual_tome/necromancy category = CAT_MISC + skill_required_for_use = STAT_OCCULT + skill_dots_minimum = 1 /datum/crafting_recipe/necrotome/is_recipe_available(mob/user) + . = ..() var/mob/living/living_user = astype(user) - if(living_user?.get_discipline(/datum/discipline/necromancy)) - return TRUE - - return FALSE + if(!living_user?.get_discipline(/datum/discipline/necromancy)) + return FALSE diff --git a/modular_darkpack/modules/ritual_thaumaturgy/arcane_tome.dm b/modular_darkpack/modules/ritual_thaumaturgy/arcane_tome.dm index 12d44edce637..ff3e55c2d885 100644 --- a/modular_darkpack/modules/ritual_thaumaturgy/arcane_tome.dm +++ b/modular_darkpack/modules/ritual_thaumaturgy/arcane_tome.dm @@ -19,10 +19,11 @@ reqs = list(/obj/item/paper = 3, /obj/item/reagent_containers/blood = 2) result = /obj/item/ritual_tome/arcane category = CAT_MISC + skill_required_for_use = STAT_OCCULT + skill_dots_minimum = 1 /datum/crafting_recipe/arctome/is_recipe_available(mob/user) + . = ..() var/mob/living/living_user = astype(user) - if(living_user?.get_discipline(/datum/discipline/thaumaturgy)) - return TRUE - - return FALSE + if(!living_user?.get_discipline(/datum/discipline/thaumaturgy)) + return FALSE