TG sync Sunday (#201)

* stage one * datums and shit * game stuff * modules * tgstation.dme * tools * these things for icons * compiling fixes * merge spree on TG * other updates * updated maps with deepfryers * My helpers were not helping
2017-02-06 00:36:56 -06:00
parent aeeca195c7
commit 73b6b33f79
279 changed files with 3548 additions and 2585 deletions
@@ -1,6 +1,6 @@
 /datum/status_effect/freon
 	id = "frozen"
-	duration = 10
+	duration = 100
 	unique = TRUE
 	alert_type = /obj/screen/alert/status_effect/freon
 	var/icon/cube