Merge branch 'master' of https://github.com/baystation12/baystation12

code/game/dna/dna_modifier.dm

@@ -401,7 +401,7 @@
 		occupantData["structuralEnzymes"] = null
 		occupantData["radiationLevel"] = null
 	else
-		occupantData["name"] = connected.occupant.name
+		occupantData["name"] = connected.occupant.real_name
 		occupantData["stat"] = connected.occupant.stat
 		occupantData["isViableSubject"] = 1
 		if (NOCLONE in connected.occupant.mutations || !src.connected.occupant.dna)
@@ -551,7 +551,7 @@
 	if (href_list["selectUIBlock"] && href_list["selectUISubblock"]) // This chunk of code updates selected block / sub-block based on click
 		var/select_block = text2num(href_list["selectUIBlock"])
 		var/select_subblock = text2num(href_list["selectUISubblock"])
-		if ((select_block <= 13) && (select_block >= 1))
+		if ((select_block <= DNA_UI_LENGTH) && (select_block >= 1))
 			src.selected_ui_block = select_block
 		if ((select_subblock <= DNA_BLOCK_SIZE) && (select_subblock >= 1))
 			src.selected_ui_subblock = select_subblock
@@ -704,7 +704,7 @@
 				databuf.types = DNA2_BUF_UE
 				databuf.dna = src.connected.occupant.dna.Clone()
 				if(ishuman(connected.occupant))
-					databuf.dna.real_name=connected.occupant.name
+					databuf.dna.real_name=connected.occupant.dna.real_name
 				databuf.name = "Unique Identifier"
 				src.buffers[bufferId] = databuf
 			return 1
@@ -715,7 +715,7 @@
 				databuf.types = DNA2_BUF_UI|DNA2_BUF_UE
 				databuf.dna = src.connected.occupant.dna.Clone()
 				if(ishuman(connected.occupant))
-					databuf.dna.real_name=connected.occupant.name
+					databuf.dna.real_name=connected.occupant.dna.real_name
 				databuf.name = "Unique Identifier + Unique Enzymes"
 				src.buffers[bufferId] = databuf
 			return 1
@@ -726,7 +726,7 @@
 				databuf.types = DNA2_BUF_SE
 				databuf.dna = src.connected.occupant.dna.Clone()
 				if(ishuman(connected.occupant))
-					databuf.dna.real_name=connected.occupant.name
+					databuf.dna.real_name=connected.occupant.dna.real_name
 				databuf.name = "Structural Enzymes"
 				src.buffers[bufferId] = databuf
 			return 1

code/game/gamemodes/heist/heist.dm

@@ -106,9 +106,19 @@ VOX HEIST ROUNDTYPE
 		vox.f_style = "Shaved"
 		for(var/datum/organ/external/limb in vox.organs)
 			limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT)
+		
+		//Now apply cortical stack.
+		var/datum/organ/external/E = vox.get_organ("head")	
+		var/obj/item/weapon/implant/cortical/I = new(vox)
+		I.imp_in = vox
+		I.implanted = 1
+		I.part = E
+		E.implants += I
+		cortical_stacks += I
+		
 		vox.equip_vox_raider()
 		vox.regenerate_icons()
-
+		
 		raider.objectives = raid_objectives
 		greet_vox(raider)
 
@@ -284,4 +294,4 @@ datum/game_mode/proc/auto_declare_completion_heist()
 		//maybe send the player a message that they've gone home/been kidnapped? Someone responsible for vox lore should write that.
 		Del(M)
 	for (var/obj/O in skipjack.contents)
-		Del(O)	//no hiding in lockers or anything
+		Del(O)	//no hiding in lockers or anything

code/game/machinery/embedded_controller/docking_program.dm

@@ -6,7 +6,9 @@
 
 #define MODE_NONE			0
 #define MODE_SERVER			1
-#define MODE_CLIENT			2	//The one who initiated the docking, and who can initiate the undocking. The server cannot initiate undocking. (Think server == station, client == shuttle)
+#define MODE_CLIENT			2	//The one who initiated the docking, and who can initiate the undocking. The server cannot initiate undocking, and is the one responsible for deciding to accept a docking request and signals when docking and undocking is complete. (Think server == station, client == shuttle)
+
+#define MESSAGE_RESEND_TIME 5	//how long (in seconds) do we wait before resending a message
 
 /*
 	*** STATE TABLE ***
@@ -64,9 +66,10 @@
 	var/dock_state = STATE_UNDOCKED
 	var/control_mode = MODE_NONE
 	var/response_sent = 0		//so we don't spam confirmation messages
+	var/resend_counter = 0		//for periodically resending confirmation messages in case they are missed
 	
-	var/override_enabled = 0	//skips checks for the docking port being ready
-	var/received_confirm = 0	//for undocking, whether the client has recieved a confirmation from the server
+	var/override_enabled = 0	//when enabled, do not open/close doors or cycle airlocks and wait for the player to do it manually
+	var/received_confirm = 0	//for undocking, whether the server has recieved a confirmation from the client
 
 /datum/computer/file/embedded_program/docking/receive_signal(datum/signal/signal, receive_method, receive_param)
 	var/receive_tag = signal.data["tag"]		//for docking signals, this is the sender id
@@ -158,10 +161,12 @@
 						finish_undocking()
 					reset()		//server is done undocking!
 					
-
+	if (response_sent || resend_counter > 0)
+		resend_counter++
 	
-	if (dock_state != STATE_DOCKING && dock_state != STATE_UNDOCKING)
+	if (resend_counter >= MESSAGE_RESEND_TIME || (dock_state != STATE_DOCKING && dock_state != STATE_UNDOCKING))
 		response_sent = 0
+		resend_counter = 0
 	
 	//handle invalid states
 	if (control_mode == MODE_NONE && dock_state != STATE_UNDOCKED)

code/game/objects/items/devices/scanners.dm

@@ -92,7 +92,7 @@ REAGENT SCANNER
 		usr << "\red You don't have the dexterity to do this!"
 		return
 	user.visible_message("<span class='notice'> [user] has analyzed [M]'s vitals.","<span class='notice'> You have analyzed [M]'s vitals.")
-	
+
 	if (!istype(M, /mob/living/carbon) || (ishuman(M) && (M:species.flags & IS_SYNTHETIC)))
 		//these sensors are designed for organic life
 		user.show_message("\blue Analyzing Results for ERROR:\n\t Overall Status: ERROR")
@@ -102,7 +102,7 @@ REAGENT SCANNER
 		user.show_message("\red <b>Warning: Blood Level ERROR: --% --cl.\blue Type: ERROR")
 		user.show_message("\blue Subject's pulse: <font color='red'>-- bpm.</font>")
 		return
-	
+
 	var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss())))
 	var/OX = M.getOxyLoss() > 50 	? 	"<b>[M.getOxyLoss()]</b>" 		: M.getOxyLoss()
 	var/TX = M.getToxLoss() > 50 	? 	"<b>[M.getToxLoss()]</b>" 		: M.getToxLoss()
@@ -141,7 +141,20 @@ REAGENT SCANNER
 	user.show_message("[OX] | [TX] | [BU] | [BR]")
 	if (istype(M, /mob/living/carbon))
 		if(M:reagents.total_volume > 0)
-			user.show_message(text("\red Warning: Unknown substance detected in subject's blood."))
+			var/unknown = 0
+			var/reagentdata[0]
+			for(var/A in M.reagents.reagent_list)
+				var/datum/reagent/R = A
+				if(R.scannable)
+					reagentdata["[R.id]"] = "\t \blue [round(M.reagents.get_reagent_amount(R.id), 1)]u [R.name]"
+				else
+					unknown++
+			if(reagentdata.len)
+				user.show_message("\blue Beneficial reagents detected in subject's blood:")
+				for(var/d in reagentdata)
+					user.show_message(reagentdata[d])
+			if(unknown)
+				user.show_message(text("\red Warning: Unknown substance[(unknown>1)?"s":""] detected in subject's blood."))
 		if(M:virus2.len)
 			var/mob/living/carbon/C = M
 			for (var/ID in C.virus2)
@@ -154,8 +167,8 @@ REAGENT SCANNER
 	for(var/datum/disease/D in M.viruses)
 		if(!D.hidden[SCANNER])
 			user.show_message(text("\red <b>Warning: [D.form] Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
-	if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
-		user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.")
+//	if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
+//		user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.")
 	if (M.has_brain_worms())
 		user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.")
 	else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)

code/game/objects/items/stacks/medical.dm

@@ -157,7 +157,10 @@
 		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
 		if(affecting.open == 0)
-			if(!affecting.bandage())
+			var/bandaged = affecting.bandage()
+			var/disinfected = affecting.disinfect()
+		
+			if(!(bandaged || disinfected))
 				user << "\red The wounds on [M]'s [affecting.display_name] have already been treated."
 				return 1
 			else
@@ -174,7 +177,8 @@
 					else
 						user.visible_message( 	"\blue [user] smears some bioglue over [W.desc] on [M]'s [affecting.display_name].", \
 										"\blue You smear some bioglue over [W.desc] on [M]'s [affecting.display_name]." )
-				affecting.heal_damage(heal_brute,0)
+				if (bandaged)
+					affecting.heal_damage(heal_brute,0)
 				use(1)
 		else
 			if (can_operate(H))        //Checks if mob is lying down on table for surgery

code/modules/admin/admin.dm

@@ -1114,7 +1114,7 @@ var/global/floorIsLava = 0
 		return 1
 	return 0
 
-/proc/get_options_bar(whom, detail = 2, name = 0, link = 1)
+/proc/get_options_bar(whom, detail = 2, name = 0, link = 1, highlight_special = 1)
 	if(!whom)
 		return "<b>(*null*)</b>"
 	var/mob/M
@@ -1129,12 +1129,12 @@ var/global/floorIsLava = 0
 		return "<b>(*not an mob*)</b>"
 	switch(detail)
 		if(0)
-			return "<b>[key_name(C, link, name)]</b>"
+			return "<b>[key_name(C, link, name, highlight_special)]</b>"
 		if(1)
-			return "<b>[key_name(C, link, name)](<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>?</A>)</b>"
+			return "<b>[key_name(C, link, name, highlight_special)](<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>?</A>)</b>"
 		if(2)
 			var/ref_mob = "\ref[M]"
-			return "<b>[key_name(C, link, name)](<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=[ref_mob]'>JMP</A>) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>)</b>"
+			return "<b>[key_name(C, link, name, highlight_special)](<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=[ref_mob]'>JMP</A>) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>)</b>"
 
 
 

code/modules/admin/verbs/adminhelp.dm

@@ -91,8 +91,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	if(!mob)	return						//this doesn't happen
 
 	var/ref_mob = "\ref[mob]"
+	var/mentor_msg = "\blue <b><font color=red>HELP: </font>[get_options_bar(mob, 2, 1, 1, 0)][ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]:</b> [msg]"
 	msg = "\blue <b><font color=red>HELP: </font>[get_options_bar(mob, 2, 1, 1)][ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]:</b> [msg]"
-
 	//send this msg to all admins
 	var/admin_number_afk = 0
 	for(var/client/X in admins)
@@ -101,7 +101,10 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 				admin_number_afk++
 			if(X.prefs.toggles & SOUND_ADMINHELP)
 				X << 'sound/effects/adminhelp.ogg'
-			X << msg
+			if(X.holder.rights == R_MENTOR)
+				X << mentor_msg		// Mentors won't see coloring of names on people with special_roles (Antags, etc.)
+			else
+				X << msg
 
 	//show it to the person adminhelping too
 	src << "<font color='blue'>PM to-<b>Admins</b>: [original_msg]</font>"

code/modules/admin/verbs/adminsay.dm

@@ -37,5 +37,7 @@
 	if(config.mods_are_mentors)
 		channel = "MENTOR:"
 	for(var/client/C in admins)
-		if((R_ADMIN|R_MOD|R_MENTOR) & C.holder.rights)
+		if((R_ADMIN|R_MOD) & C.holder.rights)
 			C << "<span class='[color]'><span class='prefix'>[channel]</span> <EM>[key_name(src,1)]</EM> (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
+		else			// Mentors get same message without fancy coloring of name if special_role.
+			C << "<span class='[color]'><span class='prefix'>[channel]</span> <EM>[key_name(src,1,1,0)]</EM> (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"

code/modules/client/preferences_toggles.dm

@@ -172,10 +172,9 @@
 	icons.Add(usr.zone_sel)
 
 	for(var/obj/screen/I in icons)
-		if(I.color && I.alpha)
-			I.icon = ui_style2icon(UI_style_new)
-			I.color = UI_style_color_new
-			I.alpha = UI_style_alpha_new
+		I.icon = ui_style2icon(UI_style_new)
+		I.color = UI_style_color_new
+		I.alpha = UI_style_alpha_new
 
 
 

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

@@ -2,7 +2,7 @@
 	..()
 	
 	// Increase germ_level regularly
-	if(germ_level < GERM_LEVEL_AMBIENT && prob(80))	//if you're just standing there, you shouldn't get more germs beyond an ambient level
+	if(germ_level < GERM_LEVEL_AMBIENT && prob(30))	//if you're just standing there, you shouldn't get more germs beyond an ambient level
 		germ_level++
 
 /mob/living/carbon/Move(NewLoc, direct)

code/modules/mob/mob.dm

@@ -768,6 +768,10 @@ note dizziness decrements automatically in the mob's Life() proc.
 				lying = 1
 		else
 			lying = 1
+	else if(buckled && (buckled.movable))
+		anchored = 0
+		canmove = 1
+		lying = 0
 	else if( stat || weakened || paralysis || resting || sleeping || (status_flags & FAKEDEATH))
 		lying = 1
 		canmove = 0
@@ -801,36 +805,34 @@ note dizziness decrements automatically in the mob's Life() proc.
 	return canmove
 
 
-/mob/verb/eastface()
-	set hidden = 1
+/mob/proc/facedir(var/ndir)
 	if(!canface())	return 0
-	dir = EAST
+	dir = ndir
+	if(buckled && buckled.movable)
+		buckled.dir = ndir
+		buckled.handle_rotation()
 	client.move_delay += movement_delay()
 	return 1
 
 
+/mob/verb/eastface()
+	set hidden = 1
+	return facedir(EAST)
+
+
 /mob/verb/westface()
 	set hidden = 1
-	if(!canface())	return 0
-	dir = WEST
-	client.move_delay += movement_delay()
-	return 1
+	return facedir(WEST)
 
 
 /mob/verb/northface()
 	set hidden = 1
-	if(!canface())	return 0
-	dir = NORTH
-	client.move_delay += movement_delay()
-	return 1
+	return facedir(NORTH)
 
 
 /mob/verb/southface()
 	set hidden = 1
-	if(!canface())	return 0
-	dir = SOUTH
-	client.move_delay += movement_delay()
-	return 1
+	return facedir(SOUTH)
 
 
 /mob/proc/IsAdvancedToolUser()//This might need a rename but it should replace the can this mob use things check

code/modules/organs/organ.dm

@@ -17,6 +17,20 @@
 /datum/organ/proc/get_icon()
 	return icon('icons/mob/human.dmi',"blank")
 
+//Germs
+/datum/organ/proc/handle_antibiotics()
+	var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin")
+	
+	if (antibiotics < 5)
+		return
+		
+	if (germ_level < INFECTION_LEVEL_ONE)
+		germ_level = 0	//cure instantly
+	else if (germ_level < INFECTION_LEVEL_TWO)
+		germ_level -= 6	//at germ_level == 500, this should cure the infection in a minute
+	else
+		germ_level -= 2 //at germ_level == 1000, this will cure the infection in 5 minutes
+
 //Handles chem traces
 /mob/living/carbon/human/proc/handle_trace_chems()
 	//New are added for reagents to random organs.

code/modules/organs/organ_external.dm

@@ -352,68 +352,97 @@ INFECTION_LEVEL_TWO		above this germ level the infection will start to spread to
 INFECTION_LEVEL_THREE	above this germ level the player will take additional toxin damage per second, and will die in minutes without
 						antitox. also, above this germ level you will need to overdose on spaceacillin to reduce the germ_level.
 
-Note that amputating the affected organ does in fact remove the infection from the
-player's body, though, antitox and spaceacillin are easy enough to get I doubt it will ever be needed.
+Note that amputating the affected organ does in fact remove the infection from the player's body.
 */
 /datum/organ/external/proc/update_germs()
 
-	if(status & (ORGAN_ROBOT|ORGAN_DESTROYED)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
+	if(status & (ORGAN_ROBOT|ORGAN_DESTROYED) || (owner.species && owner.species.flags & IS_PLANT)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
 		germ_level = 0
 		return
 
 	if(owner.bodytemperature >= 170)	//cryo stops germs from moving and doing their bad stuffs
-		//Syncing germ levels with external wounds
+		//** Syncing germ levels with external wounds
+		handle_germ_sync()
+		
+		//** Handle antibiotics and curing infections
+		handle_antibiotics()
+
+		//** Handle the effects of infections
+		handle_germ_effects()
+
+/datum/organ/external/proc/handle_germ_sync()
+	var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin")
+	for(var/datum/wound/W in wounds)
+		//Open wounds can become infected
+		if (owner.germ_level > W.germ_level && W.infection_check())
+			W.germ_level++
+
+	if (antibiotics < 5)
 		for(var/datum/wound/W in wounds)
-			//Open wounds can become infected
-			if (owner.germ_level > W.germ_level && W.infection_check())
-				W.germ_level++
-
 			//Infected wounds raise the organ's germ level
-			W.germ_level = max(W.germ_level, germ_level)	//Wounds get all the germs
-			if (W.germ_level > germ_level)	//Badly infected wounds raise internal germ levels
+			if (W.germ_level > germ_level)
 				germ_level++
+				break	//limit increase to a maximum of one per second
 
-		var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin")
-		if (germ_level > 0 && antibiotics > 5)
-			if (prob(4*antibiotics)) germ_level--	//the higher the germ level the more antibiotics you'll need.
+/datum/organ/external/proc/handle_germ_effects()
+	var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin")
+	
+	if (germ_level < INFECTION_LEVEL_ONE && prob(60))	//this could be an else clause, but it looks cleaner this way
+		germ_level--	//since germ_level increases at a rate of 1 per second with dirty wounds, prob(60) should give us about 5 minutes before level one.
+	
+	if(germ_level >= INFECTION_LEVEL_ONE)
+		//having an infection raises your body temperature
+		var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/INFECTION_LEVEL_THREE, 1) + owner.species.body_temperature
+		if (owner.bodytemperature < fever_temperature)
+			//world << "fever: [owner.bodytemperature] < [fever_temperature], raising temperature."
+			owner.bodytemperature++
 
-		if(germ_level >= INFECTION_LEVEL_ONE)
-			//having an infection raises your body temperature
-			var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/INFECTION_LEVEL_THREE, 1) + owner.species.body_temperature
-			if (owner.bodytemperature < fever_temperature)
-				//world << "fever: [owner.bodytemperature] < [fever_temperature], raising temperature."
-				owner.bodytemperature++
-
-			if(prob(round(germ_level/10)))
+		if(prob(round(germ_level/10)))
+			if (antibiotics < 5)
 				germ_level++
-				if (prob(5))	//adjust this to tweak how fast people take toxin damage from infections
-					owner.adjustToxLoss(1)
+			
+			if (prob(5))	//adjust this to tweak how fast people take toxin damage from infections
+				owner.adjustToxLoss(1)
 
-		if(germ_level >= INFECTION_LEVEL_TWO)
-			//spread the infection
+	if(germ_level >= INFECTION_LEVEL_TWO && antibiotics < 5)
+		//spread the infection to internal organs
+		var/datum/organ/internal/target_organ = null	//make internal organs become infected one at a time instead of all at once
+		for (var/datum/organ/internal/I in internal_organs)
+			if (I.germ_level > 0 && I.germ_level < min(germ_level, INFECTION_LEVEL_TWO))	//once the organ reaches whatever we can give it, or level two, switch to a different one
+				if (!target_organ || I.germ_level > target_organ.germ_level)	//choose the organ with the highest germ_level
+					target_organ = I
+		
+		if (!target_organ)
+			//figure out which organs we can spread germs to and pick one at random
+			var/list/candidate_organs = list()
 			for (var/datum/organ/internal/I in internal_organs)
 				if (I.germ_level < germ_level)
-					I.germ_level++
+					candidate_organs += I
+			if (candidate_organs.len)
+				target_organ = pick(candidate_organs)
+		
+		if (target_organ)
+			target_organ.germ_level++
 
-			if (children)	//To child organs
-				for (var/datum/organ/external/child in children)
-					if (child.germ_level < germ_level && !(child.status & ORGAN_ROBOT))
-						if (child.germ_level < INFECTION_LEVEL_ONE*2 || prob(30))
-							child.germ_level++
+		//spread the infection to child and parent organs
+		if (children)
+			for (var/datum/organ/external/child in children)
+				if (child.germ_level < germ_level && !(child.status & ORGAN_ROBOT))
+					if (child.germ_level < INFECTION_LEVEL_ONE*2 || prob(30))
+						child.germ_level++
 
-			if (parent)
-				if (parent.germ_level < germ_level && !(parent.status & ORGAN_ROBOT))
-					if (parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30))
-						parent.germ_level++
+		if (parent)
+			if (parent.germ_level < germ_level && !(parent.status & ORGAN_ROBOT))
+				if (parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30))
+					parent.germ_level++
 
-		if(germ_level >= INFECTION_LEVEL_THREE && antibiotics < 30)	//overdosing is necessary to stop severe infections
-			if (!(status & ORGAN_DEAD))
-				status |= ORGAN_DEAD
-				owner << "<span class='notice'>You can't feel your [display_name] anymore...</span>"
-
-			germ_level++
-			owner.adjustToxLoss(1)
+	if(germ_level >= INFECTION_LEVEL_THREE && antibiotics < 30)	//overdosing is necessary to stop severe infections
+		if (!(status & ORGAN_DEAD))
+			status |= ORGAN_DEAD
+			owner << "<span class='notice'>You can't feel your [display_name] anymore...</span>"
 
+		germ_level++
+		owner.adjustToxLoss(1)
 
 //Updating wounds. Handles wound natural I had some free spachealing, internal bleedings and infections
 /datum/organ/external/proc/update_wounds()
@@ -429,7 +458,7 @@ player's body, though, antitox and spaceacillin are easy enough to get I doubt i
 			// let the GC handle the deletion of the wound
 
 		// Internal wounds get worse over time. Low temperatures (cryo) stop them.
-		if(W.internal && !W.is_treated() && owner.bodytemperature >= 170)
+		if(W.internal && !W.can_autoheal() && owner.bodytemperature >= 170)
 			var/bicardose = owner.reagents.get_reagent_amount("bicaridine")
 			var/inaprovaline = owner.reagents.get_reagent_amount("inaprovaline")
 			if(!bicardose || !inaprovaline)	//bicaridine and inaprovaline stop internal wounds from growing bigger with time, and also stop bleeding
@@ -446,7 +475,7 @@ player's body, though, antitox and spaceacillin are easy enough to get I doubt i
 		var/heal_amt = 0
 
 		// if damage >= 50 AFTER treatment then it's probably too severe to heal within the timeframe of a round.
-		if (W.is_treated() && W.wound_damage() < 50)
+		if (W.can_autoheal() && W.wound_damage() < 50)
 			heal_amt += 0.5
 
 		//we only update wounds once in [wound_update_accuracy] ticks so have to emulate realtime
@@ -461,8 +490,8 @@ player's body, though, antitox and spaceacillin are easy enough to get I doubt i
 
 		// Salving also helps against infection
 		if(W.germ_level > 0 && W.salved && prob(2))
-			W.germ_level = 0
 			W.disinfected = 1
+			W.germ_level = 0
 
 	// sync the organ's damage with its wounds
 	src.update_damages()
@@ -665,6 +694,15 @@ player's body, though, antitox and spaceacillin are easy enough to get I doubt i
 		W.bandaged = 1
 	return rval
 
+/datum/organ/external/proc/disinfect()
+	var/rval = 0
+	for(var/datum/wound/W in wounds)
+		if(W.internal) continue
+		rval |= !W.disinfected
+		W.disinfected = 1
+		W.germ_level = 0
+	return rval
+
 /datum/organ/external/proc/clamp()
 	var/rval = 0
 	src.status &= ~ORGAN_BLEEDING
@@ -726,7 +764,7 @@ player's body, though, antitox and spaceacillin are easy enough to get I doubt i
 
 /datum/organ/external/proc/has_infected_wound()
 	for(var/datum/wound/W in wounds)
-		if(W.germ_level > 150)
+		if(W.germ_level > INFECTION_LEVEL_ONE)
 			return 1
 	return 0
 

code/modules/organs/organ_internal.dm

@@ -32,35 +32,37 @@
 	src.owner = H
 
 /datum/organ/internal/process()
-
 	//Process infections
 	if (!germ_level)
 		return
 
-	if (robotic >= 2)	//TODO make robotic internal and external organs separate types of organ instead of a flag
+	if (robotic >= 2 || (owner.species && owner.species.flags & IS_PLANT))	//TODO make robotic internal and external organs separate types of organ instead of a flag
 		germ_level = 0
 		return
 
-	var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin")
+	if(owner.bodytemperature >= 170)	//cryo stops germs from moving and doing their bad stuffs
+		//** Handle antibiotics and curing infections
+		handle_antibiotics()
 
-	if (germ_level > 0 && antibiotics > 5)
-		if (prob(4*antibiotics)) germ_level--
-		if (antibiotics > 30) germ_level--
-
-	if (germ_level >= INFECTION_LEVEL_ONE/2)
-		if(prob(round(germ_level/6)))	//aiming for germ level to go from ambient to INFECTION_LEVEL_TWO in an average of 15 minutes
-			germ_level++
-		if(prob(1))
-			take_damage(1,silent=0)
-
-	if (germ_level >= INFECTION_LEVEL_TWO)
-		var/datum/organ/external/parent = owner.get_organ(parent_organ)
-		if (parent.germ_level < germ_level && ( parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30) ))
-			parent.germ_level++
+		//** Handle the effects of infections
+		var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin")
 		
-		if (prob(5))	//about once every 20 seconds
-			take_damage(1,silent=prob(30))
+		if (germ_level < INFECTION_LEVEL_ONE/2 && prob(30))
+			germ_level--
+		
+		if (germ_level >= INFECTION_LEVEL_ONE/2)
+			//aiming for germ level to go from ambient to INFECTION_LEVEL_TWO in an average of 15 minutes
+			if(antibiotics < 5 && prob(round(germ_level/6)))
+				germ_level++
 
+		if (germ_level >= INFECTION_LEVEL_TWO)
+			var/datum/organ/external/parent = owner.get_organ(parent_organ)
+			//spread germs
+			if (antibiotics < 5 && parent.germ_level < germ_level && ( parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30) ))
+				parent.germ_level++
+			
+			if (prob(3))	//about once every 30 seconds
+				take_damage(1,silent=prob(30))
 
 /datum/organ/internal/proc/take_damage(amount, var/silent=0)
 	if(src.robotic == 2)
@@ -121,6 +123,11 @@
 	parent_organ = "chest"
 
 	process()
+		..()
+		if (germ_level > INFECTION_LEVEL_ONE)
+			if(prob(5))
+				owner.emote("cough")		//respitory tract infection
+		
 		if(is_bruised())
 			if(prob(2))
 				spawn owner.emote("me", 1, "coughs up blood!")
@@ -135,6 +142,14 @@
 	var/process_accuracy = 10
 
 	process()
+		..()
+		if (germ_level > INFECTION_LEVEL_ONE)
+			if(prob(1))
+				owner << "\red Your skin itches."
+		if (germ_level > INFECTION_LEVEL_TWO)
+			if(prob(1))
+				spawn owner.vomit()
+		
 		if(owner.life_tick % process_accuracy == 0)
 			if(src.damage < 0)
 				src.damage = 0
@@ -177,6 +192,7 @@
 	parent_organ = "head"
 
 	process() //Eye damage replaces the old eye_stat var.
+		..()
 		if(is_bruised())
 			owner.eye_blurry = 20
 		if(is_broken())

code/modules/organs/wound.dm

@@ -85,24 +85,25 @@
 	proc/wound_damage()
 		return src.damage / src.amount
 	
-	// checks whether the wound has been appropriately treated
-	// always returns 1 for wounds that are too minor to need treatment
-	proc/is_treated()
+	proc/can_autoheal()
 		if(src.wound_damage() <= autoheal_cutoff)
 			return 1
-
+		
+		return is_treated()
+	
+	// checks whether the wound has been appropriately treated
+	proc/is_treated()
 		if(damage_type == BRUISE || damage_type == CUT)
 			return bandaged
 		else if(damage_type == BURN)
 			return salved
 	
-	
 	// Checks whether other other can be merged into src.
 	proc/can_merge(var/datum/wound/other)
 		if (other.type != src.type) return 0
 		if (other.current_stage != src.current_stage) return 0
 		if (other.damage_type != src.damage_type) return 0
-		if (!(other.is_treated()) != !(src.is_treated())) return 0
+		if (!(other.can_autoheal()) != !(src.can_autoheal())) return 0
 		if (!(other.bandaged) != !(src.bandaged)) return 0
 		if (!(other.clamped) != !(src.clamped)) return 0
 		if (!(other.salved) != !(src.salved)) return 0
@@ -120,20 +121,28 @@
 	// checks if wound is considered open for external infections
 	// untreated cuts (and bleeding bruises) and burns are possibly infectable, chance higher if wound is bigger
 	proc/infection_check()
-		if (is_treated() && damage < 10)
+		if (damage < 10)	//small cuts, tiny bruises, and moderate burns shouldn't be infectable.
+			return 0
+		if (is_treated() && damage < 25)	//anything less than a flesh wound (or equivalent) isn't infectable if treated properly
 			return 0
 		if (disinfected)
+			germ_level = 0	//reset this, just in case
 			return 0
+		
+		if (damage_type == BRUISE && !bleeding()) //bruises only infectable if bleeding
+			return 0
+		
 		var/dam_coef = round(damage/10)
 		switch (damage_type)
 			if (BRUISE)
-				return prob(dam_coef*5) && bleeding() //bruises only infectable if bleeding
+				return prob(dam_coef*5)
 			if (BURN)
 				return prob(dam_coef*10)
 			if (CUT)
 				return prob(dam_coef*20)
 
 		return 0
+
 	// heal the given amount of damage, and if the given amount of damage was more
 	// than what needed to be healed, return how much heal was left
 	// set @heals_internal to also heal internal organ damage
@@ -183,10 +192,20 @@
 		
 		return 1
 
-	
 	proc/bleeding()
-		// internal wounds don't bleed in the sense of this function
-		return ((wound_damage() > 30 || bleed_timer > 0) && !(bandaged||clamped) && (damage_type == BRUISE && wound_damage() >= 20 || damage_type == CUT && wound_damage() >= 5) && current_stage <= max_bleeding_stage && !src.internal)
+		if (src.internal)
+			return 0	// internal wounds don't bleed in the sense of this function
+		
+		if (current_stage > max_bleeding_stage)
+			return 0
+		
+		if (bandaged||clamped)
+			return 0
+		
+		if (wound_damage() <= 30 && bleed_timer <= 0)
+			return 0	//Bleed timer has run out. Wounds with more than 30 damage don't stop bleeding on their own.
+		
+		return (damage_type == BRUISE && wound_damage() >= 20 || damage_type == CUT && wound_damage() >= 5)
 
 /** CUTS **/
 /datum/wound/cut/small

code/modules/reagents/Chemistry-Reagents.dm

@@ -22,6 +22,7 @@ datum
 		var/custom_metabolism = REAGENTS_METABOLISM
 		var/overdose = 0
 		var/overdose_dam = 1
+		var/scannable = 0 //shows up on health analyzers
 		//var/list/viruses = list()
 		var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!)
 
@@ -408,6 +409,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE*2
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob, var/alien)
 				if(!M) M = holder.my_atom
@@ -778,6 +780,8 @@ datum
 			reagent_state = LIQUID
 			color = "#C855DC"
 			overdose = 60
+			scannable = 1
+			custom_metabolism = 0.025 // Lasts 10 minutes for 15 units
 
 			on_mob_life(var/mob/living/M as mob)
 				if (volume > overdose)
@@ -792,6 +796,8 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC"
 			overdose = 30
+			scannable = 1
+			custom_metabolism = 0.025 // Lasts 10 minutes for 15 units
 
 			on_mob_life(var/mob/living/M as mob)
 				if (volume > overdose)
@@ -806,6 +812,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C805DC"
 			overdose = 20
+			custom_metabolism = 0.25 // Lasts 10 minutes for 15 units
 
 			on_mob_life(var/mob/living/M as mob)
 				if (volume > overdose)
@@ -835,6 +842,18 @@ datum
 			description = "Sterilizes wounds in preparation for surgery."
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
+			
+			//makes you squeaky clean
+			reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+				if (method == TOUCH)
+					M.germ_level -= min(volume*20, M.germ_level)
+			
+			reaction_obj(var/obj/O, var/volume)
+				O.germ_level -= min(volume*20, O.germ_level)
+			
+			reaction_turf(var/turf/T, var/volume)
+				T.germ_level -= min(volume*20, T.germ_level)
+			
 	/*		reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
 				src = null
 				if (method==TOUCH)
@@ -996,6 +1015,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1031,6 +1051,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(M.stat == 2.0)
@@ -1048,6 +1069,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE/2
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob, var/alien)
 				if(M.stat == 2.0) //THE GUY IS **DEAD**! BEREFT OF ALL LIFE HE RESTS IN PEACE etc etc. He does NOT metabolise shit anymore, god DAMN
@@ -1065,6 +1087,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob, var/alien)
 				if(M.stat == 2.0)
@@ -1088,6 +1111,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE/2
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob, var/alien)
 				if(M.stat == 2.0)
@@ -1110,6 +1134,7 @@ datum
 			description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob, var/alien)
 				if(M.stat == 2.0)
@@ -1129,6 +1154,7 @@ datum
 			description = "Dylovene is a broad-spectrum antitoxin."
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob, var/alien)
 				if(!M) M = holder.my_atom
@@ -1187,6 +1213,7 @@ datum
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			custom_metabolism = 0.01
 			overdose = REAGENTS_OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1226,6 +1253,7 @@ datum
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			custom_metabolism = 0.05
 			overdose = REAGENTS_OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1261,6 +1289,7 @@ datum
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			custom_metabolism = 0.05
 			overdose = REAGENTS_OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1275,6 +1304,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1296,6 +1326,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			overdose = 10
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1315,6 +1346,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob, var/alien)
 				if(M.stat == 2.0)
@@ -1346,6 +1378,7 @@ datum
 			description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly."
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1363,6 +1396,7 @@ datum
 			description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube."
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1381,6 +1415,7 @@ datum
 			reagent_state = SOLID
 			color = "#669900" // rgb: 102, 153, 0
 			overdose = REAGENTS_OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1410,6 +1445,7 @@ datum
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			custom_metabolism = 0.01
 			overdose = REAGENTS_OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				..()

code/modules/reagents/reagent_containers.dm

@@ -28,7 +28,9 @@
 	return
 
 /obj/item/weapon/reagent_containers/attack(mob/M as mob, mob/user as mob, def_zone)
-	return
+	if (can_operate(M))        //Checks if mob is lying down on table for surgery
+		if (do_surgery(M,user,src))
+			return
 
 // this prevented pills, food, and other things from being picked up by bags.
 // possibly intentional, but removing it allows us to not duplicate functionality.

code/modules/shuttles/shuttle_supply.dm

@@ -47,11 +47,11 @@
 			sleep(5)
 
 		if (destination != away_area)
+			//late
+			if (prob(late_chance))
+				sleep(rand(0,max_late_time))
+		
 			move(away_area, destination)
-
-		//late
-		if (prob(late_chance))
-			sleep(rand(0,max_late_time))
 		
 		moving_status = SHUTTLE_IDLE
 		

code/modules/supermatter/supermatter.dm

@@ -1,10 +1,7 @@
 
 #define NITROGEN_RETARDATION_FACTOR 4        //Higher == N2 slows reaction more
-#define THERMAL_RELEASE_MODIFIER 10                //Higher == less heat released during reaction
-#define PHORON_RELEASE_MODIFIER 1500                //Higher == less phoron released by reaction
-#define OXYGEN_RELEASE_MODIFIER 750        //Higher == less oxygen released at high temperature/power
 #define THERMAL_RELEASE_MODIFIER 750               //Higher == more heat released during reaction
-#define PLASMA_RELEASE_MODIFIER 1500                //Higher == less plasma released by reaction
+#define PHORON_RELEASE_MODIFIER 1500                //Higher == less phoron released by reaction
 #define OXYGEN_RELEASE_MODIFIER 1500        //Higher == less oxygen released at high temperature/power
 #define REACTION_POWER_MODIFIER 1.1                //Higher == more overall power
 

code/modules/surgery/headreattach.dm

@@ -64,7 +64,7 @@
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		if(..())
 			var/datum/organ/external/affected = target.get_organ(target_zone)
-			return affected.status & ORGAN_CUT_AWAY && affected.open < 3 && !(affected.status & ORGAN_ATTACHABLE)
+			return affected.status & ORGAN_CUT_AWAY && target.op_stage.head_reattach == 0 && !(affected.status & ORGAN_ATTACHABLE)
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -73,10 +73,9 @@
 		..()
 
 	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\blue [user] has finished repositioning flesh and tissue to something anatomically recognizable where [target]'s head used to be with \the [tool].",	\
 		"\blue You have finished repositioning flesh and tissue to something anatomically recognizable where [target]'s head used to be with \the [tool].")
-		affected.open = 3
+		target.op_stage.head_reattach = 1
 
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -97,8 +96,7 @@
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		if(..())
-			var/datum/organ/external/affected = target.get_organ(target_zone)
-			return affected.open == 3
+			return target.op_stage.head_reattach == 1
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		user.visible_message("[user] is stapling and suturing flesh into place in [target]'s esophagal and vocal region with \the [tool].", \
@@ -106,10 +104,9 @@
 		..()
 
 	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\blue [user] has finished stapling [target]'s neck into place with \the [tool].",	\
 		"\blue You have finished stapling [target]'s neck into place with \the [tool].")
-		affected.open = 4
+		target.op_stage.head_reattach = 2
 
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -132,8 +129,7 @@
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		if(..())
-			var/datum/organ/external/affected = target.get_organ(target_zone)
-			return affected.open == 4
+			return target.op_stage.head_reattach == 2
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		user.visible_message("[user] starts adjusting area around [target]'s neck with \the [tool].", \
@@ -144,6 +140,7 @@
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\blue [user] has finished adjusting the area around [target]'s neck with \the [tool].",	\
 		"\blue You have finished adjusting the area around [target]'s neck with \the [tool].")
+		target.op_stage.head_reattach = 0
 		affected.status |= ORGAN_ATTACHABLE
 		affected.amputated = 1
 		affected.setAmputatedTree()

code/modules/surgery/other.dm

@@ -51,3 +51,121 @@
 		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)
+
+/datum/surgery_step/fix_dead_tissue		//Debridement
+	priority = 2
+	allowed_tools = list(
+		/obj/item/weapon/scalpel = 100,		\
+		/obj/item/weapon/kitchenknife = 75,	\
+		/obj/item/weapon/shard = 50, 		\
+	)
+	
+	can_infect = 1
+	blood_level = 1
+
+	min_duration = 110
+	max_duration = 160
+
+	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if(!hasorgans(target))
+			return 0
+
+		if (target_zone == "mouth" || target_zone == "eyes")
+			return 0
+		
+		var/datum/organ/external/affected = target.get_organ(target_zone)
+
+		return affected.open == 2 && (affected.status & ORGAN_DEAD)
+
+	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 cutting away necrotic tissue in [target]'s [affected.display_name] with \the [tool]." , \
+		"You start cutting away necrotic tissue in [target]'s [affected.display_name] with \the [tool].")
+		target.custom_pain("The pain in [affected.display_name] is unbearable!",1)
+		..()
+
+	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/external/affected = target.get_organ(target_zone)
+		user.visible_message("\blue [user] has cut away necrotic tissue in [target]'s [affected.display_name] with \the [tool].", \
+			"\blue You have cut away necrotic tissue in [target]'s [affected.display_name] with \the [tool].")
+		affected.open = 3
+
+	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/external/affected = target.get_organ(target_zone)
+		user.visible_message("\red [user]'s hand slips, slicing an artery inside [target]'s [affected.display_name] with \the [tool]!", \
+		"\red Your hand slips, slicing an artery inside [target]'s [affected.display_name] with \the [tool]!")
+		affected.createwound(CUT, 20, 1)
+
+/datum/surgery_step/treat_necrosis
+	priority = 2
+	allowed_tools = list(
+		/obj/item/weapon/reagent_containers/dropper = 100,
+		/obj/item/weapon/reagent_containers/glass/bottle = 75,
+		/obj/item/weapon/reagent_containers/glass/beaker = 75,
+		/obj/item/weapon/reagent_containers/spray = 50,
+		/obj/item/weapon/reagent_containers/glass/bucket = 50,
+	)
+	
+	can_infect = 0
+	blood_level = 0
+
+	min_duration = 50
+	max_duration = 60
+
+	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if (!istype(tool, /obj/item/weapon/reagent_containers))
+			return 0
+		
+		var/obj/item/weapon/reagent_containers/container = tool
+		if(!container.reagents.has_reagent("peridaxon"))
+			return 0
+
+		if(!hasorgans(target))
+			return 0
+
+		if (target_zone == "mouth" || target_zone == "eyes")
+			return 0
+		
+		var/datum/organ/external/affected = target.get_organ(target_zone)
+		return affected.open == 3 && (affected.status & ORGAN_DEAD)
+
+	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 applying medication to the affected tissue in [target]'s [affected.display_name] with \the [tool]." , \
+		"You start applying medication to the affected tissue in [target]'s [affected.display_name] with \the [tool].")
+		target.custom_pain("Something in your [affected.display_name] is causing you a lot of pain!",1)
+		..()
+
+	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/external/affected = target.get_organ(target_zone)
+		
+		if (!istype(tool, /obj/item/weapon/reagent_containers))
+			return
+		
+		var/obj/item/weapon/reagent_containers/container = tool
+		
+		var/trans = container.reagents.trans_to(target, container.amount_per_transfer_from_this)
+		if (trans > 0)
+			container.reagents.reaction(target, INGEST)	//technically it's contact, but the reagents are being applied to internal tissue
+			
+			if(container.reagents.has_reagent("peridaxon"))
+				affected.status &= ~ORGAN_DEAD
+			
+			user.visible_message("\blue [user] applies [trans] units of the solution to affected tissue in [target]'s [affected.display_name]", \
+				"\blue You apply [trans] units of the solution to affected tissue in [target]'s [affected.display_name] with \the [tool].")
+
+	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/external/affected = target.get_organ(target_zone)
+		
+		if (!istype(tool, /obj/item/weapon/reagent_containers))
+			return
+		
+		var/obj/item/weapon/reagent_containers/container = tool
+		
+		var/trans = container.reagents.trans_to(target, container.amount_per_transfer_from_this)
+		container.reagents.reaction(target, INGEST)	//technically it's contact, but the reagents are being applied to internal tissue
+		
+		user.visible_message("\red [user]'s hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.display_name] with the [tool]!" , \
+		"\red Your hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.display_name] with the [tool]!")
+		
+		//no damage or anything, just wastes medicine

code/modules/surgery/surgery.dm

@@ -111,4 +111,5 @@ proc/sort_surgeries()
 	var/eyes	=	0
 	var/face	=	0
 	var/appendix =	0
-	var/ribcage =	0
+	var/ribcage =	0
+	var/head_reattach = 0

maps/tgstation2.dmm

@@ -1088,7 +1088,7 @@
 "auV" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/hydroponics/garden)
 "auW" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
 "auX" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
-"auY" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor{icon_state = "green"; dir = 8},/area/hydroponics/garden)
+"auY" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/landmark/start{name = "Gardener"},/turf/simulated/floor{icon_state = "green"; dir = 8},/area/hydroponics/garden)
 "auZ" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/hallway/primary/central)
 "ava" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/hallway/primary/port)
 "avb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/hallway/primary/port)
@@ -1127,7 +1127,7 @@
 "avI" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/stool/bed/chair/comfy/brown{icon_state = "comfychair_brown"; dir = 4},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor/carpet,/area/crew_quarters/bar)
 "avJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/wall,/area/crew_quarters/bar)
 "avK" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen)
-"avL" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor{dir = 9; icon_state = "green"},/area/hydroponics/garden)
+"avL" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/landmark/start{name = "Gardener"},/turf/simulated/floor{dir = 9; icon_state = "green"},/area/hydroponics/garden)
 "avM" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/hallway/primary/port)
 "avN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/hallway/primary/port)
 "avO" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/maintenance/fpmaint)
@@ -2227,7 +2227,7 @@
 "aQQ" = (/obj/machinery/door/morgue{dir = 2; name = "Confession Booth"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "aQR" = (/obj/machinery/light/small,/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 25},/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "aQS" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
-"aQT" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor{icon_state = "green"; dir = 8},/area/hydroponics/garden)
+"aQT" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/landmark/start{name = "Gardener"},/turf/simulated/floor{icon_state = "green"; dir = 8},/area/hydroponics/garden)
 "aQU" = (/obj/structure/closet/emcloset,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/hallway/secondary/exit)
 "aQV" = (/obj/structure/closet/emcloset,/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/hallway/secondary/exit)
 "aQW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 2},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/secondary/exit)
@@ -3189,7 +3189,7 @@
 "bjq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor,/area/hallway/primary/aft)
 "bjr" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/port)
 "bjs" = (/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/port)
-"bjt" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor/wood,/area/crew_quarters/captain)
+"bjt" = (/obj/machinery/computer/arcade,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bju" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 9},/area/maintenance/asmaint2)
 "bjv" = (/obj/structure/disposalpipe/sortjunction/flipped{dir = 8; sortType = "Janitor Closet"; name = "Janitor Closet"},/turf/simulated/floor,/area/hallway/primary/central)
 "bjw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j1s"; sortType = "HoP Office"; name = "HoP Office"},/turf/simulated/floor/plating,/area/maintenance/aft)
@@ -5943,7 +5943,7 @@
 "cko" = (/obj/machinery/atmospherics/binary/pump{dir = 4; icon_state = "intact_off"; name = "Air to Mix"; on = 0},/turf/simulated/floor,/area/atmos)
 "ckp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor,/area/atmos)
 "ckq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/engine/atmos_monitoring)
-"ckr" = (/obj/structure/stool/bed/chair/comfy/brown{dir = 4},/obj/effect/landmark/start{name = "Captain"},/obj/machinery/door_control{desc = "A remote control-switch for shutters."; id = "captaindoor"; name = "Door Control"; pixel_x = -15; pixel_y = 38},/turf/simulated/floor/wood,/area/crew_quarters/captain)
+"ckr" = (/obj/structure/stool/bed/chair/comfy/brown{dir = 4},/obj/effect/landmark/start{name = "Captain"},/obj/machinery/door_control{desc = "A remote control-switch for the office door."; id = "captaindoor"; name = "Door Control"; normaldoorcontrol = 1; pixel_x = -15; pixel_y = 30; req_access_txt = "20"},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "cks" = (/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/research{name = "Mech Bay"; req_access_txt = "29"; req_one_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/assembly/chargebay)
 "ckt" = (/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/medical/morgue)
 "cku" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor,/area/engine/atmos_monitoring)