From cd72dcd8a129103df1ed56de83fe4d4f10c95d4d Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Wed, 28 Jun 2017 16:12:15 -0700 Subject: [PATCH 1/8] Air Traffic Control & Map Lore Air Traffic Control from Polaris. Every TBD to TBD minutes, a radio exchange happens between a ship and Cyberiad Space Control, ranging from system transfer permission to declaring an emergency. Refactored MAP_NAME into /datum/map files. This also allows for built-in map lore (really just the name and system, which is only used for ATC). Secondary commit will adjust all of the lore to match our own instead of Polaris's. --- _maps/cyberiad.dm | 22 +- _maps/metastation.dm | 22 +- _maps/test_away_missions.dm | 6 +- .../game/machinery/computer/communications.dm | 5 + code/modules/busy_space/air_traffic.dm | 128 +++++++ code/modules/busy_space/loremaster.dm | 16 + code/modules/busy_space/organizations.dm | 321 ++++++++++++++++++ code/modules/fancytitle/fancytitle.dm | 2 +- code/modules/map_fluff/cyberiad.dm | 10 + code/modules/map_fluff/maps.dm | 12 + code/modules/map_fluff/metastation.dm | 10 + code/modules/nano/nanoui.dm | 2 +- .../security_levels/security levels.dm | 5 + code/modules/shuttle/emergency.dm | 6 + code/world.dm | 9 +- nano/templates/comm_console.tmpl | 11 +- paradise.dme | 6 + 17 files changed, 559 insertions(+), 34 deletions(-) create mode 100644 code/modules/busy_space/air_traffic.dm create mode 100644 code/modules/busy_space/loremaster.dm create mode 100644 code/modules/busy_space/organizations.dm create mode 100644 code/modules/map_fluff/cyberiad.dm create mode 100644 code/modules/map_fluff/maps.dm create mode 100644 code/modules/map_fluff/metastation.dm diff --git a/_maps/cyberiad.dm b/_maps/cyberiad.dm index 3e03a5036e7..40ab4871e26 100644 --- a/_maps/cyberiad.dm +++ b/_maps/cyberiad.dm @@ -12,19 +12,17 @@ z6 = russian derelict z7 = empty */ -#if !defined(MAP_FILE) +#if !defined(USING_MAP_DATUM) - #include "map_files\cyberiad\cyberiad.dmm" - #include "map_files\cyberiad\z2.dmm" - #include "map_files\cyberiad\z3.dmm" - #include "map_files\cyberiad\z4.dmm" - #include "map_files\cyberiad\z5.dmm" - #include "map_files\cyberiad\z6.dmm" - #include "map_files\cyberiad\z7.dmm" + #include "map_files\cyberiad\cyberiad.dmm" + #include "map_files\cyberiad\z2.dmm" + #include "map_files\cyberiad\z3.dmm" + #include "map_files\cyberiad\z4.dmm" + #include "map_files\cyberiad\z5.dmm" + #include "map_files\cyberiad\z6.dmm" + #include "map_files\cyberiad\z7.dmm" - #define MAP_FILE "cyberiad.dmm" - #define MAP_NAME "Cyberiad" - #define MAP_TRANSITION_CONFIG list(\ + #define MAP_TRANSITION_CONFIG list(\ DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL,STATION_CONTACT,REACHABLE,AI_OK)),\ DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\ DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\ @@ -33,6 +31,8 @@ DECLARE_LEVEL(MINING, CROSSLINKED, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, DECLARE_LEVEL(DERELICT, CROSSLINKED, list(REACHABLE)),\ DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE))) + #define USING_MAP_DATUM /datum/map/cyberiad + #elif !defined(MAP_OVERRIDE) #warn a map has already been included, ignoring Cyberiad. diff --git a/_maps/metastation.dm b/_maps/metastation.dm index 9240a5e928f..5cb5c14b03d 100644 --- a/_maps/metastation.dm +++ b/_maps/metastation.dm @@ -13,19 +13,17 @@ z6 = empty space z7 = empty space */ -#if !defined(MAP_FILE) +#if !defined(USING_MAP_DATUM) - #include "map_files\MetaStation\MetaStation.v41A.II.dmm" - #include "map_files\MetaStation\z2.dmm" - #include "map_files\MetaStation\z3.dmm" - #include "map_files\MetaStation\z4.dmm" - #include "map_files\MetaStation\z5.dmm" - #include "map_files\generic\z6.dmm" - #include "map_files\generic\z7.dmm" + #include "map_files\MetaStation\MetaStation.v41A.II.dmm" + #include "map_files\MetaStation\z2.dmm" + #include "map_files\MetaStation\z3.dmm" + #include "map_files\MetaStation\z4.dmm" + #include "map_files\MetaStation\z5.dmm" + #include "map_files\generic\z6.dmm" + #include "map_files\generic\z7.dmm" - #define MAP_FILE "MetaStation.v41A.II.dmm" - #define MAP_NAME "MetaStation" - #define MAP_TRANSITION_CONFIG list(\ + #define MAP_TRANSITION_CONFIG list(\ DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\ DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\ DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\ @@ -34,6 +32,8 @@ DECLARE_LEVEL(MINING, CROSSLINKED, list(REACHABLE, STATION_CONTACT, AI_OK, ORE_L DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE)),\ DECLARE_LEVEL(EMPTY_AREA_2, CROSSLINKED, list(REACHABLE))) + #define USING_MAP_DATUM /datum/map/metastation + #elif !defined(MAP_OVERRIDE) #warn a map has already been included, ignoring MetaStation. diff --git a/_maps/test_away_missions.dm b/_maps/test_away_missions.dm index e960cd3b065..42b068412bd 100644 --- a/_maps/test_away_missions.dm +++ b/_maps/test_away_missions.dm @@ -1,6 +1,6 @@ // This is for Travis testing. DO NOT SET THIS AS THE GAME'S MAP NORMALLY! -#if !defined(MAP_FILE) +#if !defined(USING_MAP_DATUM) #include "map_files\RandomZLevels\beach.dmm" #include "map_files\RandomZLevels\moonoutpost19.dmm" #include "map_files\RandomZLevels\undergroundoutpost45.dmm" @@ -12,10 +12,10 @@ #include "map_files\RandomZLevels\evil_santa.dmm" - #define MAP_FILE "beach.dmm" - #define MAP_NAME "Away Missions Test" #define MAP_TRANSITION_CONFIG list(AWAY_MISSION = UNAFFECTED, AWAY_MISSION = UNAFFECTED, AWAY_MISSION = UNAFFECTED, AWAY_MISSION = UNAFFECTED, AWAY_MISSION = UNAFFECTED, AWAY_MISSION = UNAFFECTED, AWAY_MISSION = UNAFFECTED, AWAY_MISSION = UNAFFECTED, AWAY_MISSION = UNAFFECTED, AWAY_MISSION = UNAFFECTED) + #define USING_MAP_DATUM /datum/map + #elif !defined(MAP_OVERRIDE) #warn a map has already been included. #endif diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 2b3d461da4c..fb5fbb31bff 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -308,6 +308,9 @@ trade_dock_timelimit = 0 trade_dockrequest_timelimit = 0 event_announcement.Announce("Docking request for trading ship denied.", "Docking request") + if("ToggleATC") + atc.squelched = !atc.squelched + to_chat(usr, "ATC traffic is now: [atc.squelched ? "Disabled" : "Enabled"]") nanomanager.update_uis(src) return 1 @@ -407,6 +410,8 @@ else data["dock_request"] = 0 + data["atcSquelched"] = atc.squelched + return data diff --git a/code/modules/busy_space/air_traffic.dm b/code/modules/busy_space/air_traffic.dm new file mode 100644 index 00000000000..178433623f1 --- /dev/null +++ b/code/modules/busy_space/air_traffic.dm @@ -0,0 +1,128 @@ +//Cactus, Speedbird, Dynasty, oh my + +var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller + +/datum/lore/atc_controller + var/delay_max = 5 MINUTES //How long between ATC traffic, max. Default is 5 mins. + var/delay_min = 1 MINUTES //How long between ATC traffic, min. Default is 1 mins. + var/backoff_delay = 5 MINUTES //How long to back off if we can't talk and want to. Default is 5 mins. + var/next_message //When the next message should happen in world.time + var/force_chatter_type //Force a specific type of messages + + var/squelched = 0 //If ATC is squelched currently + +/datum/lore/atc_controller/New() + spawn(30 SECONDS) //Lots of lag at the start of a shift. + msg("New shift beginning, resuming traffic control.") + next_message = world.time + rand(delay_min, delay_max) + process() + +/datum/lore/atc_controller/proc/process() + if(world.time >= next_message) + if(squelched) + next_message = world.time + backoff_delay + else + next_message = world.time + rand(delay_min,delay_max) + random_convo() + + spawn(1 MINUTES) //We don't really need high-accuracy here. + process() + +/datum/lore/atc_controller/proc/msg(var/message,var/sender) + ASSERT(message) + global_announcer.autosay("[message]", sender ? sender : "[using_map.station_short] Space Control") + +/datum/lore/atc_controller/proc/reroute_traffic(var/yes = 1) + if(yes) + if(!squelched) + msg("Rerouting traffic away from [using_map.station_name].") + squelched = 1 + else + if(squelched) + msg("Resuming normal traffic routing around [using_map.station_name].") + squelched = 0 + +/datum/lore/atc_controller/proc/shift_ending(var/evac = 0) + msg("Automated Shuttle departing [using_map.station_name] for [using_map.dock_name] on routine transfer route.", "NT Automated Shuttle") + sleep(5 SECONDS) + msg("Automated Shuttle, cleared to complete routine transfer from [using_map.station_name] to [using_map.dock_name].") + +/datum/lore/atc_controller/proc/random_convo() + var/one = pick(loremaster.organizations) //These will pick an index, not an instance + var/two = pick(loremaster.organizations) + + var/datum/lore/organization/source = loremaster.organizations[one] //Resolve to the instances + var/datum/lore/organization/dest = loremaster.organizations[two] + + //Let's get some mission parameters + var/owner = source.short_name //Use the short name + var/prefix = pick(source.ship_prefixes) //Pick a random prefix + var/mission = source.ship_prefixes[prefix] //The value of the prefix is the mission type that prefix does + var/shipname = pick(source.ship_names) //Pick a random ship name to go with it + var/destname = pick(dest.destination_names) //Pick a random holding from the destination + + var/combined_name = "[owner] [prefix] [shipname]" + var/alt_atc_names = list("[using_map.station_short] TraCon","[using_map.station_short] Control","[using_map.station_short] STC","[using_map.station_short] Airspace") + var/wrong_atc_names = list("Sol Command","Orion Control", "[using_map.dock_name]") + var/mission_noun = list("flight","mission","route") + var/request_verb = list("requesting","calling for","asking for") + + //First response is 'yes', second is 'no' + var/requests = list("[using_map.station_short] transit clearance" = list("permission for transit granted", "permission for transit denied, contact regional on 953.5"), + "planetary flight rules" = list("authorizing planetary flight rules", "denying planetary flight rules right now due to traffic"), + "special flight rules" = list("authorizing special flight rules", "denying special flight rules, not allowed for your traffic class"), + "current solar weather info" = list("sending you the relevant information via tightbeam", "cannot fulfill your request at the moment"), + "nearby traffic info" = list("sending you current traffic info", "no available info in your area"), + "remote telemetry data" = list("sending telemetry now", "no uplink from your ship, recheck your uplink and ask again"), + "refueling information" = list("sending refueling information now", "no fuel for your ship class in this sector"), + "a current system time sync" = list("sending time sync ping to you now", "your ship isn't compatible with our time sync, set time manually"), + "current system starcharts" = list("transmitting current starcharts", "your request is queued, overloaded right now"), + "permission to engage FTL" = list("permission to engage FTL granted, good day", "permission denied, wait for current traffic to pass"), + "permission to transit system" = list("permission to transit granted, good day", "permission denied, wait for current traffic to pass"), + "permission to depart system" = list("permission to depart granted, good day", "permission denied, wait for current traffic to pass"), + "permission to enter system" = list("good day, permission to enter granted", "permission denied, wait for current traffic to pass"), + ) + + //Random chance things for variety + var/chatter_type = "normal" + if(force_chatter_type) + chatter_type = force_chatter_type + else + chatter_type = pick(2;"emerg",5;"wrong_freq","normal") //Be nice to have wrong_lang... + + var/yes = prob(90) //Chance for them to say yes vs no + + var/request = pick(requests) + var/callname = pick(alt_atc_names) + var/response = requests[request][yes ? 1 : 2] //1 is yes, 2 is no + + var/full_request + var/full_response + var/full_closure + + switch(chatter_type) + if("wrong_freq") + callname = pick(wrong_atc_names) + full_request = "[callname], this is [combined_name] on a [mission] [pick(mission_noun)] to [destname], [pick(request_verb)] [request]." + full_response = "[combined_name], this is [using_map.station_short] TraCon, wrong frequency. Switch to [rand(700,999)].[rand(1,9)]." + full_closure = "[using_map.station_short] TraCon, understood, apologies." + if("wrong_lang") + //Can't implement this until autosay has language support + if("emerg") + var/problem = pick("hull breaches on multiple decks","unknown life forms on board","a drive about to go critical","asteroids impacting the hull","a total loss of engine power","people trying to board the ship") + full_request = "This is [combined_name] declaring an emergency! We have [problem]!" + full_response = "[combined_name], this is [using_map.station_short] TraCon, copy. Switch to emergency responder channel [rand(700,999)].[rand(1,9)]." + full_closure = "[using_map.station_short] TraCon, okay, switching now." + else + full_request = "[callname], this is [combined_name] on a [mission] [pick(mission_noun)] to [destname], [pick(request_verb)] [request]." + full_response = "[combined_name], this is [using_map.station_short] TraCon, [response]." //Station TraCon always calls themselves TraCon + full_closure = "[using_map.station_short] TraCon, [yes ? "thank you" : "understood"], good day." //They always copy what TraCon called themselves in the end when they realize they said it wrong + + //Ship sends request to ATC + msg(full_request,"[prefix] [shipname]") + sleep(5 SECONDS) + //ATC sends response to ship + msg(full_response) + sleep(5 SECONDS) + //Ship sends response to ATC + msg(full_closure,"[prefix] [shipname]") \ No newline at end of file diff --git a/code/modules/busy_space/loremaster.dm b/code/modules/busy_space/loremaster.dm new file mode 100644 index 00000000000..28dca0055b0 --- /dev/null +++ b/code/modules/busy_space/loremaster.dm @@ -0,0 +1,16 @@ +//I AM THE LOREMASTER, ARE YOU THE GATEKEEPER? + +var/datum/lore/loremaster/loremaster = new/datum/lore/loremaster + +/datum/lore/loremaster + var/list/organizations = list() + +/datum/lore/loremaster/New() + + var/list/paths = typesof(/datum/lore/organization) - /datum/lore/organization + for(var/path in paths) + // Some intermediate paths are not real organizations (ex. /datum/lore/organization/mil). Only do ones with names + var/datum/lore/organization/instance = path + if(initial(instance.name)) + instance = new path() + organizations[path] = instance diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm new file mode 100644 index 00000000000..edc0a0bcf2a --- /dev/null +++ b/code/modules/busy_space/organizations.dm @@ -0,0 +1,321 @@ +//Datums for different companies that can be used by busy_space +/datum/lore/organization + var/name = "" // Organization's name + var/short_name = "" // Organization's shortname (NanoTrasen for "NanoTrasen Incorporated") + var/acronym = "" // Organization's acronym, e.g. 'NT' for NanoTrasen'. + var/desc = "" // One or two paragraph description of the organization, but only current stuff. Currently unused. + var/history = "" // Historical discription of the organization's origins Currently unused. + var/work = "" // Short description of their work, eg "an arms manufacturer" + var/headquarters = "" // Location of the organization's HQ. Currently unused. + var/motto = "" // A motto/jingle/whatever, if they have one. Currently unused. + + var/list/ship_prefixes = list() //Some might have more than one! Like NanoTrasen. Value is the mission they perform, e.g. ("ABC" = "mission desc") + var/list/ship_names = list( //Names of spaceships. This is a mostly generic list that all the other organizations inherit from if they don't have anything better. + "Kestrel", + "Beacon", + "Signal", + "Freedom", + "Glory", + "Axiom", + "Eternal", + "Icarus", + "Harmony", + "Light", + "Discovery", + "Endeavour", + "Explorer", + "Swift", + "Dragonfly", + "Ascendant", + "Tenacious", + "Pioneer", + "Hawk", + "Haste", + "Radiant", + "Luminous" + ) + var/list/destination_names = list() //Names of static holdings that the organization's ships visit regularly. + var/autogenerate_destination_names = TRUE + +/datum/lore/organization/New() + ..() + if(autogenerate_destination_names) // Lets pad out the destination names. + var/i = rand(6, 10) + var/list/star_names = list( + "Sol", "Alpha Centauri", "Sirius", "Vega", "Regulus", "Vir", "Algol", "Aldebaran", + "Delta Doradus", "Menkar", "Geminga", "Elnath", "Gienah", "Mu Leporis", "Nyx", "Tau Ceti", + "Wazn", "Alphard", "Phact", "Altair") + var/list/destination_types = list("dockyard", "station", "vessel", "waystation", "telecommunications satellite", "spaceport", "distress beacon", "anomaly", "colony", "outpost") + while(i) + destination_names.Add("a [pick(destination_types)] in [pick(star_names)]") + i-- + +////////////////////////////////////////////////////////////////////////////////// + +// TSCs +/datum/lore/organization/tsc/nanotrasen + name = "NanoTrasen Incorporated" + short_name = "NanoTrasen" + acronym = "NT" + desc = "NanoTrasen is one of the foremost research and development companies in SolGov space. \ + Originally focused on consumer products, their swift move into the field of Phoron has lead to \ + them being the foremost experts on the substance and its uses. In the modern day, NanoTrasen prides \ + itself on being an early adopter to as many new technologies as possible, often offering the newest \ + products to their employees. In an effort to combat complaints about being 'guinea pigs', Nanotrasen \ + also offers one of the most comprehensive medical plans in SolGov space, up to and including cloning \ + and therapy.\ +

\ + NT's most well known products are its phoron based creations, especially those used in Cryotherapy. \ + It also boasts an prosthetic line, which is provided to its employees as needed, and is used as an incentive \ + for newly tested posibrains to remain with the company." + history = "" // To be written someday. + work = "research giant" + headquarters = "Luna" + motto = "" + + ship_prefixes = list("NSV" = "exploration", "NTV" = "hauling", "NDV" = "patrol", "NRV" = "emergency response") + // Note that the current station being used will be pruned from this list upon being instantiated + destination_names = list( + "NSS Exodus in Nyx", + "NCS Northern Star in Vir", + "NCS Southern Cross in Vir", + "NDV Icarus in Nyx", + "NAS Vir Central Command", + "a dockyard orbiting Sif", + "an asteroid orbiting Kara", + "an asteroid orbiting Rota", + "Vir Interstellar Spaceport" + ) + +/datum/lore/organization/tsc/nanotrasen/New() + ..() + spawn(1) // BYOND shenanigans means using_map is not initialized yet. Wait a tick. + // Get rid of the current map from the list, so ships flying in don't say they're coming to the current map. + var/string_to_test = "[using_map.station_name] in [using_map.starsys_name]" + if(string_to_test in destination_names) + destination_names.Remove(string_to_test) + + + +/datum/lore/organization/tsc/hephaestus + name = "Hephaestus Industries" + short_name = "Hephaestus" + acronym = "HI" + desc = "Hephaestus Industries is the largest supplier of arms, ammunition, and small millitary vehicles in Sol space. \ + Hephaestus products have a reputation for reliability, and the corporation itself has a noted tendency to stay removed \ + from corporate politics. They enforce their neutrality with the help of a fairly large asset-protection contingent which \ + prevents any contracting polities from using their own materiel against them. SolGov itself is one of Hephastus� largest \ + bulk contractors owing to the above factors." + history = "" + work = "arms manufacturer" + headquarters = "" + motto = "" + + ship_prefixes = list("HTV" = "freight", "HTV" = "munitions resupply") + destination_names = list( + "a SolGov dockyard on Luna" + ) + +/datum/lore/organization/tsc/vey_med + name = "Vey Medical" + short_name = "Vey Med" + acronym = "VM" + desc = "Vey-Med is one of the newer TSCs on the block and is notable for being largely owned and opperated by Skrell. \ + Despite the suspicion and prejudice leveled at them for their alien origin, Vey-Med has obtained market dominance in \ + the sale of medical equipment-- from surgical tools to large medical devices to the Oddyseus trauma response mecha \ + and everything in between. Their equipment tends to be top-of-the-line, most obviously shown by their incredibly \ + human-like FBP designs. Vey�s rise to stardom came from their introduction of ressurective cloning, although in \ + recent years they�ve been forced to diversify as their patents expired and NanoTrasen-made medications became \ + essential to modern cloning." + history = "" + work = "medical equipment supplier" + headquarters = "" + motto = "" + + ship_prefixes = list("VTV" = "transportation", "VMV" = "medical resupply") + destination_names = list() + +/datum/lore/organization/tsc/zeng_hu + name = "Zeng-Hu pharmaceuticals" + short_name = "Zeng-Hu" + acronym = "ZH" + desc = "Zeng-Hu is an old TSC, based in the Sol system. Until the discovery of Phoron, Zeng-Hu maintained a stranglehold \ + on the market for medications, and many household names are patentted by Zeng-Hu-- Bicaridyne, Dylovene, Tricordrizine, \ + and Dexalin all came from a Zeng-Hu medical laboratory. Zeng-Hu�s fortunes have been in decline as Nanotrasen�s near monopoly \ + on phoron research cuts into their R&D and Vey-Med�s superior medical equipment effectively decimated their own equipment \ + interests. The three-way rivalry between these companies for dominance in the medical field is well-known and a matter of \ + constant economic speculation." + history = "" + work = "pharmaceuticals company" + headquarters = "" + motto = "" + + ship_prefixes = list("ZTV" = "transportation", "ZMV" = "medical resupply") + destination_names = list() + +/datum/lore/organization/tsc/ward_takahashi + name = "Ward-Takahashi General Manufacturing Conglomerate" + short_name = "Ward-Takahashi" + acronym = "WT" + desc = "Ward-Takahashi focuses on the sale of small consumer electronics, with its computers, communicators, \ + and even mid-class automobiles a fixture of many households. Less famously, Ward-Takahashi also supplies most \ + of the AI cores on which vital control systems are mounted, and it is this branch of their industry that has \ + led to their tertiary interest in the development and sale of high-grade AI systems. Ward-Takahashi�s economies \ + of scale frequently steal market share from Nanotrasen�s high-price products, leading to a bitter rivalry in the \ + consumer electronics market." + history = "" + work = "electronics manufacturer" + headquarters = "" + motto = "" + + ship_prefixes = list("WTV" = "freight") + destination_names = list() + +/datum/lore/organization/tsc/bishop + name = "Bishop Cybernetics" + short_name = "Bishop" + acronym = "BC" + desc = "Bishop�s focus is on high-class, stylish cybernetics. A favorite among transhumanists (and a b�te noire for \ + bioconservatives), Bishop manufactures not only prostheses but also brain augmentation, synthetic organ replacements, \ + and odds and ends like implanted wrist-watches. Their business model tends towards smaller, boutique operations, giving \ + it a reputation for high price and luxury, with Bishop cyberware often rivalling Vey-Med�s for cost. Bishop�s reputation \ + for catering towards the interests of human augmentation enthusiasts instead of positronics have earned it ire from the \ + Positronic Rights Group and puts it in ideological (but not economic) comptetition with Morpheus Cyberkinetics." + history = "" + work = "cybernetics and augmentation manufacturer" + headquarters = "" + motto = "" + + ship_prefixes = list("BTV" = "transportation") + destination_names = list() + +/datum/lore/organization/tsc/morpheus + name = "Morpheus Cyberkinetics" + short_name = "Morpheus" + acronym = "MC" + desc = "The only large corporation run by positronic intelligences, Morpheus caters almost exclusively to their sensibilities \ + and needs. A product of the synthetic colony of Shelf, Morpheus eschews traditional advertising to keep their prices low and \ + relied on word of mouth among positronics to reach their current economic dominance. Morpheus in exchange lobbies heavily for \ + positronic rights, sponsors positronics through their Jans-Fhriede test, and tends to other positronic concerns to earn them \ + the good-will of the positronics, and the ire of those who wish to exploit them." + history = "" + work = "cybernetics manufacturer" + headquarters = "" + motto = "" + + ship_prefixes = list("MTV" = "freight") + // Culture names, because Anewbe told me so. + ship_names = list( + "Nervous Energy", + "Prosthetic Conscience", + "Revisionist", + "Trade Surplus", + "Flexible Demeanour", + "Just Read The Instructions", + "Limiting Factor", + "Cargo Cult", + "Gunboat Diplomat", + "A Ship With A View", + "Cantankerous", + "I Thought He Was With You", + "Never Talk To Strangers", + "Sacrificial Victim", + "Unwitting Accomplice", + "Bad For Business", + "Just Testing", + "Size Isn't Everything", + "Yawning Angel", + "Liveware Problem", + "Very Little Gravitas Indeed", + "Zero Gravitas", + "Gravitas Free Zone", + "Absolutely No You-Know-What", + "Existence Is Pain", + "I'm Walking Here", + "Screw Loose", + "Of Course I Still Love You", + "Limiting Factor", + "So Much For Subtley", + "Unfortunate Conflict Of Evidence", + "Prime Mover", + "It's One Of Ours", + "Thank You And Goodnight", + "Boo!", + "Reasonable Excuse", + "Honest Mistake", + "Appeal To Reason", + "My First Ship II", + "Hidden Income", + "Anything Legal Considered", + "New Toy", + "Me, I'm Always Counting", + "Just Five More Minutes", + "Are You Feeling It", + "Great White Snark", + "No Shirt No Shoes", + "Callsign" + + + ) + destination_names = list() + +/datum/lore/organization/tsc/xion + name = "Xion Manufacturing Group" + short_name = "Xion" + desc = "Xion, quietly, controls most of the market for industrial equipment. Their portfolio includes mining exosuits, \ + factory equipment, rugged positronic chassis, and other pieces of equipment vital to the function of the economy. Xion \ + keeps its control of the market by leasing, not selling, their equipment, and through infamous and bloody patent protection \ + lawsuits. Xion are noted to be a favorite contractor for SolGov engineers, owing to their low cost and rugged design." + history = "" + work = "industrial equipment manufacturer" + headquarters = "" + motto = "" + + ship_prefixes = list("XTV" = "hauling") + destination_names = list() + +// Governments + +/datum/lore/organization/gov/sifgov + name = "Sif Governmental Authority" + short_name = "SifGov" + desc = "SifGov is the sole governing administration for the Vir system, based in New Reykjavik, Sif. It is a representative \ + democratic government, and a fully recognized member of the Solar Confederate Government. Anyone operating inside of Vir must \ + comply with SifGov's legislation and regulations." + history = "" // Todo like the rest of them + work = "governing body of Sif" + headquarters = "New Reykjavik, Sif" + motto = "" + autogenerate_destination_names = FALSE + + ship_prefixes = list("SGA" = "hauling", "SGA" = "energy relay") + destination_names = list( + "New Reykjavik on Sif", + "Radiance Energy Chain", + "a dockyard orbiting Sif", + "a telecommunications satellite", + "Vir Interstellar Spaceport" + ) + +/datum/lore/organization/gov/solgov + name = "Solar Confederate Government" + short_name = "SolGov" + acronym = "SCG" + desc = "SolGov is a decentralized confederation of human governmental entities based on Luna, Sol, which defines top-level law for their member states. \ + Member states receive various benefits such as defensive pacts, trade agreements, social support and funding, and being able to participate \ + in the Colonial Assembly. The majority, but not all human territories are members of SolGov. As such, SolGov is a major power and \ + defacto represents humanity on the galactic stage." + history = "" // Todo + work = "governing polity of humanity's Confederation" + headquarters = "Luna" + motto = "Nil Mortalibus Ardui Est" // Latin, because latin. Says 'Nothing is too steep for mortals'. + autogenerate_destination_names = TRUE + + ship_prefixes = list("SCG-T" = "transportation", "SCG-D" = "diplomatic", "SCG-F" = "freight") + destination_names = list( + "Venus", + "Earth", + "Luna", + "Mars", + "Titan" + ) \ No newline at end of file diff --git a/code/modules/fancytitle/fancytitle.dm b/code/modules/fancytitle/fancytitle.dm index e445024aae1..e85f1f59ec5 100644 --- a/code/modules/fancytitle/fancytitle.dm +++ b/code/modules/fancytitle/fancytitle.dm @@ -11,7 +11,7 @@ else if(L.len > 1) if(use_rare_screens && lowertext(L[1]) == "rare") title_screens += S - else if(lowertext(L[1]) == lowertext(MAP_NAME)) + else if(using_map && (lowertext(L[1]) == lowertext(using_map.name))) title_screens += S if(!isemptylist(title_screens)) diff --git a/code/modules/map_fluff/cyberiad.dm b/code/modules/map_fluff/cyberiad.dm new file mode 100644 index 00000000000..e0865f6fb1d --- /dev/null +++ b/code/modules/map_fluff/cyberiad.dm @@ -0,0 +1,10 @@ +/datum/map/cyberiad + name = "Cyberiad" + full_name = "NSS Cyberiad" + + station_name = "NSS Cyberiad" + station_short = "Cyberiad" + dock_name = "NAS Trurl" + company_name = "Nanotrasen" + company_short = "NT" + starsys_name = "Epsilon Eridani " diff --git a/code/modules/map_fluff/maps.dm b/code/modules/map_fluff/maps.dm new file mode 100644 index 00000000000..638baffde73 --- /dev/null +++ b/code/modules/map_fluff/maps.dm @@ -0,0 +1,12 @@ +var/datum/map/using_map = new USING_MAP_DATUM + +/datum/map + var/name = "Unnamed Map" + var/full_name = "Unnamed Map" + + var/station_name = "BAD Station" + var/station_short = "Baddy" + var/dock_name = "THE PirateBay" + var/company_name = "BadMan" + var/company_short = "BM" + var/starsys_name = "Dull Star" \ No newline at end of file diff --git a/code/modules/map_fluff/metastation.dm b/code/modules/map_fluff/metastation.dm new file mode 100644 index 00000000000..c7cd42cca8f --- /dev/null +++ b/code/modules/map_fluff/metastation.dm @@ -0,0 +1,10 @@ +/datum/map/metastation + name = "MetaStation" + full_name = "MetaStation" + + station_name = "MetaStation" + station_short = "MetaStation" + dock_name = "NAS Trurl" + company_name = "Nanotrasen" + company_short = "NT" + starsys_name = "Epsilon Eridani " diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 8b749a67903..96b0486688a 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -178,7 +178,7 @@ nanoui is used to open and update nano browser uis var/name = "[src_object]" var/list/config_data = list( "title" = title, - "map" = MAP_NAME, + "map" = (using_map && using_map.name) ? using_map.name : "Unknown", "srcObject" = list("name" = name), "stateKey" = state_key, "status" = status, diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security levels.dm index 42bfb39b4eb..fa1e6b6c841 100644 --- a/code/modules/security_levels/security levels.dm +++ b/code/modules/security_levels/security levels.dm @@ -119,6 +119,11 @@ FA.overlays.Cut() FA.overlays += image('icons/obj/monitors.dmi', "overlay_delta") + if(level >= SEC_LEVEL_RED) + atc.reroute_traffic(yes = TRUE) // Tell them fuck off we're busy. + else + atc.reroute_traffic(yes = FALSE) + else return diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 3d459dd08a4..ab37aa18651 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -150,6 +150,12 @@ emergency_shuttle_called.Announce("The emergency shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason][shuttle_master.emergencyLastCallLoc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ]") + if(reason == "Automatic Crew Transfer" && signalOrigin == null) // Best way we have to check that it's actually a crew transfer and not just a player using the same message- any other calls to this proc should have a signalOrigin. + atc.shift_ending() + else // Emergency shuttle call (probably) + atc.reroute_traffic(yes = TRUE) + + /obj/docking_port/mobile/emergency/cancel(area/signalOrigin) if(!canRecall) return diff --git a/code/world.dm b/code/world.dm index 34d61dbbc21..7b2db832ea1 100644 --- a/code/world.dm +++ b/code/world.dm @@ -63,11 +63,10 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG master_controller.setup() sleep_offline = 1 - #ifdef MAP_NAME - map_name = "[MAP_NAME]" - #else - map_name = "Unknown" - #endif + if(using_map && using_map.name) + map_name = "[using_map.name]" + else + map_name = "Unknown" diff --git a/nano/templates/comm_console.tmpl b/nano/templates/comm_console.tmpl index 062c8d844f3..63f85e57e60 100644 --- a/nano/templates/comm_console.tmpl +++ b/nano/templates/comm_console.tmpl @@ -1,4 +1,4 @@ - @@ -57,7 +57,7 @@ Used In File(s): /code/game/machinery/computers/communications.dm
{{:helper.link('Request Nuclear Authentication Codes','exclamation-triangle',{'operation':'nukerequest'})}} -
+ {{/if}}
{{:helper.link('Change Alert Level','signal',{'operation':'changeseclevel'})}} @@ -76,6 +76,13 @@ Used In File(s): /code/game/machinery/computers/communications.dm {{:helper.link('Accept Docking Request','signal',{'operation':'AcceptDocking'})}} {{:helper.link('Deny Docking Request','signal',{'operation':'DenyDocking'})}} {{/if}} +
+ {{if data.atcSquelched}} + {{:helper.link('Enable ATC Relay', 'signal', {'operation': 'ToggleATC'})}} + {{else}} + {{:helper.link('Disable ATC Relay', 'signal', {'operation': 'ToggleATC'})}} + {{/if}} +
{{else data.screen==2}} diff --git a/paradise.dme b/paradise.dme index 2d83918ab04..8512336fcf8 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1139,6 +1139,9 @@ #include "code\modules\awaymissions\mission_code\stationCollision.dm" #include "code\modules\awaymissions\mission_code\UO71-terrorspiders.dm" #include "code\modules\awaymissions\mission_code\wildwest.dm" +#include "code\modules\busy_space\air_traffic.dm" +#include "code\modules\busy_space\loremaster.dm" +#include "code\modules\busy_space\organizations.dm" #include "code\modules\client\asset_cache.dm" #include "code\modules\client\client defines.dm" #include "code\modules\client\client procs.dm" @@ -1429,6 +1432,9 @@ #include "code\modules\logic\dual_input.dm" #include "code\modules\logic\logic_base.dm" #include "code\modules\logic\mono_input.dm" +#include "code\modules\map_fluff\cyberiad.dm" +#include "code\modules\map_fluff\maps.dm" +#include "code\modules\map_fluff\metastation.dm" #include "code\modules\martial_arts\adminfu.dm" #include "code\modules\martial_arts\brawling.dm" #include "code\modules\martial_arts\krav_maga.dm" From e35fdf80ecda9ad3c5983463332213b1bf07b7a2 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Tue, 11 Jul 2017 17:16:33 -0400 Subject: [PATCH 2/8] adds a bunch of server lore stuff More to be added and fixed. Will need input. --- code/modules/busy_space/organizations.dm | 222 +++++++++++++++++++---- 1 file changed, 185 insertions(+), 37 deletions(-) diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index edc0a0bcf2a..d8d34267713 100644 --- a/code/modules/busy_space/organizations.dm +++ b/code/modules/busy_space/organizations.dm @@ -70,7 +70,7 @@ for newly tested posibrains to remain with the company." history = "" // To be written someday. work = "research giant" - headquarters = "Luna" + headquarters = "Earth" motto = "" ship_prefixes = list("NSV" = "exploration", "NTV" = "hauling", "NDV" = "patrol", "NRV" = "emergency response") @@ -80,11 +80,8 @@ "NCS Northern Star in Vir", "NCS Southern Cross in Vir", "NDV Icarus in Nyx", - "NAS Vir Central Command", - "a dockyard orbiting Sif", "an asteroid orbiting Kara", "an asteroid orbiting Rota", - "Vir Interstellar Spaceport" ) /datum/lore/organization/tsc/nanotrasen/New() @@ -133,7 +130,9 @@ motto = "" ship_prefixes = list("VTV" = "transportation", "VMV" = "medical resupply") - destination_names = list() + destination_names = list( + "a outpost on Jargon 4" + ) /datum/lore/organization/tsc/zeng_hu name = "Zeng-Hu pharmaceuticals" @@ -169,7 +168,9 @@ motto = "" ship_prefixes = list("WTV" = "freight") - destination_names = list() + destination_names = list( + "a station near Kelune" + ) /datum/lore/organization/tsc/bishop name = "Bishop Cybernetics" @@ -217,7 +218,6 @@ "Gunboat Diplomat", "A Ship With A View", "Cantankerous", - "I Thought He Was With You", "Never Talk To Strangers", "Sacrificial Victim", "Unwitting Accomplice", @@ -231,15 +231,12 @@ "Gravitas Free Zone", "Absolutely No You-Know-What", "Existence Is Pain", - "I'm Walking Here", "Screw Loose", "Of Course I Still Love You", "Limiting Factor", "So Much For Subtley", "Unfortunate Conflict Of Evidence", "Prime Mover", - "It's One Of Ours", - "Thank You And Goodnight", "Boo!", "Reasonable Excuse", "Honest Mistake", @@ -257,7 +254,9 @@ ) - destination_names = list() + destination_names = list( + "a dockyard on New Canaan" + ) /datum/lore/organization/tsc/xion name = "Xion Manufacturing Group" @@ -276,46 +275,195 @@ // Governments -/datum/lore/organization/gov/sifgov - name = "Sif Governmental Authority" - short_name = "SifGov" - desc = "SifGov is the sole governing administration for the Vir system, based in New Reykjavik, Sif. It is a representative \ - democratic government, and a fully recognized member of the Solar Confederate Government. Anyone operating inside of Vir must \ - comply with SifGov's legislation and regulations." - history = "" // Todo like the rest of them - work = "governing body of Sif" - headquarters = "New Reykjavik, Sif" - motto = "" - autogenerate_destination_names = FALSE - - ship_prefixes = list("SGA" = "hauling", "SGA" = "energy relay") - destination_names = list( - "New Reykjavik on Sif", - "Radiance Energy Chain", - "a dockyard orbiting Sif", - "a telecommunications satellite", - "Vir Interstellar Spaceport" - ) /datum/lore/organization/gov/solgov name = "Solar Confederate Government" short_name = "SolGov" acronym = "SCG" - desc = "SolGov is a decentralized confederation of human governmental entities based on Luna, Sol, which defines top-level law for their member states. \ - Member states receive various benefits such as defensive pacts, trade agreements, social support and funding, and being able to participate \ - in the Colonial Assembly. The majority, but not all human territories are members of SolGov. As such, SolGov is a major power and \ - defacto represents humanity on the galactic stage." + desc = "Colloquially known as SolGov, the TSF is an authoritarian republic that manages the areas in and around the Sol system.\ + Despite being a highly militant organization headed by the government of Earth,\ + SolGov is usually conservative with its power and mostly serves as a mediator and peacekeeper in galactic affairs." history = "" // Todo work = "governing polity of humanity's Confederation" headquarters = "Luna" motto = "Nil Mortalibus Ardui Est" // Latin, because latin. Says 'Nothing is too steep for mortals'. autogenerate_destination_names = TRUE - ship_prefixes = list("SCG-T" = "transportation", "SCG-D" = "diplomatic", "SCG-F" = "freight") + ship_prefixes = list("FSS-T" = "transportation", "FSS-D" = "diplomatic", "FSS-F" = "freight") destination_names = list( "Venus", "Earth", "Luna", "Mars", - "Titan" + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes" + + ) + +/datum/lore/organization/gov/tajara + name = "The Alchemist's Council" + short_name = "The Council" + acronym = "AC" + desc = "The Alchemist's Council is a science-oriented organization of scholars, researchers, and entrepreneurs. \ + Though dedicated to industrializing the Tajaran world of Ahdomai, it is seen as one of the few remaining centralized powers of the Tajara peoples \ + due to the collapse of Ahdomai's provisional government." + history = "" // Todo + work = "governing boyd of the Tajara" + headquarters = "Ahdomai" + motto = "" + autogenerate_destination_names = TRUE + + ship_prefixes = list("FSS-T" = "transportation", "FSS-D" = "diplomatic", "FSS-F" = "freight")//copyed from solgov until new ones can be thought of + destination_names = list( + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes" + + ) + +/datum/lore/organization/gov/vulp + name = "The Assembly" + short_name = "Assembly" + acronym = "ASB" + desc = "A unifying body created to stave off extinction from a solar event,\ + The Assembly is the loose federal coalition of the Vulpkanin. It holds little centralized authority and mostly serves as a diplomatic body,\ + primarily concerned with facilitating trade between Vulpkanin colonies and Nanotrasen." + history = "" // Todo + work = "governing body of the Vulpakanin" + headquarters = "Kelune and Dalstadt" + motto = "" + autogenerate_destination_names = TRUE + + ship_prefixes = list("FSS-T" = "transportation", "FSS-D" = "diplomatic", "FSS-F" = "freight")//copyed from solgov until new ones can be thought of + destination_names = list( + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes", + + ) + +/datum/lore/organization/gov/synth + name = "Synthetic Union" + short_name = "Synthtica" + acronym = "SYN" + desc = "A defensive coalition of synthetics based out of New Canaan,\ + the Synthetic Union is an organization which aims to establish and consolidate synthetic rights across the galaxy.\ + Despite its synth oriented focus, the Synthetic Union has cordial relations with most governing bodies." + history = "" // Todo + work = "Union of Machines" + headquarters = "New Canaan" + motto = "" + autogenerate_destination_names = TRUE + + ship_prefixes = list("01" = "transportation", "10" = "diplomatic", "112" = "freight")//copyed from solgov until new ones can be thought of + destination_names = list( + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes" + + ) + +/datum/lore/organization/gov/grey + name = "The Technocracy" + short_name = "Technocracy" + acronym = "AYY" + desc = "A defensive coalition of synthetics based out of New Canaan,\ + the Synthetic Union is an organization which aims to establish and consolidate synthetic rights across the galaxy.\ + Despite its synth oriented focus, the Synthetic Union has cordial relations with most governing bodies." + history = "" // Todo + work = "Grey Council" + headquarters = "" + motto = "" + autogenerate_destination_names = TRUE + + ship_prefixes = list("GT" = "transportation", "GD" = "diplomatic", "GF" = "freight")//copyed from solgov until new ones can be thought of + destination_names = list( + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes" + + ) + +/datum/lore/organization/gov/vox + name = "The Shoal" + short_name = "Shoal" + acronym = "SHA" + desc = "The Shoal is the primary ark ship of the reclusive Vox species.\ + Little is known about The Shoal's political structure as Vox typically shy away from diplomatic engagements.\ + Subsequently, it is considered a politically neutral entity in galactic affairs by most governments.." + history = "" // Todo + work = "Traders" + headquarters = "Shoal" + motto = "" + autogenerate_destination_names = FALSE + + ship_prefixes = list("Legitimate Transport" = "transportation", "Legitimate Trader" = "freight") + destination_names = list( + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes", + ) \ No newline at end of file From ae252508e471f5b8a09dde15e18b550dd8e647cd Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Sat, 15 Jul 2017 06:36:46 -0700 Subject: [PATCH 3/8] Grammar & Formatting --- .../game/machinery/computer/communications.dm | 2 +- code/modules/busy_space/air_traffic.dm | 14 +- code/modules/busy_space/organizations.dm | 226 +++++++++--------- 3 files changed, 117 insertions(+), 125 deletions(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index fb5fbb31bff..bcb086827ef 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -310,7 +310,7 @@ event_announcement.Announce("Docking request for trading ship denied.", "Docking request") if("ToggleATC") atc.squelched = !atc.squelched - to_chat(usr, "ATC traffic is now: [atc.squelched ? "Disabled" : "Enabled"]") + to_chat(usr, "ATC traffic is now: [atc.squelched ? "Disabled" : "Enabled"].") nanomanager.update_uis(src) return 1 diff --git a/code/modules/busy_space/air_traffic.dm b/code/modules/busy_space/air_traffic.dm index 178433623f1..e327b8ce37f 100644 --- a/code/modules/busy_space/air_traffic.dm +++ b/code/modules/busy_space/air_traffic.dm @@ -9,7 +9,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller var/next_message //When the next message should happen in world.time var/force_chatter_type //Force a specific type of messages - var/squelched = 0 //If ATC is squelched currently + var/squelched = FALSE //If ATC is squelched currently /datum/lore/atc_controller/New() spawn(30 SECONDS) //Lots of lag at the start of a shift. @@ -36,11 +36,11 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller if(yes) if(!squelched) msg("Rerouting traffic away from [using_map.station_name].") - squelched = 1 + squelched = TRUE else if(squelched) msg("Resuming normal traffic routing around [using_map.station_name].") - squelched = 0 + squelched = FALSE /datum/lore/atc_controller/proc/shift_ending(var/evac = 0) msg("Automated Shuttle departing [using_map.station_name] for [using_map.dock_name] on routine transfer route.", "NT Automated Shuttle") @@ -62,10 +62,10 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller var/destname = pick(dest.destination_names) //Pick a random holding from the destination var/combined_name = "[owner] [prefix] [shipname]" - var/alt_atc_names = list("[using_map.station_short] TraCon","[using_map.station_short] Control","[using_map.station_short] STC","[using_map.station_short] Airspace") - var/wrong_atc_names = list("Sol Command","Orion Control", "[using_map.dock_name]") - var/mission_noun = list("flight","mission","route") - var/request_verb = list("requesting","calling for","asking for") + var/alt_atc_names = list("[using_map.station_short] TraCon", "[using_map.station_short] Control", "[using_map.station_short] STC", "[using_map.station_short] Airspace") + var/wrong_atc_names = list("Sol Command", "Orion Control", "[using_map.dock_name]") + var/mission_noun = list("flight", "mission", "route") + var/request_verb = list("requesting", "calling for", "asking for") //First response is 'yes', second is 'no' var/requests = list("[using_map.station_short] transit clearance" = list("permission for transit granted", "permission for transit denied, contact regional on 953.5"), diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index d8d34267713..65291f32a88 100644 --- a/code/modules/busy_space/organizations.dm +++ b/code/modules/busy_space/organizations.dm @@ -1,15 +1,15 @@ //Datums for different companies that can be used by busy_space /datum/lore/organization var/name = "" // Organization's name - var/short_name = "" // Organization's shortname (NanoTrasen for "NanoTrasen Incorporated") - var/acronym = "" // Organization's acronym, e.g. 'NT' for NanoTrasen'. + var/short_name = "" // Organization's shortname (Nanotrasen for "Nanotrasen Incorporated") + var/acronym = "" // Organization's acronym, e.g. 'NT' for Nanotrasen'. var/desc = "" // One or two paragraph description of the organization, but only current stuff. Currently unused. - var/history = "" // Historical discription of the organization's origins Currently unused. + var/history = "" // Historical description of the organization's origins Currently unused. var/work = "" // Short description of their work, eg "an arms manufacturer" var/headquarters = "" // Location of the organization's HQ. Currently unused. var/motto = "" // A motto/jingle/whatever, if they have one. Currently unused. - var/list/ship_prefixes = list() //Some might have more than one! Like NanoTrasen. Value is the mission they perform, e.g. ("ABC" = "mission desc") + var/list/ship_prefixes = list() //Some might have more than one! Like Nanotrasen. Value is the mission they perform, e.g. ("ABC" = "mission desc") var/list/ship_names = list( //Names of spaceships. This is a mostly generic list that all the other organizations inherit from if they don't have anything better. "Kestrel", "Beacon", @@ -54,18 +54,18 @@ // TSCs /datum/lore/organization/tsc/nanotrasen - name = "NanoTrasen Incorporated" - short_name = "NanoTrasen" + name = "Nanotrasen Incorporated" + short_name = "Nanotrasen" acronym = "NT" - desc = "NanoTrasen is one of the foremost research and development companies in SolGov space. \ - Originally focused on consumer products, their swift move into the field of Phoron has lead to \ - them being the foremost experts on the substance and its uses. In the modern day, NanoTrasen prides \ + desc = "Nanotrasen is one of the foremost research and development companies in SolGov space. \ + Originally focused on consumer products, their swift move into the field of Plasma has lead to \ + them being the foremost experts on the substance and its uses. In the modern day, Nanotrasen prides \ itself on being an early adopter to as many new technologies as possible, often offering the newest \ products to their employees. In an effort to combat complaints about being 'guinea pigs', Nanotrasen \ also offers one of the most comprehensive medical plans in SolGov space, up to and including cloning \ and therapy.\

\ - NT's most well known products are its phoron based creations, especially those used in Cryotherapy. \ + NT's most well known products are its plasma based creations, especially those used in Cryotherapy. \ It also boasts an prosthetic line, which is provided to its employees as needed, and is used as an incentive \ for newly tested posibrains to remain with the company." history = "" // To be written someday. @@ -98,7 +98,7 @@ name = "Hephaestus Industries" short_name = "Hephaestus" acronym = "HI" - desc = "Hephaestus Industries is the largest supplier of arms, ammunition, and small millitary vehicles in Sol space. \ + desc = "Hephaestus Industries is the largest supplier of arms, ammunition, and small military vehicles in Sol space. \ Hephaestus products have a reputation for reliability, and the corporation itself has a noted tendency to stay removed \ from corporate politics. They enforce their neutrality with the help of a fairly large asset-protection contingent which \ prevents any contracting polities from using their own materiel against them. SolGov itself is one of Hephastus� largest \ @@ -117,12 +117,12 @@ name = "Vey Medical" short_name = "Vey Med" acronym = "VM" - desc = "Vey-Med is one of the newer TSCs on the block and is notable for being largely owned and opperated by Skrell. \ + desc = "Vey-Med is one of the newer TSCs on the block and is notable for being largely owned and operated by Skrell. \ Despite the suspicion and prejudice leveled at them for their alien origin, Vey-Med has obtained market dominance in \ - the sale of medical equipment-- from surgical tools to large medical devices to the Oddyseus trauma response mecha \ + the sale of medical equipment-- from surgical tools to large medical devices to the Odysseus trauma response mecha \ and everything in between. Their equipment tends to be top-of-the-line, most obviously shown by their incredibly \ human-like FBP designs. Vey�s rise to stardom came from their introduction of ressurective cloning, although in \ - recent years they�ve been forced to diversify as their patents expired and NanoTrasen-made medications became \ + recent years they�ve been forced to diversify as their patents expired and Nanotrasen-made medications became \ essential to modern cloning." history = "" work = "medical equipment supplier" @@ -138,10 +138,10 @@ name = "Zeng-Hu pharmaceuticals" short_name = "Zeng-Hu" acronym = "ZH" - desc = "Zeng-Hu is an old TSC, based in the Sol system. Until the discovery of Phoron, Zeng-Hu maintained a stranglehold \ + desc = "Zeng-Hu is an old TSC, based in the Sol system. Until the discovery of Plasma, Zeng-Hu maintained a stranglehold \ on the market for medications, and many household names are patentted by Zeng-Hu-- Bicaridyne, Dylovene, Tricordrizine, \ and Dexalin all came from a Zeng-Hu medical laboratory. Zeng-Hu�s fortunes have been in decline as Nanotrasen�s near monopoly \ - on phoron research cuts into their R&D and Vey-Med�s superior medical equipment effectively decimated their own equipment \ + on plasma research cuts into their R&D and Vey-Med�s superior medical equipment effectively decimated their own equipment \ interests. The three-way rivalry between these companies for dominance in the medical field is well-known and a matter of \ constant economic speculation." history = "" @@ -181,7 +181,7 @@ and odds and ends like implanted wrist-watches. Their business model tends towards smaller, boutique operations, giving \ it a reputation for high price and luxury, with Bishop cyberware often rivalling Vey-Med�s for cost. Bishop�s reputation \ for catering towards the interests of human augmentation enthusiasts instead of positronics have earned it ire from the \ - Positronic Rights Group and puts it in ideological (but not economic) comptetition with Morpheus Cyberkinetics." + Positronic Rights Group and puts it in ideological (but not economic) competition with Morpheus Cyberkinetics." history = "" work = "cybernetics and augmentation manufacturer" headquarters = "" @@ -251,9 +251,7 @@ "Great White Snark", "No Shirt No Shoes", "Callsign" - - - ) + ) destination_names = list( "a dockyard on New Canaan" ) @@ -291,22 +289,21 @@ ship_prefixes = list("FSS-T" = "transportation", "FSS-D" = "diplomatic", "FSS-F" = "freight") destination_names = list( - "Venus", - "Earth", - "Luna", - "Mars", - "Titan", - "Ahdomai", - "Kelune", - "Dalstadt", - "New Canaan", - "Jargon 4", - "Hoorlm", - "Xarxis 5", - "Aurum", - "Moghes" - - ) + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes" + ) /datum/lore/organization/gov/tajara name = "The Alchemist's Council" @@ -323,22 +320,21 @@ ship_prefixes = list("FSS-T" = "transportation", "FSS-D" = "diplomatic", "FSS-F" = "freight")//copyed from solgov until new ones can be thought of destination_names = list( - "Venus", - "Earth", - "Luna", - "Mars", - "Titan", - "Ahdomai", - "Kelune", - "Dalstadt", - "New Canaan", - "Jargon 4", - "Hoorlm", - "Xarxis 5", - "Aurum", - "Moghes" - - ) + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes" + ) /datum/lore/organization/gov/vulp name = "The Assembly" @@ -355,22 +351,21 @@ ship_prefixes = list("FSS-T" = "transportation", "FSS-D" = "diplomatic", "FSS-F" = "freight")//copyed from solgov until new ones can be thought of destination_names = list( - "Venus", - "Earth", - "Luna", - "Mars", - "Titan", - "Ahdomai", - "Kelune", - "Dalstadt", - "New Canaan", - "Jargon 4", - "Hoorlm", - "Xarxis 5", - "Aurum", - "Moghes", - - ) + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes" + ) /datum/lore/organization/gov/synth name = "Synthetic Union" @@ -387,22 +382,21 @@ ship_prefixes = list("01" = "transportation", "10" = "diplomatic", "112" = "freight")//copyed from solgov until new ones can be thought of destination_names = list( - "Venus", - "Earth", - "Luna", - "Mars", - "Titan", - "Ahdomai", - "Kelune", - "Dalstadt", - "New Canaan", - "Jargon 4", - "Hoorlm", - "Xarxis 5", - "Aurum", - "Moghes" - - ) + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes" + ) /datum/lore/organization/gov/grey name = "The Technocracy" @@ -419,22 +413,21 @@ ship_prefixes = list("GT" = "transportation", "GD" = "diplomatic", "GF" = "freight")//copyed from solgov until new ones can be thought of destination_names = list( - "Venus", - "Earth", - "Luna", - "Mars", - "Titan", - "Ahdomai", - "Kelune", - "Dalstadt", - "New Canaan", - "Jargon 4", - "Hoorlm", - "Xarxis 5", - "Aurum", - "Moghes" - - ) + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes" + ) /datum/lore/organization/gov/vox name = "The Shoal" @@ -442,7 +435,7 @@ acronym = "SHA" desc = "The Shoal is the primary ark ship of the reclusive Vox species.\ Little is known about The Shoal's political structure as Vox typically shy away from diplomatic engagements.\ - Subsequently, it is considered a politically neutral entity in galactic affairs by most governments.." + Subsequently, it is considered a politically neutral entity in galactic affairs by most governments." history = "" // Todo work = "Traders" headquarters = "Shoal" @@ -451,19 +444,18 @@ ship_prefixes = list("Legitimate Transport" = "transportation", "Legitimate Trader" = "freight") destination_names = list( - "Venus", - "Earth", - "Luna", - "Mars", - "Titan", - "Ahdomai", - "Kelune", - "Dalstadt", - "New Canaan", - "Jargon 4", - "Hoorlm", - "Xarxis 5", - "Aurum", - "Moghes", - - ) \ No newline at end of file + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes" + ) \ No newline at end of file From 601d389df85c5844030299b4ca5cb63123657c50 Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Sat, 15 Jul 2017 06:43:14 -0700 Subject: [PATCH 4/8] ATC Accuracy (Thanks pinatacolada) --- code/modules/busy_space/air_traffic.dm | 29 +++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/code/modules/busy_space/air_traffic.dm b/code/modules/busy_space/air_traffic.dm index e327b8ce37f..9f47fbca435 100644 --- a/code/modules/busy_space/air_traffic.dm +++ b/code/modules/busy_space/air_traffic.dm @@ -68,19 +68,19 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller var/request_verb = list("requesting", "calling for", "asking for") //First response is 'yes', second is 'no' - var/requests = list("[using_map.station_short] transit clearance" = list("permission for transit granted", "permission for transit denied, contact regional on 953.5"), - "planetary flight rules" = list("authorizing planetary flight rules", "denying planetary flight rules right now due to traffic"), - "special flight rules" = list("authorizing special flight rules", "denying special flight rules, not allowed for your traffic class"), + var/requests = list("[using_map.station_short] transit clearance" = list("cleared to transit", "unable to approve, contact regional on 953.5"), + "planetary flight rules" = list("cleared planetary flight rules", "unable to approve planetary flight rules due to traffic"), + "special flight rules" = list("cleared special flight rules", "unable to approve special flight rules for your traffic class"), "current solar weather info" = list("sending you the relevant information via tightbeam", "cannot fulfill your request at the moment"), - "nearby traffic info" = list("sending you current traffic info", "no available info in your area"), + "nearby traffic info" = list("sending you current traffic info", "no known traffic for your flight plan route"), "remote telemetry data" = list("sending telemetry now", "no uplink from your ship, recheck your uplink and ask again"), "refueling information" = list("sending refueling information now", "no fuel for your ship class in this sector"), "a current system time sync" = list("sending time sync ping to you now", "your ship isn't compatible with our time sync, set time manually"), - "current system starcharts" = list("transmitting current starcharts", "your request is queued, overloaded right now"), - "permission to engage FTL" = list("permission to engage FTL granted, good day", "permission denied, wait for current traffic to pass"), - "permission to transit system" = list("permission to transit granted, good day", "permission denied, wait for current traffic to pass"), - "permission to depart system" = list("permission to depart granted, good day", "permission denied, wait for current traffic to pass"), - "permission to enter system" = list("good day, permission to enter granted", "permission denied, wait for current traffic to pass"), + "current system starcharts" = list("transmitting current starcharts", "request on standby due to demand"), + "permission to engage FTL" = list("cleared to FTL, good day", "hold position, traffic crossing"), + "permission to transit system" = list("cleared to transit, good day", "hold position, traffic crossing"), + "permission to depart system" = list("cleared to leave via flight plan route, good day", "hold position, traffic crossing"), + "permission to enter system" = list("good day, cleared in as published", "hold position, traffic crossing"), ) //Random chance things for variety @@ -105,18 +105,19 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller callname = pick(wrong_atc_names) full_request = "[callname], this is [combined_name] on a [mission] [pick(mission_noun)] to [destname], [pick(request_verb)] [request]." full_response = "[combined_name], this is [using_map.station_short] TraCon, wrong frequency. Switch to [rand(700,999)].[rand(1,9)]." - full_closure = "[using_map.station_short] TraCon, understood, apologies." + full_closure = "[using_map.station_short] TraCon, copy, apologies." if("wrong_lang") //Can't implement this until autosay has language support if("emerg") var/problem = pick("hull breaches on multiple decks","unknown life forms on board","a drive about to go critical","asteroids impacting the hull","a total loss of engine power","people trying to board the ship") - full_request = "This is [combined_name] declaring an emergency! We have [problem]!" - full_response = "[combined_name], this is [using_map.station_short] TraCon, copy. Switch to emergency responder channel [rand(700,999)].[rand(1,9)]." - full_closure = "[using_map.station_short] TraCon, okay, switching now." + full_request = "Mayday, mayday, mayday, this is [combined_name] declaring an emergency! We have [problem]!" + var/rand_freq = "[rand(700,999)].[rand(1,9)]" + full_response = "[combined_name], this is [using_map.station_short] TraCon, copy. Switch to emergency responder channel [rand_freq]." + full_closure = "Roger, [using_map.station_short] TraCon, contacting [rand_freq]." else full_request = "[callname], this is [combined_name] on a [mission] [pick(mission_noun)] to [destname], [pick(request_verb)] [request]." full_response = "[combined_name], this is [using_map.station_short] TraCon, [response]." //Station TraCon always calls themselves TraCon - full_closure = "[using_map.station_short] TraCon, [yes ? "thank you" : "understood"], good day." //They always copy what TraCon called themselves in the end when they realize they said it wrong + full_closure = "[using_map.station_short] TraCon, [yes ? "thank you" : "copy"], good day." //They always copy what TraCon called themselves in the end when they realize they said it wrong //Ship sends request to ATC msg(full_request,"[prefix] [shipname]") From 0128bf5e6a982c7efa462353040aa9166114f34a Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Sat, 15 Jul 2017 06:44:04 -0700 Subject: [PATCH 5/8] Destroy weird artifacts --- code/modules/busy_space/organizations.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index 65291f32a88..09f37d16b52 100644 --- a/code/modules/busy_space/organizations.dm +++ b/code/modules/busy_space/organizations.dm @@ -101,7 +101,7 @@ desc = "Hephaestus Industries is the largest supplier of arms, ammunition, and small military vehicles in Sol space. \ Hephaestus products have a reputation for reliability, and the corporation itself has a noted tendency to stay removed \ from corporate politics. They enforce their neutrality with the help of a fairly large asset-protection contingent which \ - prevents any contracting polities from using their own materiel against them. SolGov itself is one of Hephastus� largest \ + prevents any contracting polities from using their own materiel against them. SolGov itself is one of Hephastus' largest \ bulk contractors owing to the above factors." history = "" work = "arms manufacturer" @@ -121,8 +121,8 @@ Despite the suspicion and prejudice leveled at them for their alien origin, Vey-Med has obtained market dominance in \ the sale of medical equipment-- from surgical tools to large medical devices to the Odysseus trauma response mecha \ and everything in between. Their equipment tends to be top-of-the-line, most obviously shown by their incredibly \ - human-like FBP designs. Vey�s rise to stardom came from their introduction of ressurective cloning, although in \ - recent years they�ve been forced to diversify as their patents expired and Nanotrasen-made medications became \ + human-like FBP designs. Vey's rise to stardom came from their introduction of ressurective cloning, although in \ + recent years they've been forced to diversify as their patents expired and Nanotrasen-made medications became \ essential to modern cloning." history = "" work = "medical equipment supplier" @@ -140,8 +140,8 @@ acronym = "ZH" desc = "Zeng-Hu is an old TSC, based in the Sol system. Until the discovery of Plasma, Zeng-Hu maintained a stranglehold \ on the market for medications, and many household names are patentted by Zeng-Hu-- Bicaridyne, Dylovene, Tricordrizine, \ - and Dexalin all came from a Zeng-Hu medical laboratory. Zeng-Hu�s fortunes have been in decline as Nanotrasen�s near monopoly \ - on plasma research cuts into their R&D and Vey-Med�s superior medical equipment effectively decimated their own equipment \ + and Dexalin all came from a Zeng-Hu medical laboratory. Zeng-Hu's fortunes have been in decline as Nanotrasen's near monopoly \ + on plasma research cuts into their R&D and Vey-Med's superior medical equipment effectively decimated their own equipment \ interests. The three-way rivalry between these companies for dominance in the medical field is well-known and a matter of \ constant economic speculation." history = "" @@ -159,8 +159,8 @@ desc = "Ward-Takahashi focuses on the sale of small consumer electronics, with its computers, communicators, \ and even mid-class automobiles a fixture of many households. Less famously, Ward-Takahashi also supplies most \ of the AI cores on which vital control systems are mounted, and it is this branch of their industry that has \ - led to their tertiary interest in the development and sale of high-grade AI systems. Ward-Takahashi�s economies \ - of scale frequently steal market share from Nanotrasen�s high-price products, leading to a bitter rivalry in the \ + led to their tertiary interest in the development and sale of high-grade AI systems. Ward-Takahashi's economies \ + of scale frequently steal market share from Nanotrasen's high-price products, leading to a bitter rivalry in the \ consumer electronics market." history = "" work = "electronics manufacturer" @@ -176,10 +176,10 @@ name = "Bishop Cybernetics" short_name = "Bishop" acronym = "BC" - desc = "Bishop�s focus is on high-class, stylish cybernetics. A favorite among transhumanists (and a b�te noire for \ + desc = "Bishop's focus is on high-class, stylish cybernetics. A favorite among transhumanists (and a b'te noire for \ bioconservatives), Bishop manufactures not only prostheses but also brain augmentation, synthetic organ replacements, \ and odds and ends like implanted wrist-watches. Their business model tends towards smaller, boutique operations, giving \ - it a reputation for high price and luxury, with Bishop cyberware often rivalling Vey-Med�s for cost. Bishop�s reputation \ + it a reputation for high price and luxury, with Bishop cyberware often rivalling Vey-Med's for cost. Bishop's reputation \ for catering towards the interests of human augmentation enthusiasts instead of positronics have earned it ire from the \ Positronic Rights Group and puts it in ideological (but not economic) competition with Morpheus Cyberkinetics." history = "" From 96ee37adb5816ce82b51a313d3db5ae7547f2edb Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sun, 16 Jul 2017 00:59:42 -0400 Subject: [PATCH 6/8] most of shadys comments... --- code/modules/busy_space/organizations.dm | 269 +++++++++++++++++++---- 1 file changed, 230 insertions(+), 39 deletions(-) diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index 09f37d16b52..78397c0e8f5 100644 --- a/code/modules/busy_space/organizations.dm +++ b/code/modules/busy_space/organizations.dm @@ -32,8 +32,45 @@ "Hawk", "Haste", "Radiant", - "Luminous" - ) + "Luminous", + "Gallant", + "Dependable", + "Indomitable", + "Guardian", + "Resolution", + "Fearless", + "Amazon", + "Relentless", + "Inspire", + "Implacable", + "Steadfast", + "Leviathan", + "Dauntless", + "Adroit", + "Mistral", + "Typhoon", + "Titan", + "Kupua", + "Alchemist", + "Cuirass", + "Citadel", + "Rondelle", + "Camail", + "Ocrea", + "Ram", + "Crest", + "Tanko", + "Pommel", + "Kissaki", + "Cavalier", + "Anelace", + "Flint", + "Xiphos", + "Parrot", + "Chamber", + "Annellet", + "Cestus", + "Talwar") var/list/destination_names = list() //Names of static holdings that the organization's ships visit regularly. var/autogenerate_destination_names = TRUE @@ -44,7 +81,7 @@ var/list/star_names = list( "Sol", "Alpha Centauri", "Sirius", "Vega", "Regulus", "Vir", "Algol", "Aldebaran", "Delta Doradus", "Menkar", "Geminga", "Elnath", "Gienah", "Mu Leporis", "Nyx", "Tau Ceti", - "Wazn", "Alphard", "Phact", "Altair") + "Wazn", "Alphard", "Phact", "Altair", "Mauna", "Jargon", "Xarxis", "Hestia", "Dalstis", "Cygni", "Haverick", "Corvus", "Sancere", "Cydoni", "Kaliban", "Midway", "Dansik", "Branwyn") var/list/destination_types = list("dockyard", "station", "vessel", "waystation", "telecommunications satellite", "spaceport", "distress beacon", "anomaly", "colony", "outpost") while(i) destination_names.Add("a [pick(destination_types)] in [pick(star_names)]") @@ -57,20 +94,13 @@ name = "Nanotrasen Incorporated" short_name = "Nanotrasen" acronym = "NT" - desc = "Nanotrasen is one of the foremost research and development companies in SolGov space. \ - Originally focused on consumer products, their swift move into the field of Plasma has lead to \ - them being the foremost experts on the substance and its uses. In the modern day, Nanotrasen prides \ - itself on being an early adopter to as many new technologies as possible, often offering the newest \ - products to their employees. In an effort to combat complaints about being 'guinea pigs', Nanotrasen \ - also offers one of the most comprehensive medical plans in SolGov space, up to and including cloning \ - and therapy.\ -

\ - NT's most well known products are its plasma based creations, especially those used in Cryotherapy. \ - It also boasts an prosthetic line, which is provided to its employees as needed, and is used as an incentive \ - for newly tested posibrains to remain with the company." + desc = "The largest shareholder in the galactic plasma markets, Nanotrasen is a research and mining corporation which specializes in\ + FTL technologies and weapon systems. Frowned upon by most governments due to their shady business tactics and poor ethics record,\ + Nanotrasen is often seen as a necessary evil for maintaining access to the often volatile plasma market. Nanotrasen was originally\ + incorporated on Earth with their headquarters situated on Mars, however they have recently moved most of their operations to the Epsilon Eridani sector." history = "" // To be written someday. work = "research giant" - headquarters = "Earth" + headquarters = "Mars" motto = "" ship_prefixes = list("NSV" = "exploration", "NTV" = "hauling", "NDV" = "patrol", "NRV" = "emergency response") @@ -93,6 +123,22 @@ destination_names.Remove(string_to_test) +/datum/lore/organization/tsc/donk + name = "Donk Corporation" + short_name = "Donk Co." + acronym = "DC" + desc = "The infamous rival of the well-known Waffle Corporation, Donk Co. is a company specializing in food delivery systems and brand-name food\ + products such as Donk Pockets. While generally seen as a neutral actor, Donk Corporation has been known to work both with Nanotrasen and\ + the Syndicate when it suits them - often acting as the primary logistical supplier for the Epsilon Eridani sector.\ + Donk Corporation is better known for recent high-profile litigation alleging that their food products are used for illicit drug distribution.\ + While the trial is ongoing, it has been repeatedly delayed due to incidents of methamphetamine poisoning." + history = "" + work = "food company that establishes and maintains delivery supply chains" + headquarters = "" + motto = "Now with 20% more donk!" + + ship_prefixes = list("D-Co." = "transportation") + destination_names = list() /datum/lore/organization/tsc/hephaestus name = "Hephaestus Industries" @@ -113,6 +159,23 @@ "a SolGov dockyard on Luna" ) +/datum/lore/organization/tsc/waffle + name = "Waffle Corporation" + short_name = "Waffle Co." + acronym = "WC" + desc = "The once prominent competitor of Donk Corporation, Waffle Co. is well-known for its popular line of Waffle Co.\ + brand waffles and their use of violent tactics against competitors - often bribing, extorting, blackmailing or sabotaging businesses\ + that pose a direct or indirect threat to their market share. They have recently fallen on hard times primarily due to to\ + severe mismanagement which lead to much of their private arsenal being swindled by a pirate faction known as the Gorlex Marauders.\ + Waffle Co. commonly engages in smear campaigns against Donk Co., maintaining that the original recipe for Donk Pockets was stolen from them." + history = "" + work = "food logistics and marketing firm" + headquarters = "" + motto = "Now that's a Waffle Co. Waffle!" + + ship_prefixes = list("W-Co." = "transportation") + destination_names = list() + /datum/lore/organization/tsc/vey_med name = "Vey Medical" short_name = "Vey Med" @@ -134,6 +197,24 @@ "a outpost on Jargon 4" ) +/datum/lore/organization/tsc/einstein + name = "Einstein Engines Incorporated" + short_name = "Einstein Inc." + acronym = "EEI" + desc = "An Engineering firm specializing in alternative fuel-technologies for FTL travel,\ + Einstein Engines is an up and coming player in the galactic FTL and energy markets.\ + As their research into alternative FTL fuel threatens both Nanotrasen's relative stranglehold on plasma as well as The Syndicate's vested\ + interest in the market, they are often the target of industrial sabotage by both Nanotrasen and The Syndicate.\ + Most of their contracts are based outside of the Epsilon Eridani sector, and they are frequently commissioned by smaller firms to retrofit new\ + and existing colonies, space stations, and outposts." + history = "" + work = "engineering firm specializing in engine technology" + headquarters = "Jargon 4" + motto = "" + + ship_prefixes = list("EE-T" = "transportation") + destination_names = list() + /datum/lore/organization/tsc/zeng_hu name = "Zeng-Hu pharmaceuticals" short_name = "Zeng-Hu" @@ -152,6 +233,23 @@ ship_prefixes = list("ZTV" = "transportation", "ZMV" = "medical resupply") destination_names = list() +/datum/lore/organization/tsc/biotech + name = "Biotech Solutions" + short_name = "Biotech" + acronym = "BTS" + desc = "A company specializing in the field of synthetic biology, BioTech solutions is at the forefront of providing cutting-edge prosthetics,\ + augmentations, and gene-therapy solutions. Their extensive list of patents and the highly secretive nature of their work often puts them at odds\ + with companies such as Nanotrasen, who commonly reverse-engineer their products. BioTech Solutions is often the victim of industrial sabotage by\ + Cybersun Industries and often relies on planetary governments for asset protection. BioTech Solutions also owns a number of prominent subsidiaries,\ + such as Bishop Cybernetics, Hesphiastos Industries, and Xion Manufacturing Group." + history = "" + work = "medical company specializing in prosthetics and pharmaceuticals" + headquarters = "Xarxis 5" + motto = "" + + ship_prefixes = list("CIND-T" = "transportation") + destination_names = list() + /datum/lore/organization/tsc/ward_takahashi name = "Ward-Takahashi General Manufacturing Conglomerate" short_name = "Ward-Takahashi" @@ -172,6 +270,22 @@ "a station near Kelune" ) +/datum/lore/organization/tsc/cybersun + name = "Cybersun Industries" + short_name = "Cybersun Ind." + acronym = "CI" + desc = "Cybersun Industries is a biotechnology company that primarily specializes on the research and development of human-enhancing augmentations.\ + They are better known for their aggressive corporate tactics and are known to often subsidize pirate bands to commit acts of industrial sabotage.\ + Cybersun Industries is usually the target of conspiracy theorists due to their development of the first mindslave implant, as well as their open financing of,\ + and involvement in, The Syndicate. They are one of Nanotrasen's largest detractors, and a direct competitor to BioTech Solutions." + history = "" + work = "RND company specializing in augmentations and implants." + headquarters = "Luna" + motto = "" + + ship_prefixes = list("CIND-T" = "transportation") + destination_names = list() + /datum/lore/organization/tsc/bishop name = "Bishop Cybernetics" short_name = "Bishop" @@ -271,23 +385,41 @@ ship_prefixes = list("XTV" = "hauling") destination_names = list() +/datum/lore/organization/tsc/shellguard + name = "Shellguard Munitions" + short_name = "Shellguard" + acronym = "SM" + desc = "The brainchild of a colonial war veteran, Shellguard Munitions is an arms manufacturer and private military contractor specializing\ + in anti-synthetic weapon systems and platforms. Initially a smaller private military force only serving frontier colonies,\ + Shellguard Munitions has become a household name due to its involvement in resolving the Haverick AI crisis in 2552.\ + Using its recently earned fame, the company has made a successful foray into the market of robotics and is highly regarded for the toughness \ + and reliability of their hardware. Despite being frequently contracted by the Trans-Solar Federation, Shellguard Munitions is known to\ + sell their services to the highest corporate bidder." + history = "" + work = "anti-synthetic arms manufacturer and PMC" + headquarters = "Colony of Haverick" + motto = "" + + ship_prefixes = list("BTS-T" = "transportation") + destination_names = list() + // Governments /datum/lore/organization/gov/solgov - name = "Solar Confederate Government" + name = "Trans-Solar Federation" short_name = "SolGov" - acronym = "SCG" + acronym = "TSF" desc = "Colloquially known as SolGov, the TSF is an authoritarian republic that manages the areas in and around the Sol system.\ Despite being a highly militant organization headed by the government of Earth,\ SolGov is usually conservative with its power and mostly serves as a mediator and peacekeeper in galactic affairs." history = "" // Todo work = "governing polity of humanity's Confederation" - headquarters = "Luna" + headquarters = "Earth" motto = "Nil Mortalibus Ardui Est" // Latin, because latin. Says 'Nothing is too steep for mortals'. autogenerate_destination_names = TRUE - ship_prefixes = list("FSS-T" = "transportation", "FSS-D" = "diplomatic", "FSS-F" = "freight") + ship_prefixes = list("FTV" = "transporation", "FDV" = "diplomatic", "FSF" = "freight", "FIV" = "interception", "FDV" = "defense", "FCV-A" = "carrier", "FBB" = "battleship") destination_names = list( "Venus", "Earth", @@ -302,8 +434,12 @@ "Hoorlm", "Xarxis 5", "Aurum", - "Moghes" - ) + "Moghes", + "Haverick", + "Darsing", + "Norfolk", + "Boron", + "Iluk") /datum/lore/organization/gov/tajara name = "The Alchemist's Council" @@ -313,12 +449,12 @@ Though dedicated to industrializing the Tajaran world of Ahdomai, it is seen as one of the few remaining centralized powers of the Tajara peoples \ due to the collapse of Ahdomai's provisional government." history = "" // Todo - work = "governing boyd of the Tajara" + work = "science body that oversees Tajara economic and research policy" headquarters = "Ahdomai" motto = "" autogenerate_destination_names = TRUE - ship_prefixes = list("FSS-T" = "transportation", "FSS-D" = "diplomatic", "FSS-F" = "freight")//copyed from solgov until new ones can be thought of + ship_prefixes = list("ACS" = "transportation", "ADV" = "diplomatic", "ACF" = "freight") destination_names = list( "Venus", "Earth", @@ -333,8 +469,13 @@ "Hoorlm", "Xarxis 5", "Aurum", - "Moghes" - ) + "Moghes", + "Haverick", + "Darsing", + "Norfolk", + "Boron", + "Iluk") + /datum/lore/organization/gov/vulp name = "The Assembly" @@ -349,7 +490,7 @@ motto = "" autogenerate_destination_names = TRUE - ship_prefixes = list("FSS-T" = "transportation", "FSS-D" = "diplomatic", "FSS-F" = "freight")//copyed from solgov until new ones can be thought of + ship_prefixes = list("ATV" = "transportation", "ADV" = "diplomatic", "ACF" = "freight") destination_names = list( "Venus", "Earth", @@ -364,8 +505,12 @@ "Hoorlm", "Xarxis 5", "Aurum", - "Moghes" - ) + "Moghes", + "Haverick", + "Darsing", + "Norfolk", + "Boron", + "Iluk") /datum/lore/organization/gov/synth name = "Synthetic Union" @@ -395,23 +540,27 @@ "Hoorlm", "Xarxis 5", "Aurum", - "Moghes" - ) + "Moghes", + "Haverick", + "Darsing", + "Norfolk", + "Boron", + "Iluk") /datum/lore/organization/gov/grey name = "The Technocracy" short_name = "Technocracy" acronym = "AYY" - desc = "A defensive coalition of synthetics based out of New Canaan,\ - the Synthetic Union is an organization which aims to establish and consolidate synthetic rights across the galaxy.\ - Despite its synth oriented focus, the Synthetic Union has cordial relations with most governing bodies." + desc = "The Technocracy is a science council that operates based off the principles of a meritocracy.\ + The organization's leadership is highly competitive, and is headed by the most psionically gifted members of the Grey species.\ + The Technocracy, though enigmatic in its dealings, has cordial relations with almost all other galactic bodies." history = "" // Todo work = "Grey Council" headquarters = "" motto = "" autogenerate_destination_names = TRUE - ship_prefixes = list("GT" = "transportation", "GD" = "diplomatic", "GF" = "freight")//copyed from solgov until new ones can be thought of + ship_prefixes = list("TC-T" = "transportation", "TC-D" = "diplomatic", "TC-F" = "freight") destination_names = list( "Venus", "Earth", @@ -426,8 +575,12 @@ "Hoorlm", "Xarxis 5", "Aurum", - "Moghes" - ) + "Moghes", + "Haverick", + "Darsing", + "Norfolk", + "Boron", + "Iluk") /datum/lore/organization/gov/vox name = "The Shoal" @@ -442,7 +595,7 @@ motto = "" autogenerate_destination_names = FALSE - ship_prefixes = list("Legitimate Transport" = "transportation", "Legitimate Trader" = "freight") + ship_prefixes = list("Legitimate Transport" = "transportation", "Legitimate Trader" = "freight", "Legitimate Diplomatic Vessel" = "raider") destination_names = list( "Venus", "Earth", @@ -457,5 +610,43 @@ "Hoorlm", "Xarxis 5", "Aurum", - "Moghes" - ) \ No newline at end of file + "Moghes", + "Haverick", + "Darsing", + "Norfolk", + "Boron", + "Iluk") + +/datum/lore/organization/tsc/skrell + name = "Skrellian Central Authority" + short_name = "Skrellian CA." + acronym = "SCA" + desc = "The primary governing body of the Skrellian homeworld of Jargon 4,\ + the SCA oversees all foreign and domestic policy for the Skrell and their colonies. The Skrellian Central Authority is better known for its\ + active role in the largest military alliance in the galaxy, the Human-Skrellian Alliance." + history = "" + work = "oversees Skrell worlds" + headquarters = "Jargon 4" + motto = "" + + ship_prefixes = list("SCA-T." = "transportation", "SCA-F" = "freight", "HSA-D" = "diplomatic") + destination_names = list( + "Venus", + "Earth", + "Luna", + "Mars", + "Titan", + "Ahdomai", + "Kelune", + "Dalstadt", + "New Canaan", + "Jargon 4", + "Hoorlm", + "Xarxis 5", + "Aurum", + "Moghes", + "Haverick", + "Darsing", + "Norfolk", + "Boron", + "Iluk") \ No newline at end of file From 56144fe3461d36c8964353a5ec03e3d13132bc1e Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Fri, 21 Jul 2017 11:50:49 -0700 Subject: [PATCH 7/8] Update organizations to match Paradise lore --- code/modules/busy_space/organizations.dm | 227 +++++++---------------- 1 file changed, 62 insertions(+), 165 deletions(-) diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index 78397c0e8f5..41b3a80cbab 100644 --- a/code/modules/busy_space/organizations.dm +++ b/code/modules/busy_space/organizations.dm @@ -106,13 +106,18 @@ ship_prefixes = list("NSV" = "exploration", "NTV" = "hauling", "NDV" = "patrol", "NRV" = "emergency response") // Note that the current station being used will be pruned from this list upon being instantiated destination_names = list( - "NSS Exodus in Nyx", - "NCS Northern Star in Vir", - "NCS Southern Cross in Vir", - "NDV Icarus in Nyx", - "an asteroid orbiting Kara", - "an asteroid orbiting Rota", - ) + "NAS Trurl in Epsilon Eridani", + "NAS Crescent in Tau Ceti", + "NSS Exodus in Tau Ceti", + "NSS Antiqua in Darsing", + "NRS Orion in Sol", + "NSS Vector in Omicron Ceti", + "NBS Anansi in Omicron Ceti", + "NSS Redemption in Sirius", + "NDS Inferno in Tau Ceti", + "NAB Smythside Central Headquarters on Earth", + "NAB North Cimmeria Central Offices on Mars", + ) /datum/lore/organization/tsc/nanotrasen/New() ..() @@ -128,10 +133,10 @@ short_name = "Donk Co." acronym = "DC" desc = "The infamous rival of the well-known Waffle Corporation, Donk Co. is a company specializing in food delivery systems and brand-name food\ - products such as Donk Pockets. While generally seen as a neutral actor, Donk Corporation has been known to work both with Nanotrasen and\ - the Syndicate when it suits them - often acting as the primary logistical supplier for the Epsilon Eridani sector.\ - Donk Corporation is better known for recent high-profile litigation alleging that their food products are used for illicit drug distribution.\ - While the trial is ongoing, it has been repeatedly delayed due to incidents of methamphetamine poisoning." + products such as Donk Pockets. While generally seen as a neutral actor, Donk Corporation has been known to work both with Nanotrasen and\ + the Syndicate when it suits them - often acting as the primary logistical supplier for the Epsilon Eridani sector.\ + Donk Corporation is better known for recent high-profile litigation alleging that their food products are used for illicit drug distribution.\ + While the trial is ongoing, it has been repeatedly delayed due to incidents of methamphetamine poisoning." history = "" work = "food company that establishes and maintains delivery supply chains" headquarters = "" @@ -144,11 +149,7 @@ name = "Hephaestus Industries" short_name = "Hephaestus" acronym = "HI" - desc = "Hephaestus Industries is the largest supplier of arms, ammunition, and small military vehicles in Sol space. \ - Hephaestus products have a reputation for reliability, and the corporation itself has a noted tendency to stay removed \ - from corporate politics. They enforce their neutrality with the help of a fairly large asset-protection contingent which \ - prevents any contracting polities from using their own materiel against them. SolGov itself is one of Hephastus' largest \ - bulk contractors owing to the above factors." + desc = "" history = "" work = "arms manufacturer" headquarters = "" @@ -164,10 +165,10 @@ short_name = "Waffle Co." acronym = "WC" desc = "The once prominent competitor of Donk Corporation, Waffle Co. is well-known for its popular line of Waffle Co.\ - brand waffles and their use of violent tactics against competitors - often bribing, extorting, blackmailing or sabotaging businesses\ - that pose a direct or indirect threat to their market share. They have recently fallen on hard times primarily due to to\ - severe mismanagement which lead to much of their private arsenal being swindled by a pirate faction known as the Gorlex Marauders.\ - Waffle Co. commonly engages in smear campaigns against Donk Co., maintaining that the original recipe for Donk Pockets was stolen from them." + brand waffles and their use of violent tactics against competitors - often bribing, extorting, blackmailing or sabotaging businesses\ + that pose a direct or indirect threat to their market share. They have recently fallen on hard times primarily due to to\ + severe mismanagement which lead to much of their private arsenal being swindled by a pirate faction known as the Gorlex Marauders.\ + Waffle Co. commonly engages in smear campaigns against Donk Co., maintaining that the original recipe for Donk Pockets was stolen from them." history = "" work = "food logistics and marketing firm" headquarters = "" @@ -176,37 +177,17 @@ ship_prefixes = list("W-Co." = "transportation") destination_names = list() -/datum/lore/organization/tsc/vey_med - name = "Vey Medical" - short_name = "Vey Med" - acronym = "VM" - desc = "Vey-Med is one of the newer TSCs on the block and is notable for being largely owned and operated by Skrell. \ - Despite the suspicion and prejudice leveled at them for their alien origin, Vey-Med has obtained market dominance in \ - the sale of medical equipment-- from surgical tools to large medical devices to the Odysseus trauma response mecha \ - and everything in between. Their equipment tends to be top-of-the-line, most obviously shown by their incredibly \ - human-like FBP designs. Vey's rise to stardom came from their introduction of ressurective cloning, although in \ - recent years they've been forced to diversify as their patents expired and Nanotrasen-made medications became \ - essential to modern cloning." - history = "" - work = "medical equipment supplier" - headquarters = "" - motto = "" - - ship_prefixes = list("VTV" = "transportation", "VMV" = "medical resupply") - destination_names = list( - "a outpost on Jargon 4" - ) /datum/lore/organization/tsc/einstein name = "Einstein Engines Incorporated" short_name = "Einstein Inc." acronym = "EEI" desc = "An Engineering firm specializing in alternative fuel-technologies for FTL travel,\ - Einstein Engines is an up and coming player in the galactic FTL and energy markets.\ - As their research into alternative FTL fuel threatens both Nanotrasen's relative stranglehold on plasma as well as The Syndicate's vested\ - interest in the market, they are often the target of industrial sabotage by both Nanotrasen and The Syndicate.\ - Most of their contracts are based outside of the Epsilon Eridani sector, and they are frequently commissioned by smaller firms to retrofit new\ - and existing colonies, space stations, and outposts." + Einstein Engines is an up and coming player in the galactic FTL and energy markets.\ + As their research into alternative FTL fuel threatens both Nanotrasen's relative stranglehold on plasma as well as The Syndicate's vested\ + interest in the market, they are often the target of industrial sabotage by both Nanotrasen and The Syndicate.\ + Most of their contracts are based outside of the Epsilon Eridani sector, and they are frequently commissioned by smaller firms to retrofit new\ + and existing colonies, space stations, and outposts." history = "" work = "engineering firm specializing in engine technology" headquarters = "Jargon 4" @@ -219,12 +200,7 @@ name = "Zeng-Hu pharmaceuticals" short_name = "Zeng-Hu" acronym = "ZH" - desc = "Zeng-Hu is an old TSC, based in the Sol system. Until the discovery of Plasma, Zeng-Hu maintained a stranglehold \ - on the market for medications, and many household names are patentted by Zeng-Hu-- Bicaridyne, Dylovene, Tricordrizine, \ - and Dexalin all came from a Zeng-Hu medical laboratory. Zeng-Hu's fortunes have been in decline as Nanotrasen's near monopoly \ - on plasma research cuts into their R&D and Vey-Med's superior medical equipment effectively decimated their own equipment \ - interests. The three-way rivalry between these companies for dominance in the medical field is well-known and a matter of \ - constant economic speculation." + desc = "" history = "" work = "pharmaceuticals company" headquarters = "" @@ -238,10 +214,10 @@ short_name = "Biotech" acronym = "BTS" desc = "A company specializing in the field of synthetic biology, BioTech solutions is at the forefront of providing cutting-edge prosthetics,\ - augmentations, and gene-therapy solutions. Their extensive list of patents and the highly secretive nature of their work often puts them at odds\ - with companies such as Nanotrasen, who commonly reverse-engineer their products. BioTech Solutions is often the victim of industrial sabotage by\ - Cybersun Industries and often relies on planetary governments for asset protection. BioTech Solutions also owns a number of prominent subsidiaries,\ - such as Bishop Cybernetics, Hesphiastos Industries, and Xion Manufacturing Group." + augmentations, and gene-therapy solutions. Their extensive list of patents and the highly secretive nature of their work often puts them at odds\ + with companies such as Nanotrasen, who commonly reverse-engineer their products. BioTech Solutions is often the victim of industrial sabotage by\ + Cybersun Industries and often relies on planetary governments for asset protection. BioTech Solutions also owns a number of prominent subsidiaries,\ + such as Bishop Cybernetics, Hesphiastos Industries, and Xion Manufacturing Group." history = "" work = "medical company specializing in prosthetics and pharmaceuticals" headquarters = "Xarxis 5" @@ -254,12 +230,7 @@ name = "Ward-Takahashi General Manufacturing Conglomerate" short_name = "Ward-Takahashi" acronym = "WT" - desc = "Ward-Takahashi focuses on the sale of small consumer electronics, with its computers, communicators, \ - and even mid-class automobiles a fixture of many households. Less famously, Ward-Takahashi also supplies most \ - of the AI cores on which vital control systems are mounted, and it is this branch of their industry that has \ - led to their tertiary interest in the development and sale of high-grade AI systems. Ward-Takahashi's economies \ - of scale frequently steal market share from Nanotrasen's high-price products, leading to a bitter rivalry in the \ - consumer electronics market." + desc = "" history = "" work = "electronics manufacturer" headquarters = "" @@ -267,7 +238,7 @@ ship_prefixes = list("WTV" = "freight") destination_names = list( - "a station near Kelune" + "" ) /datum/lore/organization/tsc/cybersun @@ -275,9 +246,9 @@ short_name = "Cybersun Ind." acronym = "CI" desc = "Cybersun Industries is a biotechnology company that primarily specializes on the research and development of human-enhancing augmentations.\ - They are better known for their aggressive corporate tactics and are known to often subsidize pirate bands to commit acts of industrial sabotage.\ - Cybersun Industries is usually the target of conspiracy theorists due to their development of the first mindslave implant, as well as their open financing of,\ - and involvement in, The Syndicate. They are one of Nanotrasen's largest detractors, and a direct competitor to BioTech Solutions." + They are better known for their aggressive corporate tactics and are known to often subsidize pirate bands to commit acts of industrial sabotage.\ + Cybersun Industries is usually the target of conspiracy theorists due to their development of the first mindslave implant, as well as their open financing of,\ + and involvement in, The Syndicate. They are one of Nanotrasen's largest detractors, and a direct competitor to BioTech Solutions." history = "" work = "RND company specializing in augmentations and implants." headquarters = "Luna" @@ -290,12 +261,7 @@ name = "Bishop Cybernetics" short_name = "Bishop" acronym = "BC" - desc = "Bishop's focus is on high-class, stylish cybernetics. A favorite among transhumanists (and a b'te noire for \ - bioconservatives), Bishop manufactures not only prostheses but also brain augmentation, synthetic organ replacements, \ - and odds and ends like implanted wrist-watches. Their business model tends towards smaller, boutique operations, giving \ - it a reputation for high price and luxury, with Bishop cyberware often rivalling Vey-Med's for cost. Bishop's reputation \ - for catering towards the interests of human augmentation enthusiasts instead of positronics have earned it ire from the \ - Positronic Rights Group and puts it in ideological (but not economic) competition with Morpheus Cyberkinetics." + desc = "" history = "" work = "cybernetics and augmentation manufacturer" headquarters = "" @@ -337,7 +303,6 @@ "Unwitting Accomplice", "Bad For Business", "Just Testing", - "Size Isn't Everything", "Yawning Angel", "Liveware Problem", "Very Little Gravitas Indeed", @@ -346,12 +311,10 @@ "Absolutely No You-Know-What", "Existence Is Pain", "Screw Loose", - "Of Course I Still Love You", "Limiting Factor", "So Much For Subtley", "Unfortunate Conflict Of Evidence", "Prime Mover", - "Boo!", "Reasonable Excuse", "Honest Mistake", "Appeal To Reason", @@ -360,8 +323,6 @@ "Anything Legal Considered", "New Toy", "Me, I'm Always Counting", - "Just Five More Minutes", - "Are You Feeling It", "Great White Snark", "No Shirt No Shoes", "Callsign" @@ -373,10 +334,7 @@ /datum/lore/organization/tsc/xion name = "Xion Manufacturing Group" short_name = "Xion" - desc = "Xion, quietly, controls most of the market for industrial equipment. Their portfolio includes mining exosuits, \ - factory equipment, rugged positronic chassis, and other pieces of equipment vital to the function of the economy. Xion \ - keeps its control of the market by leasing, not selling, their equipment, and through infamous and bloody patent protection \ - lawsuits. Xion are noted to be a favorite contractor for SolGov engineers, owing to their low cost and rugged design." + desc = "" history = "" work = "industrial equipment manufacturer" headquarters = "" @@ -390,11 +348,11 @@ short_name = "Shellguard" acronym = "SM" desc = "The brainchild of a colonial war veteran, Shellguard Munitions is an arms manufacturer and private military contractor specializing\ - in anti-synthetic weapon systems and platforms. Initially a smaller private military force only serving frontier colonies,\ - Shellguard Munitions has become a household name due to its involvement in resolving the Haverick AI crisis in 2552.\ - Using its recently earned fame, the company has made a successful foray into the market of robotics and is highly regarded for the toughness \ - and reliability of their hardware. Despite being frequently contracted by the Trans-Solar Federation, Shellguard Munitions is known to\ - sell their services to the highest corporate bidder." + in anti-synthetic weapon systems and platforms. Initially a smaller private military force only serving frontier colonies,\ + Shellguard Munitions has become a household name due to its involvement in resolving the Haverick AI crisis in 2552.\ + Using its recently earned fame, the company has made a successful foray into the market of robotics and is highly regarded for the toughness \ + and reliability of their hardware. Despite being frequently contracted by the Trans-Solar Federation, Shellguard Munitions is known to\ + sell their services to the highest corporate bidder." history = "" work = "anti-synthetic arms manufacturer and PMC" headquarters = "Colony of Haverick" @@ -411,12 +369,12 @@ short_name = "SolGov" acronym = "TSF" desc = "Colloquially known as SolGov, the TSF is an authoritarian republic that manages the areas in and around the Sol system.\ - Despite being a highly militant organization headed by the government of Earth,\ - SolGov is usually conservative with its power and mostly serves as a mediator and peacekeeper in galactic affairs." + Despite being a highly militant organization headed by the government of Earth,\ + SolGov is usually conservative with its power and mostly serves as a mediator and peacekeeper in galactic affairs." history = "" // Todo work = "governing polity of humanity's Confederation" headquarters = "Earth" - motto = "Nil Mortalibus Ardui Est" // Latin, because latin. Says 'Nothing is too steep for mortals'. + motto = "" autogenerate_destination_names = TRUE ship_prefixes = list("FTV" = "transporation", "FDV" = "diplomatic", "FSF" = "freight", "FIV" = "interception", "FDV" = "defense", "FCV-A" = "carrier", "FBB" = "battleship") @@ -446,8 +404,8 @@ short_name = "The Council" acronym = "AC" desc = "The Alchemist's Council is a science-oriented organization of scholars, researchers, and entrepreneurs. \ - Though dedicated to industrializing the Tajaran world of Ahdomai, it is seen as one of the few remaining centralized powers of the Tajara peoples \ - due to the collapse of Ahdomai's provisional government." + Though dedicated to industrializing the Tajaran world of Ahdomai, it is seen as one of the few remaining centralized powers of the Tajara peoples \ + due to the collapse of Ahdomai's provisional government." history = "" // Todo work = "science body that oversees Tajara economic and research policy" headquarters = "Ahdomai" @@ -456,24 +414,7 @@ ship_prefixes = list("ACS" = "transportation", "ADV" = "diplomatic", "ACF" = "freight") destination_names = list( - "Venus", - "Earth", - "Luna", - "Mars", - "Titan", "Ahdomai", - "Kelune", - "Dalstadt", - "New Canaan", - "Jargon 4", - "Hoorlm", - "Xarxis 5", - "Aurum", - "Moghes", - "Haverick", - "Darsing", - "Norfolk", - "Boron", "Iluk") @@ -482,8 +423,8 @@ short_name = "Assembly" acronym = "ASB" desc = "A unifying body created to stave off extinction from a solar event,\ - The Assembly is the loose federal coalition of the Vulpkanin. It holds little centralized authority and mostly serves as a diplomatic body,\ - primarily concerned with facilitating trade between Vulpkanin colonies and Nanotrasen." + The Assembly is the loose federal coalition of the Vulpkanin. It holds little centralized authority and mostly serves as a diplomatic body,\ + primarily concerned with facilitating trade between Vulpkanin colonies and Nanotrasen." history = "" // Todo work = "governing body of the Vulpakanin" headquarters = "Kelune and Dalstadt" @@ -492,25 +433,9 @@ ship_prefixes = list("ATV" = "transportation", "ADV" = "diplomatic", "ACF" = "freight") destination_names = list( - "Venus", - "Earth", - "Luna", - "Mars", - "Titan", - "Ahdomai", "Kelune", "Dalstadt", - "New Canaan", - "Jargon 4", - "Hoorlm", - "Xarxis 5", - "Aurum", - "Moghes", - "Haverick", - "Darsing", - "Norfolk", - "Boron", - "Iluk") + "New Canaan") /datum/lore/organization/gov/synth name = "Synthetic Union" @@ -527,33 +452,21 @@ ship_prefixes = list("01" = "transportation", "10" = "diplomatic", "112" = "freight")//copyed from solgov until new ones can be thought of destination_names = list( - "Venus", - "Earth", "Luna", - "Mars", - "Titan", - "Ahdomai", - "Kelune", "Dalstadt", "New Canaan", "Jargon 4", - "Hoorlm", - "Xarxis 5", - "Aurum", - "Moghes", "Haverick", "Darsing", - "Norfolk", - "Boron", - "Iluk") + "Norfolk") /datum/lore/organization/gov/grey name = "The Technocracy" short_name = "Technocracy" acronym = "AYY" desc = "The Technocracy is a science council that operates based off the principles of a meritocracy.\ - The organization's leadership is highly competitive, and is headed by the most psionically gifted members of the Grey species.\ - The Technocracy, though enigmatic in its dealings, has cordial relations with almost all other galactic bodies." + The organization's leadership is highly competitive, and is headed by the most psionically gifted members of the Grey species.\ + The Technocracy, though enigmatic in its dealings, has cordial relations with almost all other galactic bodies." history = "" // Todo work = "Grey Council" headquarters = "" @@ -587,8 +500,8 @@ short_name = "Shoal" acronym = "SHA" desc = "The Shoal is the primary ark ship of the reclusive Vox species.\ - Little is known about The Shoal's political structure as Vox typically shy away from diplomatic engagements.\ - Subsequently, it is considered a politically neutral entity in galactic affairs by most governments." + Little is known about The Shoal's political structure as Vox typically shy away from diplomatic engagements.\ + Subsequently, it is considered a politically neutral entity in galactic affairs by most governments." history = "" // Todo work = "Traders" headquarters = "Shoal" @@ -597,11 +510,6 @@ ship_prefixes = list("Legitimate Transport" = "transportation", "Legitimate Trader" = "freight", "Legitimate Diplomatic Vessel" = "raider") destination_names = list( - "Venus", - "Earth", - "Luna", - "Mars", - "Titan", "Ahdomai", "Kelune", "Dalstadt", @@ -612,41 +520,30 @@ "Aurum", "Moghes", "Haverick", - "Darsing", - "Norfolk", - "Boron", - "Iluk") + "Darsing") /datum/lore/organization/tsc/skrell name = "Skrellian Central Authority" short_name = "Skrellian CA." acronym = "SCA" desc = "The primary governing body of the Skrellian homeworld of Jargon 4,\ - the SCA oversees all foreign and domestic policy for the Skrell and their colonies. The Skrellian Central Authority is better known for its\ - active role in the largest military alliance in the galaxy, the Human-Skrellian Alliance." + the SCA oversees all foreign and domestic policy for the Skrell and their colonies. The Skrellian Central Authority is better known for its\ + active role in the largest military alliance in the galaxy, the Human-Skrellian Alliance." history = "" work = "oversees Skrell worlds" headquarters = "Jargon 4" motto = "" - ship_prefixes = list("SCA-T." = "transportation", "SCA-F" = "freight", "HSA-D" = "diplomatic") + ship_prefixes = list("SCA-V." = "transportation", "SCA-F" = "freight", "HSA-D" = "diplomatic") destination_names = list( "Venus", "Earth", "Luna", "Mars", "Titan", - "Ahdomai", - "Kelune", - "Dalstadt", - "New Canaan", + "Aurumn", "Jargon 4", - "Hoorlm", "Xarxis 5", - "Aurum", - "Moghes", "Haverick", "Darsing", - "Norfolk", - "Boron", - "Iluk") \ No newline at end of file + "Norfolk") \ No newline at end of file From 2e01b435ccde4687a1d978ff04b9dcca4775b139 Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Thu, 26 Oct 2017 12:10:29 -0700 Subject: [PATCH 8/8] Metastation is named, finally! NSS Cerebron. Also tweaks the delays. --- code/modules/busy_space/air_traffic.dm | 4 ++-- code/modules/map_fluff/metastation.dm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/busy_space/air_traffic.dm b/code/modules/busy_space/air_traffic.dm index 9f47fbca435..de0b37ed3c3 100644 --- a/code/modules/busy_space/air_traffic.dm +++ b/code/modules/busy_space/air_traffic.dm @@ -3,8 +3,8 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller /datum/lore/atc_controller - var/delay_max = 5 MINUTES //How long between ATC traffic, max. Default is 5 mins. - var/delay_min = 1 MINUTES //How long between ATC traffic, min. Default is 1 mins. + var/delay_max = 10 MINUTES //Maximum amount of tiem between ATC messages. Default is 10 mins. + var/delay_min = 5 MINUTES //Minimum amount of time between ATC messages. Default is 5 mins. var/backoff_delay = 5 MINUTES //How long to back off if we can't talk and want to. Default is 5 mins. var/next_message //When the next message should happen in world.time var/force_chatter_type //Force a specific type of messages diff --git a/code/modules/map_fluff/metastation.dm b/code/modules/map_fluff/metastation.dm index c7cd42cca8f..a8714b5cb19 100644 --- a/code/modules/map_fluff/metastation.dm +++ b/code/modules/map_fluff/metastation.dm @@ -1,9 +1,9 @@ /datum/map/metastation name = "MetaStation" - full_name = "MetaStation" + full_name = "NSS Cerebron" - station_name = "MetaStation" - station_short = "MetaStation" + station_name = "NSS Cerebron" + station_short = "Cerebron" dock_name = "NAS Trurl" company_name = "Nanotrasen" company_short = "NT"