Merge remote-tracking branch 'ParadiseSS13/master' into jobs_unlock_system

This commit is contained in:
Kyep
2016-11-28 22:19:27 -08:00
437 changed files with 16798 additions and 21683 deletions
-1
View File
@@ -1,6 +1,5 @@
var/global/BSACooldown = 0
var/global/floorIsLava = 0
var/global/nologevent = 0
////////////////////////////////