shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268

Browse Source
This commit is contained in:
Poojawa
2017-05-21 00:44:08 -05:00
parent 94b7e560ab 9785b94cc5
commit 186ed2acbb
149 changed files with 5040 additions and 2255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/game_modes.dm
+2 -1
View File
@@ -13,4 +13,5 @@ GLOBAL_VAR_INIT(sac_image, null)
GLOBAL_VAR_INIT(cult_vote_called, FALSE)
GLOBAL_VAR_INIT(cult_mastered, FALSE)
GLOBAL_VAR_INIT(reckoning_complete, FALSE)
GLOBAL_VAR_INIT(sac_complete, FALSE)
GLOBAL_VAR_INIT(sac_complete, FALSE)
GLOBAL_DATUM(cult_narsie, /obj/singularity/narsie/large/cult)