From 77ae93e9ae72906c613ee4b5be3ecb3e9e176c4f Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Tue, 4 Jan 2022 12:50:26 -0800 Subject: [PATCH] Air Traffic Adjustments --- code/modules/busy_space_vr/air_traffic.dm | 5 ++++- code/modules/busy_space_vr/organizations.dm | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/busy_space_vr/air_traffic.dm b/code/modules/busy_space_vr/air_traffic.dm index a71fb888df1..8a3e5a16072 100644 --- a/code/modules/busy_space_vr/air_traffic.dm +++ b/code/modules/busy_space_vr/air_traffic.dm @@ -116,6 +116,9 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller chatter_type = pick(5;"emerg",25;"policescan",25;"traveladvisory",30;"pathwarning",30;"dockingrequestgeneric",30;"dockingrequestdenied",30;"dockingrequestdelayed",30;"dockingrequestsupply",30;"dockingrequestrepair",30;"dockingrequestmedical",30;"dockingrequestsecurity",30;"undockingrequest","normal",30;"undockingdenied",30;"undockingdelayed",300;"slogan") else if((org_type == "government" || org_type == "neutral" || org_type == "military")) chatter_type = pick(5;"emerg",25;"policescan",25;"traveladvisory",30;"pathwarning",30;"dockingrequestgeneric",30;"dockingrequestdenied",30;"dockingrequestdelayed",30;"dockingrequestsupply",30;"dockingrequestrepair",30;"dockingrequestmedical",30;"dockingrequestsecurity",30;"undockingrequest","normal",30;"undockingdenied",30;"undockingdelayed") + else if(org_type == "spacer") + chatter_type = pick(5;"emerg",15;"policescan",15;"traveladvisory",5;"pathwarning",10;"dockingrequestgeneric",30;"dockingrequestdenied",10;"dockingrequestdelayed",30;"dockingrequestsupplly",10;"dockingrequestrepair",20;"dockingrequestmedical",20;"dockingrequestsecurity",30;"undockingrequest","normal",10;"undockingdenied",30;"undockingdelayed") + //the following filters *always* fire their 'unique' event when they're tripped, simply because the conditions behind them are quite rare to begin with else if(org_type == "smuggler" && org_type2 != "system defense") //just straight up funnel smugglers into always being caught, otherwise we get them asking for traffic info and stuff chatter_type = "policeflee" @@ -141,7 +144,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller //to_world("DEBUG OUTPUT 2: [secondowner], [secondprefix], [secondshipname], [org_type2]") //to_world("DEBUG OUTPUT 3: Chose [chatter_type]") //DEBUG BLOCK ENDS - + var/yes = prob(90) //Chance for them to say yes vs no var/request = pick(requests) diff --git a/code/modules/busy_space_vr/organizations.dm b/code/modules/busy_space_vr/organizations.dm index f52a61fe2d7..f2d719968ae 100644 --- a/code/modules/busy_space_vr/organizations.dm +++ b/code/modules/busy_space_vr/organizations.dm @@ -2677,6 +2677,7 @@ work = "salvage and trade operators" headquarters = "AH-CV Migrant" motto = "" + org_type = "spacer" ship_prefixes = list("AH-DV" = "a diplomatic", "AH-EV" = "an exploration", "AH-FV" = "a fueling", "AH-FV" = "a cargo", "AH-SV" = "a research", "AH-TV" = "a colony-transporter", "AH-RV" = "an emergency response", "AH-RV" = "a response", "AH-MV" = "a medical") ship_names = list(