From 8ef0e74ec98e79d047cc6b3c9fab8b9fd4101c5f Mon Sep 17 00:00:00 2001 From: JaySparrow Date: Tue, 14 Jul 2020 19:35:27 -0500 Subject: [PATCH] Husks and donuts Fixes various dehusking methods, and also donut crafting. --- .../food_and_drinks/recipes/tablecraft/recipes_pastry.dm | 2 +- code/modules/reagents/chemistry/reagents/medicine_reagents.dm | 3 +++ code/modules/surgery/advanced/reconstruction.dm | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 931a7821..365cf499 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -23,7 +23,7 @@ result = /obj/item/reagent_containers/food/snacks/donut subcategory = CAT_PASTRY -/datum/crafting_recipe/food/donut +/datum/crafting_recipe/food/donut/semen time = 15 name = "Semen donut" reqs = list( diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 7ff2a40d..88b0fe4e 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -213,6 +213,7 @@ /datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/M) M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that. M.heal_bodypart_damage(1,1) + M.cure_husk() REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC) ..() . = 1 @@ -448,6 +449,8 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M) /datum/reagent/medicine/synthflesh/overdose_start(mob/living/M) metabolization_rate = 15 * REAGENTS_METABOLISM + if(M.getFireLoss() <= 20 && M.getBruteLoss() <= 20) + M.cure_husk() /datum/reagent/medicine/charcoal name = "Charcoal" diff --git a/code/modules/surgery/advanced/reconstruction.dm b/code/modules/surgery/advanced/reconstruction.dm index 84d9f5b9..dac94e3b 100644 --- a/code/modules/surgery/advanced/reconstruction.dm +++ b/code/modules/surgery/advanced/reconstruction.dm @@ -27,6 +27,8 @@ /datum/surgery_step/reconstruct/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message("[user] fixes some of [target]'s wounds.", "You succeed in fixing some of [target]'s wounds.") target.heal_bodypart_damage(10,10) + if(target.getFireLoss() <= 20 && target.getBruteLoss() <= 20) + target.cure_husk() return TRUE /datum/surgery_step/reconstruct/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)