Merge pull request #4 from CHOMPStation2/master

Keeping fork up-to-date
2026-08-30 00:35:45 +01:00 · 2020-09-15 17:47:39 -07:00
parent c0f7631371 08f491fa1c
commit 8fa92826b6
16 changed files with 75 additions and 56 deletions
@@ -623,37 +623,37 @@
 	name = "Engineering suit cycler"
 	model_text = "Engineering"
 	req_access = list(access_construction)
-	departments = list("Engineering","Atmospherics","HAZMAT","Construction")
+	departments = list("Engineering","Atmospherics","HAZMAT","Construction","No Change")

 /obj/machinery/suit_cycler/mining
 	name = "Mining suit cycler"
 	model_text = "Mining"
 	req_access = list(access_mining)
-	departments = list("Mining")
+	departments = list("Mining","No Change")

 /obj/machinery/suit_cycler/security
 	name = "Security suit cycler"
 	model_text = "Security"
 	req_access = list(access_security)
-	departments = list("Security","Crowd Control","Security EVA")
+	departments = list("Security","Crowd Control","Security EVA","No Change")

 /obj/machinery/suit_cycler/medical
 	name = "Medical suit cycler"
 	model_text = "Medical"
 	req_access = list(access_medical)
-	departments = list("Medical","Biohazard","Emergency Medical Response")
+	departments = list("Medical","Biohazard","Emergency Medical Response","No Change")

 /obj/machinery/suit_cycler/syndicate
 	name = "Nonstandard suit cycler"
 	model_text = "Nonstandard"
 	req_access = list(access_syndicate)
-	departments = list("Mercenary", "Charring")
+	departments = list("Mercenary", "Charring","No Change")
 	can_repair = 1

 /obj/machinery/suit_cycler/exploration
 	name = "Explorer suit cycler"
 	model_text = "Exploration"
-	departments = list("Exploration","Old Exploration")
+	departments = list("Exploration","Old Exploration","No Change")

 /obj/machinery/suit_cycler/exploration/Initialize()
 	species -= SPECIES_TESHARI
@@ -662,33 +662,33 @@
 /obj/machinery/suit_cycler/pilot
 	name = "Pilot suit cycler"
 	model_text = "Pilot"
-	departments = list("Pilot Blue","Pilot")
+	departments = list("Pilot Blue","Pilot","No Change")

 /obj/machinery/suit_cycler/vintage
 	name = "Vintage Crew suit cycler"
 	model_text = "Vintage"
-	departments = list("Vintage Crew")
+	departments = list("Vintage Crew","No Change")
 	req_access = null

 /obj/machinery/suit_cycler/vintage/pilot
 	name = "Vintage Pilot suit cycler"
 	model_text = "Vintage Pilot"
-	departments = list("Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)")
+	departments = list("Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)","No Change")
 	
 /obj/machinery/suit_cycler/vintage/medsci
 	name = "Vintage MedSci suit cycler"
 	model_text = "Vintage MedSci"
-	departments = list("Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)")
+	departments = list("Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)","No Change")
 	
 /obj/machinery/suit_cycler/vintage/rugged
 	name = "Vintage Ruggedized suit cycler"
 	model_text = "Vintage Ruggedized"
-	departments = list("Vintage Engineering","Vintage Marine","Vintage Officer","Vintage Mercenary")
+	departments = list("Vintage Engineering","Vintage Marine","Vintage Officer","Vintage Mercenary","No Change")

 /obj/machinery/suit_cycler/vintage/omni
 	name = "Vintage Master suit cycler"
 	model_text = "Vintage Master"
-	departments = list("Vintage Crew","Vintage Engineering","Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)","Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)","Vintage Marine","Vintage Officer","Vintage Mercenary")
+	departments = list("Vintage Crew","Vintage Engineering","Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)","Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)","Vintage Marine","Vintage Officer","Vintage Mercenary","No Change")

 /obj/machinery/suit_cycler/vintage/Initialize()
 	species -= SPECIES_TESHARI
@@ -1054,17 +1054,9 @@
 /obj/machinery/suit_cycler/proc/apply_paintjob()
 	var/obj/item/clothing/head/helmet/parent_helmet
 	var/obj/item/clothing/suit/space/parent_suit
-
+	var/turf/T = get_turf(src)
 	if(!target_species || !target_department)
 		return
-
-	if(target_species)
-		if(helmet) helmet.refit_for_species(target_species)
-		if(suit) 
-			suit.refit_for_species(target_species)
-			if(suit.helmet)
-				suit.helmet.refit_for_species(target_species)
-
 	//Now "Complete" with most departmental and variant suits, and sorted by department. These aren't available in the standard or emagged cycler lists because they're incomplete for most species.
 	switch(target_department)
 		if("No Change")
@@ -1222,7 +1214,23 @@
 			parent_suit = /obj/item/clothing/suit/space/void/refurb/mercenary/talon
 		//VOREStation Addition End
 		//END: downstream variant space
-	
+	if(target_species)
+		//Making sure all of our items have the sprites to be refitted.
+		var/helmet_check = ((helmet!=null && (initial(parent_helmet.icon_state) in icon_states(helmet.sprite_sheets_obj[target_species],1))) || helmet==null)
+		//If the helmet exists, only return true if there's also sprites for it. If the helmet doesn't exist, return true.
+		var/suit_check = ((suit!=null && (initial(parent_suit.icon_state) in icon_states(suit.sprite_sheets_obj[target_species],1))) || suit==null)
+		var/suit_helmet_check = ((suit.helmet!=null && (initial(parent_helmet.icon_state) in icon_states(suit.helmet.sprite_sheets_obj[target_species],1))) || suit.helmet==null)
+		if(helmet_check && suit_check && suit_helmet_check)
+			if(helmet) 
+				helmet.refit_for_species(target_species)
+			if(suit) 
+				suit.refit_for_species(target_species)
+				if(suit.helmet)
+					suit.helmet.refit_for_species(target_species)
+		else
+			//If they don't, alert the user and stop here.
+			T.visible_message("[bicon(src)]<span class='warning'>Unable to apply specified cosmetics with specified species. Please try again with a different species or cosmetic option selected.</span>")
+			return
 	//look at this! isn't it beautiful? -KK (well ok not beautiful but it's a lot cleaner)
 	if(helmet && target_department != "No Change")
 		var/obj/item/clothing/H = new parent_helmet
@@ -1240,7 +1248,7 @@
 		suit.desc = initial(parent_suit.desc)
 		suit.icon_state = initial(parent_suit.icon_state)
 		suit.item_state = initial(parent_suit.item_state)
-		suit.item_state_slots = S.item_state_slots		
+		suit.item_state_slots = S.item_state_slots
 		qdel(S)
 		
 		//can't believe I forgot to fix this- now helmets will properly cycle if they're attached to a suit -KK
@@ -1,11 +1,11 @@
 /obj/machinery/suit_cycler
-	departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot","Director","Prototype")
+	departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot","Director","Prototype","No Change")
 	species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_VULPKANIN, SPECIES_GREY_YW /*ywedit*/)

 // Old Exploration is too WIP to use right now
 /obj/machinery/suit_cycler/exploration
 	req_access = list(access_explorer)
-	departments = list("Exploration")
+	departments = list("Exploration","No Change")

 /obj/machinery/suit_cycler/pilot
 	req_access = list(access_pilot)
@@ -14,7 +14,7 @@
 	name = "Director suit cycler"
 	model_text = "Director"
 	req_access = list(access_captain)
-	departments = list("Director")
+	departments = list("Director","No Change")

 /obj/machinery/suit_cycler/captain/Initialize() //No Teshari Sprites
 	species -= SPECIES_TESHARI
@@ -24,7 +24,7 @@
 	name = "Prototype suit cycler"
 	model_text = "Prototype"
 	req_access = list(access_hos)
-	departments = list("Prototype")
+	departments = list("Prototype","No Change")

 /obj/machinery/suit_cycler/prototype/Initialize() //No Teshari Sprites
 	species -= SPECIES_TESHARI
@@ -34,34 +34,34 @@
 	name = "Talon crew suit cycler"
 	model_text = "Talon crew"
 	req_access = list(access_talon)
-	departments = list("Talon Crew")
+	departments = list("Talon Crew","No Change")

 /obj/machinery/suit_cycler/vintage/tpilot
 	name = "Talon pilot suit cycler"
 	model_text = "Talon pilot"
 	req_access = list(access_talon)
-	departments = list("Talon Pilot (Bubble Helm)","Talon Pilot (Closed Helm)")
+	departments = list("Talon Pilot (Bubble Helm)","Talon Pilot (Closed Helm)","No Change")

 /obj/machinery/suit_cycler/vintage/tengi
 	name = "Talon engineer suit cycler"
 	model_text = "Talon engineer"
 	req_access = list(access_talon)
-	departments = list("Talon Engineering")
+	departments = list("Talon Engineering","No Change")

 /obj/machinery/suit_cycler/vintage/tguard
 	name = "Talon guard suit cycler"
 	model_text = "Talon guard"
 	req_access = list(access_talon)
-	departments = list("Talon Marine","Talon Mercenary")
+	departments = list("Talon Marine","Talon Mercenary","No Change")

 /obj/machinery/suit_cycler/vintage/tmedic
 	name = "Talon doctor suit cycler"
 	model_text = "Talon doctor"
 	req_access = list(access_talon)
-	departments = list("Talon Medical (Bubble Helm)","Talon Medical (Closed Helm)")
+	departments = list("Talon Medical (Bubble Helm)","Talon Medical (Closed Helm)","No Change")

 /obj/machinery/suit_cycler/vintage/tcaptain
 	name = "Talon captain suit cycler"
 	model_text = "Talon captain"
 	req_access = list(access_talon)
-	departments = list("Talon Officer")
+	departments = list("Talon Officer","No Change")
@@ -159,9 +159,9 @@
 		else
 			message_admins("[key_name_admin(user)] triggered a fueltank explosion with a welding tool.")
 			log_game("[key_name(user)] triggered a fueltank explosion with a welding tool.")
-			//Yawn edit: removed weldertank booms
 			to_chat(user, "<span class='danger'>You begin welding on the fueltank and with a moment of lucidity you realize... you are doomed.</span>") //CHOMP Edit: changed yawn edit to just say you are doomed
-			//End yawn edit
+			var/obj/structure/reagent_dispensers/fueltank/tank = O // CHOMPS edit - Readds welderbombing 
+			tank.explode()
 			return
 	if (src.welding)
 		remove_fuel(1)
@@ -95,7 +95,7 @@
 			var/list/potentials = living_mobs(0)
 			if(potentials.len)
 				var/mob/living/target = pick(potentials)
-				if(istype(target) && vore_selected)
+				if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected)
 					target.forceMove(vore_selected)
 					to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")

@@ -257,7 +257,7 @@
 			var/list/potentials = living_mobs(0)
 			if(potentials.len)
 				var/mob/living/target = pick(potentials)
-				if(istype(target) && vore_selected)
+				if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected)
 					if(target.buckled)
 						target.buckled.unbuckle_mob(target, force = TRUE)
 					target.forceMove(vore_selected)
@@ -56,7 +56,7 @@
 			var/list/potentials = living_mobs(0)
 			if(potentials.len)
 				var/mob/living/target = pick(potentials)
-				if(istype(target) && vore_selected)
+				if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected)
 					target.forceMove(vore_selected)
 					to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")

@@ -203,7 +203,7 @@
 			var/list/potentials = living_mobs(0)
 			if(potentials.len)
 				var/mob/living/target = pick(potentials)
-				if(istype(target) && vore_selected)
+				if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected)
 					target.forceMove(vore_selected)
 					to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")

@@ -44,7 +44,7 @@
 			var/list/potentials = living_mobs(0)
 			if(potentials.len)
 				var/mob/living/target = pick(potentials)
-				if(istype(target) && vore_selected)
+				if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected)
 					target.forceMove(vore_selected)
 					to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")

@@ -314,7 +314,7 @@
 			var/list/potentials = living_mobs(0)
 			if(potentials.len)
 				var/mob/living/target = pick(potentials)
-				if(istype(target) && vore_selected)
+				if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected)
 					target.forceMove(vore_selected)
 					to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")

@@ -32,8 +32,19 @@
 			if(do_after(user, 5 SECONDS))
 				to_chat(user, "<span class='notice'>\The [src] can possibly be restored with:</span>")
 				for(var/resource in material_needs)
+					var/obj/item/res = resource
 					if(material_needs[resource] > 0)
-						to_chat(user, "<span class='notice'>- [bicon(resource)] x [material_needs[resource]] [resource]</span>")
+						var/res_name = ""
+						if(ispath(res,/obj/item/stack/material))
+							var/obj/item/stack/material/mat_stack = res
+							var/material/mat = get_material_by_name("[initial(mat_stack.default_type)]")
+							if(material_needs[resource]>1)
+								res_name = "[mat.use_name] [mat.sheet_plural_name]"
+							else
+								res_name = "[mat.use_name] [mat.sheet_singular_name]"
+						else
+							res_name = initial(res.name)
+						to_chat(user, "<span class='notice'>- x [material_needs[resource]] [res_name]</span>")

 /obj/item/weapon/broken_gun/proc/setup_gun(var/obj/item/weapon/gun/path)
 	if(ispath(path))
@@ -1022,7 +1022,7 @@
 "aCd" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/port)
 "aCg" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/reinforced,/area/rnd/xenobiology)
 "aCh" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 8},/turf/simulated/floor/reinforced,/area/rnd/xenobiology)
-"aCi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = list(43)},/turf/simulated/floor/tiled,/area/hangar/lockerroomone)
+"aCi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = null; req_one_access = list(43,67)},/turf/simulated/floor/tiled,/area/hangar/lockerroomone)
 "aCj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hangar/lockerroomone)
 "aCk" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/monotile,/area/hangar/lockerroomone)
 "aCl" = (/obj/machinery/camera/network/first_deck{c_tag = "Hangar One - Exploration Locker Room"; dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/hangar/lockerroomone)
@@ -1126,7 +1126,7 @@
 "aFg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard)
 "aFh" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/item/weapon/material/shard,/obj/item/stack/rods,/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard)
 "aFj" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/steel,/area/hangar/lockerroomthree)
-"aFk" = (/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = list(43)},/turf/simulated/floor/tiled,/area/hangar/lockerroomthree)
+"aFk" = (/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = null; req_one_access = list(43,67)},/turf/simulated/floor/tiled,/area/hangar/lockerroomthree)
 "aFn" = (/obj/item/stack/tile/wood,/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor,/area/construction/firstdeck/construction4)
 "aFq" = (/obj/structure/closet/emcloset,/obj/machinery/ai_status_display{pixel_y = 32},/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/red/border{dir = 9},/turf/simulated/floor/tiled,/area/hallway/secondary/firstdeck/research_access)
 "aFr" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/white/border{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/firstdeck/research_access)
@@ -1165,7 +1165,7 @@
 "aGe" = (/obj/structure/table/standard,/obj/item/weapon/folder/yellow,/obj/item/weapon/folder/yellow,/obj/item/device/multitool,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/blue{pixel_x = -3; pixel_y = 2},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled,/area/tcomm/computer)
 "aGf" = (/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/turf/simulated/floor/tiled,/area/hallway/secondary/firstdeck/research_access)
 "aGg" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = null},/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralstarboard)
-"aGh" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Exploration Locker Room Access"; req_access = list(43); req_one_access = null},/turf/simulated/floor/plating,/area/hangar/lockerroomthree)
+"aGh" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Exploration Locker Room Access"; req_access = null; req_one_access = list(43,67)},/turf/simulated/floor/plating,/area/hangar/lockerroomthree)
 "aGi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/hangar/lockerroomthree)
 "aGj" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/monotile,/area/hangar/lockerroomthree)
 "aGk" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hangar/lockerroomthree)
@@ -1327,7 +1327,7 @@
 "aLl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals5,/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/ascenter)
 "aLm" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/ascenter)
 "aLn" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo)
-"aLo" = (/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = list(43)},/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo)
+"aLo" = (/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = null; req_one_access = list(43,67)},/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo)
 "aLr" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/starboard)
 "aLs" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/firstdeck/ep_starboard)
 "aLt" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/firstdeck/ep_starboard)
@@ -1391,7 +1391,7 @@
 "aNh" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hangar/lockerroomone)
 "aNj" = (/turf/simulated/wall/r_wall,/area/tcomm/tcomstorage)
 "aNk" = (/turf/simulated/floor/reinforced,/area/rnd/xenobiology)
-"aNl" = (/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43)},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/turf/simulated/floor/tiled,/area/hangar/lockerroomone)
+"aNl" = (/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43,67)},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/turf/simulated/floor/tiled,/area/hangar/lockerroomone)
 "aNn" = (/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/reinforced,/area/rnd/xenobiology)
 "aNo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport)
 "aNq" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport)
@@ -2042,7 +2042,7 @@
 "dYM" = (/obj/structure/closet/crate/internals,/obj/random/tank,/obj/random/tank,/obj/random/tank,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard)
 "dYO" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weapon/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard)
 "dYQ" = (/obj/structure/closet,/obj/item/weapon/lipstick/purple,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard)
-"dYS" = (/obj/machinery/camera/network/first_deck{c_tag = "Hangar Two - Exploration Locker Room Two"; dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43)},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo)
+"dYS" = (/obj/machinery/camera/network/first_deck{c_tag = "Hangar Two - Exploration Locker Room Two"; dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(67,43)},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo)
 "dYT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/green/bordercorner{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/starboard)
 "dYU" = (/obj/structure/mirror{pixel_y = 25},/turf/simulated/floor,/area/construction/firstdeck/construction3)
 "dYV" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/mime,/obj/item/weapon/pen/crayon/mime,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor,/area/construction/firstdeck/construction3)
@@ -2100,7 +2100,7 @@
 "dZV" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard)
 "dZW" = (/obj/random/trash,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard)
 "dZY" = (/obj/random/junk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard)
-"dZZ" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Exploration Locker Room Access"; req_access = list(43); req_one_access = null},/turf/simulated/floor/plating,/area/hangar/lockerroomtwo)
+"dZZ" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Exploration Locker Room Access"; req_access = null; req_one_access = list(43,67)},/turf/simulated/floor/plating,/area/hangar/lockerroomtwo)
 "eaa" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo)
 "eab" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/monotile,/area/hangar/lockerroomtwo)
 "eac" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/construction/firstdeck/construction3)
@@ -1753,7 +1753,7 @@
 "aOK" = (/obj/machinery/suit_cycler/security,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/camera/network/command{c_tag = "EVA - Port"},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
 "aOL" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
 "aOM" = (/obj/structure/table/rack,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
-"aON" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
+"aON" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/gps,/obj/item/device/gps,/obj/item/device/gps,/obj/item/device/gps,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
 "aOO" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
 "aOP" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/light{dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
 "aOQ" = (/obj/structure/table/reinforced,/obj/machinery/requests_console{department = "EVA"; pixel_y = 26},/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
@@ -1679,7 +1679,7 @@
 "sBY" = (/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/foreportsolar)
 "sEf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/catwalk,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/thirddeck/dormsaft)
 "sEn" = (/obj/machinery/power/tracker,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/airless,/area/solar/forestarboardsolar)
-"sFo" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/light,/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/sd)
+"sFo" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/light,/obj/machinery/suit_cycler/captain,/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/sd)
 "sFQ" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "heads_meeting"; name = "Meeting Room Window Shutters"; opacity = 0},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green,/turf/simulated/floor/plating,/area/bridge/meeting_room)
 "sGT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/corner/beige/border,/turf/simulated/floor/tiled,/area/hallway/primary/thirddeck/aftdoorm)
 "sGX" = (/obj/machinery/computer/communications,/turf/simulated/floor/wood,/area/crew_quarters/heads/sc/sd)
@@ -1923,7 +1923,7 @@
 "vik" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/thirddeck/central)
 "viX" = (/obj/effect/floor_decal/borderfloorblack{dir = 5},/obj/effect/floor_decal/industrial/danger{dir = 5},/turf/simulated/floor/tiled/techfloor/grid,/area/hallway/primary/thirddeck/central)
 "vjg" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/vistor_room_10)
-"vkF" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/mask/gas,/obj/structure/window/basic{dir = 1},/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/space/void/captain,/obj/item/clothing/head/helmet/space/void/captain,/turf/simulated/floor/wood,/area/crew_quarters/heads/sc/sd)
+"vkF" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/mask/gas,/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/space/void/captain,/obj/item/clothing/head/helmet/space/void/captain,/obj/machinery/door/window/holowindoor{dir = 1; req_access = list(20)},/turf/simulated/floor/wood,/area/crew_quarters/heads/sc/sd)
 "vkN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/thirddeck/port)
 "vlA" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/cafeteria)
 "vmg" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/meter,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; layer = 3.3; master_tag = "aft_starboard_solar_airlock"; name = "interior access button"; pixel_x = 25; pixel_y = 25; req_access = list(); req_one_access = list(11,24)},/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar)
@@ -36,7 +36,7 @@
 "aZ" = (/obj/item/weapon/bikehorn/rubberducky,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/freezer,/area/surface/outpost/main/showers)
 "ba" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/surface/outpost/civilian/pool)
 "bb" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/purple/border{dir = 1},/turf/simulated/floor/tiled,/area/surface/outpost/main/exploration)
-"bc" = (/obj/structure/closet/secure_closet/guncabinet{req_access = list(43); req_one_access = newlist()},/obj/effect/floor_decal/corner/purple{dir = 5},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/exploration)
+"bc" = (/obj/structure/closet/secure_closet/guncabinet{req_access = list(43,67); req_one_access = newlist()},/obj/effect/floor_decal/corner/purple{dir = 5},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/exploration)
 "bd" = (/obj/effect/floor_decal/corner/white{dir = 9},/obj/effect/floor_decal/corner/white{dir = 6},/obj/structure/bed/chair,/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/right_upper)
 "be" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/full,/obj/structure/grille,/turf/simulated/floor/plating,/area/surface/outpost/mining_main/storage)
 "bg" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/right_lower)
@@ -758,7 +758,7 @@
 "sK" = (/obj/machinery/vending/loadout,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/white/border{dir = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/main/laundry)
 "sL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/monotile,/area/surface/outpost/main/landing)
 "sN" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/junction{dir = 2; icon_state = "pipe-j2"},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/dorms)
-"sO" = (/obj/structure/closet/secure_closet/guncabinet/phase{name = "phase weapon cabinet"; req_access = list(43); req_one_access = newlist()},/obj/item/clothing/accessory/holster/hip,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/camera/network/main_outpost{c_tag = "MO - Exploration Prep"; dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/exploration)
+"sO" = (/obj/structure/closet/secure_closet/guncabinet/phase{name = "phase weapon cabinet"; req_access = list(43,67); req_one_access = newlist()},/obj/item/clothing/accessory/holster/hip,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/camera/network/main_outpost{c_tag = "MO - Exploration Prep"; dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/exploration)
 "sP" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled,/area/surface/outpost/main/airlock/landing_south)
 "sQ" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/surface/outpost/security/maa)
 "sR" = (/turf/simulated/floor/water/shoreline{dir = 5},/area/surface/outside/ocean)
@@ -612,7 +612,7 @@
 "lY" = (/obj/structure/bed/chair/shuttle{dir = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/shuttle/floor/black,/area/shuttle/shuttle3/start)
 "lZ" = (/obj/structure/bed/chair/shuttle{dir = 1},/turf/simulated/shuttle/floor/black,/area/shuttle/shuttle3/start)
 "ma" = (/obj/machinery/vending/wallmed1{dir = 8},/turf/simulated/shuttle/wall/voidcraft/blue,/area/shuttle/shuttle3/start)
-"mb" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43)},/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/corner/green/border{dir = 4},/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/simulated/floor/tiled,/area/expoutpost/hangarone)
+"mb" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43,67)},/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/corner/green/border{dir = 4},/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/simulated/floor/tiled,/area/expoutpost/hangarone)
 "mc" = (/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/expoutpost/hangarone)
 "md" = (/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled/white,/area/expoutpost/hangaroneprep)
 "me" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 5},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/white,/area/expoutpost/hangaroneprep)
@@ -625,7 +625,7 @@
 "ml" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/monofloor,/area/expoutpost/hangarone)
 "mm" = (/obj/machinery/door/airlock/centcom{req_one_access = newlist()},/turf/simulated/shuttle/floor/black,/area/shuttle/shuttle3/start)
 "mn" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/monofloor,/area/expoutpost/hangarone)
-"mo" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43)},/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/corner/green/border{dir = 4},/obj/item/clothing/accessory/holster/waist,/turf/simulated/floor/tiled,/area/expoutpost/hangarone)
+"mo" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43,67)},/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/corner/green/border{dir = 4},/obj/item/clothing/accessory/holster/waist,/turf/simulated/floor/tiled,/area/expoutpost/hangarone)
 "mp" = (/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/structure/table/glass,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/storage/firstaid/adv{pixel_x = 3; pixel_y = 3},/turf/simulated/floor/tiled/white,/area/expoutpost/hangaroneprep)
 "mq" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/expoutpost/hangaroneprep)
 "mr" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/expoutpost/hangaroneprep)