Where No Spaceman Has Gone Before: a space sector system (#11801)

code/datums/ert/nanotrasen.dm

@@ -2,9 +2,9 @@
 	name = "Nanotrasen ERT"
 	chance = 20
 	spawner = /datum/ghostspawner/human/ert/nanotrasen
+	possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI)
 
 /datum/responseteam/deathsquad
 	name = "Nanotrasen Asset Protection"
 	spawner = /datum/ghostspawner/human/ert/deathsquad
-	admin = TRUE
 	chance = 1

code/datums/ert/outsider.dm

@@ -3,33 +3,35 @@
 	chance = 15
 	spawner = /datum/ghostspawner/human/ert/mercenary
 	equipment_map = /datum/map_template/distress_freelancers
+	possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE)
 
 /datum/responseteam/kataphracts
 	name = "Kataphracts"
 	chance = 15
 	spawner = /datum/ghostspawner/human/ert/kataphract
 	equipment_map = /datum/map_template/distress_kataphract
+	possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE)
 
 /datum/responseteam/iac
 	name = "Interstellar Aid Corps"
 	chance = 1
 	spawner = /datum/ghostspawner/human/ert/iac
 	equipment_map = /datum/map_template/distress_iac
-	admin = TRUE
 
 /datum/responseteam/ap_eridani
 	name = "Eridani Asset Protection Team"
 	chance = 15
 	spawner = /datum/ghostspawner/human/ert/ap_eridani
 	equipment_map = /datum/map_template/distress_iac
+	possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE)
 
 /datum/responseteam/fsf
 	name = "Free Solarian Fleets Fireteam"
 	chance = 15
 	spawner = /datum/ghostspawner/human/ert/fsf
+	possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE)
 
 /datum/responseteam/syndicate
 	name = "Syndicate Commandos"
 	spawner = /datum/ghostspawner/human/ert/commando
-	admin = TRUE
 	chance = 1

code/datums/ert/responseteam.dm

@@ -2,5 +2,5 @@
 	var/name = "Default Team"                         //ERT name.
 	var/chance                                       //Probability to get picked.
 	var/datum/ghostspawner/human/ert/spawner        //This response type's BASE spawner type.
-	var/admin = FALSE								// if this is a special team that is not supossed to show up in regular rounds
+	var/list/possible_space_sector = list()			//Which space sectors this ert can spawn, leave empty for admin only erts
 	var/datum/map_template/equipment_map 			// if this team spawns extra equipment

code/datums/ert/tcfl.dm

@@ -2,3 +2,4 @@
 	name = "Tau Ceti Foreign Legion"
 	chance = 20
 	spawner = /datum/ghostspawner/human/ert/tcfl
+	possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE)

code/datums/helper_datums/away_mission.dm

@@ -3,7 +3,7 @@
 	var/weight = 1
 	var/autoselect = TRUE
 	var/list/map_files = null
-	var/list/valid_maps = null
+	var/list/valid_sectors = null
 	var/list/characteristics = null
 
 	var/base_dir = null
@@ -13,7 +13,7 @@
 	weight = config["weight"]
 	autoselect = config["autoselect"]
 	map_files = config["map_files"]
-	valid_maps = config["valid_maps"]
+	valid_sectors = config["valid_sectors"]
 	characteristics = config["characteristics"]
 	base_dir = i_base_dir
 

code/datums/trading/trade.dm

@@ -12,7 +12,7 @@
 	var/list/possible_trading_items                             //List of all possible trading items. Structure is (type = mode)
 	var/list/trading_items = list()                             //What items they are currently trading away.
 	var/list/blacklisted_trade_items = list(/mob/living/carbon/human)
-	                                                            //Things they will automatically refuse
+	var/list/allowed_space_sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE)	//which sector this merchant can show up                                                            //Things they will automatically refuse
 
 	var/list/speech = list()                                    //The list of all their replies and messages. Structure is (id = talk)
 	/*SPEECH IDS:
@@ -258,4 +258,10 @@
 		qdel(offer)
 
 /datum/trader/proc/bribe_to_stay_longer(var/amt)
-	return get_response("bribe_refusal", "How about... no?")
+	return get_response("bribe_refusal", "How about... no?")
+
+/datum/trader/proc/system_allowed()
+	if(SSatlas.current_sector.name in allowed_space_sectors)
+		return TRUE
+	else
+		return FALSE

code/datums/trading/unique.dm

@@ -28,6 +28,7 @@
 /datum/trader/ship/unique/syndicate
 	name = "Cyndie Kate"
 	origin = "Cloaked ship"
+	allowed_space_sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE)
 
 	possible_wanted_items = list (
 		/obj/item/gun/energy/captain                 = TRADER_THIS_TYPE,
@@ -78,6 +79,7 @@
 /datum/trader/ship/unique/severance
 	name = "Unknown"
 	origin = "SGS Severance"
+	allowed_space_sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE)
 
 	possible_wanted_items = list(
 		/obj/item/reagent_containers/food/snacks/human      = TRADER_SUBTYPES_ONLY,

code/datums/trading/weaponry.dm

@@ -98,6 +98,8 @@
 		"insult_bad"        = "Rrrracist!"
 	)
 
+	allowed_space_sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE)
+
 	possible_trading_items = list(
 		/obj/item/gun/projectile/shotgun/pump/rifle           = TRADER_ALL,
 		/obj/item/gun/projectile/dragunov                     = TRADER_THIS_TYPE,