made nymphs able to be blended + diona blood

BeeStation · Aug 4, 2024 · c7bb766 · c7bb766
1 parent 2461b28
commit c7bb766
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/code/modules/mob/living/carbon/human/species_types/diona.dm b/code/modules/mob/living/carbon/human/species_types/diona.dm
@@ -19,7 +19,7 @@
 	brutemod = 0.8
 	staminamod = 0.7
 	meat = /obj/item/food/meat/slab/human/mutant/diona
-	exotic_blood = /datum/reagent/water
+	exotic_blood = /datum/reagent/consumable/chlorophyll
 	species_gibs = null //Someone please make this like, xeno gibs or something in the future. I cant be bothered to fuck around with gib code right now.
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
 	species_language_holder = /datum/language_holder/diona
@@ -143,6 +143,9 @@
 	partition_ability.Remove(H)
 	QDEL_NULL(partition_ability)
 	REMOVE_TRAIT(H, TRAIT_MOBILE, "diona")
+	for(var/status_effect as anything in H.status_effects)
+		if(status_effect == STATUS_EFFECT_PLANTHEALING)
+			H.remove_status_effect(STATUS_EFFECT_PLANTHEALING)
 
 /datum/species/diona/random_name(gender, unique, lastname, attempts)
 	. = "[pick(GLOB.diona_names)]"

diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm
@@ -327,6 +327,8 @@
 	//Variables for planting a dead nymph into a hydroponics tray
 	tool_behaviour = null
 	fake_seed = null
+	grind_results = list(/datum/reagent/consumable/chlorophyll = 20)
+	juice_results = list(/datum/reagent/consumable/chlorophyll = 20)
 
 /obj/item/clothing/head/mob_holder/nymph/Initialize(mapload, mob/living/M, worn_state, head_icon, lh_icon, rh_icon, worn_slot_flags)
 	if(M.mind)
@@ -359,3 +361,8 @@
 /obj/item/clothing/head/mob_holder/nymph/equipped()
 	. = ..()
 	on_head = TRUE
+
+/obj/item/clothing/head/mob_holder/nymph/on_grind()
+	playsound(held_mob, 'sound/effects/splat.ogg', 50, 1)
+	qdel(held_mob)
+	. = ..()
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -797,6 +797,14 @@
 		playsound(M, "sparks", 50, 1)
 	return ..()
 
+/datum/reagent/consumable/chlorophyll
+	name = "Liquid Chlorophyll"
+	description = "A plant-specific elixir of life."
+	nutriment_factor = 5 * REAGENTS_METABOLISM
+	color = "#00df30"
+	chem_flags = CHEMICAL_RNG_GENERAL | CHEMICAL_RNG_FUN | CHEMICAL_RNG_BOTANY
+	taste_description = "bitter, dry, broccoli soup"
+
 /datum/reagent/consumable/astrotame
 	name = "Astrotame"
 	description = "A space age artifical sweetener."