diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 382ab89c367..00e45b009b9 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/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 += "Scan - [src.scanner.occupant]
" else diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index c0d479c17cf..f667ec390a4 100644 --- a/code/game/objects/weapons.dm +++ b/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 diff --git a/code/modules/research/artifact_archaeo.dm b/code/modules/research/artifact_archaeo.dm index 9ad7179b705..cc03ad685d6 100644 --- a/code/modules/research/artifact_archaeo.dm +++ b/code/modules/research/artifact_archaeo.dm @@ -47,17 +47,6 @@ M.show_message("\blue The acid splashes harmlessly off the rock, nothing else interesting happens.",1) return 1 -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -//this should probably be elsewhere, but oh well -/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*/ - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /obj/item/weapon/crystal name = "Crystal"