Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub

This commit is contained in:
Aurorablade
2016-11-22 01:48:56 -05:00
94 changed files with 7719 additions and 8002 deletions
+6 -2
View File
@@ -268,8 +268,12 @@ client/proc/one_click_antag()
return 1
/datum/admins/proc/makeAliens()
alien_infestation(3)
return 1
var/datum/event/alien_infestation/E = new /datum/event/alien_infestation
E.spawncount = 3
// TODO The fact we have to do this rather than just have events start
// when we ask them to, is bad.
E.processing = TRUE
return TRUE
/*
/datum/admins/proc/makeSpaceNinja()