mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-15 20:52:41 +00:00
Fixed compilation error and moved acid_act()
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user