Fixed compilation error and moved acid_act()

This commit is contained in:
Albert Iordache
2012-06-24 19:13:51 +03:00
parent 46ea22a7c1
commit 156f1349c2
3 changed files with 8 additions and 12 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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"