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

code/WorkInProgress/autopsy.dm

@@ -78,7 +78,7 @@
 /obj/item/weapon/autopsy_scanner/verb/print_data()
 	set src in view(usr, 1)
 	set name = "Print Data"
-	if(usr.stat)
+	if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
 		usr << "No."
 		return
 

code/game/gamemodes/malfunction/Malf_Modules.dm

@@ -85,7 +85,7 @@ rcd light flash thingy on matter drain
 				for(var/mob/V in hearers(M, null))
 					V.show_message("\blue You hear a loud electrical buzzing sound!", 2)
 				spawn(50)
-					explosion(get_turf(M), 0,1,1,0)
+					explosion(get_turf(M), 0,1,2,3)
 					del(M)
 			else usr << "Out of uses."
 	else usr << "That's not a machine."

code/modules/mob/transform_procs.dm

@@ -137,7 +137,6 @@
 		return
 	for(var/obj/item/W in src)
 		drop_from_inventory(W)
-	regenerate_icons()
 	monkeyizing = 1
 	canmove = 0
 	icon = null

code/modules/organs/organ_external.dm

@@ -308,6 +308,10 @@
 
 //Updating wounds. Handles wound natural I had some free spachealing, internal bleedings and infections
 /datum/organ/external/proc/update_wounds()
+
+	if((status & ORGAN_ROBOT)) //Robotic limbs don't heal or get worse.
+		return
+
 	for(var/datum/wound/W in wounds)
 		// wounds can disappear after 10 minutes at the earliest
 		if(W.damage == 0 && W.created + 10 * 10 * 60 <= world.time)