[MIRROR] Killian's Grab Bag PR (#6880)

Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>

code/game/machinery/doors/airlock.dm

@@ -8,6 +8,7 @@
 
 /obj/machinery/door/airlock
 	name = "Airlock"
+	description_info = "If you hold left alt whilst left-clicking on an airlock, you can ring the doorbell to announce your presence to anyone on the other side! Alternately if you are on HARM intent when doing this, you will bang loudly on the door!<br><br>AIs and Cyborgs can also quickly open/close, bolt/unbolt, and electrify/de-electrify doors at a distance by holding left shift, left control, or left alt respectively whilst left-clicking."
 	icon = 'icons/obj/doors/Doorint.dmi'
 	icon_state = "door_closed"
 	power_channel = ENVIRON

code/game/objects/structures/simple_doors.dm

@@ -1,5 +1,6 @@
 /obj/structure/simple_door
 	name = "door"
+	description_info = "If you hold left alt whilst left-clicking on a door, you can knock on it to announce your presence to anyone on the other side! Alternately if you are on HARM intent when doing this, you will bang loudly on the door!"
 	density = TRUE
 	anchored = TRUE
 	can_atmos_pass = ATMOS_PASS_DENSITY

code/modules/busy_space_vr/air_traffic.dm

@@ -1,6 +1,10 @@
 //Cactus, Speedbird, Dynasty, oh my
 //Also, massive additions/refactors by Killian, because the original incarnation was full of holes
 
+//minimum and maximum message delays, typically tracked in seconds
+#define MIN_MSG_DELAY 3
+#define MAX_MSG_DELAY 6
+
 var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 
 /datum/lore/atc_controller
@@ -60,7 +64,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 
 /datum/lore/atc_controller/proc/shift_ending(var/evac = 0)
 	msg("[using_map.shuttle_name], this is [using_map.dock_name] Control, you are cleared to complete routine transfer from [using_map.station_name] to [using_map.dock_name].")
-	sleep(rand(3,6) SECONDS)
+	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()
@@ -113,11 +117,11 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 	else if((org_type == "government" || org_type == "neutral" || org_type == "military" || org_type == "corporate" || org_type == "system defense" || org_type == "spacer") && org_type2 == "pirate") //this is ugly but when I tried to do it with !='s it fired for pirate-v-pirate, still not sure why. might as well stick it up here so it takes priority over other combos.
 		chatter_type = "distress"
 	else if(org_type == "corporate") //corporate-specific subset for the slogan event. despite the relatively high weight it was still quite rare in tests.
-		chatter_type = pick(5;"emerg",25;"policescan",25;"traveladvisory",30;"pathwarning",180;"dockingrequestgeneric",30;"undockingrequest","normal",30;"undockingdenied",50;"slogan",25;"civvieleaks")
+		chatter_type = pick(5;"emerg",25;"policescan",25;"traveladvisory",30;"pathwarning",180;"dockingrequestgeneric",30;"undockingrequest","normal",30;"undockingdenied",50;"slogan",25;"civvieleaks",25;"report_to_dock")
 	else if((org_type == "government" || org_type == "neutral" || org_type == "military"))
-		chatter_type = pick(5;"emerg",25;"policescan",25;"traveladvisory",30;"pathwarning",180;"dockingrequestgeneric",30;"undockingrequest","normal",30;"undockingdenied",25;"civvieleaks")
+		chatter_type = pick(5;"emerg",25;"policescan",25;"traveladvisory",30;"pathwarning",180;"dockingrequestgeneric",30;"undockingrequest","normal",30;"undockingdenied",25;"civvieleaks",25;"report_to_dock")
 	else if(org_type == "spacer")
-		chatter_type = pick(5;"emerg",15;"policescan",15;"traveladvisory",5;"pathwarning",150;"dockingrequestgeneric",30;"undockingrequest","normal",10;"undockingdenied",25;"civvieleaks")
+		chatter_type = pick(5;"emerg",15;"policescan",15;"traveladvisory",5;"pathwarning",150;"dockingrequestgeneric",30;"undockingrequest","normal",10;"undockingdenied",25;"civvieleaks",25;"report_to_dock")
 
 	//the following filters *always* fire their 'unique' event when they're tripped, simply because the conditions behind them are quite rare to begin with
 	else if(org_type == "smuggler" && org_type2 != "system defense") //just straight up funnel smugglers into always being caught, otherwise we get them asking for traffic info and stuff
@@ -154,19 +158,23 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 	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")
 	//fallbacks in case someone sets the dock_type on the map datum to null- it defaults to "station" normally
 	var/landing_zone = "LZ [zone]"
+	var/landing_type = "landing zone"
 	var/landing_move = "landing request"
 	var/landing_short = "land"
 	switch(using_map.dock_type)
 		if("surface")		//formal installations with proper facilities
 			landing_zone = "landing pad [number]"
+			landing_type = "landing pad"
 			landing_move = "landing request"
 			landing_short = "land"
 		if("frontier")		//for frontier bases - landing spots are literally just open ground, maybe concrete at best
 			landing_zone = "LZ [zone]"
+			landing_type = "landing zone"
 			landing_move = "landing request"
 			landing_short = "land"
 		if("station")		//standard station pattern
 			landing_zone = "docking bay [number]"
+			landing_type = "docking bay"
 			landing_move = "docking request"
 			landing_short = "dock"
 
@@ -175,78 +183,78 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 	switch(chatter_type)
 		//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 RCS are malfunctioning and we're losing stability","Our life support [pick("is failing","has failed")]")
+			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]")
-			sleep(rand(3,6) SECONDS)
+			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].")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("Understood [using_map.dock_name] Control, 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?")
+			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.")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[confirm] [using_map.dock_name] Control, holding position.","[prefix] [shipname]")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("Your compliance is appreciated, [combined_first_name]. Scan commencing.")
-			sleep(rand(3,6)*2 SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*2 SECONDS)
 			msg(complain,"[prefix] [shipname]")
-			sleep(rand(3,6)*3 SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*3 SECONDS)
 			msg("[combined_first_name], this is [using_map.dock_name] Control. 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!")
+			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.")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[uhoh]","[shipname]")
-			sleep(rand(3,6) SECONDS)
+			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")
 		//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?")
+			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]")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[confirm] [combined_first_name], holding position.","[secondprefix] [secondshipname]")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("Your compliance is appreciated, [combined_second_name]. Scan commencing.","[prefix] [shipname]")
-			sleep(rand(3,6)*2 SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*2 SECONDS)
 			msg(complain,"[secondprefix] [secondshipname]")
-			sleep(rand(3,6)*3 SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*3 SECONDS)
 			msg("[combined_second_name], this is [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!")
+			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]")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[uhoh]","[shipname]")
-			sleep(rand(3,6) SECONDS)
+			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]")
-			sleep(rand(3,6) SECONDS)
+			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]")
-			sleep(rand(3,6) SECONDS)
+			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]")
-			sleep(rand(3,6) SECONDS)
+			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]")
-			sleep(rand(3,6) SECONDS)
+			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.")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[appreciation], [using_map.dock_name] Control. [dockingplan]","[prefix] [shipname]")
 		//SDF event: general chatter
 		if("sdfchatter")
@@ -254,21 +262,23 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 			switch(chain)
 				if("codecheck")
 					msg("Check. Check. |Check|. Uhhh... check? Wait. Wait! Hold on. Yeah, okay, I gotta call this one in.","[prefix] [shipname]")
-					sleep(rand(3,6) SECONDS)
+					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]")
-					sleep(rand(3,6) SECONDS)
+					sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
-					msg("One moment... yeah, that code checks out [combined_first_name].")
+					msg("One moment...")
-					sleep(rand(3,6) SECONDS)
+					sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*2 SECONDS)
+					msg("Yeah, that code checks out [combined_first_name].")
+					sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 					msg("|(sigh)| Copy that Control. You! Move along!","[prefix] [shipname]")
 				if("commscheck")
 					msg("Control this is [combined_first_name], we're getting some interference in our area. [pick("How's our line?","Do you read?","How copy, over?")]","[prefix] [shipname]")
-					sleep(rand(3,6) SECONDS)
+					sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 					msg("Control reads you loud and clear [combined_first_name].","[using_map.starsys_name] Defense Control")
-					sleep(rand(3,6) SECONDS)
+					sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 					msg("[pick("Copy that","Thanks,","Roger that")] Control. [combined_first_name] out.","[prefix] [shipname]")
 		//Civil event: leaky chatter
 		if("civvieleaks")
-			var/commleak = pick("thatsmywife","missingkit","pipeleaks","weirdsmell","weirdsmell2")
+			var/commleak = pick("thatsmywife","missingkit","pipeleaks","weirdsmell","weirdsmell2","scug","teppi")
 			switch(commleak)
 				if("thatsmywife")
 					msg("-so then I says to him, |that's no [pick("space carp","space shark","vox","garbage scow","freight liner","cargo hauler","superlifter")], that's my +wife!+| And he-","[prefix] [shipname]")
@@ -280,15 +290,21 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 					msg("-and where the hell is that smell coming fr-","[prefix] [shipname]")
 				if("weirdsmell2")
 					msg("-hat in the [pick("three","five","seven","nine")] hells did you |eat| [pick("ensign","crewman")]? This compartment reeks of-","[prefix] [shipname]")
-			sleep(rand(3,6) SECONDS)
+				if("scug")
+					msg("-and if that weird cat of yours keeps crawling into the pipes we-","[prefix] [shipname]")
+				if("teppi")
+					msg("-at are we supposed to do with this damn cow?","[prefix] [shipname]")
+					sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
+					msg("I don't think it's a cow, sir, it looks more like a-","[prefix] [shipname]")
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[combined_first_name], your internal comms are leaking[pick("."," again.",", again.",". |Again|.")]")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("Sorry Control, won't happen again.","[prefix] [shipname]")
 		//DefCon event: hostile found
 		if("hostiledetected")
 			var/orders = pick("Engage on sight","Engage with caution","Engage with extreme prejudice","Engage at will","Search and destroy","Bring them in alive, if possible","Interdict and detain","Keep your eyes peeled","Bring them in, dead or alive","Stay alert")
 			msg("This is [using_map.starsys_name] Defense Control to all SDF assets. Priority update follows.","[using_map.starsys_name] Defense Control")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("Be on the lookout for [combined_first_name], last sighted [pick("near route","in sector","near sector")] [rand(1,100)]. [orders]. DefCon, out.","[using_map.starsys_name] Defense Control")
 		//Ship event: distress call, under attack
 		if("distress")
@@ -296,25 +312,25 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 			switch(state)
 				if("calm")
 					msg("[using_map.starsys_name] Defense Control, this is [combined_first_name].","[prefix] [shipname]")
-					sleep(rand(3,6) SECONDS)
+					sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 					msg("We read you. Go ahead, [combined_first_name].","[using_map.starsys_name] Defense Control")
-					sleep(rand(3,6) SECONDS)
+					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(3,6) SECONDS)
+					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")
-					sleep(rand(3,6) SECONDS)
+					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]")
-					sleep(rand(3,6) SECONDS)
+					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].")
-					sleep(rand(3,6) SECONDS)
+					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 a [pick("fuel tanker","cargo liner","passenger liner","freighter","transport ship","mining barge","salvage trawler")] 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")
+			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.")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[flightwarning]. Control out.")
 		//Control event: warning to a specific vessel
 		if("pathwarning")
@@ -322,28 +338,36 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 			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.")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[confirm] [using_map.dock_name] Control, adjusting course.","[prefix] [shipname]")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("Your compliance is appreciated, [combined_first_name]. [safetravels].")
+		//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.")
+			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)
 		if("dockingrequestgeneric")
-			var/request_type = pick(100;"generic",40;"delayed",40;"supply",20;"repair",20;"medical",20;"security")
+			var/request_type = pick(100;"generic",50;"delayed",80;"supply",30;"repair",30;"medical",30;"security")
 			var/appreciation = pick("Much appreciated","Many thanks","Understood","Perfect, thank you","Excellent, thanks","Great","Copy that")
 			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]")
-					sleep(rand(3,6) SECONDS)
+					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.")
 				if("delayed")
-					var/reason = pick("we don't have any free landing pads right now, please hold for a few minutes","you're too far away, please close to ten thousand meters","we're seeing heavy traffic around the landing pads right now, please hold for a few minutes","we're currently cleaning up a fuel spill on one of our free pads, please hold for a few minutes","there are loose containers on our free pads, stand by for a couple of minutes whilst we secure them","another vessel has aerospace priority right now, please hold for a few minutes")
+					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]")
-					sleep(rand(3,6) SECONDS)
+					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.")
-					sleep(rand(3,6) SECONDS)
+					sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 					msg("Understood, [using_map.dock_name] Control.","[prefix] [shipname]")
-					sleep(rand(3,6)*60 SECONDS)
+					sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY)*60 SECONDS)
 					msg("[callname], this is [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.")
@@ -353,29 +377,29 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 					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]")
-					sleep(rand(3,6) SECONDS)
+					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.")
 				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 minor [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","RCS","auto-repair system","artificial gravity generator","environmental control system")] is [pick("failing","acting up","on the fritz","shorting out","glitching out","freaking out","malfunctioning")]")
+					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]")
-					sleep(rand(3,6) SECONDS)
+					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].")
 				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]")
-					sleep(rand(3,6) SECONDS)
+					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].")
 				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",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","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
 					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]")
-					sleep(rand(3,6) SECONDS)
+					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].")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[appreciation], [using_map.dock_name] Control. [dockingplan]","[prefix] [shipname]")
 		//Ship event: undocking request
 		if("undockingrequest")
@@ -384,20 +408,18 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 			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]")
-			sleep(rand(3,6) SECONDS)
+			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].")
-					sleep(rand(3,6) SECONDS)
-					msg("[thanks], [using_map.dock_name] Control. This is [combined_first_name] setting course for [destname], out.","[prefix] [shipname]")
 				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(3,6)*60 SECONDS)
+					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]")
-					sleep(rand(3,6) SECONDS)
+					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].")
-			sleep(rand(3,6) SECONDS)
+			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]")
 		//SDF event: starting patrol
 		if("sdfbeginpatrol")
@@ -405,16 +427,16 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 			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]")
-			sleep(rand(3,6) SECONDS)
+			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].")
-			sleep(rand(3,6) SECONDS)
+			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]")
 		//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]")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("Negative [combined_first_name], request denied. [denialreason].")
 		if("slogan")
 			msg("The following is a sponsored message from [name].","Facility PA")
@@ -422,19 +444,19 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 			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]")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[combined_first_name], this is [using_map.dock_name] Control, [response].")
-			sleep(rand(3,6) SECONDS)
+			sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 			msg("[using_map.dock_name] Control, [yes ? "thank you" : "understood"], out.","[prefix] [shipname]")
 	return //oops, forgot to restore this
 
 /*	//OLD BLOCK, for reference
 	//Ship sends request to ATC
 	msg(full_request,"[prefix] [shipname]"
-	sleep(rand(3,6) SECONDS)
+	sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 	//ATC sends response to ship
 	msg(full_response)
-	sleep(rand(3,6) SECONDS)
+	sleep(rand(MIN_MSG_DELAY,MAX_MSG_DELAY) SECONDS)
 	//Ship sends response to ATC
 	msg(full_closure,"[prefix] [shipname]")
 	return

code/modules/busy_space_vr/organizations.dm

@@ -2224,7 +2224,7 @@
 			"Blade"
 			)
 	while(i)
-		ship_names.Add("[pick(first_names)] [pick(words)]")
+		ship_names.Add("[pick(first_names)]'s [pick(words)]")
 		i--
 
 /datum/lore/organization/other/marauders

code/modules/projectiles/guns/energy.dm

@@ -27,6 +27,7 @@
 	var/shot_counter = TRUE // does this gun tell you how many shots it has?
 
 	var/battery_lock = 0	//If set, weapon cannot switch batteries
+	var/random_start_ammo = FALSE	//if TRUE, the weapon will spawn with randomly-determined ammo
 
 /obj/item/weapon/gun/energy/New()
 	..()
@@ -41,7 +42,9 @@
 			power_supply = new cell_type(src)
 		else
 			power_supply = null
-
+	//random starting power! gives us a random number of shots in the battery between 0 and the max possible
+	if(random_start_ammo && cell_type)
+		power_supply.charge = charge_cost*rand(0,power_supply.maxcharge/charge_cost)
 	update_icon()
 
 /obj/item/weapon/gun/energy/Destroy()

code/modules/projectiles/guns/projectile.dm

@@ -35,15 +35,23 @@
 	//var/list/icon_keys = list()		//keys
 	//var/list/ammo_states = list()	//values
 
+	var/random_start_ammo = FALSE	//randomize amount of starting ammo
+
 /obj/item/weapon/gun/projectile/New(loc, var/starts_loaded = 1)
 	..()
 	if(starts_loaded)
 		if(ispath(ammo_type) && (load_method & (SINGLE_CASING|SPEEDLOADER)))
 			for(var/i in 1 to max_shells)
 				loaded += new ammo_type(src)
+				if(random_start_ammo)
+					loaded.Cut(0,rand(0,max_shells))
 		if(ispath(magazine_type) && (load_method & MAGAZINE))
 			ammo_magazine = new magazine_type(src)
 			allowed_magazines += /obj/item/ammo_magazine/smart
+			if(random_start_ammo)
+				var/ammo_cut = rand(0,ammo_magazine.max_ammo)
+				ammo_magazine.contents.Cut(0,ammo_cut)
+				ammo_magazine.stored_ammo.Cut(0,ammo_cut)
 	update_icon()
 
 /obj/item/weapon/gun/projectile/consume_next_projectile()

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -241,3 +241,4 @@
 	load_method = SINGLE_CASING
 	max_shells = 5
 	ammo_type = /obj/item/ammo_casing/a12g/beanbag
+

maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm

@@ -200,7 +200,9 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber,
-/obj/item/weapon/gun/energy/gun/compact,
+/obj/item/weapon/gun/energy/gun/compact{
+	random_start_ammo = 1
+	},
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 0;
 	oxygen = 0
@@ -475,7 +477,9 @@
 	icon_state = "1-2"
 	},
 /obj/effect/landmark/corpse/vintage/marine,
-/obj/item/weapon/gun/energy/laser/old,
+/obj/item/weapon/gun/energy/laser/old{
+	random_start_ammo = 1
+	},
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 0;
 	oxygen = 0
@@ -565,7 +569,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/decal/cleanable/blood,
-/obj/item/weapon/gun/energy/laser/old,
+/obj/item/weapon/gun/energy/laser/old{
+	random_start_ammo = 1
+	},
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 0;
 	oxygen = 0
@@ -666,7 +672,9 @@
 	pixel_y = 21
 	},
 /obj/effect/map_helper/airlock/sensor/chamber_sensor,
-/obj/item/weapon/gun/energy/gun/compact,
+/obj/item/weapon/gun/energy/gun/compact{
+	random_start_ammo = 1
+	},
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 0;
 	oxygen = 0
@@ -755,8 +763,10 @@
 	dir = 1;
 	pixel_y = -28
 	},
-/obj/item/weapon/gun/energy/laser/old,
 /obj/item/weapon/material/shard/shrapnel,
+/obj/item/weapon/gun/energy/laser/old{
+	random_start_ammo = 1
+	},
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 0;
 	oxygen = 0
@@ -969,7 +979,9 @@
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/structure/closet/walllocker/emerglocker/south,
-/obj/item/weapon/gun/energy/laser/old,
+/obj/item/weapon/gun/energy/laser/old{
+	random_start_ammo = 1
+	},
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 0;
 	oxygen = 0

vorestation.dme

@@ -479,7 +479,6 @@
 #include "code\datums\repositories\repository.dm"
 #include "code\datums\repositories\unique.dm"
 #include "code\datums\roundstats\_defines_local.dm"
-#include "code\datums\roundstats\departmentgoal.dm"
 #include "code\datums\roundstats\roundstats.dm"
 #include "code\datums\supplypacks\atmospherics.dm"
 #include "code\datums\supplypacks\contraband_vr.dm"