diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm
index fdd4435d12..63d2b05d1b 100644
--- a/code/datums/mob_hud.dm
+++ b/code/datums/mob_hud.dm
@@ -93,7 +93,7 @@ var/list/datum/mob_hud/huds = list(
 // makes the client able to 'see' them whenever they're offscreen
 // somewhat confusingly
 /datum/mob_hud/proc/add_to_single_hud(mob/user, mob/target)
-	if(!user.client)
+	if(!user?.client)
 		return
 	for(var/i in hud_icons)
 		if(i in target.hud_list)
diff --git a/code/modules/cm_marines/equipment/maps.dm b/code/modules/cm_marines/equipment/maps.dm
index a6dd0660f4..05f774cc4d 100644
--- a/code/modules/cm_marines/equipment/maps.dm
+++ b/code/modules/cm_marines/equipment/maps.dm
@@ -175,14 +175,14 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
 /obj/item/map/current_map/Initialize(mapload, ...)
 	. = ..()
 
-	var/map_name = SSmapping.configs[GROUND_MAP].map_name
+	/*var/map_name = SSmapping.configs[GROUND_MAP].map_name
 	var/obj/item/map/map = GLOB.map_type_list[map_name]
 	if (!map && (map_name == MAP_RUNTIME || map_name == MAP_CHINOOK || (map_name in SHIP_MAP_NAMES)))
 		return // "Maps" we don't have maps for so we don't need to throw a runtime for (namely in unit_testing)
 	name = map.name
 	desc = map.desc
 	html_link = map.html_link
-	color = map.color
+	color = map.color*/ // SHUT UP SHUT uP
 
 // Landmark - Used for mapping. Will spawn the appropriate map for each gamemode (LV map items will spawn when LV is the gamemode, etc)
 /obj/effect/landmark/map_item
diff --git a/code/modules/events/timeevent.dm b/code/modules/events/timeevent.dm
index f6ba82ba1f..912bf818f1 100644
--- a/code/modules/events/timeevent.dm
+++ b/code/modules/events/timeevent.dm
@@ -5,6 +5,7 @@ GLOBAL_VAR(timeloop_nuke)
 GLOBAL_VAR(tdd_cell)
 GLOBAL_VAR_INIT(map_iteration, 1)
 GLOBAL_VAR(midway_dockingport)
+GLOBAL_VAR(nuketimer_id)
 
 // <p>Your squad has been tasked with investigating a distress signal from an abandoned USCM outpost designated "Whiskey". The cause of the distress signal is unknown, considering the base was decommissioned years ago. Additionally, strange readings inconsistent with anything seen before have been reported emitting from the outpost. RADAR suggests the existence of an unknown shuttle west of the main outpost's defensive pads. <br><br>Investigate the outpost, find out what's happened, and extract any survivors if needed. To that end, ARES will be piloting the Midway for this operation.</p>
 
@@ -57,7 +58,7 @@ GLOBAL_VAR(midway_dockingport)
 /proc/start_nuketimer()
 	//addtimer(CALLBACK(bomb, TYPE_PROC_REF(/obj/structure/machinery/nuclearbomb, explode)), SStimeloop.nukepostloop)
 	GLOB.nuketimer_started = TRUE
-	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(message_admins), "TIME IS UP. DETONATE THE BOMB."), SStimeloop.nukepostloop)
+	GLOB.nuketimer_id = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(message_admins), "TIME IS UP. DETONATE THE BOMB."), SStimeloop.nukepostloop, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE)
 
 /proc/revert_timeloop()
 	if(!GLOB.timeloop_power)
@@ -137,6 +138,7 @@ GLOBAL_VAR(midway_dockingport)
 	light_range = 3
 	indestructible = TRUE
 	unacidable = TRUE
+	var/mid_removal = FALSE
 
 /obj/structure/tdd/get_examine_text(mob/user)
 	. = ..()
@@ -149,16 +151,22 @@ GLOBAL_VAR(midway_dockingport)
 /obj/structure/tdd/attackby(obj/item/W, mob/user)
 	. = ..()
 	if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH))
+		if(mid_removal)
+			return
+
 		if(!GLOB.timeloop_power)
 			to_chat(user, SPAN_WARNING("There's nothing to remove!"))
 			return
 
 		to_chat(user, SPAN_WARNING("You start to unwrench [src]'s power source. You hope you know what you're doing..."))
 		playsound(src, 'sound/items/Ratchet.ogg', 25, 1)
+		mid_removal = TRUE
 		if(!do_after(user, 10 SECONDS, show_busy_icon = BUSY_ICON_GENERIC))
 			to_chat(user, SPAN_WARNING("You stop trying to remove [src]'s power source."))
+			mid_removal = FALSE
 			return
 
+		mid_removal = FALSE
 		remove_power_source(user)
 
 /obj/structure/tdd/proc/remove_power_source(mob/user)
@@ -184,7 +192,11 @@ GLOBAL_VAR(midway_dockingport)
 
 /obj/structure/machinery/nuclearbomb/emplaced/get_examine_text(mob/user)
 	. = ..()
-	. += "A timer on [src] reads \"DETONATION IN [(timeleft(SStimeloop.mainloop_timer_id) / 10) + 120] SECONDS\"." //roughly
+	if(!GLOB.nuketimer_started)
+		. += "A timer on [src] reads \"DETONATION IN [(timeleft(SStimeloop.mainloop_timer_id) / 10) + 120] SECONDS\"." //roughly
+	else
+		. += "A timer on [src] reads \"DETONATION IN [(timeleft(GLOB.nuketimer_id) / 10)] SECONDS\"."
+
 
 /obj/structure/machinery/nuclearbomb/emplaced/update_icon()
 	return
diff --git a/maps/map_files/rover/rover.dmm b/maps/map_files/rover/rover.dmm
index ad495d23b9..fde292b59d 100644
--- a/maps/map_files/rover/rover.dmm
+++ b/maps/map_files/rover/rover.dmm
@@ -42,13 +42,13 @@
 /area/golden_arrow/canteen)
 "ax" = (
 /obj/structure/machinery/prop{
+	desc = "Yeah, it got fucked up during FORECON operation in iron forests of LV-711. Literally - the trees there were too tough even for tanks: threads, transmission and even turret rotation motors are now chilling somewhere in repair bay.";
 	icon = 'icons/obj/vehicles/tank.dmi';
 	icon_state = "tank_base";
 	layer = 3.9;
-	pixel_x = -16;
-	pixel_y = -17;
 	name = "M34A2 Longstreet Light Tank 'Lawnmower'";
-	desc = "Yeah, it got fucked up during FORECON operation in iron forests of LV-711. Literally - the trees there were too tough even for tanks: threads, transmission and even turret rotation motors are now chilling somewhere in repair bay."
+	pixel_x = -16;
+	pixel_y = -17
 	},
 /obj/structure/blocker/invisible_wall,
 /turf/open/floor/almayer,
@@ -69,8 +69,8 @@
 /area/golden_arrow/canteen)
 "aC" = (
 /obj/structure/closet/secure_closet/smartgunner_forecon{
-	req_one_access = list();
-	req_access_txt = "14;39"
+	req_access_txt = "14;39";
+	req_one_access = list()
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/squad_one)
@@ -102,9 +102,9 @@
 	layer = 2.9
 	},
 /obj/structure/largecrate/random/secure{
-	pixel_y = 17;
+	layer = 5.2;
 	pixel_x = 7;
-	layer = 5.2
+	pixel_y = 17
 	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
@@ -172,8 +172,8 @@
 	pixel_y = 29
 	},
 /obj/structure/sign/poster/music{
-	pixel_y = 34;
-	pixel_x = 8
+	pixel_x = 8;
+	pixel_y = 34
 	},
 /obj/structure/gun_rack/m41/unloaded,
 /turf/open/floor/almayer{
@@ -191,8 +191,8 @@
 "cl" = (
 /obj/structure/machinery/cm_vending/sorted/tech/comp_storage,
 /obj/structure/sign/safety/distribution_pipes{
-	pixel_y = 8;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 8
 	},
 /obj/structure/sign/safety/rewire{
 	pixel_x = 32;
@@ -333,9 +333,6 @@
 /area/golden_arrow/cryo_cells)
 "dv" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/prop/almayer/CICmap{
-	density = 0
-	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -376,8 +373,8 @@
 "dB" = (
 /obj/structure/machinery/door/airlock/almayer/generic/glass{
 	dir = 1;
-	req_one_access_txt = "12;32";
-	name = "\improper Assistant Squad Leader"
+	name = "\improper Assistant Squad Leader";
+	req_one_access_txt = "12;32"
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
@@ -467,8 +464,8 @@
 	pixel_x = -8
 	},
 /obj/item/prop/almayer/handheld1{
-	pixel_y = 12;
-	pixel_x = 9
+	pixel_x = 9;
+	pixel_y = 12
 	},
 /obj/structure/machinery/floodlight/landing/floor{
 	layer = 2.79
@@ -503,8 +500,8 @@
 "ez" = (
 /obj/structure/machinery/camera/autoname/golden_arrow,
 /obj/structure/sign/safety/commline_connection{
-	pixel_y = 29;
-	pixel_x = 16
+	pixel_x = 16;
+	pixel_y = 29
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -621,8 +618,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/safety/food_storage{
-	pixel_y = 35;
-	pixel_x = -20
+	pixel_x = -20;
+	pixel_y = 35
 	},
 /turf/open/floor/almayer{
 	icon_state = "cargo_arrow"
@@ -636,13 +633,13 @@
 /area/golden_arrow/hangar)
 "fn" = (
 /obj/structure/prop{
-	name = "\improper comfy HE orbital warhead";
+	can_buckle = 1;
 	desc = "Rover barely uses it's OB cannon anyway, so this poor baby is stuck here...";
-	icon_state = "ob_warhead_1";
 	icon = 'icons/obj/structures/props/almayer_props.dmi';
-	can_buckle = 1;
-	pixel_y = -10;
-	layer = 5.2
+	icon_state = "ob_warhead_1";
+	layer = 5.2;
+	name = "\improper comfy HE orbital warhead";
+	pixel_y = -10
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -723,8 +720,8 @@
 "fK" = (
 /obj/structure/largecrate/random,
 /obj/structure/largecrate/random{
-	pixel_y = 16;
-	pixel_x = -3
+	pixel_x = -3;
+	pixel_y = 16
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
@@ -974,9 +971,9 @@
 	pixel_y = -15
 	},
 /obj/structure/machinery/light{
+	pixel_x = -17;
 	unacidable = 1;
-	unslashable = 1;
-	pixel_x = -17
+	unslashable = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -992,8 +989,8 @@
 "iy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/safety/commline_connection{
-	pixel_y = -29;
-	pixel_x = 15
+	pixel_x = 15;
+	pixel_y = -29
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -1112,9 +1109,9 @@
 "jG" = (
 /obj/structure/largecrate/random/barrel/blue,
 /obj/structure/largecrate/random/barrel/green{
+	layer = 3.01;
 	pixel_x = 12;
-	pixel_y = 22;
-	layer = 3.01
+	pixel_y = 22
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
@@ -1264,8 +1261,8 @@
 "lh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/forecon{
-	req_one_access_txt = "8;12;13;39";
-	req_access = list()
+	req_access = list();
+	req_one_access_txt = "8;12;13;39"
 	},
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -1361,8 +1358,8 @@
 /area/golden_arrow/hangar)
 "lB" = (
 /obj/structure/ladder{
-	id = "rover2";
-	height = -1
+	height = -1;
+	id = "rover2"
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -1388,9 +1385,9 @@
 "lN" = (
 /obj/structure/machinery/power/smes/buildable,
 /obj/item/clothing/ears/earmuffs{
-	pixel_y = 16;
 	icon_state = "earmuffs2";
-	item_state = "earmuffs2"
+	item_state = "earmuffs2";
+	pixel_y = 16
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/engineering)
@@ -1530,8 +1527,8 @@
 /obj/structure/surface/table/almayer,
 /obj/item/storage/box/m94/signal,
 /obj/item/storage/box/m94/signal{
-	pixel_y = 5;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 5
 	},
 /obj/item/device/binoculars/range/designator,
 /turf/open/floor/almayer{
@@ -1564,8 +1561,8 @@
 /area/golden_arrow/squad_one)
 "nH" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
-	name = "\improper Hangar Lockdown Blast Door";
-	dir = 4
+	dir = 4;
+	name = "\improper Hangar Lockdown Blast Door"
 	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -1653,9 +1650,9 @@
 	dir = 1
 	},
 /obj/structure/machinery/light{
+	pixel_x = -17;
 	unacidable = 1;
-	unslashable = 1;
-	pixel_x = -17
+	unslashable = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
@@ -1663,8 +1660,8 @@
 /area/golden_arrow/canteen)
 "ph" = (
 /obj/structure/cargo_container/lockmart/right{
-	pixel_y = 5;
-	layer = 5.2
+	layer = 5.2;
+	pixel_y = 5
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
@@ -1730,8 +1727,8 @@
 /area/golden_arrow/squad_one)
 "pS" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
-	name = "\improper Hangar Lockdown Blast Door";
-	dir = 4
+	dir = 4;
+	name = "\improper Hangar Lockdown Blast Door"
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -1830,8 +1827,8 @@
 /area/golden_arrow/squad_one)
 "qy" = (
 /obj/structure/ladder{
-	id = "rover3";
-	height = -1
+	height = -1;
+	id = "rover3"
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -1918,12 +1915,12 @@
 	desc = "Nobody knows how a mannequin got aboard, but last Halloween it got dressed up as Voorhees and scared the shit out of new guy. Heh, good times.";
 	icon = 'icons/mob/humans/species/r_synthetic.dmi';
 	icon_state = "Synthetic_Template";
-	name = "mannequin";
-	indestructible = 1
+	indestructible = 1;
+	name = "mannequin"
 	},
 /obj/item/clothing/under/gimmick/jason{
-	icon = 'icons/mob/humans/onmob/uniform_1.dmi';
-	anchored = 1
+	anchored = 1;
+	icon = 'icons/mob/humans/onmob/uniform_1.dmi'
 	},
 /obj/item/clothing/suit/gimmick/jason{
 	anchored = 1
@@ -1932,16 +1929,16 @@
 	anchored = 1
 	},
 /obj/item/clothing/shoes/jackboots{
-	icon = 'icons/mob/humans/onmob/feet.dmi';
-	anchored = 1
+	anchored = 1;
+	icon = 'icons/mob/humans/onmob/feet.dmi'
 	},
 /obj/item/clothing/gloves/brown{
 	anchored = 1;
 	icon = 'icons/mob/humans/onmob/hands.dmi'
 	},
 /obj/item/weapon/sword/machete{
-	icon = 'icons/mob/humans/onmob/items_lefthand_0.dmi';
-	anchored = 1
+	anchored = 1;
+	icon = 'icons/mob/humans/onmob/items_lefthand_0.dmi'
 	},
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
@@ -2101,8 +2098,8 @@
 "sB" = (
 /obj/structure/surface/table/almayer,
 /obj/item/clothing/head/cmcap/boonie/tan{
-	pixel_y = -6;
-	pixel_x = -8
+	pixel_x = -8;
+	pixel_y = -6
 	},
 /obj/item/clothing/head/cmcap{
 	layer = 4.1;
@@ -2117,8 +2114,8 @@
 /area/golden_arrow/hangar)
 "sN" = (
 /obj/structure/anti_air_cannon{
-	pixel_y = 8;
-	pixel_x = -13
+	pixel_x = -13;
+	pixel_y = 8
 	},
 /turf/open/floor/almayer_hull{
 	dir = 10;
@@ -2435,12 +2432,12 @@
 "wd" = (
 /obj/structure/surface/table/almayer,
 /obj/item/prop/magazine/boots/n117{
-	pixel_y = 3;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 3
 	},
 /obj/item/reagent_container/food/drinks/cans/souto/lime{
-	pixel_y = 3;
-	pixel_x = 9
+	pixel_x = 9;
+	pixel_y = 3
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -2735,8 +2732,8 @@
 	dir = 4
 	},
 /obj/structure/closet/secure_closet/marine_personal{
-	job = "Platoon Sergeant";
-	has_cryo_gear = 0
+	has_cryo_gear = 0;
+	job = "Platoon Sergeant"
 	},
 /obj/item/clothing/shoes/marine/jungle/knife,
 /obj/item/device/radio/headset/almayer/sof/survivor_forecon,
@@ -2782,8 +2779,8 @@
 	pixel_x = -8
 	},
 /obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_y = 10;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 10
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -2842,9 +2839,9 @@
 	force = 15;
 	layer = 4.1;
 	name = "Commando Huggs";
+	pixel_x = 9;
 	pixel_y = 3;
-	throwforce = 15;
-	pixel_x = 9
+	throwforce = 15
 	},
 /obj/item/clothing/head/cmcap{
 	layer = 4.1;
@@ -2903,8 +2900,8 @@
 	},
 /obj/item/clothing/mask/cigarette/weed,
 /obj/item/tool/lighter/zippo/gold{
-	pixel_y = -5;
-	pixel_x = 10
+	pixel_x = 10;
+	pixel_y = -5
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -3157,13 +3154,13 @@
 "Ev" = (
 /obj/structure/prop/invuln/overhead_pipe{
 	dir = 4;
-	pixel_y = -9;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = -9
 	},
 /obj/structure/prop/invuln/overhead_pipe{
 	dir = 4;
-	pixel_y = -9;
-	pixel_x = 13
+	pixel_x = 13;
+	pixel_y = -9
 	},
 /obj/structure/curtain/red{
 	pixel_y = -21
@@ -3181,13 +3178,13 @@
 "Ey" = (
 /obj/structure/surface/table/almayer,
 /obj/effect/spawner/prop_gun{
-	prop_gun_type = /obj/item/weapon/gun/smg/m39;
 	custom_gun_desc = "Welp. Too delicate for jungles, it seems. Nothing beats MK1.";
-	custom_gun_name = "Broken M39 submachinegun"
+	custom_gun_name = "Broken M39 submachinegun";
+	prop_gun_type = /obj/item/weapon/gun/smg/m39
 	},
 /obj/item/tool/screwdriver/tactical{
-	pixel_y = -3;
-	pixel_x = -9
+	pixel_x = -9;
+	pixel_y = -3
 	},
 /obj/structure/machinery/power/apc/almayer{
 	dir = 4
@@ -3274,8 +3271,8 @@
 	pixel_y = 27
 	},
 /obj/structure/sign/safety/autodoc{
-	pixel_y = 27;
-	pixel_x = 13
+	pixel_x = 13;
+	pixel_y = 27
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -3466,8 +3463,8 @@
 "HQ" = (
 /obj/structure/machinery/door/airlock/almayer/generic/glass{
 	dir = 1;
-	req_one_access_txt = "12;13;32";
-	name = "\improper Radio Telephone Operator"
+	name = "\improper Radio Telephone Operator";
+	req_one_access_txt = "12;13;32"
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
@@ -3531,13 +3528,13 @@
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/prop/ice_colony/tiger_rug{
-	pixel_x = -13;
-	layer = 2.5;
-	pixel_y = -15;
 	desc = "It's a rug, made from real tiger! Well, not *real* real tiger - this pelt belonged to similar-looking species, native to LV-842, that Snake Eaters ran over with their ATV. It still has some tire prints visible here and there...";
-	icon_state = "HotlineAlt";
 	dir = 4;
-	name = "moon tiger rug"
+	icon_state = "HotlineAlt";
+	layer = 2.5;
+	name = "moon tiger rug";
+	pixel_x = -13;
+	pixel_y = -15
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
@@ -3555,9 +3552,9 @@
 /area/golden_arrow/prep_hallway)
 "IM" = (
 /obj/structure/machinery/light{
+	pixel_x = -17;
 	unacidable = 1;
-	unslashable = 1;
-	pixel_x = -17
+	unslashable = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -3574,9 +3571,9 @@
 /obj/structure/machinery/recharger,
 /obj/item/reagent_container/spray/cleaner,
 /obj/structure/machinery/light{
+	dir = 1;
 	unacidable = 1;
-	unslashable = 1;
-	dir = 1
+	unslashable = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
@@ -3587,8 +3584,8 @@
 	dir = 4
 	},
 /obj/item/clothing/head/headset{
-	pixel_y = 8;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = 8
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -3637,8 +3634,8 @@
 "JS" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/item/clothing/glasses/welding{
-	pixel_y = 8;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 8
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -3647,8 +3644,8 @@
 "JV" = (
 /obj/structure/barricade/handrail{
 	dir = 1;
-	pixel_y = 10;
-	layer = 3.01
+	layer = 3.01;
+	pixel_y = 10
 	},
 /obj/structure/machinery/conveyor{
 	dir = 8
@@ -3672,8 +3669,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/secure_closet/marine_personal{
-	job = "Smartgunner";
-	has_cryo_gear = 0
+	has_cryo_gear = 0;
+	job = "Smartgunner"
 	},
 /obj/item/clothing/shoes/marine/jungle/knife,
 /obj/item/device/radio/headset/almayer/sof/survivor_forecon,
@@ -3730,8 +3727,8 @@
 /area/golden_arrow/canteen)
 "Kp" = (
 /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/forecon{
-	req_one_access_txt = "8;12;13;39";
-	req_access = list()
+	req_access = list();
+	req_one_access_txt = "8;12;13;39"
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -3847,12 +3844,12 @@
 	pixel_x = 11
 	},
 /obj/structure/largecrate/random/mini/ammo{
-	pixel_y = 10;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 10
 	},
 /obj/structure/largecrate/random/mini/ammo{
-	pixel_y = 10;
-	pixel_x = 12
+	pixel_x = 12;
+	pixel_y = 10
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
@@ -4074,10 +4071,10 @@
 "NI" = (
 /obj/structure/machinery/cm_vending/sorted/marine_food,
 /obj/structure/machinery/light{
-	unacidable = 1;
-	unslashable = 1;
+	dir = 1;
 	pixel_x = -17;
-	dir = 1
+	unacidable = 1;
+	unslashable = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -4204,8 +4201,8 @@
 /area/golden_arrow/prep_hallway)
 "OU" = (
 /obj/structure/closet/secure_closet/marine_personal{
-	job = "Squad Sergeant";
-	has_cryo_gear = 0
+	has_cryo_gear = 0;
+	job = "Squad Sergeant"
 	},
 /obj/item/clothing/shoes/marine/jungle/knife,
 /obj/item/device/radio/headset/almayer/sof/survivor_forecon,
@@ -4248,8 +4245,8 @@
 /obj/structure/machinery/chem_dispenser,
 /obj/item/reagent_container/glass/beaker/bluespace,
 /obj/item/storage/box/pillbottles{
-	pixel_y = 18;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 18
 	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
@@ -4384,8 +4381,8 @@
 	},
 /obj/structure/barricade/handrail{
 	dir = 1;
-	pixel_y = 13;
-	layer = 3.01
+	layer = 3.01;
+	pixel_y = 13
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
@@ -4538,8 +4535,8 @@
 /area/golden_arrow/hangar)
 "SR" = (
 /obj/structure/closet/secure_closet/marine_personal{
-	job = "Platoon Corpsman";
-	has_cryo_gear = 0
+	has_cryo_gear = 0;
+	job = "Platoon Corpsman"
 	},
 /obj/item/clothing/shoes/marine/jungle/knife,
 /obj/item/device/radio/headset/almayer/sof/survivor_forecon,
@@ -4603,8 +4600,8 @@
 /area/golden_arrow/hangar)
 "Tp" = (
 /obj/structure/ladder{
-	id = "rover1";
-	height = -1
+	height = -1;
+	id = "rover1"
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -4994,15 +4991,15 @@
 /obj/item/tool/kitchen/utensil/spoon{
 	desc = "Its tongs molded together after someone tried a bite of that arcturian curry.";
 	name = "melted fork";
-	pixel_y = 9;
-	pixel_x = -9
+	pixel_x = -9;
+	pixel_y = 9
 	},
 /obj/item/tool/kitchen/tray,
 /obj/item/reagent_container/food/snacks/resin_fruit{
-	name = "arcturian curry";
 	desc = "Never let Joes cook alien cuisine. Eugh.";
-	pixel_y = 4;
-	pixel_x = 6
+	name = "arcturian curry";
+	pixel_x = 6;
+	pixel_y = 4
 	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -5028,8 +5025,8 @@
 /area/golden_arrow/hangar)
 "ZC" = (
 /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/forecon{
-	req_one_access_txt = "8;12;13;39";
-	req_access = list()
+	req_access = list();
+	req_one_access_txt = "8;12;13;39"
 	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4