Merge upstream

This commit is contained in:
Cyberboss
2017-04-01 23:38:37 -04:00
121 changed files with 2258 additions and 4320 deletions
-6
View File
@@ -523,7 +523,6 @@ SUBSYSTEM_DEF(garbage)
SearchVar(start_landmarks_list)
SearchVar(department_security_spawns)
SearchVar(generic_event_spawns)
SearchVar(monkeystart)
SearchVar(wizardstart)
SearchVar(newplayer_start)
SearchVar(latejoin)
@@ -534,7 +533,6 @@ SUBSYSTEM_DEF(garbage)
SearchVar(tdome2)
SearchVar(tdomeobserve)
SearchVar(tdomeadmin)
SearchVar(prisonsecuritywarp)
SearchVar(prisonwarped)
SearchVar(blobstart)
SearchVar(secequipment)
@@ -927,10 +925,6 @@ SUBSYSTEM_DEF(garbage)
SearchVar(GALOSHES_DONT_HELP)
SearchVar(SLIDE_ICE)
SearchVar(limb_icon_cache)
SearchVar(MIN_IMPREGNATION_TIME)
SearchVar(MAX_IMPREGNATION_TIME)
SearchVar(MIN_ACTIVE_TIME)
SearchVar(MAX_ACTIVE_TIME)
SearchVar(default_martial_art)
SearchVar(plasmaman_on_fire)
SearchVar(ai_list)