diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm
index 81557f597c..6d89980bae 100644
--- a/code/modules/mob/living/bot/bot.dm
+++ b/code/modules/mob/living/bot/bot.dm
@@ -53,6 +53,9 @@
access_scanner.req_access = req_access.Copy()
access_scanner.req_one_access = req_one_access.Copy()
+ if(!using_map.bot_patrolling)
+ will_patrol = FALSE
+
// Make sure mapped in units start turned on.
/mob/living/bot/Initialize()
. = ..()
diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm
index eb2371c329..b620ca3e1a 100644
--- a/code/modules/mob/living/bot/cleanbot.dm
+++ b/code/modules/mob/living/bot/cleanbot.dm
@@ -113,7 +113,8 @@
dat += "Maintenance panel is [open ? "opened" : "closed"]"
if(!locked || issilicon(user))
dat += "
Cleans Blood: [blood ? "Yes" : "No"]
"
- dat += "
Patrol station: [will_patrol ? "Yes" : "No"]
"
+ if(using_map.bot_patrolling)
+ dat += "
Patrol station: [will_patrol ? "Yes" : "No"]
"
if(open && !locked)
dat += "Odd looking screw twiddled: [screwloose ? "Yes" : "No"]
"
dat += "Weird button pressed: [oddbutton ? "Yes" : "No"]"
diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm
index 9b84651165..08d7d9ace6 100644
--- a/code/modules/mob/living/bot/edCLNbot.dm
+++ b/code/modules/mob/living/bot/edCLNbot.dm
@@ -82,7 +82,8 @@
dat += "Maintenance panel is [open ? "opened" : "closed"]"
if(!locked || issilicon(user))
dat += "
Cleans Blood: [blood ? "Yes" : "No"]
"
- dat += "
Patrol station: [will_patrol ? "Yes" : "No"]
"
+ if(using_map.bot_patrolling)
+ dat += "
Patrol station: [will_patrol ? "Yes" : "No"]
"
if(open && !locked)
dat += "
Red Switch: [red_switch ? "On" : "Off"]
"
dat += "
Green Switch: [green_switch ? "On" : "Off"]
"
diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm
index d2cb90a319..0745fc96e0 100644
--- a/code/modules/mob/living/bot/secbot.dm
+++ b/code/modules/mob/living/bot/secbot.dm
@@ -81,7 +81,8 @@
dat += "Check Arrest Status: [check_arrest ? "Yes" : "No"]
"
dat += "Operating Mode: [arrest_type ? "Detain" : "Arrest"]
"
dat += "Report Arrests: [declare_arrests ? "Yes" : "No"]
"
- dat += "Auto Patrol: [will_patrol ? "On" : "Off"]"
+ if(using_map.bot_patrolling)
+ dat += "Auto Patrol: [will_patrol ? "On" : "Off"]"
var/datum/browser/popup = new(user, "autosec", "Securitron controls")
popup.set_content(jointext(dat,null))
popup.open()
diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm
index deba256588..0cc1ac6a43 100644
--- a/maps/~map_system/maps.dm
+++ b/maps/~map_system/maps.dm
@@ -80,6 +80,8 @@ var/list/all_maps = list()
var/list/station_networks = list() // Camera networks that will show up on the console.
var/list/secondary_networks = list() // Camera networks that exist, but don't show on regular camera monitors.
+ var/bot_patrolling = TRUE // Determines if this map supports automated bot patrols
+
var/allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage")
var/lobby_icon = 'icons/misc/title.dmi' // The icon which contains the lobby image(s)