Merge branch 'master' into synmedstuff

code/modules/admin/game_master/game_master.dm

@@ -21,20 +21,6 @@ GLOBAL_LIST_EMPTY(game_master_objectives)
 	if(src)
 		open_game_master_panel(src)
 
-/client/proc/toggle_join_xeno()
-	set name = "Toggle Player Xeno Joins"
-	set category = "Game Master"
-
-	if(!admin_holder || !check_rights(R_MOD, FALSE))
-		return
-
-	if(!SSticker.mode)
-		to_chat(usr, SPAN_WARNING("A mode hasn't been selected yet!"))
-		return
-
-	SSticker.mode.toggleable_flags ^= MODE_NO_JOIN_AS_XENO
-	message_admins("[src] has [MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_JOIN_AS_XENO) ? "disallowed players from joining" : "allowed players to join"] as xenos.")
-
 // Spawn stuff
 #define DEFAULT_SPAWN_XENO_STRING XENO_CASTE_DRONE
 #define GAME_MASTER_AI_XENOS list(XENO_CASTE_DRONE, XENO_CASTE_RUNNER, XENO_CASTE_CRUSHER)

code/modules/admin/game_master/toggle_join_xeno.dm

@@ -0,0 +1,15 @@
+
+/// For PvE CM we start without the ability for people to join as xenos. This can be toggled by game masters.
+/client/proc/toggle_join_xeno()
+	set name = "Toggle Player Xeno Joins"
+	set category = "Game Master"
+
+	if(!admin_holder || !check_rights(R_MOD, FALSE))
+		return
+
+	if(!SSticker.mode)
+		to_chat(usr, SPAN_WARNING("A mode hasn't been selected yet!"))
+		return
+
+	SSticker.mode.toggleable_flags ^= MODE_NO_JOIN_AS_XENO
+	message_admins("[src] has [MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_JOIN_AS_XENO) ? "disallowed players from joining" : "allowed players to join"] as xenos.")

colonialmarines.dme

@@ -1365,6 +1365,7 @@ s// DM Environment file for colonialmarines.dme.
 #include "code\modules\admin\ToRban.dm"
 #include "code\modules\admin\game_master\game_master.dm"
 #include "code\modules\admin\game_master\game_master_submenu.dm"
+#include "code\modules\admin\game_master\toggle_join_xeno.dm"
 #include "code\modules\admin\game_master\game_master_submenu\vents.dm"
 #include "code\modules\admin\medal_panel\medals_panel.dm"
 #include "code\modules\admin\medal_panel\medals_panel_tgui.dm"