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

code/game/machinery/computer/cloning.dm

@@ -186,7 +186,7 @@
 						if(scantemp == "Scanner unoccupied") scantemp = "" // Stupid check to remove the text
 
 						// Make sure we can't scan a headless person. It breaks the cloner permanently.
-						var/datum/organ/external/temp = organs["head"]
+						var/datum/organ/external/temp = src.scanner.occupant.organs["head"]
 						if(temp && !(temp.status & DESTROYED))
 							dat += "<a href='byond://?src=\ref[src];scan=1'>Scan - [src.scanner.occupant]</a><br>"
 						else

code/game/objects/weapons.dm

@@ -95,6 +95,13 @@
 /atom/proc/blob_act()
 	return
 
+/atom/proc/acid_act(var/datum/reagent/R)
+	return 0
+/*/obj/proc/acid_act(var/datum/reagent/R)
+	return 0
+/mob/proc/acid_act(var/datum/reagent/R)
+	return 0*/
+
 // bullet_act called when anything is hit buy a projectile (bullet, tazer shot, laser, etc.)
 // flag is projectile type, can be:
 //PROJECTILE_TASER = 1   		taser gun