diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm
index 885407ef90..478109048a 100644
--- a/code/datums/map_config.dm
+++ b/code/datums/map_config.dm
@@ -29,7 +29,7 @@
 	var/config_max_users = 0
 	var/config_min_users = 0
 	var/voteweight = 1
-	var/allow_custom_shuttles = "yes"
+	var/allow_custom_shuttles = TRUE
 
 /datum/map_config/New(filename = "data/next_map.json", default_to_box, delete_after)
 	if(default_to_box)
@@ -69,7 +69,7 @@
 	map_file = json["map_file"]
 
 	minetype = json["minetype"] || minetype
-	allow_custom_shuttles = json["allow_custom_shuttles"] == TRUE
+	allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE
 
 	var/jtcl = json["transition_config"]
 	if(jtcl && jtcl != "default")
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 77f6e08c7d..4797756a4b 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -463,12 +463,21 @@
 					dat += "<BR><BR><B>Captain Functions</B>"
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=announce'>Make a Captain's Announcement</A> \]"
 					if(CONFIG_GET(string/cross_server_address))
+<<<<<<< HEAD
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=crossserver'>Send a message to an allied station</A> \]"
 					if(SSmapping.config.allow_custom_shuttles == "yes")
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=purchase_menu'>Purchase Shuttle</A> \]"
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=changeseclevel'>Change Alert Level</A> \]"
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=emergencyaccess'>Emergency Maintenance Access</A> \]"
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=nukerequest'>Request Nuclear Authentication Codes</A> \]"
+=======
+						dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=crossserver'>Send a message to an allied station</A> \]"
+					if(SSmapping.config.allow_custom_shuttles)
+						dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=purchase_menu'>Purchase Shuttle</A> \]"
+					dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=changeseclevel'>Change Alert Level</A> \]"
+					dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=emergencyaccess'>Emergency Maintenance Access</A> \]"
+					dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=nukerequest'>Request Nuclear Authentication Codes</A> \]"
+>>>>>>> 379869e... Fixes allow_custom_shuttles default (#32221)
 					if(!emagged)
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageCentCom'>Send Message to CentCom</A> \]"
 					else
@@ -704,3 +713,15 @@
 /obj/machinery/computer/communications/proc/overrideCooldown()
 	var/obj/item/circuitboard/computer/communications/CM = circuit
 	CM.lastTimeUsed = 0
+<<<<<<< HEAD
+=======
+
+/obj/machinery/computer/communications/proc/add_message(datum/comm_message/new_message)
+	messages += new_message
+
+/datum/comm_message
+	var/title
+	var/content
+	var/list/possible_answers = list()
+	var/answered
+>>>>>>> 379869e... Fixes allow_custom_shuttles default (#32221)