Merge pull request #7870 from Fox-McCloud/tweaks/fixes/organ/stuff

Various little fixes/refactors

code/modules/surgery/organs/augments_internal.dm

@@ -6,8 +6,8 @@
 	status = ORGAN_ROBOT
 	var/implant_color = "#FFFFFF"
 	var/implant_overlay
-	tough = 1 //not easyly broken by combat damage
-	sterile = 1 //not very germy
+	tough = TRUE // Immune to damage
+	sterile = TRUE // Doesn't accumulate germs
 	robotic = 2 // these are cybernetic after all
 
 /obj/item/organ/internal/cyberimp/New(var/mob/M = null)

code/modules/surgery/organs/organ.dm

@@ -29,8 +29,8 @@ var/list/organ_cache = list()
 	var/freezer_update_period = 100
 	var/is_in_freezer = 0
 
-	var/sterile = 0 //can the organ be infected by germs?
-	var/tough = 0 //can organ be easily damaged?
+	var/sterile = FALSE //can the organ be infected by germs?
+	var/tough = TRUE //can organ be easily damaged?
 
 
 /obj/item/organ/Destroy()
@@ -95,7 +95,7 @@ var/list/organ_cache = list()
 		return
 
 	//Process infections
-	if((status & ORGAN_ROBOT) || sterile ||(owner && (IS_PLANT in owner.species.species_traits)))
+	if((status & ORGAN_ROBOT) || sterile || (owner && (IS_PLANT in owner.species.species_traits)))
 		germ_level = 0
 		return
 

code/modules/surgery/organs/organ_external.dm

@@ -97,25 +97,24 @@
 	switch(open)
 		if(0)
 			if(istype(W,/obj/item/weapon/scalpel))
-				spread_germs_to_organ(src,user, W)
+				spread_germs_to_organ(src, user, W)
 				user.visible_message("<span class='danger'><b>[user]</b> cuts [src] open with [W]!</span>")
 				open++
 				return
 		if(1)
 			if(istype(W,/obj/item/weapon/retractor))
-				spread_germs_to_organ(src,user, W)
+				spread_germs_to_organ(src, user, W)
 				user.visible_message("<span class='danger'><b>[user]</b> cracks [src] open like an egg with [W]!</span>")
 				open++
 				return
 		if(2)
 			if(istype(W,/obj/item/weapon/hemostat))
-				spread_germs_to_organ(src,user, W)
+				spread_germs_to_organ(src, user, W)
 				if(contents.len)
 					var/obj/item/removing = pick(contents)
 					var/obj/item/organ/internal/O = removing
 					if(istype(O))
-						if(!O.sterile)
-							spread_germs_to_organ(O,user, W) // This wouldn't be any cleaner than the actual surgery
+						spread_germs_to_organ(O, user, W) // This wouldn't be any cleaner than the actual surgery
 					user.put_in_hands(removing)
 					user.visible_message("<span class='danger'><b>[user]</b> extracts [removing] from [src] with [W]!</span>")
 				else
@@ -192,9 +191,8 @@
 		// Damage an internal organ
 		if(internal_organs && internal_organs.len)
 			var/obj/item/organ/internal/I = pick(internal_organs)
-			if(!I.tough)//mostly for cybernetic organs
-				I.take_damage(brute / 2)
-			brute -= brute / 2
+			I.take_damage(brute * 0.5)
+			brute -= brute * 0.5
 
 	if(status & ORGAN_BROKEN && prob(40) && brute)
 		owner.emote("scream")	//getting hit on broken hand hurts
@@ -591,7 +589,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 		burn_mod = 0.66
 		dismember_at_max_damage = TRUE
 	else
-		tough = 1
+		tough = TRUE
 	// Robot parts also lack bones
 	// This is so surgery isn't kaput, let's see how this does
 	encased = null

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

@@ -2,28 +2,18 @@
 	origin_tech = "biotech=5"
 	icon_state = "xgibmid2"
 	var/list/alien_powers = list()
-	tough = 1
-	sterile = 1
-
-///obj/item/organ/internal/xenos/New()
-//	for(var/A in alien_powers)
-//		if(ispath(A))
-//			alien_powers -= A
-//			alien_powers += new A(src)
-//	..()
+	tough = TRUE
+	sterile = TRUE
 
 ///can be changed if xenos get an update..
 /obj/item/organ/internal/xenos/insert(mob/living/carbon/M, special = 0)
 	..()
 	for(var/P in alien_powers)
 		M.verbs |= P
-    	//M.verbs |= alien_powers.Copy()
 
 /obj/item/organ/internal/xenos/remove(mob/living/carbon/M, special = 0)
 	for(var/P in alien_powers)
 		M.verbs -= P
-		//M.verbs -= alien_powers.Copy()
-
 	. = ..()
 
 /obj/item/organ/internal/xenos/prepare_eat()

code/modules/surgery/surgery.dm

@@ -181,7 +181,7 @@
 	return null
 
 /proc/spread_germs_to_organ(obj/item/organ/E, mob/living/carbon/human/user, obj/item/tool)
-	if(!istype(user) || !istype(E))
+	if(!istype(user) || !istype(E) || !(E.status & ORGAN_ROBOT) || E.sterile)
 		return
 
 	var/germ_level = user.germ_level
@@ -189,12 +189,11 @@
 	//germ spread from surgeon touching the patient
 	if(user.gloves)
 		germ_level = user.gloves.germ_level
-	if(!(E.status & ORGAN_ROBOT)) //Germs on robotic limbs bad
-		E.germ_level = max(germ_level,E.germ_level) //as funny as scrubbing microbes out with clean gloves is - no.
-		spread_germs_by_incision(E,tool)//germ spread from environement to patient
+	E.germ_level += germ_level
+	spread_germs_by_incision(E, tool) //germ spread from environement to patient
 
 /proc/spread_germs_by_incision(obj/item/organ/external/E,obj/item/tool)
-	if(!istype(E,/obj/item/organ/external))
+	if(!istype(E, /obj/item/organ/external))
 		return
 
 	var/germs = 0
@@ -202,7 +201,7 @@
 	for(var/mob/living/carbon/human/H in view(2, E.loc))//germs from people
 		if(AStar(E.loc, H.loc, /turf/proc/Distance, 2, simulated_only = 0))
 			if((!(NO_BREATH in H.mutations) || !(NO_BREATH in H.species.species_traits)) && !H.wear_mask) //wearing a mask helps preventing people from breathing cooties into open incisions
-				germs+=H.germ_level/4
+				germs += H.germ_level * 0.25
 
 	for(var/obj/effect/decal/cleanable/M in view(2, E.loc))//germs from messes
 		if(AStar(E.loc, M.loc, /turf/proc/Distance, 2, simulated_only = 0))
@@ -213,7 +212,7 @@
 		germs += 30
 
 	if(E.internal_organs.len)
-		germs = germs / E.internal_organs.len
+		germs = germs / (E.internal_organs.len + 1) // +1 for the external limb this eventually applies to; let's not multiply germs now.
 		for(var/obj/item/organ/internal/O in E.internal_organs)
 			if(!(O.status & ORGAN_ROBOT))
 				O.germ_level += germs