Skip to content

Commit

Permalink
regen purple adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
Absolucy committed Jun 28, 2024
1 parent 9e3f90d commit ab4d7ee
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
3 changes: 2 additions & 1 deletion code/datums/dna.dm
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
update_mutations_overlay()// no lizard with human hulk overlay please.


/mob/proc/has_dna()
/mob/proc/has_dna() as /datum/dna
RETURN_TYPE(/datum/dna)
return

/mob/living/carbon/has_dna()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ Regenerative extracts:

/obj/item/slimecross/regenerative/purple
colour = "purple"
effect_desc = "Rapidly heals the target at an even greater rate, and injects them with some regenerative jelly. Prevents softcrit while active." // monkestation edit: updates effect_desc to reflect the rework
effect_desc = "Rapidly heals the target at an even greater rate, and injects them with some regenerative jelly afterwards. Prevents softcrit while active." // monkestation edit: updates effect_desc to reflect the rework

/* monkestation edit: moved functionality to status effect
/obj/item/slimecross/regenerative/purple/core_effect(mob/living/target, mob/user)
target.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
*/

/obj/item/slimecross/regenerative/blue
colour = "blue"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
diminish_time = 1.5 MINUTES
extra_traits = list(TRAIT_NOCRITOVERLAY, TRAIT_NOSOFTCRIT)

/datum/status_effect/regenerative_extract/purple/on_remove()
. = ..()
if(owner.has_dna()?.species?.reagent_tag & PROCESS_ORGANIC) // won't work during cooldown, and won't waste effort injecting into IPCs
var/inject_amt = round(10 * multiplier)
if(inject_amt >= 1)
owner.reagents?.add_reagent(/datum/reagent/medicine/regen_jelly, inject_amt)


/datum/status_effect/regenerative_extract/silver
base_healing_amt = 4
nutrition_heal_cap = NUTRITION_LEVEL_WELL_FED + 50
Expand Down

0 comments on commit ab4d7ee

Please sign in to comment.