Merge pull request #4889 from Citadel-Station-13/upstream-merge-34319

[MIRROR] Fails travis on common mapping mistakes
This commit is contained in:
deathride58
2018-01-17 20:12:39 +00:00
committed by GitHub
22 changed files with 468 additions and 1158 deletions
+1 -1
View File
@@ -514,7 +514,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
var/list/areas_with_LS = list()
var/list/areas_with_intercom = list()
var/list/areas_with_camera = list()
var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engine/supermatter, /area/science/test_area, /area/space, /area/solar, /area/mine, /area/ruin))
var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engine/supermatter, /area/science/test_area, /area/space, /area/solar, /area/mine, /area/ruin, /area/asteroid))
if(SSticker.current_state == GAME_STATE_STARTUP)
to_chat(usr, "Game still loading, please hold!")