Merge branch 'master' of github.com:Baystation12/Baystation12

This commit is contained in:
Hawk-v3
2012-02-27 00:18:30 +00:00
5 changed files with 11 additions and 4 deletions
+1
View File
@@ -254,6 +254,7 @@ the mob is also allowed to move without any sort of restriction. For instance, i
var/hallucination = 0
//Singularity wants you!
var/grav_delay = 0
var/being_strangled = 0
/mob/proc/contract_disease(var/datum/disease/virus, var/skip_this = 0, var/force_species_check=1)
// world << "Contract_disease called by [src] with virus [virus]"