Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

This commit is contained in:
Cael_Aislinn
2013-02-22 23:56:38 +10:00
61 changed files with 1018 additions and 895 deletions
@@ -24,12 +24,11 @@
side_effects += M
/mob/living/carbon/human/proc/handle_medical_side_effects()
if(src.reagents.has_reagent("bicaridine") || src.reagents.has_reagent("tricordrazine") || src.reagents.has_reagent("cryoxadone"))
if(src.reagents.has_reagent("cryoxadone"))
src.add_side_effect("Headache")
if(src.reagents.has_reagent("kelotane") || src.reagents.has_reagent("dermaline"))
src.add_side_effect("Bad Stomach")
/*if(src.reagents.has_reagent("kelotane") && prob(20) || src.reagents.has_reagent("dermaline"))
src.add_side_effect("Bad Stomach")*/
// One full cycle(in terms of strength) every 10 minutes
var/strength_percent = sin(life_tick / 2)