Merge branch 'necrosis' into bleeding-edge-freeze

code/modules/mob/living/carbon/human/human.dm

@@ -920,3 +920,31 @@
 
 	E.ruptured_lungs = 1
 
+/mob/living/carbon/human/verb/simulate()
+	set name = "sim"
+	set background = 1
+
+	var/damage = input("Wound damage","Wound damage") as num
+
+	var/germs = 0
+	var/tdamage = 0
+	var/ticks = 0
+	while (germs < 2501 && ticks < 100000 && round(damage/10)*20)
+		diary << "VIRUS TESTING: [ticks] : germs [germs] tdamage [tdamage] prob [round(damage/10)*20]"
+		ticks++
+		if (prob(round(damage/10)*20))
+			germs++
+		if (germs == 100)
+			world << "Reached stage 1 in [ticks] ticks"
+		if (germs > 100)
+			if (prob(10))
+				damage++
+				germs++
+		if (germs == 1000)
+			world << "Reached stage 2 in [ticks] ticks"
+		if (germs > 1000)
+			damage++
+			germs++
+		if (germs == 2500)
+			world << "Reached stage 3 in [ticks] ticks"
+	world << "Mob took [tdamage] tox damage"

code/modules/mob/living/carbon/human/update_icons.dm

@@ -222,6 +222,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 	var/husk_color_mod = rgb(96,88,80)
 	var/hulk_color_mod = rgb(48,224,40)
 	var/plant_color_mod = rgb(144,224,144)
+	var/necrosis_color_mod = rgb(10,50,0)
 
 	var/husk = (HUSK in src.mutations)  //100% unnecessary -Agouri	//nope, do you really want to iterate through src.mutations repeatedly? -Pete
 	var/fat = (FAT in src.mutations)
@@ -283,6 +284,9 @@ proc/get_damage_icon_part(damage_state, body_part)
 				temp = new /icon(icobase, "[part.icon_name]")
 			if(part.status & ORGAN_ROBOT)
 				temp.GrayScale()
+			if(part.status & ORGAN_DEAD)
+				temp.ColorTone(necrosis_color_mod)
+				temp.SetIntensity(0.7)
 			else if(!skeleton)
 				if(husk)
 					temp.ColorTone(husk_color_mod)

code/modules/surgery/appendix.dm

@@ -4,6 +4,7 @@
 //////////////////////////////////////////////////////////////////
 
 /datum/surgery_step/appendectomy/
+	priority = 2
 	can_infect = 1
 	blood_level = 1
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)

code/modules/surgery/bones.dm

@@ -4,6 +4,7 @@
 //////////////////////////////////////////////////////////////////
 
 /datum/surgery_step/glue_bone
+	priority = 2
 	required_tool = /obj/item/weapon/bonegel
 	allowed_tools = list(/obj/item/weapon/screwdriver)
 	can_infect = 1

code/modules/surgery/braincore.dm

@@ -4,6 +4,7 @@
 //////////////////////////////////////////////////////////////////
 
 /datum/surgery_step/brain/
+	priority = 2
 	blood_level = 1
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		return target_zone == "head" && hasorgans(target)

code/modules/surgery/eye.dm

@@ -4,6 +4,7 @@
 //////////////////////////////////////////////////////////////////
 
 /datum/surgery_step/eye
+	priority = 2
 	can_infect = 1
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		if (!hasorgans(target))

code/modules/surgery/face.dm

@@ -4,6 +4,7 @@
 //////////////////////////////////////////////////////////////////
 
 /datum/surgery_step/face
+	priority = 2
 	can_infect = 0
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		if (!hasorgans(target))

code/modules/surgery/other.dm

@@ -5,6 +5,7 @@
 
 
 /datum/surgery_step/fix_vein
+	priority = 2
 	required_tool = /obj/item/weapon/FixOVein
 	allowed_tools = list(/obj/item/weapon/cable_coil)
 	can_infect = 1
@@ -45,120 +46,3 @@
 		user.visible_message("\red [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.display_name]!" , \
 		"\red Your hand slips, smearing [tool] in the incision in [target]'s [affected.display_name]!")
 		affected.take_damage(5, 0)
-
-//////////////////////////////////////////////////////////////////
-//					IMPLANT REMOVAL SURGERY						//
-//////////////////////////////////////////////////////////////////
-
-/datum/surgery_step/implant_removal
-	required_tool = /obj/item/weapon/hemostat
-	allowed_tools = list(/obj/item/weapon/wirecutters, /obj/item/weapon/kitchen/utensil/fork)
-
-	min_duration = 80
-	max_duration = 100
-
-	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return affected.open == 2 && !(affected.status & ORGAN_BLEEDING)
-
-	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		user.visible_message("[user] starts poking around inside the incision on [target]'s [affected.display_name] with \the [tool].", \
-		"You start poking around inside the incision on [target]'s [affected.display_name] with \the [tool]" )
-		target.custom_pain("The pain in your chest is living hell!",1)
-		..()
-
-	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/chest/affected = target.get_organ(target_zone)
-
-		var/find_prob = 0
-		if (affected.implants.len)
-			var/obj/item/weapon/implant/imp = affected.implants[1]
-			if (imp.islegal())
-				find_prob +=60
-			else
-				find_prob +=40
-			if (isright(tool))
-				find_prob +=20
-			if (prob(find_prob))
-				user.visible_message("\blue [user] takes something out of incision on [target]'s [affected.display_name] with \the [tool].", \
-				"\blue You take something out of incision on [target]'s [affected.display_name]s with \the [tool]." )
-				affected.implants -= imp
-				imp.loc = get_turf(target)
-				imp.imp_in = null
-				imp.implanted = 0
-		else if (affected.hidden)
-			user.visible_message("\blue [user] takes something out of incision on [target]'s [affected.display_name] with \the [tool].", \
-			"\blue You take something out of incision on [target]'s [affected.display_name]s with \the [tool]." )
-			affected.hidden.loc = get_turf(target)
-			if(!affected.hidden.blood_DNA)
-				affected.hidden.blood_DNA = list()
-			affected.hidden.blood_DNA[target.dna.unique_enzymes] = target.dna.b_type
-			affected.hidden.update_icon()
-			affected.hidden = null
-
-		else
-			user.visible_message("\blue [user] could not find anything inside [target]'s [affected.display_name], and pulls \the [tool] out.", \
-			"\blue You could not find anything inside [target]'s [affected.display_name]." )
-
-	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/chest/affected = target.get_organ(target_zone)
-		user.visible_message("\red [user]'s hand slips, scraping tissue inside [target]'s [affected.display_name] with \the [tool]!", \
-		"\red Your hand slips, scraping tissue inside [target]'s [affected.display_name] with \the [tool]!")
-		affected.createwound(CUT, 20)
-		if (affected.implants.len)
-			var/fail_prob = 10
-			if (!isright(tool))
-				fail_prob += 30
-			if (prob(fail_prob))
-				var/obj/item/weapon/implant/imp = affected.implants[1]
-				user.visible_message("\red Something beeps inside [target]'s [affected.display_name]!")
-				playsound(imp.loc, 'sound/items/countdown.ogg', 75, 1, -3)
-				spawn(25)
-					imp.activate()
-
-//////////////////////////////////////////////////////////////////
-//					ITEM PLACEMENT SURGERY						//
-//////////////////////////////////////////////////////////////////
-
-/datum/surgery_step/item_place
-	required_tool = /obj/item
-
-	min_duration = 80
-	max_duration = 100
-	var/max_size = 2	//maximum w_class of item that fits.
-
-	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		if (affected.name in list("chest","groin","head"))
-			max_size = 3
-		else
-			max_size = 2
-		return affected.open == 2 && !(affected.status & ORGAN_BLEEDING) && tool.w_class <= max_size && !affected.hidden
-
-	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		user.visible_message("[user] starts putting [tool] inside the incision on [target]'s [affected.display_name].", \
-		"You start putting [tool] inside the incision on [target]'s [affected.display_name]." )
-		target.custom_pain("The pain in your chest is living hell!",1)
-		..()
-
-	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/chest/affected = target.get_organ(target_zone)
-
-		user.visible_message("\blue [user] puts [tool] inside [target]'s [affected.display_name].", \
-		"\blue You put [tool] inside [target]'s [affected.display_name]." )
-		if (tool.w_class > max_size/2 && prob(50))
-			user << "\red You tear some vessels trying to fit such big object in this cavity."
-			var/datum/wound/internal_bleeding/I = new (15)
-			affected.wounds += I
-			affected.owner.custom_pain("You feel something rip in your [affected.display_name]!", 1)
-		user.drop_item()
-		affected.hidden = tool
-		tool.loc = target
-
-	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/chest/affected = target.get_organ(target_zone)
-		user.visible_message("\red [user]'s hand slips, scraping tissue inside [target]'s [affected.display_name] with \the [tool]!", \
-		"\red Your hand slips, scraping tissue inside [target]'s [affected.display_name] with \the [tool]!")
-		affected.createwound(CUT, 20)

code/modules/surgery/ribcage.dm

@@ -3,6 +3,7 @@
 //				GENERIC	RIBCAGE SURGERY							//
 //////////////////////////////////////////////////////////////////
 /datum/surgery_step/ribcage
+	priority = 2
 	can_infect = 1
 	blood_level = 1
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -195,4 +196,4 @@
 		var/datum/organ/external/chest/affected = target.get_organ("chest")
 		user.visible_message("\red [user]'s hand slips, slicing an artery inside [target]'s chest with \the [tool]!", \
 		"\red Your hand slips, slicing an artery inside [target]'s chest with \the [tool]!")
-		affected.createwound(CUT, 20)
+		affected.createwound(CUT, 20)

code/modules/surgery/surgery.dm

@@ -1,6 +1,7 @@
 /* SURGERY STEPS */
 
 /datum/surgery_step
+	var/priority = 0	//steps with higher priority would be attempted first
 	// type path referencing the required tool for this step
 	var/required_tool = null
 
@@ -78,6 +79,22 @@ proc/do_surgery(mob/living/M, mob/living/user, obj/item/tool)
 			return	1	  												//don't want to do weapony things after surgery
 	return 0
 
+proc/sort_surgeries()
+	var/gap = surgery_steps.len
+	var/swapped = 1
+	while (gap > 1 || swapped)
+		swapped = 0
+		if(gap > 1)
+			gap = round(gap / 1.247330950103979)
+		if(gap < 1)
+			gap = 1
+		for(var/i = 1; gap + i <= surgery_steps.len; i++)
+			var/datum/surgery_step/l = surgery_steps[i]		//Fucking hate
+			var/datum/surgery_step/r = surgery_steps[gap+i]	//how lists work here
+			if(l.priority < r.priority)
+				surgery_steps.Swap(i, gap + i)
+				swapped = 1
+
 /datum/surgery_status/
 	var/eyes	=	0
 	var/face	=	0