module things, jfc

code/modules/zombie/organs.dm

@@ -4,6 +4,7 @@
 	zone = BODY_ZONE_HEAD
 	slot = ORGAN_SLOT_ZOMBIE
 	icon_state = "blacktumor"
+	var/causes_damage = TRUE
 	var/datum/species/old_species = /datum/species/human
 	var/living_transformation_time = 30
 	var/converts_living = FALSE
@@ -44,7 +45,10 @@
 		return
 	if(!(src in owner.internal_organs))
 		Remove(owner)
-
+	if (causes_damage && !iszombie(owner) && owner.stat != DEAD)
+		owner.adjustToxLoss(1)
+		if (prob(10))
+			to_chat(owner, "<span class='danger'>You feel sick...</span>")
 	if(timer_id)
 		return
 	if(owner.suiciding)
@@ -64,16 +68,21 @@
 /obj/item/organ/zombie_infection/proc/zombify()
 	timer_id = null
 
+	if(!converts_living && owner.stat != DEAD)
+		return
+
 	if(!iszombie(owner))
 		old_species = owner.dna.species.type
 		owner.set_species(/datum/species/zombie/infectious)
 
-	if(!converts_living && owner.stat != DEAD)
-		return
-
 	var/stand_up = (owner.stat == DEAD) || (owner.stat == UNCONSCIOUS)
 
-	if(!owner.revive(full_heal = TRUE))
+	//Fully heal the zombie's damage the first time they rise
+	owner.setToxLoss(0, 0)
+	owner.setOxyLoss(0, 0)
+	owner.heal_overall_damage(INFINITY, INFINITY, INFINITY, FALSE, FALSE, TRUE)
+
+	if(!owner.revive())
 		return
 
 	owner.grab_ghost()
@@ -82,3 +91,6 @@
 	owner.do_jitter_animation(living_transformation_time)
 	owner.Stun(living_transformation_time)
 	to_chat(owner, "<span class='alertalien'>You are now a zombie!</span>")
+
+/obj/item/organ/zombie_infection/nodamage
+	causes_damage = FALSE