Merge remote-tracking branch 'upstream/master' into rebase-to-vg

This commit is contained in:
PJB3005
2017-02-12 16:35:57 +01:00
182 changed files with 2195 additions and 91090 deletions
@@ -814,3 +814,23 @@
if(prob(30))
M << "You should sit down and take a rest..."
..()
/datum/reagent/toxin/delayed
name = "Toxin Microcapsules"
id = "delayed_toxin"
description = "Causes heavy toxin damage after a brief time of inactivity."
reagent_state = LIQUID
metabolization_rate = 0 //stays in the system until active.
var/actual_metaboliztion_rate = REAGENTS_METABOLISM
toxpwr = 0
var/actual_toxpwr = 5
var/delay = 30
/datum/reagent/toxin/delayed/on_mob_life(mob/living/M)
if(current_cycle > delay)
holder.remove_reagent(id, actual_metaboliztion_rate * M.metabolism_efficiency)
M.adjustToxLoss(actual_toxpwr*REM, 0)
if(prob(10))
M.Weaken(1, 0)
. = 1
..()