Ports over the status effect unification

code/modules/surgery/face.dm

@@ -55,7 +55,7 @@
 		user.visible_message("<span class='warning'> [user]'s hand slips, slicing [target]'s throat wth \the [tool]!</span>" , \
 		"<span class='warning'> Your hand slips, slicing [target]'s throat wth \the [tool]!</span>" )
 		affected.createwound(CUT, 60)
-		target.losebreath += 4
+		target.AdjustLoseBreath(4)
 
 		return 0
 
@@ -83,7 +83,7 @@
 /datum/surgery_step/face/mend_vocal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
 		user.visible_message("<span class='warning'> [user]'s hand slips, clamping [target]'s trachea shut for a moment with \the [tool]!</span>", \
 		"<span class='warning'> Your hand slips, clamping [user]'s trachea shut for a moment with \the [tool]!</span>")
-		target.losebreath += 4
+		target.AdjustLoseBreath(4)
 		return 0
 
 /datum/surgery_step/face/fix_face

code/modules/surgery/organs/blood.dm

@@ -101,7 +101,7 @@
 				else
 					adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1))
 				if(prob(5))
-					eye_blurry = max(eye_blurry, 6)
+					EyeBlurry(6)
 					var/word = pick("dizzy","woozy","faint")
 					to_chat(src, "<span class='warning'>You feel very [word].</span>")
 			if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)

code/modules/surgery/organs/organ_internal.dm

@@ -307,7 +307,7 @@
 			owner.drip(10)
 		if(prob(4))
 			spawn owner.custom_emote(1, "gasps for air!")
-			owner.losebreath += 5
+			owner.AdjustLoseBreath(5)
 
 /obj/item/organ/internal/kidneys
 	name = "kidneys"
@@ -357,10 +357,10 @@
 /obj/item/organ/internal/eyes/surgeryize()
 	if(!owner)
 		return
-	owner.disabilities &= ~NEARSIGHTED
-	owner.disabilities &= ~BLIND
-	owner.eye_blurry = 0
-	owner.eye_blind = 0
+	owner.CureNearsighted()
+	owner.CureBlind()
+	owner.SetEyeBlurry(0)
+	owner.SetEyeBlind(0)
 
 
 /obj/item/organ/internal/liver
@@ -493,6 +493,7 @@
 	slot = "brain_tumor"
 	health = 3
 	var/organhonked = 0
+	var/suffering_delay = 900
 
 /obj/item/organ/internal/honktumor/New()
 	..()
@@ -535,11 +536,11 @@
 		return
 
 	if(organhonked < world.time)
-		organhonked = world.time+900
+		organhonked = world.time + suffering_delay
 		to_chat(owner, "<font color='red' size='7'>HONK</font>")
-		owner.sleeping = 0
-		owner.stuttering = 20
-		owner.adjustEarDamage(0, 30)
+		owner.SetSleeping(0)
+		owner.Stuttering(20)
+		owner.AdjustEarDeaf(30)
 		owner.Weaken(3)
 		owner << 'sound/items/AirHorn.ogg'
 		if(prob(30))

code/modules/surgery/organs/pain.dm

@@ -15,8 +15,8 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0
 	if(world.time < next_pain_time && !force)
 		return
 	if(amount > 10 && istype(src,/mob/living/carbon/human))
-		if(src:paralysis)
-			src:paralysis = max(0, src:paralysis-round(amount/10))
+		if(paralysis)
+			AdjustParalysis(-round(amount/10))
 	if(amount > 50 && prob(amount / 5))
 		src:drop_item()
 	var/msg
@@ -132,4 +132,4 @@ mob/living/carbon/human/proc/handle_pain()
 			toxDamageMessage = "Your body aches all over, it's driving you mad."
 
 	if(toxDamageMessage && prob(toxMessageProb))
-		src.custom_pain(toxDamageMessage, getToxLoss() >= 15)
+		src.custom_pain(toxDamageMessage, getToxLoss() >= 15)

code/modules/surgery/organs/subtypes/diona.dm

@@ -169,10 +169,10 @@
 /obj/item/organ/internal/diona_receptor/surgeryize()
 	if(!owner)
 		return
-	owner.disabilities &= ~NEARSIGHTED
-	owner.disabilities &= ~BLIND
-	owner.eye_blurry = 0
-	owner.eye_blind = 0
+	owner.CureNearsighted()
+	owner.CureBlind()
+	owner.SetEyeBlurry(0)
+	owner.SetEyeBlind(0)
 
 
 //TODO:Make absorb rads on insert

code/modules/surgery/organs/subtypes/machine.dm

@@ -142,10 +142,10 @@
 /obj/item/organ/internal/optical_sensor/surgeryize()
 	if(!owner)
 		return
-	owner.disabilities &= ~NEARSIGHTED
-	owner.disabilities &= ~BLIND
-	owner.eye_blurry = 0
-	owner.eye_blind = 0
+	owner.CureNearsighted()
+	owner.CureBlind()
+	owner.SetEyeBlurry(0)
+	owner.SetEyeBlind(0)
 
 
 // Used for an MMI or posibrain being installed into a human.