diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 5d46329462..c0ea108c57 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -508,6 +508,8 @@ /datum/status_effect/stabilized/purple/tick() var/is_healing = FALSE + if(owner.nutrition <= NUTRITION_LEVEL_STARVING) //No healing if you don't eat + return..() if(owner.getBruteLoss() > 0) owner.adjustBruteLoss(-0.4) is_healing = TRUE @@ -520,6 +522,7 @@ if(is_healing) examine_text = "SUBJECTPRONOUN is regenerating slowly, purplish goo filling in small injuries!" new /obj/effect/temp_visual/heal(get_turf(owner), "#FF0000") + owner.nutrition -= 5 //Drains nutrition to heal. Idea is to make it seem like it's just speeding up natural regeneration significantly else examine_text = null ..() @@ -561,8 +564,8 @@ /datum/status_effect/stabilized/yellow id = "stabilizedyellow" colour = "yellow" - var/cooldown = 10 - var/max_cooldown = 10 + var/cooldown = 30 + var/max_cooldown = 30 examine_text = "Nearby electronics seem just a little more charged wherever SUBJECTPRONOUN goes." /datum/status_effect/stabilized/yellow/tick() @@ -623,6 +626,7 @@ colour = "dark blue" /datum/status_effect/stabilized/darkblue/tick() + owner.adjust_bodytemperature(min(-1.5)) //Makes you colder, you are soaking wet after all if(owner.fire_stacks > 0 && prob(80)) owner.fire_stacks-- if(owner.fire_stacks <= 0) diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index 7f3d2ce791..437a39596c 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -47,6 +47,7 @@ Regenerative extracts: user.visible_message("[user] crushes the [src] over [M], the milky goo quickly regenerating all of [M.p_their()] injuries!", "You squeeze the [src], and it bursts over [M], the milky goo regenerating [M.p_their()] injuries.") else + /* GS13 EDIT START user.visible_message("[user] crushes the [src] over [user.p_them()]self, the milky goo quickly regenerating all of [user.p_their()] injuries!", "You squeeze the [src], and it bursts in your hand, splashing you with milky goo which quickly regenerates your injuries!") core_effect_before(M, user) @@ -57,6 +58,13 @@ Regenerative extracts: M.revive(full_heal = 1) M.set_disgust(new_disgust_level) core_effect(M, user) + */ + user.visible_message("[user] crushes the [src] over [user.p_them()]self, the milky goo quickly seeping into [user.p_their()] skin!", + "You squeeze the [src], and it bursts in your hand, splashing you with milky goo which seeps into your skin!") + core_effect_before(H, user) + target.reagents.add_reagent(/datum/reagent/medicine/pure_regen_jelly,5) //No instant aheals. Gives medicine instead, extremely fast acting and very powerful. But not instant. + core_effect(H, user) + //GS13 EDIT END playsound(target, 'sound/effects/splat.ogg', 40, 1) //warn receivers of the extract about the disgust if they're carbon, making it clear that the regenerative extract is causing this. if(iscarbon(M)) @@ -88,7 +96,8 @@ Regenerative extracts: colour = "purple" /obj/item/slimecross/regenerative/purple/core_effect(mob/living/target, mob/user) - target.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10) + //GS13 EDIT target.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10) + target.reagents.add_reagent(/datum/reagent/medicine/pure_neo_jelly,5) //Varies what it applies so you get two powerful healing chems at once since Purples are all about healing. /obj/item/slimecross/regenerative/blue colour = "blue"