Merge branch 'master' into vanguardprae

.github/CODEOWNERS

@@ -24,9 +24,8 @@
 /tools/docker/ @Fira
 /Dockerfile @Fira
 
-# MorrowWolf
+# Zonespace
 
-/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @morrowwolf
-/code/modules/gear_presets/survivors.dm @morrowwolf
+/code/modules/gear_presets/survivors.dm @zonespace27
 
 # MULTIPLE OWNERS

code/__DEFINES/traits.dm

@@ -221,6 +221,9 @@
 /// Can lockout blackmarket from ASRS console circuits.
 #define TRAIT_TOOL_TRADEBAND "t_tool_tradeband"
 
+/// Can hack ASRS consoles to access the black market
+#define TRAIT_TOOL_BLACKMARKET_HACKER "t_tool_blackmarket_hacker"
+
 // CLOTHING TRAITS
 #define TRAIT_CLOTHING_HOOD "t_clothing_hood"
 

code/_onclick/hud/human.dm

@@ -116,6 +116,10 @@
 		return
 	var/mob/living/carbon/human/H = mymob
 	var/mob/screenmob = viewer || H
+
+	if(!screenmob?.client)
+		return
+
 	if(!gear.len)
 		inventory_shown = FALSE
 		return //species without inv slots don't show items.
@@ -181,6 +185,9 @@
 	var/mob/living/carbon/human/H = mymob
 	var/mob/screenmob = viewer || H
 
+	if(!screenmob?.client)
+		return
+
 	if(H.hud_used)
 		if(H.hud_used.hud_shown)
 			if(H.s_store)

code/datums/supply_packs/black_market.dm

@@ -127,70 +127,42 @@ Non-USCM items, from CLF, UPP, colonies, etc. Mostly combat-related.
 	spawn_guns() //the crate gives 2 guns
 
 /obj/structure/largecrate/black_market/confiscated_weaponry/proc/spawn_guns()
-	switch(rand(1,6))
+	switch(rand(1, 5))
 		if(1) //pmc
-			if(prob(50))
-				new /obj/item/weapon/gun/rifle/nsg23/no_lock(src)
-				new /obj/item/ammo_magazine/rifle/nsg23(src)
-				new /obj/item/ammo_magazine/rifle/nsg23(src)
-				new /obj/item/ammo_magazine/rifle/nsg23/ap(src)
-				new /obj/item/ammo_magazine/rifle/nsg23/extended(src)
-			else
-				new /obj/item/weapon/gun/smg/fp9000(src)
-				new /obj/item/ammo_magazine/smg/fp9000(src)
-				new /obj/item/ammo_magazine/smg/fp9000(src)
-				new /obj/item/ammo_magazine/smg/fp9000(src)
-				new /obj/item/ammo_magazine/smg/fp9000(src)
+			new /obj/item/weapon/gun/smg/fp9000(src)
+			new /obj/item/ammo_magazine/smg/fp9000(src)
+			new /obj/item/ammo_magazine/smg/fp9000(src)
+			new /obj/item/ammo_magazine/smg/fp9000(src)
+			new /obj/item/ammo_magazine/smg/fp9000(src)
 		if(2) //pizza
 			new /obj/item/weapon/gun/pistol/holdout(src)
 			new /obj/item/ammo_magazine/pistol/holdout(src)
 		if(3) //clf
-			switch(rand(1, 3))
+			switch(rand(1, 2))
 				if(1)
-					new /obj/item/weapon/twohanded/lungemine/damaged(src)
-				if(2)
 					new /obj/item/weapon/gun/smg/uzi(src)
 					new /obj/item/ammo_magazine/smg/uzi/extended(src)
 					new /obj/item/ammo_magazine/smg/uzi(src)
 					new /obj/item/ammo_magazine/smg/uzi(src)
-				if(3)
+				if(2)
 					new /obj/item/weapon/gun/smg/mac15(src)
 					new /obj/item/ammo_magazine/smg/mac15/extended(src)
 					new /obj/item/ammo_magazine/smg/mac15(src)
 					new /obj/item/ammo_magazine/smg/mac15(src)
 		if(4) //upp
-			if(prob(50))
-				new /obj/item/weapon/gun/rifle/type71(src)
-				new /obj/item/ammo_magazine/rifle/type71/ap(src)
-				new /obj/item/ammo_magazine/rifle/type71(src)
-				new /obj/item/ammo_magazine/rifle/type71(src)
-			else
-				new /obj/item/weapon/gun/shotgun/type23/riot_control(src)
-				new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag(src)
-				new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag(src)
-				new /obj/item/ammo_magazine/handful/shotgun/heavy/flechette(src)
-				new /obj/item/ammo_magazine/handful/shotgun/heavy/flechette(src)
-				new /obj/item/ammo_magazine/handful/shotgun/heavy/slug(src)
-				new /obj/item/ammo_magazine/handful/shotgun/heavy/slug(src) //NO buckshot!
+			new /obj/item/weapon/gun/shotgun/type23/riot_control(src)
+			new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag(src)
+			new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag(src)
+			new /obj/item/ammo_magazine/handful/shotgun/heavy/flechette(src)
+			new /obj/item/ammo_magazine/handful/shotgun/heavy/flechette(src)
+			new /obj/item/ammo_magazine/handful/shotgun/heavy/slug(src)
+			new /obj/item/ammo_magazine/handful/shotgun/heavy/slug(src) //NO buckshot!
 		if(5) //freelancer
-			if(prob(80))
-				new /obj/item/weapon/gun/rifle/mar40(src)
-				new /obj/item/ammo_magazine/rifle/mar40/extended(src)
-				new /obj/item/ammo_magazine/rifle/mar40(src)
-				new /obj/item/ammo_magazine/rifle/mar40(src)
-			else
-				new /obj/item/weapon/gun/rifle/mar40/lmg(src)
-				new /obj/item/ammo_magazine/rifle/mar40/lmg(src)
-		if(6) //VAIPO
-			if(prob(50))
-				new /obj/item/weapon/gun/rifle/mar40/tactical(src)
-				new /obj/item/ammo_magazine/rifle/mar40/extended(src)
-				new /obj/item/ammo_magazine/rifle/mar40/extended(src)
-				new /obj/item/ammo_magazine/rifle/mar40(src)
-			else
-				new /obj/item/weapon/gun/rifle/mar40/lmg(src)
-				new /obj/item/ammo_magazine/rifle/mar40/lmg(src)
-				new /obj/item/ammo_magazine/rifle/mar40/lmg(src)
+			new /obj/item/weapon/gun/rifle/mar40(src)
+			new /obj/item/ammo_magazine/rifle/mar40/extended(src)
+			new /obj/item/ammo_magazine/rifle/mar40(src)
+			new /obj/item/ammo_magazine/rifle/mar40(src)
+
 
 /* Misc. Individual Guns */
 
@@ -561,10 +533,6 @@ Primarily made up of things that would be best utilized, well, shipside. Recreat
 		/obj/item/reagent_container/food/snacks/egg/random,
 		/obj/item/reagent_container/food/snacks/egg/random, //not a dupe
 		/obj/item/reagent_container/food/snacks/xemeatpie,
-		/obj/item/reagent_container/food/snacks/monkeycube,
-		/obj/item/reagent_container/food/snacks/monkeycube/farwacube,
-		/obj/item/reagent_container/food/snacks/monkeycube/stokcube,
-		/obj/item/reagent_container/food/snacks/monkeycube/yirencube,
 		/obj/item/reagent_container/food/snacks/upp,
 		/obj/item/reagent_container/food/snacks/mre_pack/xmas1,
 		/obj/item/reagent_container/food/snacks/mre_pack/xmas2,
@@ -722,13 +690,6 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted
 	dollar_cost = 50
 	containertype = /obj/structure/largecrate/black_market
 
-/datum/supply_packs/contraband/surplus/surplus_m4ra_extended
-	name = "surplus magazine box (Ext M4RA x 12)"
-	contains = list(/obj/item/ammo_box/magazine/m4ra/ext)
-	dollar_cost = 45
-	crate_heat = 3
-	containertype = /obj/structure/largecrate/black_market
-
 /* - Misc. USCM weaponry - */
 
 /datum/supply_packs/contraband/surplus/mk45_automag
@@ -1108,21 +1069,15 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro
 			new /obj/item/ammo_magazine/smg/mac15/extended(loc)
 			new /obj/item/ammo_magazine/smg/mac15/extended(loc)
 			loot_message = SPAN_NOTICE("It's some CLF SMG armaments.")
-		if(21 to 25)
+		if(21 to 29)
 			// Discovered Yautja ruins.. (None of these will trigger any alarms. They are far too old, degraded, and useless for any Yautja to care.)
 			new /obj/item/clothing/mask/yautja_flavor(loc)
 			new /obj/item/clothing/suit/armor/yautja_flavor(loc)
 			new /obj/item/clothing/shoes/yautja_flavor(loc)
 			new /obj/item/weapon/twohanded/yautja/glaive/damaged(loc)
 			new /obj/item/stack/yautja_rope(loc)
 			loot_message = SPAN_NOTICE("It's some strange ancient gear...?")
-		if(26 to 30)
-		// Damaged lunge mines, don't let the marines near these. Not even *close* to effective against even a runner.
-			new /obj/item/weapon/twohanded/lungemine/damaged(loc)
-			new /obj/item/weapon/twohanded/lungemine/damaged(loc)
-			new /obj/item/weapon/twohanded/lungemine/damaged(loc)
-			loot_message = SPAN_NOTICE("It's a bunch of lunge mines..?")
-		if(31 to 35)
+		if(30 to 35)
 		// CLF nades!
 			loot_message = SPAN_NOTICE("It's a package of assorted CLF grenades!")
 			var/list/nades_to_pick = list(

code/game/gamemodes/cm_self_destruct.dm

@@ -259,12 +259,12 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi
 		var/list/alive_mobs = list() //Everyone who will be destroyed on the zlevel(s).
 		var/list/dead_mobs = list() //Everyone who only needs to see the cinematic.
 		for(var/mob/current_mob as anything in GLOB.mob_list) //This only does something cool for the people about to die, but should prove pretty interesting.
-			if(!current_mob || !current_mob.loc)
+			var/turf/current_turf = get_turf(current_mob)
+			if(!current_mob || !current_mob.loc || !current_turf)
 				continue //In case something changes when we sleep().
 			if(current_mob.stat == DEAD)
 				dead_mobs |= current_mob
 				continue
-			var/turf/current_turf = get_turf(current_mob)
 			if(current_turf.z in z_levels)
 				alive_mobs |= current_mob
 				shake_camera(current_mob, 110, 4)
@@ -286,6 +286,8 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi
 		for(var/mob/current_mob in alive_mobs)
 			if(current_mob && current_mob.loc) //Who knows, maybe they escaped, or don't exist anymore.
 				var/turf/current_mob_turf = get_turf(current_mob)
+				if(!current_mob_turf)
+					continue
 				if(current_mob_turf.z in z_levels)
 					if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge))
 						continue

code/game/machinery/bioprinter.dm

@@ -113,6 +113,10 @@
 
 	switch(action)
 		if("print")
+			if(working)
+				//If we're already printing something then we're too busy to multi task.
+				to_chat(usr, SPAN_NOTICE("[src] is busy at the moment."))
+				return FALSE
 			var/recipe = params["recipe_id"]
 			var/valid_recipe = FALSE
 			for(var/datum/bioprinter_recipe/product_recipes in products)
@@ -124,6 +128,10 @@
 				message_admins("[key_name(usr)] attempted to print an invalid recipe on \the [src].")
 				return FALSE
 			var/datum/bioprinter_recipe/recipe_datum = new recipe
+			if(stored_metal < recipe_datum.metal)
+				to_chat(usr, SPAN_NOTICE("[src] does not have enough stored metal."))
+				QDEL_NULL(recipe_datum)
+				return FALSE
 			stored_metal -= recipe_datum.metal
 			to_chat(usr, SPAN_NOTICE("\The [src] is now printing the selected organ. Please hold."))
 			working = TRUE
@@ -146,6 +154,8 @@
 
 /obj/structure/machinery/bioprinter/proc/print_limb(limb_path)
 	if(inoperable())
+		//In case we lose power or anything between the print and the callback we don't want to permenantly break the printer
+		working = FALSE
 		return
 	new limb_path(get_turf(src))
 	working = FALSE

code/game/machinery/cryopod.dm

@@ -192,7 +192,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 
 //Lifted from Unity stasis.dm and refactored. ~Zuhayr
 /obj/structure/machinery/cryopod/process()
-	if(occupant && !(WEAKREF(occupant) in GLOB.freed_mob_list)) //ignore freed mobs
+	if(occupant && !(occupant in GLOB.freed_mob_list)) //ignore freed mobs
 		//if occupant ghosted, time till despawn is severely shorter
 		if(!occupant.key && time_till_despawn == 10 MINUTES)
 			time_till_despawn -= 8 MINUTES

code/game/machinery/fax_machine.dm

@@ -324,22 +324,22 @@ var/list/alldepartments = list()
 
 	switch(target_department)
 		if(DEPARTMENT_HC)
-			GLOB.USCMFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.USCMFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		if(DEPARTMENT_PROVOST)
-			GLOB.ProvostFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.ProvostFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		if(DEPARTMENT_CMB)
-			GLOB.CMBFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CMBFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.CMBFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CMBFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CMBFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		if(DEPARTMENT_WY)
-			GLOB.WYFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.WYFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		if(DEPARTMENT_PRESS)
-			GLOB.PressFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];PressFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.PressFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];PressFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];PressFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		else
-			GLOB.GeneralFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.GeneralFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 
 	msg_admin += SPAN_STAFF_IC("Receiving fax via secure connection ... <a href='?FaxView=\ref[faxcontents]'>view message</a>")