Some minor contamination fixes

This commit is contained in:
oranges
2017-11-01 09:29:47 +13:00
committed by CitadelStationBot
parent 31e2303e39
commit c5e11eceed
4 changed files with 35 additions and 24 deletions
+15 -6
View File
@@ -4,16 +4,21 @@ PROCESSING_SUBSYSTEM_DEF(radiation)
priority = 25
var/list/warned_atoms = list()
var/list/next_warn = list()
var/last_warn = 0
/datum/controller/subsystem/processing/radiation/proc/warn(datum/component/radioactive)
if(!radioactive || QDELETED(radioactive))
/datum/controller/subsystem/processing/radiation/proc/warn(datum/component/radioactive/contamination)
if(!contamination || QDELETED(contamination))
return
<<<<<<< HEAD
if(warned_atoms["\ref[radioactive.parent]"])
=======
var/ref = REF(contamination.parent)
if(warned_atoms[ref])
>>>>>>> b78e060... Merge pull request #32247 from ninjanomnom/minor-rad-fixes
return
var/atom/master = radioactive.parent
warned_atoms[ref] = TRUE
var/atom/master = contamination.parent
SSblackbox.add_details("contaminated", "[master.type]")
<<<<<<< HEAD
next_warn["\ref[master]"] = "\ref[radioactive]"
var/wait_time = max(0, 500-(world.time-last_warn))+20 // wait at least 20 ticks, longer if we just messaged
addtimer(CALLBACK(src, .proc/send_warn), wait_time, TIMER_UNIQUE | TIMER_OVERRIDE)
@@ -38,4 +43,8 @@ PROCESSING_SUBSYSTEM_DEF(radiation)
warned_atoms += next_warn
src.next_warn = list()
last_warn = world.time
message_admins(msg)
message_admins(msg)
=======
var/msg = "has become contamintaed with enough radiation to contaminate other objects. || Source: [contamination.source] || Strength: [contamination.strength]"
master.investigate_log(msg, INVESTIGATE_RADIATION)
>>>>>>> b78e060... Merge pull request #32247 from ninjanomnom/minor-rad-fixes