From 5d854f0c767abc5dbc282eabd1e5d7bb3b797f0c Mon Sep 17 00:00:00 2001 From: Killian Date: Mon, 11 Nov 2024 20:41:43 +0000 Subject: [PATCH] traffic update --- code/modules/busy_space_vr/air_traffic.dm | 158 +++--- code/modules/busy_space_vr/organizations.dm | 517 +++++------------- code/modules/catalogue/catalogue_data_vr.dm | 4 - .../guns/energy/cell_loaded_vr/cell_loaded.dm | 4 +- .../guns/energy/cell_loaded_vr/nsfw.dm | 10 +- .../guns/energy/cell_loaded_vr/nsfw_cells.dm | 1 - code/modules/resleeving/computers.dm | 3 +- code/modules/resleeving/designer.dm | 3 +- code/modules/resleeving/implant.dm | 6 +- code/modules/resleeving/machines.dm | 9 +- code/modules/resleeving/sleevecard.dm | 3 +- .../vore/fluffstuff/custom_clothes_vr.dm | 1 - 12 files changed, 228 insertions(+), 491 deletions(-) diff --git a/code/modules/busy_space_vr/air_traffic.dm b/code/modules/busy_space_vr/air_traffic.dm index 46adabfcb21..44757b0e533 100644 --- a/code/modules/busy_space_vr/air_traffic.dm +++ b/code/modules/busy_space_vr/air_traffic.dm @@ -8,12 +8,12 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller /datum/lore/atc_controller - var/delay_min = 45 MINUTES //How long between ATC traffic, minimum - var/delay_max = 90 MINUTES //Ditto, maximum + var/delay_min = 1 MINUTE //45 MINUTES //How long between ATC traffic, minimum + var/delay_max = 2 MINUTES //90 MINUTES //Ditto, maximum //Shorter delays means more traffic, which gives the impression of a busier system, but also means a lot more radio noise var/backoff_delay = 5 MINUTES //How long to back off if we can't talk and want to. Default is 5 mins. - var/initial_delay = 15 MINUTES //How long to wait before sending the first message of the shift. - var/next_message = 45 MINUTES //When the next message should happen in world.time - Making it default to min value + var/initial_delay = 2 MINUTES //15 MINUTES //How long to wait before sending the first message of the shift. + var/next_message = 1 MINUTE //45 MINUTES //When the next message should happen in world.time - Making it default to min value var/force_chatter_type //Force a specific type of messages var/squelched = 0 //If ATC is squelched currently @@ -32,7 +32,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller engchannel = "[rand(800,849)].[rand(1,9)]" secchannel = "[rand(850,899)].[rand(1,9)]" sdfchannel = "[rand(900,999)].[rand(1,9)]" - spawn(450 SECONDS) //Lots of lag at the start of a shift. Yes, the following lines *have* to be indented or they're not delayed by the spawn properly. + spawn(5 SECONDS) //Lots of lag at the start of a shift. Yes, the following lines *have* to be indented or they're not delayed by the spawn properly. msg("New shift beginning, resuming traffic control. This shift's Colony Frequencies are as follows: Emergency Responders: [ertchannel]. Medical: [medchannel]. Engineering: [engchannel]. Security: [secchannel]. System Defense: [sdfchannel].") next_message = world.time + initial_delay process() @@ -67,7 +67,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("[using_map.shuttle_name] departing [using_map.dock_name] for [using_map.station_name] on routine transfer route. Estimated time to arrival: ten minutes.","[using_map.shuttle_name]") -/datum/lore/atc_controller/proc/random_convo() +/datum/lore/atc_controller/proc/random_convo(var/force_chatter_type) var/one = pick(loremaster.organizations) //These will pick an index, not an instance var/two = pick(loremaster.organizations) @@ -78,6 +78,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller var/name = source.name //get the name var/owner = source.short_name //Use the short name var/prefix = pick(source.ship_prefixes) //Pick a random prefix + var/firstid = "[rand(1,9)][rand(0,9)][rand(0,9)][rand(0,9)]" 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 var/destname = pick(source.destination_names) //destination is where? @@ -86,15 +87,21 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller //pick our second ship //var/secondname = secondary.name //not used atm, commented out to suppress errors - var/secondowner = secondary.short_name + //var/secondowner = secondary.short_name //ditto var/secondprefix = pick(secondary.ship_prefixes) //Pick a random prefix + var/secondid = "[rand(1,9)][rand(0,9)][rand(0,9)][rand(0,9)]" var/secondshipname = pick(secondary.ship_names) //Pick a random ship name var/org_type2 = secondary.org_type - var/combined_first_name = "[owner][prefix] |[shipname]|" - var/combined_second_name = "[secondowner][secondprefix] |[secondshipname]|" + //DEBUG BLOCK + //to_world("DEBUG OUTPUT 1: [name], [owner], [prefix], [firstid], [mission], [shipname], [org_type], [destname]") + //to_world("DEBUG OUTPUT 2: [secondowner], [secondprefix], [secondid], [secondshipname], [org_type2]") + //to_world("DEBUG OUTPUT 3: Chose [chatter_type]") + //DEBUG BLOCK ENDS + + var/combined_first_name = "[prefix] [firstid] |[shipname]|" + var/combined_second_name = "[secondprefix] [secondid] |[secondshipname]|" - var/alt_atc_names = list("[using_map.dock_name] Traffic Control","[using_map.dock_name] TraCon","[using_map.dock_name] System Control","[using_map.dock_name] Star Control","[using_map.dock_name] SysCon","[using_map.dock_name] Tower","[using_map.dock_name] Control","[using_map.dock_name] STC","[using_map.dock_name] StarCon") var/mission_noun = pick(source.flight_types) //pull from a list of owner-specific flight ops, to allow an extra dash of flavor if(source.complex_tasks) //if our source has the complex_tasks flag, regenerate with a two-stage assignment mission_noun = "[pick(source.task_types)] [pick(source.flight_types)]" @@ -143,16 +150,10 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller chatter_type = pick(5;"emerg",25;"policescan",25;"traveladvisory",30;"pathwarning",90;"dockingrequestgeneric",30;"undockingrequest",30;"undockingdenied","normal",25;"civvieleaks") //I probably should do some kind of pass here to work through all the possible combinations of major factors and see if the filtering list needs reordering or modifying, but I really can't be arsed - //DEBUG BLOCK - //to_world("DEBUG OUTPUT 1: [name], [owner], [prefix], [mission], [shipname], [org_type], [destname]") - //to_world("DEBUG OUTPUT 2: [secondowner], [secondprefix], [secondshipname], [org_type2]") - //to_world("DEBUG OUTPUT 3: Chose [chatter_type]") - //DEBUG BLOCK ENDS - var/yes = prob(90) //Chance for them to say yes vs no var/request = pick(requests) - var/callname = pick(alt_atc_names) + var/callname = "[using_map.dock_name] Control" var/response = requests[request][yes ? 1 : 2] //1 is yes, 2 is no var/number = rand(1,42) var/zone = pick("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega") @@ -184,39 +185,39 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller //mayday call if("emerg") var/problem = pick("We have hull breaches on multiple decks","We have unknown hostile life forms on board","Our primary drive is failing","We have [pick("asteroids","space debris")] impacting the hull","We're experiencing a total loss of engine power","We have hostile ships closing fast","There's smoke [pick("in the cockpit","on the bridge")]","We have unidentified boarders","Our reaction control system is malfunctioning and we're losing stability","Our life support [pick("is failing","has failed")]") - msg("+Mayday, mayday, mayday!+ This is [combined_first_name] declaring an emergency! [problem]!","[prefix] [shipname]") + msg("+Mayday, mayday, mayday!+ [combined_first_name], declaring an emergency! [problem]!","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control, copy. Switch to emergency responder channel [ertchannel].") + msg("[combined_first_name], [callname]. Switch to emergency responder channel [ertchannel].") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("Understood [using_map.dock_name] Control, switching now.","[prefix] [shipname]") + msg("[callname], [combined_first_name] switching now.","[prefix] [shipname]") //Control scan event: soft outcome if("policescan") var/confirm = pick("Understood","Roger that","Affirmative","Very well","Copy that") var/complain = pick("I hope this doesn't take too long.","Can we hurry this up?","Make it quick.","This better not take too long.","Is this really necessary?","I'm sure you'll find everything to be in order, Control.") var/completed = pick("You're free to proceed.","Everything looks fine, carry on.","You're clear, move along.","Apologies for the delay, you're clear.","Switch to channel [sdfchannel] and await further instruction.") - msg("[combined_first_name], this is [using_map.dock_name] Control, your [pick("ship","vessel","starship")] has been flagged for routine inspection. Hold position and prepare to be scanned.") + msg("[combined_first_name], [callname], your [pick("ship","vessel","starship")] has been flagged for routine inspection. Hold position and prepare to be scanned.") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[confirm] [using_map.dock_name] Control, holding position.","[prefix] [shipname]") + msg("[confirm] [callname], holding position.","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("Your compliance is appreciated, [combined_first_name]. Scan commencing.") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*2 SECONDS) msg(complain,"[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*3 SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Scan complete. [completed]") + msg("[combined_first_name], [callname]. Scan complete. [completed]") //Control scan event: hard outcome if("policeflee") var/uhoh = pick("No can do chief, we got places to be.","Sorry but we've got places to be.","Not happening.","Ah fuck, who ratted us out this time?!","You'll never take me alive!","Hey, I have a cloaking device! You can't see me!","I'm going to need to ask for a refund on that stealth drive...","I'm afraid I can't do that, Control.","Ah |hell|.","Fuck!","This isn't the ship you're looking for.","Well. This is awkward.","Uh oh.","I surrender!","Ah f- |ditch the containers!| +Now!+","Unless you have something a little +bigger+ in your torpedo tubes, we're |not| turning around!") - msg("Unknown [pick("ship","vessel","starship")], this is [using_map.dock_name] Control, identify yourself and submit to a full inspection. Flying without an active transponder is a violation of interstellar shipping regulations.") + msg("Unknown [pick("ship","vessel","starship")], [callname], identify yourself and submit to a full inspection. Flying without an active transponder is a violation of interstellar shipping regulations.") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[uhoh]","[shipname]") + msg("[uhoh]","Unknown Vessel") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("This is [using_map.starsys_name] Defense Control to all local assets: vector to interdict and detain [combined_first_name]. Control out.","[using_map.starsys_name] Defense Control") + msg("[using_map.starsys_name] Defense Control to all local assets: vector to interdict and detain [prefix], temporary callsign |[shipname]|. Control out.","[using_map.starsys_name] Defense Control") //SDF scan event: soft outcome if("policeshipscan") var/confirm = pick("Understood","Roger that","Affirmative") var/complain = pick("I hope this doesn't take too long.","Can we hurry this up?","Make it quick.","This better not take too long.","Is this really necessary?","I'm sure you'll find everything to be in order, officer.") var/completed = pick("You're free to proceed.","Everything looks fine, carry on.","You're clear. Move along.","Apologies for the delay, you're clear.","Switch to channel [sdfchannel] and await further instruction.") - msg("[combined_second_name], this is [combined_first_name], your [pick("ship","vessel","starship")] has been flagged for routine inspection. Hold position and prepare to be scanned.","[prefix] [shipname]") + msg("[combined_second_name], [combined_first_name], your [pick("ship","vessel","starship")] has been flagged for routine inspection. Hold position and prepare to be scanned.","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("[confirm] [combined_first_name], holding position.","[secondprefix] [secondshipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) @@ -224,38 +225,38 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*2 SECONDS) msg(complain,"[secondprefix] [secondshipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*3 SECONDS) - msg("[combined_second_name], this is [combined_first_name]. Scan complete. [completed]","[prefix] [shipname]") + msg("[combined_second_name], [combined_first_name]. Scan complete. [completed]","[prefix] [shipname]") //SDF scan event: hard outcome if("policeshipflee") var/uhoh = pick("No can do chief, we got places to be.","Sorry but we've got places to be.","Not happening.","Ah fuck, who ratted us out this time?!","You'll never take me alive!","Hey, I have a cloaking device! You can't see me!","I'm going to need to ask for a refund on that stealth drive...","I'm afraid I can't do that, |[shipname]|.","Ah |hell|.","Fuck!","This isn't the ship you're looking for.","Well. This is awkward.","Uh oh.","I surrender!","Ah f- |ditch the containers!| +Now!+","Unless you have something a little +bigger+ in your torpedo tubes, we're |not| turning around!") - msg("Unknown [pick("ship","vessel","starship")], this is [combined_second_name], identify yourself and submit to a full inspection. Flying without an active transponder is a violation of interstellar shipping regulations.","[secondprefix] [secondshipname]") + msg("Unknown [pick("ship","vessel","starship")], [combined_second_name], identify yourself and submit to a full inspection. Flying without an active transponder is a violation of interstellar shipping regulations.","[secondprefix] [secondshipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[uhoh]","[shipname]") + msg("[uhoh]","Unknown Vessel") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[using_map.starsys_name] Defense Control, this is [combined_second_name]. We have a situation here, please advise.","[secondprefix] [secondshipname]") + msg("[using_map.starsys_name] Defense Control, [combined_second_name]. We have a [prefix] here, please advise.","[secondprefix] [secondshipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("Defense Control copies, [combined_second_name], reinforcements are en route. Switch further communications to encrypted band [sdfchannel].","[using_map.starsys_name] Defense Control") //SDF scan event: engage primary in combat! fairly rare since it needs a pirate/vox + SDF roll if("policeshipcombat") var/battlestatus = pick("requesting reinforcements.","we need backup! Now!","holding steady.","we're holding our own for now.","we have them on the run.","they're trying to make a run for it!","we have them right where we want them.","we're badly outgunned!","we have them outgunned.","we're outnumbered here!","we have them outnumbered.","this'll be a cakewalk.",10;"notify their next of kin.") - msg("[using_map.starsys_name] Defense Control, this is [combined_second_name], engaging [combined_first_name] [pick("near route","in sector")] [rand(1,100)], [battlestatus]","[secondprefix] [secondshipname]") + msg("[using_map.starsys_name] Defense Control, [combined_second_name], engaging [combined_first_name] [pick("near route","in sector")] [rand(1,100)], [battlestatus]","[secondprefix] [secondshipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("[using_map.starsys_name] Defense Control copies, [combined_second_name]. Keep us updated.","[using_map.starsys_name] Defense Control") //SDF event: patrol update if("sdfpatrolupdate") - var/statusupdate = pick("nothing unusual so far","nothing of note","everything looks clear so far","ran off some [pick("pirates","marauders")] near route [pick(1,100)], [pick("no","minor")] damage sustained, continuing patrol","situation normal, no suspicious activity yet","minor incident on route [pick(1,100)]","Code 7-X [pick("on route","in sector")] [pick(1,100)], situation is under control","seeing a lot of traffic on route [pick(1,100)]","caught a couple of smugglers [pick("on route","in sector")] [pick(1,100)]","sustained some damage in a skirmish just now, we're heading back for repairs") - msg("[using_map.starsys_name] Defense Control, this is [combined_first_name] reporting in, [statusupdate], over.","[prefix] [shipname]") + var/statusupdate = pick("nothing unusual so far","nothing of note","everything looks clear so far","ran off some [pick("pirates","scavengers")] near route [pick(1,100)], [pick("no","minor")] damage sustained, continuing patrol","situation normal, no suspicious activity yet","minor incident on route [pick(1,100)]","Code 7-X [pick("on route","in sector")] [pick(1,100)], situation is under control","seeing a lot of traffic on route [pick(1,100)]","caught a couple of smugglers [pick("on route","in sector")] [pick(1,100)]","sustained some damage in a skirmish just now, we're heading back for repairs") + msg("[using_map.starsys_name] Defense Control, [combined_first_name] reporting in, [statusupdate], over.","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("[using_map.starsys_name] Defense Control copies, [combined_first_name]. Keep us updated, out.","[using_map.starsys_name] Defense Control") //SDF event: end patrol if("sdfendingpatrol") var/appreciation = pick("Copy","Understood","Affirmative","10-4","Roger that") var/dockingplan = pick("Starting final approach now.","Commencing landing procedures.","Autopilot engaged.","Approach vector locked in.","In the pipe, five by five.") - msg("[callname], this is [combined_first_name], returning from our system patrol route, requesting permission to [landing_short].","[prefix] [shipname]") + msg("[callname], [combined_first_name], returning from our system patrol route, requesting permission to [landing_short].","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in.") + msg("[combined_first_name], [callname]. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in.") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[appreciation], [using_map.dock_name] Control. [dockingplan]","[prefix] [shipname]") + msg("[appreciation], [callname]. [dockingplan]","[prefix] [shipname]") //SDF event: general chatter if("sdfchatter") var/chain = pick("codecheck","commscheck") @@ -263,7 +264,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller if("codecheck") msg("Check. Check. |Check|. Uhhh... check? Wait. Wait! Hold on. Yeah, okay, I gotta call this one in.","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[using_map.dock_name] Control, confirm auth-code... [rand(1,9)][rand(1,9)][rand(1,9)]-[pick("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")]?","[prefix] [shipname]") + msg("[callname], confirm auth-code... [rand(1,9)][rand(1,9)][rand(1,9)]-[pick("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")]?","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("One moment...") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*2 SECONDS) @@ -311,41 +312,40 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller var/state = pick(66;"calm",34;"panic") switch(state) if("calm") - msg("[using_map.starsys_name] Defense Control, this is [combined_first_name].","[prefix] [shipname]") + msg("[using_map.starsys_name] Defense Control, [combined_first_name].","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("We read you. Go ahead, [combined_first_name].","[using_map.starsys_name] Defense Control") + msg("[combined_first_name], [using_map.starsys_name] Defense Control.","[using_map.starsys_name] Defense Control") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("Another vessel in our area is moving [pick("aggressively","suspiciously","erratically","unpredictably","with clear hostile intent")], please advise? Forwarding sensor data now.","[prefix] [shipname]","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], [using_map.starsys_name] Defense Control copies. Sensor data matches logged profile for [combined_second_name]. SDF units are en route to your location.","[using_map.starsys_name] Defense Control") + msg("[combined_first_name], [using_map.starsys_name] Defense Control copies. Sensor data matches logged profile for [secondprefix] |[secondshipname]|. SDF units are en route to your location.","[using_map.starsys_name] Defense Control") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("[pick("Appreciated","Copy that","Understood")], Control. Switching to [sdfchannel] to coordinate.","[prefix] [shipname]") if("panic") - msg("+Mayday, mayday, mayday!+ This is [combined_first_name] declaring an emergency! We are under attack by [combined_second_name]! Requesting immediate assistance!","[prefix] [shipname]") + msg("+Mayday, mayday, mayday!+ This is [combined_first_name] declaring an emergency! We are under attack! Requesting immediate assistance!","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.starsys_name] Defense Control, copy. SDF is en route, contact on [sdfchannel].") + msg("[combined_first_name], [using_map.starsys_name] Defense Control. SDF is en route, contact on [sdfchannel].") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("[pick("Copy that","Understood")] [using_map.starsys_name] Defense Control, switching now!","[prefix] [shipname]") //Control event: travel advisory if("traveladvisory") - var/flightwarning = pick("Solar flare activity is spiking and expected to cause issues along main flight lanes [rand(1,33)], [rand(34,67)], and [rand(68,100)]","Pirate activity is on the rise, stay close to System Defense vessels","We're seeing a rise in illegal salvage operations, please report any unusual activity to the nearest SDF vessel via channel [sdfchannel]","Vox Marauder activity is higher than usual, report any unusual activity to the nearest System Defense vessel","A quarantined [pick("fleet","convoy")] is passing through the system along route [rand(1,100)], please observe minimum safe distance","A prison [pick("fleet","convoy")] is passing through the system along route [rand(1,100)], please observe minimum safe distance","Traffic volume is higher than normal, expect processing delays","Anomalous bluespace activity detected [pick("along route [rand(1,100)]","in sector [rand(1,100)]")], exercise caution","Smugglers have been particularly active lately, expect increased security scans","Depots are currently experiencing a fuel shortage, expect delays and higher rates","Asteroid mining has displaced debris dangerously close to main flight lanes on route [rand(1,100)], watch for potential impactors","[pick("Pirate","Vox Marauder")] and System Defense forces are currently engaged in skirmishes throughout the system, please steer clear of any active combat zones","A [pick("fuel tanker","cargo liner","passenger liner","freighter","transport ship","mining barge","salvage trawler")] has collided with [pick("a fuel tanker","a cargo liner","a passenger liner","a freighter","a transport ship","a mining barge","a salvage trawler","a meteoroid","a cluster of space debris","an asteroid","an ice-rich comet")] near route [rand(1,100)], watch for debris and do not impede emergency service vessels","A [pick("fuel tanker","cargo liner","passenger liner","freighter","transport ship","mining barge","salvage trawler")] on route [rand(1,100)] has experienced total engine failure. Emergency response teams are en route, please observe minimum safe distances and do not impede emergency service vessels","Transit routes have been recalculated to adjust for planetary drift. Please synch your astronav computers as soon as possible to avoid delays and difficulties","[pick("Bounty hunters","System Defense officers","Mercenaries")] are currently searching for a wanted fugitive, report any sightings of suspicious activity to System Defense via channel [sdfchannel]","Mercenary contractors are currently conducting aggressive [pick("piracy","marauder")] suppression operations",10;"It's space [pick("carp","shark")] breeding season. [pick("Stars","Skies","Gods","God","Goddess","Fates")] have mercy on you all") - msg("This is [using_map.dock_name] Control to all vessels in the [using_map.starsys_name] system. Priority travel advisory follows.") + var/flightwarning = pick("Solar flare activity is spiking and expected to cause issues along main flight lanes [rand(1,33)], [rand(34,67)], and [rand(68,100)]","Pirate activity is on the rise, stay close to System Defense vessels","We're seeing a rise in illegal salvage operations, please report any unusual activity to the nearest SDF vessel via channel [sdfchannel]","A quarantined [pick("fleet","convoy")] is passing through the system along route [rand(1,100)], please observe minimum safe distance","A prison [pick("fleet","convoy")] is passing through the system along route [rand(1,100)], please observe minimum safe distance","Traffic volume is higher than normal, expect processing delays","Anomalous bluespace activity detected [pick("along route [rand(1,100)]","in sector [rand(1,100)]")], exercise caution","Smugglers have been particularly active lately, expect increased security scans","Depots are currently experiencing a fuel shortage, expect delays and higher rates","Asteroid mining has displaced debris dangerously close to main flight lanes on route [rand(1,100)], watch for potential impactors","A [pick("fuel tanker","cargo liner","passenger liner","freighter","transport ship","mining barge","salvage trawler")] has collided with [pick("a fuel tanker","a cargo liner","a passenger liner","a freighter","a transport ship","a mining barge","a salvage trawler","a meteoroid","a cluster of space debris","an asteroid","an ice-rich comet")] near route [rand(1,100)], watch for debris and do not impede emergency service vessels","A [pick("fuel tanker","cargo liner","passenger liner","freighter","transport ship","mining barge","salvage trawler")] on route [rand(1,100)] has experienced total engine failure. Emergency response teams are en route, please observe minimum safe distances and do not impede emergency service vessels","Transit routes have been recalculated to adjust for planetary drift. Please synch your astronav computers as soon as possible to avoid delays and difficulties","[pick("Bounty hunters","System Defense officers","Mercenaries")] are currently searching for a wanted fugitive, report any sightings of suspicious activity to System Defense via channel [sdfchannel]",10;"It's space [pick("carp","shark")] breeding season. [pick("Stars","Skies","Gods","God","Goddess","Fates")] have mercy on you all") + msg("[callname], all vessels in the [using_map.starsys_name] system. Priority travel advisory follows.") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("[flightwarning]. Control out.") //Control event: warning to a specific vessel if("pathwarning") var/navhazard = pick("a pocket of intense radiation","a pocket of unstable gas","a debris field","a secure installation","an active combat zone","a quarantined ship","a quarantined installation","a quarantined sector","a live-fire SDF training exercise","an ongoing Search & Rescue operation","a hazardous derelict","an intense electrical storm","an intense ion storm","a shoal of space carp","a pack of space sharks","an asteroid infested with gnat hives","a protected space ray habitat","a region with anomalous bluespace activity","a rogue comet") var/confirm = pick("Understood","Roger that","Affirmative","Our bad","Thanks for the heads up") - var/safetravels = pick("Fly safe out there","Good luck","Safe travels","Godspeed","Stars guide you","Don't let it happen again") - msg("[combined_first_name], this is [using_map.dock_name] Control, your [pick("ship","vessel","starship")] is approaching [navhazard], observe minimum safe distance and adjust your heading appropriately.") + msg("[combined_first_name], [callname], your [pick("ship","vessel","starship")] is approaching [navhazard], observe minimum safe distance and adjust your heading appropriately.") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[confirm] [using_map.dock_name] Control, adjusting course.","[prefix] [shipname]") + msg("[confirm] [callname], adjusting course.","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("Your compliance is appreciated, [combined_first_name]. [safetravels].") + msg("Your compliance is appreciated, [combined_first_name].") //Control event: personnel report to dock if("report_to_dock") var/situation_type = pick("medical","security","engineering","animal control") - msg("This is [using_map.dock_name] Control. Would a free [situation_type] team please report to [landing_zone] immediately. This is not a drill.") + msg("This is [using_map.dock_name] Tower. Would a free [situation_type] team please report to [landing_zone] immediately. This is not a drill.") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*10 SECONDS) msg("Repeat, any free [situation_type] team, report to [landing_zone] immediately. This is +not+ a drill.") //Ship event: docking request (generic) @@ -355,87 +355,87 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller var/dockingplan = pick("Starting final approach now.","Commencing landing procedures.","Autopilot engaged.","Approach vector locked in.","In the pipe, five by five.") switch(request_type) if("generic") - msg("[callname], this is [combined_first_name], [pick("stopping by","passing through")] on our way to [destname], requesting permission to [landing_short].","[prefix] [shipname]") + msg("[callname], [combined_first_name], [pick("stopping by","passing through")] on our way to [destname], requesting permission to [landing_short].","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in.") + msg("[combined_first_name], [callname]. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in.") if("delayed") var/reason = pick( "we don't have any free [landing_type]s right now, please [pick("stand by for a couple of minutes","hold for a few minutes")]", "you're too far away, please close to ten thousand meters","we're seeing heavy traffic around the [landing_type]s right now, please [pick("stand by for a couple of minutes","hold for a few minutes")]","ground crews are currently clearing up [pick("loose containers","a fuel spill")] to free up one of our [landing_type]s, please [pick("stand by for a couple of minutes","hold for a few minutes")]","another vessel has aerospace priority right now, please [pick("stand by for a couple of minutes","hold for a few minutes")]") - msg("[callname], this is [combined_first_name], [pick("stopping by","passing through")] on our way to [destname], requesting permission to [landing_short].","[prefix] [shipname]") + msg("[callname], [combined_first_name], [pick("stopping by","passing through")] on our way to [destname], requesting permission to [landing_short].","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Request denied, [reason] and resubmit your request.") + msg("[combined_first_name], [callname]. Request denied, [reason] and resubmit your request.") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("Understood, [using_map.dock_name] Control.","[prefix] [shipname]") + msg("Understood, [callname].","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*60 SECONDS) - msg("[callname], this is [combined_first_name], resubmitting [landing_move].","[prefix] [shipname]") + msg("[callname], [combined_first_name], resubmitting [landing_move].","[prefix] [shipname]") sleep (5 SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Everything appears to be in order now, permission granted, proceed to [landing_zone]. Follow the green lights on your way in.") + msg("[combined_first_name], [callname]. Everything appears to be in order now, permission granted, proceed to [landing_zone]. Follow the green lights on your way in.") if("supply") var/preintensifier = pick(75;"getting ",75;"running ","",15;"like, ") //whitespace hack, sometimes they'll add a preintensifier, but not always var/intensifier = pick("very","pretty","critically","extremely","dangerously","desperately","kinda","a little","a bit","rather","sorta") var/low_thing = pick("ammunition","munitions","clean water","food","spare parts","medical supplies","reaction mass","gas","hydrogen fuel","phoron fuel","fuel",10;"tea",10;"coffee",10;"soda",10;"pizza",10;"beer",10;"booze",10;"vodka",10;"snacks") //low chance of a less serious shortage appreciation = pick("Much appreciated","Many thanks","Understood","You're a lifesaver","We owe you one","I owe you one","Perfect, thank you") - msg("[callname], this is [combined_first_name]. We're [preintensifier][intensifier] low on [low_thing]. Requesting permission to [landing_short] for resupply.","[prefix] [shipname]") + msg("[callname], [combined_first_name]. We're [preintensifier][intensifier] low on [low_thing]. Requesting permission to [landing_short] for resupply.","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in.") + msg("[combined_first_name], [callname]. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in.") if("repair") var/damagestate = pick("We've experienced some hull damage","We're suffering minor system malfunctions","We're having some [pick("weird","strange","odd","unusual")] technical issues","We're overdue maintenance","We have several minor space debris impacts","We've got some battle damage here","Our reactor output is fluctuating","We're hearing some weird noises from the [pick("engines","pipes","ducting","HVAC")]","We just got caught in a solar flare","We had a close call with an asteroid","We have a [pick("minor","mild","major","serious")] [pick("fuel","water","oxygen","gas")] leak","We have depressurized compartments","We have a hull breach","One of our [pick("hydraulic","pneumatic")] systems has depressurized","Our [pick("life support","water recycling system","navcomp","shield generator","reaction control system","auto-repair system","repair drone controller","artificial gravity generator","environmental control system","master control system")] is [pick("failing","acting up","on the fritz","shorting out","glitching out","freaking out","malfunctioning")]") appreciation = pick("Much appreciated","Many thanks","Understood","You're a lifesaver","We owe you one","I owe you one","Perfect, thank you") - msg("[callname], this is [combined_first_name]. [damagestate]. Requesting permission to [landing_short] for repairs and maintenance.","[prefix] [shipname]") + msg("[callname], [combined_first_name]. [damagestate]. Requesting permission to [landing_short] for repairs and maintenance.","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in. Repair crews are standing by, contact them on channel [engchannel].") + msg("[combined_first_name], [callname]. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in. Repair crews are standing by, contact them on channel [engchannel].") if("medical") var/species = pick("human","humanoid","unathi","lizard","tajaran","feline","skrell","akula","promethean","sergal","synthetic","robotic","teshari","avian","vulpkanin","canine","vox","zorren","hybrid","mixed-species","vox","grey","alien",5;"catslug") var/medicalstate = pick("multiple casualties","several cases of radiation sickness","an unknown virus","an unknown infection","a critically injured VIP","sick refugees","multiple cases of food poisoning","injured [pick("","[species] ")]passengers","sick [pick("","[species] ")]passengers","injured engineers","wounded marines","a delicate situation","a pregnant passenger","injured [pick("","[species] ")]castaways","recovered escape pods","unknown escape pods") appreciation = pick("Much appreciated","Many thanks","Understood","You're a lifesaver","We owe you one","I owe you one","Perfect, thank you") - msg("[callname], this is [combined_first_name]. We have [medicalstate] on board. Requesting permission to [landing_short] for medical assistance.","[prefix] [shipname]") + msg("[callname], [combined_first_name]. We have [medicalstate] on board. Requesting permission to [landing_short] for medical assistance.","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in. Medtechs are standing by, contact them on channel [medchannel].") + msg("[combined_first_name], [callname]. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in. Medtechs are standing by, contact them on channel [medchannel].") if("security") var/species = pick("human","humanoid","unathi","lizard","tajaran","feline","skrell","akula","promethean","sergal","synthetic","robotic","teshari","avian","vulpkanin","canine","vox","zorren","hybrid","mixed-species","vox","grey","alien",5;"catslug") - var/securitystate = pick("several [species] convicts","a captured pirate","a wanted criminal","[species] stowaways","incompetent [species] shipjackers","a delicate situation","a disorderly passenger","disorderly [species] passengers","ex-mutineers","a captured vox marauder","captured vox marauders","stolen goods","[pick("a container","containers")] full of [pick("confiscated contraband","stolen goods")]",5;"a very lost shadekin",10;"some kinda big wooly critter",15;"a buncha lost-looking uh... cat... slug... |things?|",10;"a raging case of [pick("spiders","crabs","geese","gnats","sharks","carp")]") //gotta have a little something to lighten the mood now and then + var/securitystate = pick("several [species] convicts","a captured pirate","a wanted criminal","[species] stowaways","incompetent [species] shipjackers","a delicate situation","a disorderly passenger","disorderly [species] passengers","ex-mutineers","stolen goods","[pick("a container","containers")] full of [pick("confiscated contraband","stolen goods")]",5;"a very lost shadekin",10;"some kinda big wooly critter",15;"a buncha lost-looking uh... cat... slug... |things?|",10;"a raging case of [pick("spiders","crabs","geese","gnats","sharks","carp")]") //gotta have a little something to lighten the mood now and then appreciation = pick("Much appreciated","Many thanks","Understood","You're a lifesaver","Perfect, thank you") - msg("[callname], this is [combined_first_name]. We have [securitystate] on board and require security assistance. Requesting permission to [landing_short].","[prefix] [shipname]") + msg("[callname], [combined_first_name]. We have [securitystate] on board and require security assistance. Requesting permission to [landing_short].","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in. Security teams are standing by, contact them on channel [secchannel].") + msg("[combined_first_name], [callname]. Permission granted, proceed to [landing_zone]. Follow the green lights on your way in. Security teams are standing by, contact them on channel [secchannel].") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[appreciation], [using_map.dock_name] Control. [dockingplan]","[prefix] [shipname]") + msg("[appreciation], [callname]. [dockingplan]","[prefix] [shipname]") //Ship event: undocking request if("undockingrequest") var/request_type = pick(150;"generic",50;"delayed") var/takeoff = pick("depart","launch") var/safetravels = pick("Fly safe out there","Good luck","Safe travels","See you next week","Godspeed","Stars guide you") var/thanks = pick("Appreciated","Thanks","Don't worry about us","We'll be fine","You too","So long") - msg("[callname], this is [combined_first_name], requesting permission to [takeoff] from [landing_zone].","[prefix] [shipname]") + msg("[callname], [combined_first_name], requesting permission to [takeoff] from [landing_zone].","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) switch(request_type) if("generic") - msg("[combined_first_name], this is [using_map.dock_name] Control. Permission granted. Docking clamps released. [safetravels].") + msg("[combined_first_name], [callname]. Permission granted. Docking clamps released. [safetravels].") if("delayed") var/denialreason = pick("Docking clamp malfunction, please hold","Fuel lines have not been secured","Ground crew are still on the pad","Loose containers are on the pad","Exhaust deflectors are not yet in position, please hold","There's heavy traffic right now, it's not safe for your vessel to launch","Another vessel has aerospace priority at this moment","Port officials are still aboard") msg("Negative [combined_first_name], request denied. [denialreason]. Try again in a few minutes.") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*60 SECONDS) - msg("[callname], this is [combined_first_name], re-requesting permission to depart from [landing_zone].","[prefix] [shipname]") + msg("[callname], [combined_first_name], re-requesting permission to depart from [landing_zone].","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Everything appears to be in order now, permission granted. Docking clamps released. [safetravels].") + msg("[combined_first_name], [callname]. Everything appears to be in order now, permission granted. Docking clamps released. [safetravels].") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[thanks], [using_map.dock_name] Control. This is [combined_first_name] setting course for [destname], out.","[prefix] [shipname]") + msg("[thanks], [callname]. This is [combined_first_name] setting course for [destname], out.","[prefix] [shipname]") //SDF event: starting patrol if("sdfbeginpatrol") var/safetravels = pick("Fly safe out there","Good luck","Good hunting","Safe travels","Godspeed","Stars guide you") var/thanks = pick("Appreciated","Thanks","Don't worry about us","We'll be fine","You too") var/takeoff = pick("depart","launch","take off","dust off") - msg("[callname], this is [combined_first_name], requesting permission to [takeoff] from [landing_zone] to begin system patrol.","[prefix] [shipname]") + msg("[callname], [combined_first_name], requesting permission to [takeoff] from [landing_zone] to begin system patrol.","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control. Permission granted. Docking clamps released. [safetravels].") + msg("[combined_first_name], [callname]. Permission granted. Docking clamps released. [safetravels].") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[thanks], [using_map.dock_name] Control. This is [combined_first_name] beginning system patrol, out.","[prefix] [shipname]") + msg("[thanks], [callname]. This is [combined_first_name] beginning system patrol, out.","[prefix] [shipname]") //Ship event: undocking request (denied) if("undockingdenied") var/takeoff = pick("depart","launch") var/denialreason = pick("Security is requesting a full cargo inspection","Your ship has been impounded for multiple [pick("security","safety")] violations","Your ship is currently under quarantine lockdown","We have reason to believe there's an issue with your papers","Security personnel are currently searching for a fugitive and have ordered all outbound ships remain grounded until further notice") - msg("[callname], this is [combined_first_name], requesting permission to [takeoff] from [landing_zone].","[prefix] [shipname]") + msg("[callname], [combined_first_name], requesting permission to [takeoff] from [landing_zone].","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) msg("Negative [combined_first_name], request denied. [denialreason].") if("slogan") @@ -443,11 +443,11 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller sleep(5 SECONDS) msg("[slogan]","Facility PA") else //time for generic message - msg("[callname], this is [combined_first_name] on [mission] [pick(mission_noun)] to [destname], requesting [request].","[prefix] [shipname]") + msg("[callname], [combined_first_name] on [mission] [pick(mission_noun)] to [destname], requesting [request].","[prefix] [shipname]") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[combined_first_name], this is [using_map.dock_name] Control, [response].") + msg("[combined_first_name], [callname], [response].") sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS) - msg("[using_map.dock_name] Control, [yes ? "thank you" : "understood"], out.","[prefix] [shipname]") + msg("[callname], [yes ? "thank you" : "understood"], out.","[prefix] [shipname]") return //oops, forgot to restore this /* //OLD BLOCK, for reference diff --git a/code/modules/busy_space_vr/organizations.dm b/code/modules/busy_space_vr/organizations.dm index 56a416a9999..54253cddca8 100644 --- a/code/modules/busy_space_vr/organizations.dm +++ b/code/modules/busy_space_vr/organizations.dm @@ -184,7 +184,76 @@ "Morning Swan", "Black Cat", "Challenger", - "Savage Chicken" + "Savage Chicken", + "Homestead", + "Peacekeeper", + "Eminent Domain", + "Clear Sky", + "Midnight Light", + "Daedalus", + "Redline", + "Wild Dog", + "Black Eagle", + "Three of a Kind", + "Bonaventure", + "Go West", + "Once Upon A Time", + "Bygones Be", + "Just Capital", + "Delight", + "Valdez", + "Pioneer", + "Antilles", + "Explorer", + "Number Crunch", + "Until Dawn", + "Pistols at Dawn", + "Right Side", + "Merchant Prince", + "Merchant Princess", + "Merchant King", + "Merchant Queen", + "Merchant's Pride", + "Trade Law", + "Onward", + "Wanderer", + "Rocky Start", + "Downtown", + "Risk Reward", + "Culture Shock", + "Ambition", + "Vigor", + "Vigilant", + "Courageous", + "Profit Vanguard", + "Free Market", + "Market Speculation", + "Banker's Dozen", + "Adventure", + "Profiteer", + "Wrong Side", + "Final Notice", + "Tax Man", + "Ferryman", + "Hangman", + "Cattlecar", + "Runtime Error", + "For Sale, Cheap", + "Starfarer", + "Drifter", + "Windward", + "Hostile Takeover", + "Tax Loop", + "Fortune's Fancy", + "Fortuna", + "Inside Outside", + "Galley", + "Constellation", + "Dromedarii", + "Golden Hand", + "White Company", + "Haggler", + "Rendezvous" ) var/list/destination_names = list() //Names of static holdings that the organization's ships visit regularly. @@ -198,8 +267,9 @@ /datum/lore/organization/New() ..() + if(autogenerate_destination_names) // Lets pad out the destination names. - var/i = rand(15, 30) //significantly increased from original values due to the greater length of rounds on YW + var/i = rand(20, 30) //significantly increased from original values due to the greater length of rounds //known planets and exoplanets, plus fictional ones var/list/planets = list( @@ -372,6 +442,9 @@ "NAS Zeus orbiting Virgo-Prime", "NIB Posideon in Alpha Centauri", "NTB Anur on Virgo-Prime", + "NSB Adephagia in Virgo-Erigone", + "NSB Rascal's Pass in Virgo-Erigone", + "NRV |Stellar Delight| in Virgo-Erigone", "a phoron refinery in Vilous", "a dockyard orbiting Virgo-Prime", "an asteroid orbiting Virgo 3", @@ -697,7 +770,7 @@ "Corona", "Binary" ) - destination_names = list() + //destination_names = list() /datum/lore/organization/tsc/bishop name = "Bishop Cybernetics" @@ -943,7 +1016,7 @@ "Galaxius Mons", "Hellas Planitia" ) - destination_names = list() + //destination_names = list() /datum/lore/organization/tsc/ftu name = "Free Trade Union" @@ -1406,7 +1479,7 @@ "Wulf Aeronautics, the Commonwealth's favorite shipwrights.", "Wulf Aeronautics, building tomorrow's ships today." ) - ship_prefixes = list("WATV" = "a transport", "WARV" = "a repair", "WAV" = "a general operations") + ship_prefixes = list("WAFV" = "a freight", "WARV" = "a repair", "WAV" = "a general operations", "WALV" = "a logistics") destination_names = list( "Wulf Aeronautics HQ", "a Wulf Aeronautics supply depot", @@ -1636,75 +1709,18 @@ ////////////////////////////////////////////////////////////////////////////////// // Other -/datum/lore/organization/other/kitsuhana //sorry KHI, but you're not a coherent stellar government, and you're definitely not a TSC. you get to go in the Others pool. //makes sense to me! - name = "Kitsuhana Heavy Industries" - short_name = "" //whitespace haaaack - desc = "A large post-scarcity amalgamation of races, Kitsuhana is no longer a company but rather a loose association of 'members' \ - who only share the KHI name and their ideals in common. Kitsuhana accepts interviews to join their ranks, and though they have no \ - formal structure with regards to government or law, the concept of 'consent' drives most of the large decision making. Kitsuhanans \ - pride themselves on their ability to avoid consequence, essentially preferring to live care-free lives. Their post-scarcity allows \ - them to rebuild, regrow, and replenish almost any lost asset or resource nearly instantly. It leads to many of the Kitsuhana \ - 'members' treating everything with frivolity and lends them a care-free demeanor." - history = "Originally a heavy industrial equipment and space mining company. During a forced evacuation of their homeworld, \ - they were the only organization with enough ship capacity to relocate any significant portion of the population, starting with \ - their own employees. After the resulting slowship travel to nearby starsystems, most of the population decided to keep the moniker \ - of the company name. Over the years, Kitsuhana developed into a post-scarcity anarchy where virtually nothing has consequences and \ - Kitsuhana 'members' can live their lives as they see fit, often in isolation." - work = "utopian anarchy" - headquarters = "Kitsuhana Prime" - motto = "Do what you want. We know we will." - - //Culture ship names! - ship_prefixes = list("KHI" = "personal") //Everybody's out for themselves, yanno. - 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" - ) - destination_names = list( - "Kitsuhana Prime", - "Kitsuhana Beta", - "Kitsuhana Gamma", - "the Kitsuhana Forge", - "a Kitsuhanan's home", - "a Kitsuhana ringworld in Pleis Ceti V", - "a Kitsuhana ringworld in Lund VI", - "a Kitsuhana ringworld in Dais IX", - "a Kitsuhana ringworld in Leibert II-b" - ) - /datum/lore/organization/other/independent name = "Independent Pilots Association" short_name = "" //using the same whitespace hack as USDF acronym = "IPA" - desc = "Though less common now than they were in the decades before the Sol Economic Organization took power, independent traders remain an important part of the galactic economy, owing in no small part to protective tariffs established by the Free Trade Union in the late twenty-second century. Further out on the frontier, independent pilots are often the only people keeping freight and supplies moving.\ + desc = "Though less common now than they were in the decades before the Sol Economic Organization took power, independent pilots and traders remain an important part of the galactic economy, owing in no small part to protective tariffs established by the Free Trade Union in the late twenty-second century. Further out on the frontier, independent pilots are often the only people keeping freight and vital supplies moving.\

\ Independent ships use a wide variety of names, many of which are as unusual and eclectic as their crews." history = "" work = "everything under the sun" headquarters = "N/A" motto = "N/A" + autogenerate_destination_names = TRUE //force random dest generation ship_prefixes = list("ISV" = "a general", "IEV" = "a prospecting", "IEC" = "a prospecting", "IFV" = "a bulk freight", "ITV" = "a passenger transport", "ITC" = "a just-in-time delivery", "IPV" = "a patrol", "IHV" = "a bounty hunting", "ICC" = "an escort", "IMV" = "a mining") flight_types = list( @@ -1715,8 +1731,10 @@ "assignment", "contract" ) - destination_names = list() //we have no hqs or facilities of our own //ship names: blank, because we use the universal list + //ship_names = list() + //destination_names = list("PLACEHOLDER!!!","DEBUG?!") + //SPACE LAW /datum/lore/organization/other/sysdef @@ -1742,19 +1760,25 @@ org_type = "system defense" ship_prefixes = list ("SDB" = "a patrol", "SDF" = "a patrol", "SDV" = "a patrol", "SDB" = "an escort", "SDF" = "an escort", "SDV" = "an escort", "SAR" = "a search and rescue", "SDT" = "a logistics", "SDT" = "a resupply", "SDJ" = "a prisoner transport") //b = boat, f = fleet (generic), v = vessel, t = tender - //ship names: weapons + //ship names: weapons, particularly medieval and renaissance melee and pre-gunpowder ranged weapons ship_names = list( "Sword", "Saber", "Cutlass", + "Scimitar", "Broadsword", "Katar", "Shamshir", + "Flyssa", + "Kaskara", + "Khopesh", + "Tachi", "Shashka", "Epee", "Estoc", "Longsword", "Katana", + "Odachi", "Baselard", "Gladius", "Kukri", @@ -1764,6 +1788,16 @@ "Machete", "Axe", "Tomahawk", + "Labrys", + "Masakari", + "Parashu", + "Sagaris", + "Francisca", + "Stiletto", + "Tanto", + "Pugio", + "Cinquedea", + "Katar", "Dirk", "Dagger", "Maul", @@ -1784,7 +1818,9 @@ "Glaive", "Halberd", "Scythe", - "Spear" + "Spear", + "Guisarme", + "Billhook" ) destination_names = list( "the outer system", @@ -1842,163 +1878,21 @@ org_type = "smuggler" ship_prefixes = list ("suspected smuggler" = "an illegal smuggling", "possible smuggler" = "an illegal smuggling") //as assigned by control, second part shouldn't even come up - //blank out our shipnames for redesignation - ship_names = list( - "Morally Bankrupt", - "Bucket of Bolts", - "Wallet Inspector", - "Laughing Stock", - "Wayward Son", - "Wide Load", - "No Refunds", - "Ugly Stick", - "Poetic Justice", - "Foreign Object", - "Why Me", - "Last Straw", - "Designated Driver", - "Slapped Together", - "Lowest Bidder", - "Harsh Language", - "Public Servant", - "Class Act", - "Deviant Citizen", - "Diminishing Returns", - "Calculated Risk", - "Logistical Nightmare", - "Gross Negligence", - "Holier Than Thou", - "Open Wide", - "Red Dread", - "Missing Link", - "Duct Taped", - "Robber Baron", - "Affront to Nature", - "Total Loss", - "Depth Perception", - "This Way", - "Mysterious Rash", - "Jolly Roger", - "Victim of Circumstance", - "Product of Society", - "Under Evaluation", - "Flying Coffin", - "Gilded Cage", - "Disgruntled Worker", - "Of Sound Mind", - "Ivory Tower", - "Bastard Son", - "Scarlet Tentacle", - "Down In Front", - "Learning Experience", - "Desperate Pauper", - "Born Lucky", - "Base Instincts", - "Check Please", - "Infinite Loop", - "Lazy Morning", - "Runtime Error", - "Pointless Platitude", - "Grey Matter", - "Conscientious Objector", - "Unexplained Itch", - "Out of Control", - "Unexpected Obstacle", - "Toxic Behavior", - "Controlled Explosion", - "Happy Camper", - "Unfortunate Ending", - "Criminally Insane", - "Not Guilty", - "Double Jeopardy", - "Perfect Pitch", - "Dark Forecast", - "Apologies in Advance", - "Reduced To This", - "Surprise Encounter", - "Meat Locker", - "Cardiac Arrest", - "Piece of Junk", - "Bottom Line", - "With Abandon", - "Unsound Methods", - "Beast of Burden", - "Red Claw", - "No Laughing Matter", - "Nothing Personal", - "Great Experiment", - "Looks Like Trouble", - "Turning Point", - "Murderous Intent", - "If Looks Could Kill", - "Liquid Courage", - "Attention Seeker", - "Juvenile Delinquent", - "Mystery Meat", - "Slippery Slope", - "Empty Gesture", - "Annoying Pest", - "Killing Implement", - "Blunt Object", - "Blockade Runner", - "Innocent Bystander", - "Lacking Purpose", - "Beyond Salvation", - "This Too Shall Pass", - "Guilty Pleasure", - "Exploratory Surgery", - "Inelegant Solution", - "Under New Ownership", - "Festering Wound", - "Red Smile", - "Mysterious Stranger", - "Process of Elimination", - "Prone to Hysteria", - "Star Beggar", - "Dream Shatterer", - "Do The Math", - "Big Boy", - "Teacher's Pet", - "Hell's Bells", - "Critical Mass", - "Star Wench", - "Double Standard", - "Blind Fury", - "Carrion Eater", - "Pound of Flesh", - "Short Fuse", - "Road Agent", - "Deceiving Looks", - "An Arrow in Flight", - "Gun-to-Head", - "Petty Theft", - "Grand Larceny", - "Pop Up", - "A Promise Kept", - "Frag Machine", - "Unrepentant Camper", - "Impersonal Space", - "Fallen Pillar", - "Motion Tabled", - "Outrageous Fortune", - "Pyrrhic and Proud", - "Wiggling Bait", - "Shoot for Loot", - "Tone Deaf Siren", - "The Worst Thing", - "Violence-Liker", - "Illegal Repercussions", - "Shameless Plagiarist", - "Dove & Crow", - "Barnacle Jim", - "Charles in Charge", - "Strange Aeons", - "Red Queen" + + ship_names = list() + +/datum/lore/organization/other/smugglers/New() + ..() + var/i = 20 //give us twenty random names + var/list/first_word = list( + "Smuggler","Safety","Scanner","Season","Secret","Section","Seeker","Server","Seller","Sequence","Shadow","Solar","Software","Smoker","Southwest","Spectrum","Spirit","Sponsor","Stainless","Stable","Study","Subject","Student","Surface","Symbol","Supreme","Surprise","Syntax","Sterling","Statement" ) - /* - destination_names = list( + var/list/nato_phonetic = list( + "Alfa","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","Xray","Yankee","Zulu" ) - */ + while(i) + ship_names.Add("[pick(first_word)] [rand(1,99)]-[pick(nato_phonetic)]") + i-- /datum/lore/organization/other/pirates name = "Pirates" @@ -2006,7 +1900,7 @@ acronym = "IPG" desc = "Where there's prey, predators are sure to follow. In space, the prey are civilian merchants, and the predators are opportunistic pirates. This is about where the analogy breaks down, but the basic concept remains the same; civilian ships are usually full of valuable goods or important people, which can be sold on black markets or ransomed back for a healthy sum. Pirates seek to seize the assets of others to get rich, rather than make an honest thaler themselves.\

\ - In contrast to the colorful Ue-Katish and sneaky Vox, common pirates tend to be rough, practical, and brutally efficient in their work. System Defense units practice rapid response drills, and in most systems it's only a matter of minutes before The Law arrives unless the pirate is able to isolate their target and prevent them from sending a distress signal.\ + Common pirates tend to be rough, practical, and brutally efficient in their work. System Defense units practice rapid response drills, and in most systems it's only a matter of minutes before The Law arrives unless the pirate is able to isolate their target and prevent them from sending a distress signal.\

\ Complicating matters is the infrequent use of privateers by various minor colonial governments, mercenaries turning to piracy during hard times, and illegal salvage operations." history = "" @@ -2019,163 +1913,24 @@ org_type = "pirate" ship_prefixes = list ("known pirate" = "a piracy", "suspected pirate" = "a piracy", "rogue privateer" = "a piracy", "Cartel enforcer" = "a piracy", "known outlaw" = "a piracy", "bandit" = "a piracy", "roving corsair" = "a piracy", "illegal salvager" = "an illegal salvage", "rogue mercenary" = "a mercenary") //as assigned by control, second part shouldn't even come up, but it exists to avoid hiccups/weirdness just in case - ship_names = list( - "Morally Bankrupt", - "Bucket of Bolts", - "Wallet Inspector", - "Laughing Stock", - "Wayward Son", - "Wide Load", - "No Refunds", - "Ugly Stick", - "Poetic Justice", - "Foreign Object", - "Why Me", - "Last Straw", - "Designated Driver", - "Slapped Together", - "Lowest Bidder", - "Harsh Language", - "Public Servant", - "Class Act", - "Deviant Citizen", - "Diminishing Returns", - "Calculated Risk", - "Logistical Nightmare", - "Gross Negligence", - "Holier Than Thou", - "Open Wide", - "Red Dread", - "Missing Link", - "Duct Taped", - "Robber Baron", - "Affront to Nature", - "Total Loss", - "Depth Perception", - "This Way", - "Mysterious Rash", - "Jolly Roger", - "Victim of Circumstance", - "Product of Society", - "Under Evaluation", - "Flying Coffin", - "Gilded Cage", - "Disgruntled Worker", - "Of Sound Mind", - "Ivory Tower", - "Bastard Son", - "Scarlet Tentacle", - "Down In Front", - "Learning Experience", - "Desperate Pauper", - "Born Lucky", - "Base Instincts", - "Check Please", - "Infinite Loop", - "Lazy Morning", - "Runtime Error", - "Pointless Platitude", - "Grey Matter", - "Conscientious Objector", - "Unexplained Itch", - "Out of Control", - "Unexpected Obstacle", - "Toxic Behavior", - "Controlled Explosion", - "Happy Camper", - "Unfortunate Ending", - "Criminally Insane", - "Not Guilty", - "Double Jeopardy", - "Perfect Pitch", - "Dark Forecast", - "Apologies in Advance", - "Reduced To This", - "Surprise Encounter", - "Meat Locker", - "Cardiac Arrest", - "Piece of Junk", - "Bottom Line", - "With Abandon", - "Unsound Methods", - "Beast of Burden", - "Red Claw", - "No Laughing Matter", - "Nothing Personal", - "Great Experiment", - "Looks Like Trouble", - "Turning Point", - "Murderous Intent", - "If Looks Could Kill", - "Liquid Courage", - "Attention Seeker", - "Juvenile Delinquent", - "Mystery Meat", - "Slippery Slope", - "Empty Gesture", - "Annoying Pest", - "Killing Implement", - "Blunt Object", - "Blockade Runner", - "Innocent Bystander", - "Lacking Purpose", - "Beyond Salvation", - "This Too Shall Pass", - "Guilty Pleasure", - "Exploratory Surgery", - "Inelegant Solution", - "Under New Ownership", - "Festering Wound", - "Red Smile", - "Mysterious Stranger", - "Process of Elimination", - "Prone to Hysteria", - "Star Beggar", - "Dream Shatterer", - "Do The Math", - "Big Boy", - "Teacher's Pet", - "Hell's Bells", - "Critical Mass", - "Star Wench", - "Double Standard", - "Blind Fury", - "Carrion Eater", - "Pound of Flesh", - "Short Fuse", - "Road Agent", - "Deceiving Looks", - "An Arrow in Flight", - "Gun-to-Head", - "Petty Theft", - "Grand Larceny", - "Pop Up", - "A Promise Kept", - "Frag Machine", - "Unrepentant Camper", - "Impersonal Space", - "Fallen Pillar", - "Motion Tabled", - "Outrageous Fortune", - "Pyrrhic and Proud", - "Wiggling Bait", - "Shoot for Loot", - "Tone Deaf Siren", - "The Worst Thing", - "Violence-Liker", - "Illegal Repercussions", - "Shameless Plagiarist", - "Dove & Crow", - "Barnacle Jim", - "Charles in Charge", - "Strange Aeons", - "Red Queen" - ) - /* - destination_names = list( - ) - */ + ship_names = list() + +/datum/lore/organization/other/pirates/New() + ..() + var/i = 20 //give us twenty random names + var/list/first_word = list( + "Bandit","Backup","Baker","Balance","Bandwidth","Banker","Banner","Bargain","Baseball","Basket","Bathroom","Berlin","Beyond","Bidder","Bishop","Bookmark","Border","Boston","Bracelet","Brazil","Breakfast","Brian","Broadband","Brochure","Broken","Broker","Brother","Buddy","Budget","Bureau","Business" + ) + var/list/nato_phonetic = list( + "Alfa","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","Xray","Yankee","Zulu" + ) + while(i) + ship_names.Add("[pick(first_word)] [rand(1,99)]-[pick(nato_phonetic)]") + i-- + +/* +//Commenting out the Ue-Katish and Vox Marauders for now, to dial down the implications of rampant piracy /datum/lore/organization/other/uekatish name = "Ue-Katish Pirates" short_name = "" @@ -2293,7 +2048,7 @@ while(i) ship_names.Add("[pick(letters)]-[pick(numbers)]") i-- - +*/ ////////////////////////////////////////////////////////////////////////////////// // Governments @@ -3122,4 +2877,4 @@ i-- //ex: "Phalanx One-Niner", "Sledgehammer Actual" (CO/VIP), "Kodiak Seven-Four", "Tomahawk Two-Zero" - //probably a more elegant (read: fancier) way to do the second part but fuck it, this works just fine + //probably a more elegant (read: fancier) way to do the second part but fuck it, this works just fine \ No newline at end of file diff --git a/code/modules/catalogue/catalogue_data_vr.dm b/code/modules/catalogue/catalogue_data_vr.dm index 350ffe088b2..f4df261b260 100644 --- a/code/modules/catalogue/catalogue_data_vr.dm +++ b/code/modules/catalogue/catalogue_data_vr.dm @@ -132,7 +132,3 @@ in the dormant brain via direct electro-uploading. However, this technology is not perfect and small, but \ non-zero error margins exist. Handle with care! Or don't. Stress testing this stuff makes a lucrative market." value = CATALOGUER_REWARD_TRIVIAL - -/datum/category_item/catalogue/information/organization/khi - name = "Independents - Kitsuhana Heavy Industries" - datum_to_copy = /datum/lore/organization/other/kitsuhana diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm index c703c0787ff..f3e14d2733e 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm @@ -1,10 +1,9 @@ // The Gun // /obj/item/gun/projectile/cell_loaded //this one can load both medical and security cells! for ERT/admin use. name = "multipurpose cell-loaded revolver" - desc = "Variety is the spice of life! This weapon is a hybrid of the KHI-102b 'Nanotech Selectable-Fire Weapon' and the Vey-Med ML-3 'Medigun', dubbed the 'NSFW-ML3M'. \ + desc = "Variety is the spice of life! This weapon is a hybrid of the Hephaestus 102b 'Nanotech Selectable-Fire Weapon' and the Vey-Med ML-3 'Medigun', dubbed the 'NSFW-ML3M'. \ It can fire both harmful and healing cells with an internal nanite fabricator and energy weapon cell loader. Up to three combinations of \ energy beams can be configured at once. Ammo not included." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) icon = 'icons/vore/custom_guns_vr.dmi' icon_state = "nsfw" @@ -209,7 +208,6 @@ /obj/item/ammo_casing/microbattery name = "\'NSFW\' microbattery - UNKNOWN" desc = "A miniature battery for an energy weapon." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) icon = 'icons/obj/ammo_vr.dmi' icon_state = "nsfw_batt" slot_flags = SLOT_BELT | SLOT_EARS diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm index c1c86a3d1fc..5258b80a514 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm @@ -1,17 +1,16 @@ // The Gun // /obj/item/gun/projectile/cell_loaded/combat name = "cell-loaded revolver" - desc = "Variety is the spice of life! The KHI-102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven \ + desc = "Variety is the spice of life! The Hephaestus 102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven \ energy weapon that allows the user to mix and match their own fire modes. Up to four combinations of \ energy beams can be configured at once. Ammo not included." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) - description_fluff = "The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding." + description_fluff = "The Hephaestus 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding." allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/combat) /obj/item/gun/projectile/cell_loaded/combat/prototype name = "prototype cell-loaded revolver" - desc = "Variety is the spice of life! A prototype based on KHI-102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven \ + desc = "Variety is the spice of life! A prototype based on Hephaestus 102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven \ energy weapon that allows the user to mix and match their own fire modes. Up to two combinations of \ energy beams can be configured at once. Ammo not included." @@ -29,7 +28,6 @@ icon_state = "nsfw_mag" max_ammo = 4 x_offset = 4 - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) description_info = "This magazine holds NSFW microbatteries to power the NSFW handgun. Up to three can be loaded at once, and each provides four shots of their respective energy type. Loading multiple of the same type will provide additional shots of that type. The batteries can be recharged in a normal recharger." ammo_type = /obj/item/ammo_casing/microbattery/combat @@ -58,7 +56,7 @@ new path(src) /obj/item/storage/secure/briefcase/nsfw_pack_hos - name = "\improper KHI-102b \'NSFW\' gun kit" + name = "\improper Hephaestus 102b \'NSFW\' gun kit" desc = "A storage case for a multi-purpose handgun. Variety hour!" w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm index 5ecdfe2ffc2..f78e077f541 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm @@ -2,7 +2,6 @@ /obj/item/ammo_casing/microbattery/combat name = "\'NSFW\' microbattery - UNKNOWN" desc = "A miniature battery for an energy weapon." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 1, TECH_MAGNET = 2) /obj/item/ammo_casing/microbattery/combat/lethal diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm index 35b697455ca..26e9d5b7f5c 100644 --- a/code/modules/resleeving/computers.dm +++ b/code/modules/resleeving/computers.dm @@ -4,8 +4,7 @@ /obj/machinery/computer/transhuman/resleeving name = "resleeving control console" - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, - /datum/category_item/catalogue/technology/resleeving) + catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) icon_keyboard = "med_key" icon_screen = "dna" light_color = "#315ab4" diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm index 72a7778e1db..cf6ce54d811 100644 --- a/code/modules/resleeving/designer.dm +++ b/code/modules/resleeving/designer.dm @@ -9,8 +9,7 @@ /obj/machinery/computer/transhuman/designer name = "body design console" - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, - /datum/category_item/catalogue/technology/resleeving) + catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/computer.dmi' icon_keyboard = "med_key" icon_screen = "explosive" diff --git a/code/modules/resleeving/implant.dm b/code/modules/resleeving/implant.dm index 7e8e07f045a..e2489dd5e97 100644 --- a/code/modules/resleeving/implant.dm +++ b/code/modules/resleeving/implant.dm @@ -7,8 +7,7 @@ /obj/item/implant/backup name = "backup implant" desc = "A mindstate backup implant that occasionally stores a copy of one's mind on a central server for backup purposes." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, - /datum/category_item/catalogue/technology/resleeving) + catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) icon = 'icons/vore/custom_items_vr.dmi' icon_state = "backup_implant" known_implant = TRUE @@ -54,8 +53,7 @@ /obj/item/backup_implanter name = "backup implanter" desc = "After discovering that Nanotrasen was just re-using the same implanters over and over again on organics, leading to cross-contamination, Kitsuhana Heavy industries designed this self-cleaning model. Holds four backup implants at a time." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, - /datum/category_item/catalogue/technology/resleeving) + catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/device_alt.dmi' icon_state = "bimplant" item_state = "syringe_0" diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index f59494250dd..c2fa3e605da 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -6,8 +6,7 @@ /////// Grower Pod /////// /obj/machinery/clonepod/transhuman name = "grower pod" - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, - /datum/category_item/catalogue/technology/resleeving) + catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) circuit = /obj/item/circuitboard/transhuman_clonepod //A full version of the pod @@ -204,8 +203,7 @@ /obj/machinery/transhuman/synthprinter name = "SynthFab 3000" desc = "A rapid fabricator for synthetic bodies." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, - /datum/category_item/catalogue/technology/resleeving) + catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/machines/synthpod.dmi' icon_state = "pod_0" circuit = /obj/item/circuitboard/transhuman_synthprinter @@ -437,8 +435,7 @@ /obj/machinery/transhuman/resleever name = "resleeving pod" desc = "Used to combine mind and body into one unit." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, - /datum/category_item/catalogue/technology/resleeving) + catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/machines/implantchair.dmi' icon_state = "implantchair" circuit = /obj/item/circuitboard/transhuman_resleever diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm index e7b273b4ba9..217a29c88b2 100644 --- a/code/modules/resleeving/sleevecard.dm +++ b/code/modules/resleeving/sleevecard.dm @@ -1,8 +1,7 @@ /obj/item/paicard/sleevecard name = "sleevecard" desc = "This KHI-upgraded pAI module has enough capacity to run a whole mind of human-level intelligence." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, - /datum/category_item/catalogue/technology/resleeving) + catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) origin_tech = list(TECH_DATA = 2) show_messages = 0 var/emagged = FALSE diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 6a19ad9ec27..278974f5fdb 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -914,7 +914,6 @@ /obj/item/clothing/under/rank/khi name = "Delete Me" desc = "Why did you spawn this one? Dork." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) sensor_mode = 3 icon = 'icons/inventory/uniform/item_vr.dmi'