diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm
index 380d4aa3de..a0a1d97ecf 100644
--- a/code/game/objects/items/weapons/material/chainsaw.dm
+++ b/code/game/objects/items/weapons/material/chainsaw.dm
@@ -12,12 +12,20 @@
 	var/active_force = 55
 	var/inactive_force = 10
 
+<<<<<<< HEAD
 /obj/item/weapon/chainsaw/Initialize() //CHOMPEdit Fixing runtime by doing New to Initialize.
+=======
+/obj/item/weapon/chainsaw/Initialize()
+>>>>>>> c527964372... Merge pull request #13346 from Heroman3003/doubleclosets
 	var/datum/reagents/R = new/datum/reagents(max_fuel)
 	reagents = R
 	R.my_atom = src
 	R.add_reagent("fuel", max_fuel)
 	START_PROCESSING(SSobj, src)
+<<<<<<< HEAD
+=======
+	. = ..()
+>>>>>>> c527964372... Merge pull request #13346 from Heroman3003/doubleclosets
 
 /obj/item/weapon/chainsaw/Destroy()
 	STOP_PROCESSING(SSobj, src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 593d6db338..054b9086c5 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -55,6 +55,12 @@
 		/obj/item/weapon/module/power_control = 3,
 		/obj/item/device/multitool = 3)
 
+/obj/structure/closet/secure_closet/engineering_electrical/double
+	starts_with = list(
+		/obj/item/clothing/gloves/yellow = 4,
+		/obj/item/weapon/storage/toolbox/electrical = 6,
+		/obj/item/weapon/module/power_control = 6,
+		/obj/item/device/multitool = 6)
 
 /obj/structure/closet/secure_closet/engineering_welding
 	name = "welding supplies"
@@ -67,6 +73,13 @@
 		/obj/item/weapon/weldpack = 3,
 		/obj/item/clothing/glasses/welding = 3)
 
+/obj/structure/closet/secure_closet/engineering_welding/double
+	starts_with = list(
+		/obj/item/clothing/head/welding = 6,
+		/obj/item/weapon/weldingtool/largetank = 6,
+		/obj/item/weapon/weldpack = 6,
+		/obj/item/clothing/glasses/welding = 6)
+
 /obj/structure/closet/secure_closet/engineering_personal
 	name = "engineer's locker"
 	req_access = list(access_engine_equip)
@@ -120,7 +133,7 @@
 		/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos,
 		/obj/item/clothing/shoes/boots/winter/atmos,
 		/obj/item/weapon/tank/emergency/oxygen/engi,
-		/obj/item/weapon/storage/belt/utility/atmostech) //VOREStation edit. They don't get a toolbox to fill it from, so why not give a spare one that's full already? 
+		/obj/item/weapon/storage/belt/utility/atmostech) //VOREStation edit. They don't get a toolbox to fill it from, so why not give a spare one that's full already?
 
 /obj/structure/closet/secure_closet/atmos_personal/Initialize()
 	if(prob(50))
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index e8d98c0e4c..43ca9e1ae7 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -529,6 +529,7 @@ lel
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
 /area/groundbase/level1/westspur)
 "bw" = (
+<<<<<<< HEAD
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/multi_tile/glass{
 	name = "Teleporter"
@@ -540,6 +541,13 @@ lel
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/bmarble,
 /area/groundbase/civilian/arrivals)
+=======
+/obj/structure/closet/toolcloset,
+/obj/item/weapon/pickaxe,
+/obj/item/weapon/chainsaw,
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/workshop)
+>>>>>>> c527964372... Merge pull request #13346 from Heroman3003/doubleclosets
 "bx" = (
 /obj/structure/table/reinforced,
 /obj/item/device/floor_painter,
@@ -597,10 +605,18 @@ lel
 /turf/simulated/floor/tiled,
 /area/groundbase/security/processing)
 "bD" = (
+<<<<<<< HEAD
 /obj/structure/table/woodentable,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/carpet/turcarpet,
 /area/groundbase/civilian/gameroom)
+=======
+/obj/structure/closet/secure_closet/engineering_electrical/double,
+/obj/item/clothing/gloves/yellow,
+/obj/item/clothing/gloves/yellow,
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/workshop)
+>>>>>>> c527964372... Merge pull request #13346 from Heroman3003/doubleclosets
 "bE" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
@@ -640,6 +656,7 @@ lel
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/armory)
 "bH" = (
+<<<<<<< HEAD
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 4
 	},
@@ -654,6 +671,15 @@ lel
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/groundbase/civilian/arrivals)
+=======
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/light,
+/obj/structure/closet/secure_closet/engineering_welding/double,
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/workshop)
+>>>>>>> c527964372... Merge pull request #13346 from Heroman3003/doubleclosets
 "bJ" = (
 /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
 /area/groundbase/level1/eastspur)
@@ -1830,11 +1856,6 @@ lel
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/civilian/bar)
-"ez" = (
-/obj/structure/closet/toolcloset,
-/obj/item/weapon/pickaxe,
-/turf/simulated/floor/tiled,
-/area/groundbase/engineering/workshop)
 "eA" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -3135,14 +3156,6 @@ lel
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
-"hS" = (
-/obj/structure/closet/secure_closet/engineering_welding,
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/light,
-/turf/simulated/floor/tiled,
-/area/groundbase/engineering/workshop)
 "hT" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
@@ -13247,12 +13260,6 @@ lel
 	},
 /turf/simulated/floor/tiled,
 /area/holodeck_control)
-"FW" = (
-/obj/structure/closet/secure_closet/engineering_electrical,
-/obj/item/clothing/gloves/yellow,
-/obj/item/clothing/gloves/yellow,
-/turf/simulated/floor/tiled,
-/area/groundbase/engineering/workshop)
 "FX" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_security/polarized{
@@ -35224,14 +35231,14 @@ pe
 Wl
 VC
 XJ
-ez
+bw
 zv
 NY
 ER
 jf
 BH
-FW
-hS
+bD
+bH
 JM
 ph
 aE
diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm
index fceb40e341..de43e9f0dc 100644
--- a/maps/stellar_delight/stellar_delight2.dmm
+++ b/maps/stellar_delight/stellar_delight2.dmm
@@ -1747,6 +1747,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/wall/bay/r_wall/steel,
 /area/stellardelight/deck2/o2production)
+"dW" = (
+/obj/structure/closet/secure_closet/engineering_electrical/double{
+	anchored = 1
+	},
+/turf/simulated/floor/tiled/eris/dark/orangecorner,
+/area/engineering/locker_room)
 "dX" = (
 /obj/machinery/light{
 	dir = 8
@@ -1899,6 +1905,10 @@
 	},
 /turf/simulated/open,
 /area/stellardelight/deck2/aftstarboard)
+"eo" = (
+/obj/structure/closet/secure_closet/engineering_welding/double,
+/turf/simulated/floor/tiled/eris/dark/orangecorner,
+/area/engineering/locker_room)
 "ep" = (
 /obj/machinery/power/apc/angled{
 	dir = 4;
@@ -1965,7 +1975,7 @@
 	},
 /obj/item/clothing/shoes/black,
 /obj/item/device/communicator,
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
 "ew" = (
 /obj/structure/table/steel_reinforced,
@@ -2308,6 +2318,10 @@
 	},
 /turf/simulated/floor/tiled/eris/steel/brown_platform,
 /area/crew_quarters/bar)
+"fj" = (
+/obj/structure/closet/secure_closet/engineering_electrical,
+/turf/simulated/floor/tiled/techfloor,
+/area/stellardelight/deck2/o2production)
 "fk" = (
 /obj/machinery/vending/engivend,
 /obj/machinery/light{
@@ -2361,6 +2375,10 @@
 	},
 /turf/simulated/floor/lino,
 /area/crew_quarters/bar)
+"fq" = (
+/obj/structure/closet/secure_closet/engineering_welding,
+/turf/simulated/floor/tiled/techfloor,
+/area/stellardelight/deck2/o2production)
 "fr" = (
 /obj/structure/sign/painting/public{
 	pixel_x = -30
@@ -3381,7 +3399,7 @@
 /obj/machinery/disposal/wall/cleaner{
 	dir = 4
 	},
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
 "hQ" = (
 /obj/structure/table/standard,
@@ -5433,10 +5451,15 @@
 	},
 /obj/machinery/vending/loadout/loadout_misc,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+<<<<<<< HEAD
 /obj/effect/landmark{
 	name = "vinestart"
 	},
 /turf/simulated/floor/holofloor/tiled/dark,
+=======
+/obj/effect/landmark/vines,
+/turf/simulated/floor/tiled/dark,
+>>>>>>> c527964372... Merge pull request #13346 from Heroman3003/doubleclosets
 /area/crew_quarters/locker)
 "me" = (
 /obj/structure/cable/white{
@@ -5672,7 +5695,7 @@
 /obj/item/clothing/shoes/black,
 /obj/machinery/light,
 /obj/item/device/communicator,
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
 "mH" = (
 /obj/structure/table/steel_reinforced,
@@ -6926,12 +6949,6 @@
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/quartermaster/storage)
-"pF" = (
-/obj/structure/closet/secure_closet/engineering_electrical,
-/obj/item/clothing/gloves/yellow,
-/obj/item/clothing/gloves/yellow,
-/turf/simulated/floor/tiled/eris/dark/orangecorner,
-/area/engineering/locker_room)
 "pG" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -7740,9 +7757,6 @@
 	},
 /turf/simulated/floor/tiled/eris/cafe,
 /area/crew_quarters/kitchen)
-"ro" = (
-/turf/simulated/floor/tiled/techfloor,
-/area/stellardelight/deck2/o2production)
 "rp" = (
 /obj/structure/cable/cyan{
 	icon_state = "1-2"
@@ -10471,7 +10485,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
 "xJ" = (
 /obj/structure/table/reinforced,
@@ -11524,7 +11538,7 @@
 	},
 /obj/machinery/vending/loadout/uniform,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
 "Af" = (
 /obj/structure/table/reinforced,
@@ -12768,7 +12782,7 @@
 	},
 /obj/machinery/vending/loadout/clothing,
 /obj/machinery/alarm/angled,
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
 "CW" = (
 /obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -12956,7 +12970,13 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+<<<<<<< HEAD
 /turf/simulated/floor/holofloor/tiled/dark,
+=======
+/obj/structure/undies_wardrobe,
+/obj/effect/landmark/vermin,
+/turf/simulated/floor/tiled/dark,
+>>>>>>> c527964372... Merge pull request #13346 from Heroman3003/doubleclosets
 /area/crew_quarters/locker)
 "Dv" = (
 /obj/structure/cable/white{
@@ -14167,7 +14187,7 @@
 	},
 /obj/machinery/vending/loadout/overwear,
 /obj/machinery/camera/network/civilian,
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
 "FS" = (
 /obj/structure/cable/green{
@@ -15150,7 +15170,7 @@
 /area/engineering/storage)
 "HV" = (
 /obj/machinery/washing_machine,
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
 "HW" = (
 /obj/machinery/door/firedoor/glass,
@@ -18114,10 +18134,6 @@
 	},
 /turf/simulated/floor/tiled/eris/cafe,
 /area/crew_quarters/kitchen)
-"OB" = (
-/obj/structure/closet/secure_closet/engineering_welding,
-/turf/simulated/floor/tiled/eris/dark/orangecorner,
-/area/engineering/locker_room)
 "OC" = (
 /obj/structure/closet/crate/bin{
 	anchored = 1
@@ -21379,7 +21395,7 @@
 	dir = 8
 	},
 /obj/machinery/vending/loadout/gadget,
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
 "VV" = (
 /obj/structure/cable/orange{
@@ -29986,7 +30002,7 @@ UY
 OK
 pO
 Qu
-ro
+fj
 Sz
 ZG
 Jh
@@ -30128,7 +30144,7 @@ pY
 DE
 sT
 WM
-ro
+fq
 Sz
 QW
 Jh
@@ -35362,7 +35378,7 @@ Re
 OI
 da
 iw
-pF
+dW
 To
 To
 Vo
@@ -35506,7 +35522,7 @@ Kv
 dS
 vb
 Nm
-OB
+eo
 OF
 Oq
 rf