Hyperzine prevents Diona regeneration. Hyperzine no longer speeds up …

…Diona as much as it used to. (#14721) * 'Done' * fixes * Forgot to remove damage * Fix 2
vgstation-coders · Jul 4, 2017 · 373c2d7 · 373c2d7
1 parent 9311089
commit 373c2d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -76,6 +76,8 @@
 	if(reagents.has_reagent(HYPERZINE))
 		if(dna.mutantrace == "slime")
 			tally *= 2
+		else if(isdiona(src))
+			tally -= 4
 		else
 			tally -= 10
 

diff --git a/code/modules/mob/living/carbon/human/life/handle_chemicals_in_body.dm b/code/modules/mob/living/carbon/human/life/handle_chemicals_in_body.dm
@@ -42,7 +42,7 @@
 		if(species.flags & IS_PLANT)
 			if(nutrition > 500)
 				nutrition = 500
-			if(light_amount >= 3) //If there's enough light, heal
+			if(light_amount >= 3 && !reagents.has_reagent(HYPERZINE)) //If there's enough light, and you do not have hyperzine in body, heal
 				adjustBruteLoss(-(light_amount))
 				adjustToxLoss(-(light_amount))
 				adjustOxyLoss(-(light_amount))

diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
@@ -2365,7 +2365,7 @@
 
 	if(..())
 		return 1
-
+	
 	if(prob(5))
 		M.emote(pick("twitch","blink_r","shiver"))