Merge branch 'virgoMaster' into virgoPull

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -248,6 +248,6 @@ var/global/list/image/splatter_cache=list()
 
 //This version should be used for admin spawns and pre-mapped virus vectors (e.g. in PoIs), this version does not dry
 /obj/effect/decal/cleanable/mucus/mapped/New()
-	...()
+	..()
 	virus2 = new /datum/disease2/disease
 	virus2.makerandom()

code/game/objects/effects/item_pickup_ghost.dm

@@ -0,0 +1,19 @@
+/obj/effect/temporary_effect/item_pickup_ghost
+	anchored = 1
+	plane = MOB_PLANE
+	layer = ABOVE_MOB_LAYER
+	mouse_opacity = 0//just in case something dumb happens
+	time_to_die = 0.5 SECONDS
+	var/lifetime = 0.25 SECONDS //so it doesn't die before animation ends
+
+/obj/effect/temporary_effect/item_pickup_ghost/proc/assumeform(var/obj/item/picked_up)
+	icon = picked_up.icon
+	icon_state = picked_up.icon_state
+	pixel_x = picked_up.pixel_x
+	pixel_y = picked_up.pixel_y
+	color = picked_up.color
+
+/obj/effect/temporary_effect/item_pickup_ghost/proc/animate_towards(var/atom/target)
+	var/new_pixel_x = pixel_x + (target.x - src.x) * 32
+	var/new_pixel_y = pixel_y + (target.y - src.y) * 32
+	animate(src, pixel_x = new_pixel_x, pixel_y = new_pixel_y, transform = matrix()*0, time = lifetime)

code/game/objects/effects/portals.dm

@@ -1,3 +1,5 @@
+GLOBAL_LIST_BOILERPLATE(all_portals, /obj/effect/portal)
+
 /obj/effect/portal
 	name = "portal"
 	desc = "Looks unstable. Best to test it with the clown."

code/game/objects/explosion.dm

@@ -46,7 +46,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 
 		var/close = range(world.view+round(devastation_range,1), epicenter)
 		// to all distanced mobs play a different sound
-		for(var/mob/M in world)
+		for(var/mob/M in player_list)
 			if(M.z == epicenter.z)
 				if(!(M in close))
 					// check if the mob can hear

code/game/objects/items.dm

@@ -218,6 +218,8 @@
 		if(!temp)
 			user << "<span class='notice'>You try to use your hand, but realize it is no longer attached!</span>"
 			return
+
+	var/old_loc = src.loc
 	src.pickup(user)
 	if (istype(src.loc, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = src.loc
@@ -230,7 +232,11 @@
 	else
 		if(isliving(src.loc))
 			return
-	user.put_in_active_hand(src)
+	if(user.put_in_active_hand(src))
+		if(isturf(old_loc))
+			var/obj/effect/temporary_effect/item_pickup_ghost/ghost = new(old_loc)
+			ghost.assumeform(src)
+			ghost.animate_towards(user)
 	return
 
 /obj/item/attack_ai(mob/user as mob)
@@ -685,6 +691,10 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 /obj/item/proc/is_hot()
 	return FALSE
 
+// Called when you swap hands away from the item
+/obj/item/proc/in_inactive_hand(mob/user)
+	return
+
 // My best guess as to why this is here would be that it does so little. Still, keep it under all the procs, for sanity's sake.
 /obj/item/device
 	icon = 'icons/obj/device.dmi'

code/game/objects/items/devices/PDA/PDA.dm

@@ -653,8 +653,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		// the ui does not exist, so we'll create a new() one
 	        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "pda.tmpl", title, 520, 400, state = inventory_state)
+		// add templates for screens in common with communicator.
+		ui.add_template("atmosphericScan", "atmospheric_scan.tmpl")
 		// when the ui is first opened this is the data it will use
-
 		ui.set_initial_data(data)
 		// open the new ui window
 		ui.open()
@@ -893,7 +894,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 		if("Toggle Door")
 			if(cartridge && cartridge.access_remote_door)
-				for(var/obj/machinery/door/blast/M in world)
+				for(var/obj/machinery/door/blast/M in machines)
 					if(M.id == cartridge.remote_door_id)
 						if(M.density)
 							M.open()
@@ -1247,19 +1248,24 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	if(issilicon(usr))
 		return
 
-	if(can_use(usr) && !isnull(cartridge))
-		cartridge.forceMove(get_turf(src))
-		if(ismob(loc))
-			var/mob/M = loc
-			M.put_in_hands(cartridge)
-		mode = 0
-		scanmode = 0
-		if (cartridge.radio)
-			cartridge.radio.hostpda = null
-		to_chat(usr, "<span class='notice'>You remove \the [cartridge] from the [name].</span>")
-		cartridge = null
-	else
+	if(!can_use(usr))
 		to_chat(usr, "<span class='notice'>You cannot do this while restrained.</span>")
+		return
+
+	if(isnull(cartridge))
+		to_chat(usr, "<span class='notice'>There's no cartridge to eject.</span>")
+		return		
+
+	cartridge.forceMove(get_turf(src))
+	if(ismob(loc))
+		var/mob/M = loc
+		M.put_in_hands(cartridge)
+	mode = 0
+	scanmode = 0
+	if (cartridge.radio)
+		cartridge.radio.hostpda = null
+	to_chat(usr, "<span class='notice'>You remove \the [cartridge] from the [name].</span>")
+	cartridge = null
 
 /obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.
 	if(choice == 1)

code/game/objects/items/devices/PDA/PDA_vr.dm

@@ -2,4 +2,8 @@
 	default_cartridge = /obj/item/weapon/cartridge/captain
 	icon_state = "pda-h"
 	detonate = 0
-//	hidden = 1
+//	hidden = 1
+
+/obj/item/device/pda/pathfinder
+	default_cartridge = /obj/item/weapon/cartridge/signal/science
+	icon_state = "pda-h"

code/game/objects/items/devices/PDA/cart.dm

@@ -468,7 +468,7 @@ var/list/civilian_cartridges = list(
 		else
 			JaniData["user_loc"] = list("x" = 0, "y" = 0)
 		var/MopData[0]
-		for(var/obj/item/weapon/mop/M in world)
+		for(var/obj/item/weapon/mop/M in all_mops)
 			var/turf/ml = get_turf(M)
 			if(ml)
 				if(ml.z != cl.z)
@@ -481,7 +481,7 @@ var/list/civilian_cartridges = list(
 
 
 		var/BucketData[0]
-		for(var/obj/structure/mopbucket/B in world)
+		for(var/obj/structure/mopbucket/B in all_mopbuckets)
 			var/turf/bl = get_turf(B)
 			if(bl)
 				if(bl.z != cl.z)
@@ -493,7 +493,7 @@ var/list/civilian_cartridges = list(
 			BucketData[++BucketData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
 
 		var/CbotData[0]
-		for(var/mob/living/bot/cleanbot/B in world)
+		for(var/mob/living/bot/cleanbot/B in mob_list)
 			var/turf/bl = get_turf(B)
 			if(bl)
 				if(bl.z != cl.z)
@@ -505,7 +505,7 @@ var/list/civilian_cartridges = list(
 		if(!CbotData.len)
 			CbotData[++CbotData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
 		var/CartData[0]
-		for(var/obj/structure/janitorialcart/B in world)
+		for(var/obj/structure/janitorialcart/B in all_janitorial_carts)
 			var/turf/bl = get_turf(B)
 			if(bl)
 				if(bl.z != cl.z)

code/game/objects/items/devices/communicator/UI.dm

@@ -118,6 +118,8 @@
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "communicator.tmpl", "Communicator", 475, 700, state = key_state)
+		// add templates for screens in common with communicator.
+		ui.add_template("atmosphericScan", "atmospheric_scan.tmpl")
 		// when the ui is first opened this is the data it will use
 		ui.set_initial_data(data)
 		// open the new ui window

code/game/objects/items/devices/flashlight.dm

@@ -10,6 +10,8 @@
 	action_button_name = "Toggle Flashlight"
 	var/on = 0
 	var/brightness_on = 4 //luminosity when on
+	var/flashlight_power = 0.8	//lighting power when on
+	var/flashlight_colour = LIGHT_COLOR_INCANDESCENT_FLASHLIGHT	//lighting colour when on
 	var/obj/item/weapon/cell/cell
 	var/cell_type = /obj/item/weapon/cell/device
 	var/list/brightness_levels
@@ -71,11 +73,11 @@
 		icon_state = "[initial(icon_state)]-on"
 
 		if(brightness_level == "low")
-			set_light(brightness_on/2)
+			set_light(brightness_on/2, flashlight_power*0.75, flashlight_colour)
 		else if(brightness_level == "high")
-			set_light(brightness_on*1.5)
+			set_light(brightness_on*1.5, flashlight_power*1.1, flashlight_colour)
 		else
-			set_light(brightness_on)
+			set_light(brightness_on, flashlight_power, flashlight_colour)
 
 	else
 		icon_state = "[initial(icon_state)]"
@@ -267,6 +269,7 @@
 	name = "maglight"
 	desc = "A very, very heavy duty flashlight."
 	icon_state = "maglight"
+	flashlight_colour = LIGHT_COLOR_FLUORESCENT_FLASHLIGHT
 	force = 10
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
@@ -303,7 +306,7 @@
 	desc = "A classic green-shaded desk lamp."
 	icon_state = "lampgreen"
 	brightness_on = 5
-	light_color = "#FFC58F"
+	flashlight_colour = "#FFC58F"
 
 /obj/item/device/flashlight/lamp/verb/toggle_light()
 	set name = "Toggle light"
@@ -320,8 +323,8 @@
 	desc = "A red standard-issue flare. There are instructions on the side reading 'pull cord, make light'."
 	w_class = ITEMSIZE_SMALL
 	brightness_on = 8 // Pretty bright.
-	light_power = 3
-	light_color = LIGHT_COLOR_FLARE
+	flashlight_power = 0.8
+	flashlight_colour = LIGHT_COLOR_FLARE
 	icon_state = "flare"
 	item_state = "flare"
 	action_button_name = null //just pull it manually, neckbeard.
@@ -383,8 +386,8 @@
 	desc = "A green military-grade glowstick."
 	w_class = ITEMSIZE_SMALL
 	brightness_on = 4
-	light_power = 2
-	light_color = "#49F37C"
+	flashlight_power = 0.9
+	flashlight_colour = "#49F37C"
 	icon_state = "glowstick"
 	item_state = "glowstick"
 	var/fuel = 0
@@ -422,28 +425,28 @@
 /obj/item/device/flashlight/glowstick/red
 	name = "red glowstick"
 	desc = "A red military-grade glowstick."
-	light_color = "#FC0F29"
+	flashlight_colour = "#FC0F29"
 	icon_state = "glowstick_red"
 	item_state = "glowstick_red"
 
 /obj/item/device/flashlight/glowstick/blue
 	name = "blue glowstick"
 	desc = "A blue military-grade glowstick."
-	light_color = "#599DFF"
+	flashlight_colour = "#599DFF"
 	icon_state = "glowstick_blue"
 	item_state = "glowstick_blue"
 
 /obj/item/device/flashlight/glowstick/orange
 	name = "orange glowstick"
 	desc = "A orange military-grade glowstick."
-	light_color = "#FA7C0B"
+	flashlight_colour = "#FA7C0B"
 	icon_state = "glowstick_orange"
 	item_state = "glowstick_orange"
 
 /obj/item/device/flashlight/glowstick/yellow
 	name = "yellow glowstick"
 	desc = "A yellow military-grade glowstick."
-	light_color = "#FEF923"
+	flashlight_colour = "#FEF923"
 	icon_state = "glowstick_yellow"
 	item_state = "glowstick_yellow"
 
@@ -454,7 +457,7 @@
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "floor1" //not a slime extract sprite but... something close enough!
 	item_state = "slime"
-	light_color = "#FFF423"
+	flashlight_colour = "#FFF423"
 	w_class = ITEMSIZE_TINY
 	brightness_on = 6
 	on = 1 //Bio-luminesence has one setting, on.
@@ -462,7 +465,7 @@
 
 /obj/item/device/flashlight/slime/New()
 	..()
-	set_light(brightness_on)
+	set_light(brightness_on, flashlight_power, flashlight_colour)
 
 /obj/item/device/flashlight/slime/update_icon()
 	return

code/game/objects/items/devices/laserpointer.dm

@@ -0,0 +1,219 @@
+/obj/item/device/laser_pointer
+	name = "laser pointer"
+	desc = "Don't shine it in your eyes!"
+	icon = 'icons/obj/device.dmi'
+	icon_state = "pointer"
+	item_state = "pen"
+	var/pointer_icon_state
+	slot_flags = SLOT_BELT
+	matter = list("glass" = 500,"metal" = 500)
+	w_class = 2 //Increased to 2, because diodes are w_class 2. Conservation of matter.
+	origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1)
+	var/turf/pointer_loc
+	var/energy = 8
+	var/max_energy = 8
+	var/effectchance = 20
+	var/cooldown = 10
+	var/last_used_time = 0
+	var/recharging = 0
+	var/recharge_locked = 0
+	var/obj/item/weapon/stock_parts/micro_laser/diode //used for upgrading!
+
+
+/obj/item/device/laser_pointer/red
+	pointer_icon_state = "red_laser"
+/obj/item/device/laser_pointer/green
+	pointer_icon_state = "green_laser"
+/obj/item/device/laser_pointer/blue
+	pointer_icon_state = "blue_laser"
+/obj/item/device/laser_pointer/purple
+	pointer_icon_state = "purple_laser"
+
+/obj/item/device/laser_pointer/New()
+	..()
+	diode = new(src)
+	if(!pointer_icon_state)
+		pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser")
+
+/obj/item/device/laser_pointer/upgraded/New()
+	..()
+	diode = new /obj/item/weapon/stock_parts/micro_laser/ultra
+
+
+
+/obj/item/device/laser_pointer/attack(mob/living/M, mob/user)
+	laser_act(M, user)
+
+/obj/item/device/laser_pointer/attackby(obj/item/W, mob/user)
+	if(istype(W, /obj/item/weapon/stock_parts/micro_laser))
+		if(!diode)
+			user.drop_item()
+			W.loc = src
+			diode = W
+			to_chat(user, "<span class='notice'>You install a [diode.name] in [src].</span>")
+		else
+			to_chat(user, "<span class='notice'>[src] already has a diode.</span>")
+
+	else if(istype(W, /obj/item/weapon/screwdriver))
+		if(diode)
+			to_chat(user, "<span class='notice'>You remove the [diode.name] from the [src].</span>")
+			diode.loc = get_turf(src.loc)
+			diode = null
+			return
+		..()
+	return
+
+/obj/item/device/laser_pointer/afterattack(var/atom/target, var/mob/living/user, flag, params)
+	if(flag)	//we're placing the object on a table or in backpack
+		return
+	laser_act(target, user)
+
+/obj/item/device/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user)
+	if(!(user in (viewers(world.view,target))))
+		return
+	if(!(world.time - last_used_time >= cooldown))
+		return
+	if (!diode)
+		to_chat(user, "<span class='notice'>You point [src] at [target], but nothing happens!</span>")
+		return
+	if (!user.IsAdvancedToolUser())
+		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
+		return
+
+	add_fingerprint(user)
+
+	//nothing happens if the battery is drained
+	if(recharge_locked)
+		to_chat(user, "<span class='notice'>You point [src] at [target], but it's still charging.</span>")
+		return
+
+	var/outmsg
+	var/turf/targloc = get_turf(target)
+
+	//human/alien mobs
+	if(iscarbon(target))
+		if(user.zone_sel.selecting == "eyes")
+			var/mob/living/carbon/C = target
+
+			//20% chance to actually hit the eyes
+
+			if(prob(effectchance * diode.rating))
+				add_attack_logs(user,C,"Tried blinding using [src]")
+
+				//eye target check, will return -1 to 2
+				var/eye_prot = C.eyecheck()
+				if(C.blinded)
+					eye_prot = 4
+				var/severity = (rand(0, 1) + diode.rating - eye_prot)
+				var/mob/living/carbon/human/H = C
+				var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
+				if(!E)
+					outmsg = "<span class='notice'>You shine [src] at [C], but they don't seem to have eyes.</span>"
+					return
+
+				outmsg = "<span class='notice'>You shine [src] into [C]'s eyes.</span>"
+				switch(severity)
+					if(0)
+						//rank 1 diode with basic eye protection (like sunglasses), or rank 2 with industrial protection (like welding goggles)
+						to_chat(C, "<span class='info'>A small, bright dot appears in your vision.</span>")
+					if(1)
+						//rank 1 with no protection, rank 2 with basic protection, or rank 3 with industrial protection
+						to_chat(C, "<span class='notice'>Something bright flashes in the corner of your vision.</span>")
+					if(2)
+						//rank 1 or 2 with no protection, rank 2 or 3 with basic protection, or rank 3 with industrial protection
+						//alternatively, rank 1 with minor vulnerability (like night vision goggles)
+						flick("flash", C.flash_eyes())
+						to_chat(C, "<span class='danger'>A bright light shines across your eyes!</span>")
+					if(3)
+						//rank 1 with minor vulnerability, rank 2 or 3 with no protection, or rank 3 with basic protection
+						if(prob(3 * diode.rating))
+							C.Weaken(1)
+						flick("flash", C.flash_eyes())
+						E.damage += 1
+						to_chat(C, "<span class='danger'>A bright light briefly blinds you!</span>")
+					if(4)
+						//rank 3 with no protection, or rank 2 with minor vulnerability
+						if(prob(5 * diode.rating))
+							C.Weaken(1)
+						flick("e_flash", C.flash_eyes())
+						E.damage += 2
+						to_chat(C, "<span class='danger'>A blinding light burns your eyes!</span>")
+			else
+				outmsg = "<span class='notice'>You shine the [src] at [C], but miss their eyes.</span>"
+
+	//robots and AI
+	else if(issilicon(target))
+		var/mob/living/silicon/S = target
+		//20% chance to actually hit the sensors
+		if(prob(effectchance * diode.rating))
+			flick("flash", S.flash_eyes(affect_silicon = TRUE))
+			if (prob(3 * diode.rating))
+				S.Weaken(1)
+			to_chat(S, "<span class='warning'>Your sensors were blinded by a laser!</span>")
+			outmsg = "<span class='notice'>You blind [S] by shining [src] at their sensors.</span>"
+			add_attack_logs(user,S,"Tried disabling using [src]")
+		else
+			outmsg = "<span class='notice'>You shine the [src] at [S], but miss their sensors.</span>"
+
+	//cameras
+	else if(istype(target, /obj/machinery/camera))
+		var/obj/machinery/camera/C = target
+		if(prob(effectchance * diode.rating))
+			C.emp_act(4 - diode.rating)
+			outmsg = "<span class='notice'>You shine the [src] into the lens of [C].</span>"
+			add_attack_logs(user,C.name,"Tried disabling using [src]")
+		else
+			outmsg = "<span class='info'>You missed the lens of [C] with [src].</span>"
+
+	//cats!
+	for(var/mob/living/simple_animal/cat/C in viewers(1,targloc))
+		if (!(C.stat || C.buckled))
+			if(prob(50) && !(C.client))
+				C.visible_message("<span class='warning'>[C] pounces on the light!</span>", "<span class='warning'>You pounce on the light!</span>")
+				step_towards(C, targloc)
+				C.lay_down()
+				spawn(10)
+					C.lay_down()
+			else
+				C.set_dir(get_dir(C,targloc))
+				C.visible_message("<span class='notice'>[C] watches the light.</span>", "<span class='notice'>Your attention is drawn to the mysterious glowing dot.</span>")
+
+
+	//laser pointer image
+	icon_state = "pointer_[pointer_icon_state]"
+	var/list/showto = list()
+	for(var/mob/M in viewers(world.view,targloc))
+		if(M.client)
+			showto.Add(M.client)
+	var/image/I = image('icons/obj/projectiles.dmi',targloc,pointer_icon_state,cooldown)
+	I.plane = PLANE_LIGHTING_ABOVE
+	I.pixel_x = target.pixel_x + rand(-5,5)
+	I.pixel_y = target.pixel_y + rand(-5,5)
+
+	if(outmsg)
+		user.visible_message("<span class='info'>[user] points [src] at [target].</span>", outmsg)
+	else
+		user.visible_message("<span class='info'>[user] points [src] at [target].</span>", "<span class='info'>You point [src] at [target].</span>")
+
+	last_used_time = world.time
+	energy -= 1
+	if(energy <= max_energy)
+		if(!recharging)
+			recharging = 1
+			processing_objects.Add(src)
+		if(energy <= 0)
+			to_chat(user, "<span class='warning'>You've overused the battery of [src], now it needs time to recharge!</span>")
+			recharge_locked = 1
+
+	flick_overlay(I, showto, cooldown)
+	spawn(cooldown)
+		icon_state = "pointer"
+
+/obj/item/device/laser_pointer/process()
+	if(prob(20 - recharge_locked*5))
+		energy += 1
+		if(energy >= max_energy)
+			energy = max_energy
+			recharging = 0
+			recharge_locked = 0
+			..()

code/game/objects/items/devices/laserpointer_vr.dm

@@ -1,167 +0,0 @@
-/obj/item/device/laser_pointer
-	name = "laser pointer"
-	desc = "Don't shine it in your eyes!"
-	icon = 'icons/obj/device_alt.dmi'
-	icon_state = "pointer"
-	item_state = "pen"
-	var/pointer_icon_state
-	flags = CONDUCT
-	slot_flags = SLOT_BELT
-	matter = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500)
-	w_class = ITEMSIZE_SMALL
-	origin_tech = list(TECH_COMBAT = 1, TECH_MAGNET = 2)
-	var/energy = 5
-	var/max_energy = 5
-	var/effectchance = 33
-	var/recharging = 0
-	var/recharge_locked = 0
-	var/obj/item/weapon/stock_parts/micro_laser/diode //used for upgrading!
-
-/obj/item/device/laser_pointer/red
-	pointer_icon_state = "red_laser"
-/obj/item/device/laser_pointer/green
-	pointer_icon_state = "green_laser"
-/obj/item/device/laser_pointer/blue
-	pointer_icon_state = "blue_laser"
-/obj/item/device/laser_pointer/purple
-	pointer_icon_state = "purple_laser"
-
-/obj/item/device/laser_pointer/New()
-	..()
-	diode = new(src)
-	if(!pointer_icon_state)
-		pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser")
-
-/obj/item/device/laser_pointer/upgraded/New()
-	..()
-	diode = new /obj/item/weapon/stock_parts/micro_laser/ultra
-
-/obj/item/device/laser_pointer/Destroy()
-	qdel_null(diode)
-	processing_objects -= src
-	. = ..()
-
-/obj/item/device/laser_pointer/attackby(obj/item/W, mob/user)
-	if(istype(W, /obj/item/weapon/stock_parts/micro_laser))
-		if(!diode)
-			user.drop_item()
-			W.forceMove(src)
-			diode = W
-			to_chat(user, "<span class='notice'>You install \a [diode] in [src].</span>")
-		else
-			to_chat(user, "<span class='notice'>\The [src] already has a diode installed.</span>")
-
-	else if(isscrewdriver(W))
-		if(diode)
-			to_chat(user, "<span class='notice'>You remove \the [diode] from \the [src].</span>")
-			diode.forceMove(drop_location())
-			diode = null
-	else
-		return ..()
-
-/obj/item/device/laser_pointer/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
-	laser_act(target, user, click_parameters)
-
-/obj/item/device/laser_pointer/proc/laser_act(atom/target, mob/living/user, click_parameters)
-	if( !(user in (viewers(world.view, target))) )
-		return
-	if (!diode)
-		to_chat(user, "<span class='notice'>You point \the [src] at \the [target], but nothing happens!</span>")
-		return
-	if (!user.IsAdvancedToolUser())
-		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
-		return
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(HULK in H.mutations)
-			to_chat(user, "<span class='warning'>Your fingers can't press the button!</span>")
-			return
-
-	add_fingerprint(user)
-
-	//nothing happens if the battery is drained
-	if(recharge_locked)
-		to_chat(user, "<span class='notice'>You point \the [src] at \the [target], but it's still charging.</span>")
-		return
-
-	var/outmsg
-	var/turf/targloc = get_turf(target)
-
-	//human/alien mobs
-	if(iscarbon(target))
-		var/mob/living/carbon/C = target
-		if(user.zone_sel.selecting == O_EYES)
-			add_attack_logs(user, C, "shone [src] in the eyes")
-
-			var/severity = 1
-			if(prob(33))
-				severity = 2
-			else if(prob(50))
-				severity = 0
-
-			//20% chance to actually hit the eyes
-			if(prob(effectchance * diode.rating) && C.flash_eyes(severity))
-				outmsg = "<span class='notice'>You blind [C] by shining [src] in their eyes.</span>"
-			else
-				outmsg = "<span class='warning'>You fail to blind [C] by shining [src] at their eyes!</span>"
-
-	//cameras
-	else if(istype(target, /obj/machinery/camera))
-		var/obj/machinery/camera/C = target
-		if(prob(effectchance * diode.rating))
-			C.emp_act(1)
-			outmsg = "<span class='notice'>You hit the lens of [C] with [src], temporarily disabling the camera!</span>"
-			add_attack_logs(user, C, "EMPed with [src]")
-		else
-			outmsg = "<span class='warning'>You miss the lens of [C] with [src]!</span>"
-
-	//cats!
-	for(var/mob/living/simple_animal/cat/C in view(1, targloc))
-		if(prob(50))
-			C.visible_message("<span class='notice'>[C] pounces on the light!</span>", "<span class='warning'>LIGHT!</span>")
-			C.Move(targloc)
-			C.resting = TRUE
-			C.update_canmove()
-		else
-			C.visible_message("<span class='notice'>[C] looks uninterested in your games.</span>", "<span class='warning'>You spot [user] shining [src] at you. How insulting!</span>")
-
-	//laser pointer image
-	icon_state = "pointer_[pointer_icon_state]"
-	var/image/I = image('icons/obj/projectiles_vr.dmi', targloc, pointer_icon_state)
-	I.plane = ABOVE_PLANE
-	var/list/click_params = params2list(click_parameters)
-	if(click_params)
-		if(click_params["icon-x"])
-			I.pixel_x = (text2num(click_params["icon-x"]) - 16)
-		if(click_params["icon-y"])
-			I.pixel_y = (text2num(click_params["icon-y"]) - 16)
-	else
-		I.pixel_x = target.pixel_x + rand(-5,5)
-		I.pixel_y = target.pixel_y + rand(-5,5)
-
-	if(outmsg)
-		to_chat(user, outmsg)
-	else
-		to_chat(user, "<span class='info'>You point [src] at [target].</span>")
-
-	energy -= 1
-	if(energy <= max_energy)
-		if(!recharging)
-			recharging = 1
-			processing_objects.Add(src)
-		if(energy <= 0)
-			to_chat(user, "<span class='warning'>[src]'s battery is overused, it needs time to recharge!</span>")
-			recharge_locked = TRUE
-
-	flick_overlay_view(I, targloc, 1 SECOND)
-	sleep(1 SECOND)
-	icon_state = "pointer"
-
-/obj/item/device/laser_pointer/process()
-	if(prob(20 - recharge_locked*5))
-		energy += 1
-		if(energy >= max_energy)
-			energy = max_energy
-			recharging = 0
-			recharge_locked = FALSE
-			..()

code/game/objects/items/devices/paicard.dm

@@ -1,3 +1,5 @@
+GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
+
 /obj/item/device/paicard
 	name = "personal AI device"
 	icon = 'icons/obj/pda.dmi'

code/game/objects/items/devices/radio/beacon.dm

@@ -6,6 +6,8 @@
 	var/code = "electronic"
 	origin_tech = list(TECH_BLUESPACE = 1)
 
+GLOBAL_LIST_BOILERPLATE(all_beacons, /obj/item/device/radio/beacon)
+
 /obj/item/device/radio/beacon/hear_talk()
 	return
 

code/game/objects/items/devices/radio/radio.dm

@@ -247,14 +247,12 @@ var/global/list/default_medbay_channels = list(
 	if (!connection)
 		return
 
-	var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(src, null, null, 1)
+	var/static/mob/living/silicon/ai/announcer/A = new /mob/living/silicon/ai/announcer(src, null, null, 1)
 	A.SetName(from)
 	Broadcast_Message(connection, A,
 						0, "*garbled automated announcement*", src,
 						message, from, "Automated Announcement", from, "synthesized voice",
 						4, 0, list(0), connection.frequency, "states")
-	qdel(A)
-	return
 
 // Interprets the message mode when talking into a radio, possibly returning a connection datum
 /obj/item/device/radio/proc/handle_message_mode(mob/living/M as mob, message, message_mode)

code/game/objects/items/poi_items.dm

@@ -28,14 +28,8 @@
 	icon_closed = "poireactor"
 	climbable = 0
 
-/obj/structure/closet/crate/oldreactor/New()
-	..()
-	new /obj/item/weapon/fuel_assembly/deuterium(src)
-	new /obj/item/weapon/fuel_assembly/deuterium(src)
-	new /obj/item/weapon/fuel_assembly/deuterium(src)
-	new /obj/item/weapon/fuel_assembly/deuterium(src)
-	new /obj/item/weapon/fuel_assembly/deuterium(src)
-	new /obj/item/weapon/fuel_assembly/deuterium(src)
+	starts_with = list(
+		/obj/item/weapon/fuel_assembly/deuterium = 6)
 
 /obj/item/poi/brokenoldreactor
 	icon_state = "poireactor_broken"
@@ -51,4 +45,15 @@
 
 /obj/item/poi/brokenoldreactor/Destroy()
 	processing_objects -= src
-	return ..()
+	return ..()
+
+
+//Crashed Cargo Shuttle PoI
+
+/obj/structure/largecrate/animal/crashedshuttle
+	name = "SCP"
+/obj/structure/largecrate/animal/crashedshuttle/initialize()
+	starts_with = pick(/mob/living/simple_animal/hostile/statue, /obj/item/cursed_marble)
+	name = pick("Spicy Crust Pizzeria", "Soap and Care Products", "Sally's Computer Parts", "Steve's Chocolate Pastries", "Smith & Christian's Plastics","Standard Containers & Packaging Co.", "Sanitary Chemical Purgation (LTD)")
+	name += " delivery crate"
+	return ..()

code/game/objects/items/stacks/marker_beacons.dm

@@ -83,7 +83,7 @@ var/list/marker_beacon_colors = list(
 //	layer = BELOW_OPEN_DOOR_LAYER
 	anchored = TRUE
 	light_range = 2
-	light_power = 3
+	light_power = 0.8
 	var/remove_speed = 15
 	var/picked_color
 

code/game/objects/items/stacks/medical.dm

@@ -9,6 +9,7 @@
 	throw_range = 20
 	var/heal_brute = 0
 	var/heal_burn = 0
+	var/apply_sounds
 
 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if (!istype(M))
@@ -65,6 +66,7 @@
 	icon_state = "brutepack"
 	origin_tech = list(TECH_BIO = 1)
 	no_variants = FALSE
+	apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg')
 
 /obj/item/stack/medical/bruise_pack/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if(..())
@@ -112,6 +114,7 @@
 					                              "<span class='notice'>You place a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>" )
 				W.bandage()
 				// W.disinfect() // VOREStation - Tech1 should not disinfect
+				playsound(src, pick(apply_sounds), 25)
 				used++
 			affecting.update_damages()
 			if(used == amount)
@@ -130,6 +133,7 @@
 	heal_burn = 1
 	origin_tech = list(TECH_BIO = 1)
 	no_variants = FALSE
+	apply_sounds = list('sound/effects/ointment.ogg')
 
 /obj/item/stack/medical/ointment/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if(..())
@@ -159,6 +163,7 @@
 			                         "<span class='notice'>You salved wounds on [M]'s [affecting.name].</span>" )
 			use(1)
 			affecting.salve()
+			playsound(src, pick(apply_sounds), 25)
 
 /obj/item/stack/medical/advanced/bruise_pack
 	name = "advanced trauma kit"
@@ -167,6 +172,7 @@
 	icon_state = "traumakit"
 	heal_brute = 3
 	origin_tech = list(TECH_BIO = 1)
+	apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg','sound/effects/tape.ogg')
 
 /obj/item/stack/medical/advanced/bruise_pack/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if(..())
@@ -212,6 +218,7 @@
 				W.bandage()
 				W.disinfect()
 				W.heal_damage(heal_brute)
+				playsound(src, pick(apply_sounds), 25)
 				used++
 			affecting.update_damages()
 			if(used == amount)
@@ -228,7 +235,7 @@
 	icon_state = "burnkit"
 	heal_burn = 3
 	origin_tech = list(TECH_BIO = 1)
-
+	apply_sounds = list('sound/effects/ointment.ogg')
 
 /obj/item/stack/medical/advanced/ointment/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if(..())
@@ -258,6 +265,7 @@
 			affecting.heal_damage(0,heal_burn)
 			use(1)
 			affecting.salve()
+			playsound(src, pick(apply_sounds), 25)
 
 /obj/item/stack/medical/splint
 	name = "medical splints"

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -3,19 +3,20 @@
 	icon_state = "flashbang"
 	item_state = "flashbang"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
+	var/max_range = 10 //The maximum range possible, including species effect mods. Cuts off at 7 for normal humans. Should be 3 higher than your intended target range for affecting normal humans.
 	var/banglet = 0
 
 /obj/item/weapon/grenade/flashbang/prime()
 	..()
-	for(var/obj/structure/closet/L in hear(7, get_turf(src)))
+	for(var/obj/structure/closet/L in hear(max_range, get_turf(src)))
 		if(locate(/mob/living/carbon/, L))
 			for(var/mob/living/carbon/M in L)
 				bang(get_turf(src), M)
 
-	for(var/mob/living/carbon/M in hear(7, get_turf(src)))
+	for(var/mob/living/carbon/M in hear(max_range, get_turf(src)))
 		bang(get_turf(src), M)
 
-	for(var/obj/structure/blob/B in hear(8,get_turf(src)))       		//Blob damage here
+	for(var/obj/structure/blob/B in hear(max_range - 2,get_turf(src)))       		//Blob damage here
 		var/damage = round(30/(get_dist(B,get_turf(src))+1))
 		if(B.overmind)
 			damage *= B.overmind.blob_type.burn_multiplier
@@ -39,13 +40,19 @@
 		ear_safety = M.get_ear_protection()
 
 	//Flashing everyone
-	if(eye_safety < 1)
+	var/mob/living/carbon/human/H = M
+	var/flash_effectiveness = 1
+	var/bang_effectiveness = 1
+	if(ishuman(M))
+		flash_effectiveness = H.species.flash_mod
+		bang_effectiveness = H.species.sound_mod
+	if(eye_safety < 1 && get_dist(M, T) <= round(max_range * 0.7 * flash_effectiveness))
 		M.flash_eyes()
-		M.Confuse(2)
-		M.Weaken(5)
+		M.Confuse(2 * flash_effectiveness)
+		M.Weaken(5 * flash_effectiveness)
 
 	//Now applying sound
-	if((get_dist(M, T) <= 2 || src.loc == M.loc || src.loc == M))
+	if((get_dist(M, T) <= round(max_range * 0.3 * bang_effectiveness) || src.loc == M.loc || src.loc == M))
 		if(ear_safety > 0)
 			M.Confuse(2)
 			M.Weaken(1)
@@ -58,20 +65,19 @@
 				M.ear_damage += rand(0, 5)
 				M.ear_deaf = max(M.ear_deaf,15)
 
-	else if(get_dist(M, T) <= 5)
+	else if(get_dist(M, T) <= round(max_range * 0.5 * bang_effectiveness))
 		if(!ear_safety)
 			M.Confuse(8)
 			M.ear_damage += rand(0, 3)
 			M.ear_deaf = max(M.ear_deaf,10)
 
-	else if(!ear_safety)
+	else if(!ear_safety && get_dist(M, T) <= (max_range * 0.7 * bang_effectiveness))
 		M.Confuse(4)
 		M.ear_damage += rand(0, 1)
 		M.ear_deaf = max(M.ear_deaf,5)
 
 	//This really should be in mob not every check
 	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
 		if (E && E.damage >= E.min_bruised_damage)
 			M << "<span class='danger'>Your eyes start to burn badly!</span>"

code/game/objects/items/weapons/implants/implant.dm

@@ -69,6 +69,8 @@
 	else
 		..()
 
+GLOBAL_LIST_BOILERPLATE(all_tracking_implants, /obj/item/weapon/implant/tracking)
+
 /obj/item/weapon/implant/tracking
 	name = "tracking implant"
 	desc = "An implant normally given to dangerous criminals. Allows security to track your location."
@@ -309,6 +311,8 @@ Implant Specifics:<BR>"}
 			explosion(get_turf(imp_in), -1, -1, 1, 3)
 			qdel(src)
 
+GLOBAL_LIST_BOILERPLATE(all_chem_implants, /obj/item/weapon/implant/chem)
+
 /obj/item/weapon/implant/chem
 	name = "chemical implant"
 	desc = "Injects things."

code/game/objects/items/weapons/material/knives.dm

@@ -101,6 +101,7 @@
 	attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut")
 	can_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned.
 	slot_flags = SLOT_BELT
+	default_material = "plasteel" //VOREStation Edit
 
 /obj/item/weapon/material/knife/tacknife/survival
 	name = "survival knife"
@@ -109,4 +110,5 @@
 	icon_state = "survivalknife"
 	item_state = "knife"
 	applies_material_colour = FALSE
+	default_material = "plasteel" //VOREStation Edit
 	toolspeed = 2 // Use a real axe if you want to chop logs.

code/game/objects/items/weapons/material/knives_vr.dm

@@ -0,0 +1,6 @@
+/obj/item/weapon/material/knife/machete/deluxe
+	name = "deluxe machete"
+	desc = "A fine example of a machete, with a polished blade, wooden handle and a leather cord loop."
+	icon = 'icons/obj/weapons_vr.dmi'
+	icon_state = "machetedx"
+	item_state = "machete"

code/game/objects/items/weapons/material/twohanded.dm

@@ -144,9 +144,9 @@
 	force = 10
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
-	force_divisor = 0.5 			// 15 when wielded with hardness 15 (glass)
+	force_divisor = 0.5 			// 15 when wielded with hardness 30 (glass)
 	unwielded_force_divisor = 0.375
-	thrown_force_divisor = 1.5 		// 20 when thrown with weight 15 (glass)
+	thrown_force_divisor = 1.5 		// 22.5 when thrown with weight 15 (glass)
 	throw_speed = 3
 	edge = 0
 	sharp = 1
@@ -156,4 +156,4 @@
 	applies_material_colour = 0
 	fragile = 1	//It's a haphazard thing of glass, wire, and steel
 	reach = 2 // Spears are long.
-	attackspeed = 14
+	attackspeed = 14

code/game/objects/items/weapons/mop.dm

@@ -1,3 +1,5 @@
+GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/weapon/mop)
+
 /obj/item/weapon/mop
 	desc = "The world of janitalia wouldn't be complete without a mop."
 	name = "mop"
@@ -12,7 +14,6 @@
 	var/mopping = 0
 	var/mopcount = 0
 
-
 /obj/item/weapon/mop/New()
 	create_reagents(30)
 

code/game/objects/items/weapons/storage/backpack.dm

@@ -47,6 +47,10 @@
 	max_storage_space = ITEMSIZE_COST_NORMAL * 14 // 56
 	storage_cost = INVENTORY_STANDARD_SPACE + 1
 
+/obj/item/weapon/storage/backpack/holding/duffle
+	name = "dufflebag of holding"
+	icon_state = "holdingduffle"
+
 /obj/item/weapon/storage/backpack/holding/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/storage/backpack/holding))
 		user << "<span class='warning'>The Bluespace interfaces of the two devices conflict and malfunction.</span>"

code/game/objects/items/weapons/storage/boxes_vr.dm

@@ -0,0 +1,4 @@
+/obj/item/weapon/storage/box/explorerkeys
+	name = "box of volunteer headsets"
+	desc = "A box full of volunteer headsets, for issuing out to exploration volunteers."
+	starts_with = list(/obj/item/device/radio/headset/volunteer = 7)

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -254,6 +254,7 @@
 	description_antag = "This case will likely contain a charged fuel rod gun, and a few fuel rods to go with it. It can only hold the fuel rod gun, fuel rods, batteries, a screwdriver, and stock machine parts."
 	force = 12 //Anti-rad lined i.e. Lead, probably gonna hurt a bit if you get bashed with it.
 	can_hold = list(/obj/item/weapon/gun/magnetic/fuelrod, /obj/item/weapon/fuel_assembly, /obj/item/weapon/cell, /obj/item/weapon/stock_parts, /obj/item/weapon/screwdriver)
+	cant_hold = list(/obj/item/weapon/screwdriver/power)
 	starts_with = list(
 		/obj/item/weapon/gun/magnetic/fuelrod,
 		/obj/item/weapon/fuel_assembly/deuterium,

code/game/objects/items/weapons/storage/wallets.dm

@@ -37,6 +37,7 @@
 		/obj/item/clothing/accessory/permit,
 		/obj/item/clothing/accessory/badge
 		)
+	cant_hold = list(/obj/item/weapon/screwdriver/power)
 	slot_flags = SLOT_ID
 
 	var/obj/item/weapon/card/id/front_id = null

code/game/objects/items/weapons/tape.dm

@@ -56,6 +56,7 @@
 				user.visible_message("<span class='danger'>\The [user] has taped up \the [H]'s eyes!</span>")
 				H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/blindfold/tape(H), slot_glasses)
 				H.update_inv_glasses()
+				playsound(src, 'sound/effects/tape.ogg',25)
 
 			else if(user.zone_sel.selecting == O_MOUTH || user.zone_sel.selecting == BP_HEAD)
 				if(!H.organs_by_name[BP_HEAD])
@@ -94,6 +95,7 @@
 
 				H.equip_to_slot_or_del(new /obj/item/clothing/mask/muzzle/tape(H), slot_wear_mask)
 				H.update_inv_wear_mask()
+				playsound(src, 'sound/effects/tape.ogg',25)
 
 			else if(user.zone_sel.selecting == "r_hand" || user.zone_sel.selecting == "l_hand")
 				can_place = 0
@@ -109,6 +111,7 @@
 					return
 
 				var/obj/item/weapon/handcuffs/cable/tape/T = new(user)
+				playsound(src, 'sound/effects/tape.ogg',25)
 
 				if(!T.place_handcuffs(H, user))
 					user.unEquip(T)
@@ -124,6 +127,7 @@
 	var/obj/item/weapon/ducttape/tape = new(get_turf(src))
 	tape.attach(W)
 	user.put_in_hands(tape)
+	playsound(src, 'sound/effects/tape.ogg',25)
 
 /obj/item/weapon/ducttape
 	name = "tape"
@@ -188,6 +192,7 @@
 			return											// reduce papers around corners issue.
 
 	user.drop_from_inventory(src)
+	playsound(src, 'sound/effects/tape.ogg',25)
 	forceMove(source_turf)
 
 	if(params)

code/game/objects/items/weapons/teleportation.dm

@@ -60,7 +60,7 @@ Frequency:
 			if (sr)
 				src.temp += "<B>Located Beacons:</B><BR>"
 
-				for(var/obj/item/device/radio/beacon/W in world)
+				for(var/obj/item/device/radio/beacon/W in all_beacons)
 					if (W.frequency == src.frequency)
 						var/turf/tr = get_turf(W)
 						if (tr.z == sr.z && tr)
@@ -78,7 +78,7 @@ Frequency:
 							src.temp += "[W.code]-[dir2text(get_dir(sr, tr))]-[direct]<BR>"
 
 				src.temp += "<B>Extranneous Signals:</B><BR>"
-				for (var/obj/item/weapon/implant/tracking/W in world)
+				for (var/obj/item/weapon/implant/tracking/W in all_tracking_implants)
 					if (!W.implanted || !(istype(W.loc,/obj/item/organ/external) || ismob(W.loc) || W.malfunction))
 						continue
 
@@ -137,7 +137,7 @@ Frequency:
 		user << "<span class='notice'>\The [src] is malfunctioning.</span>"
 		return
 	var/list/L = list(  )
-	for(var/obj/machinery/teleport/hub/R in world)
+	for(var/obj/machinery/teleport/hub/R in machines)
 		var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(R.x - 2, R.y, R.z))
 		if (istype(com, /obj/machinery/computer/teleporter) && com.locked && !com.one_time_use)
 			if(R.icon_state == "tele1")
@@ -156,7 +156,7 @@ Frequency:
 	if ((user.get_active_hand() != src || user.stat || user.restrained()))
 		return
 	var/count = 0	//num of portals from this teleport in world
-	for(var/obj/effect/portal/PO in world)
+	for(var/obj/effect/portal/PO in all_portals)
 		if(PO.creator == src)	count++
 	if(count >= 3)
 		user.show_message("<span class='notice'>\The [src] is recharging!</span>")

code/game/objects/items/weapons/tools.dm

@@ -172,7 +172,7 @@
 	item_state = "drill"
 	matter = list(DEFAULT_WALL_MATERIAL = 150, MAT_SILVER = 50)
 	origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
-
+	slot_flags = SLOT_BELT
 	force = 8
 	w_class = ITEMSIZE_SMALL
 	throwforce = 8
@@ -685,7 +685,7 @@
 
 /obj/item/weapon/weldingtool/experimental
 	name = "experimental welding tool"
-	desc = "An experimental welder capable of self-fuel generation. It can output a flame hotter than regular welders."
+	desc = "An experimental welder capable of synthesizing its own fuel from waste compounds. It can output a flame hotter than regular welders."
 	icon_state = "exwelder"
 	max_fuel = 40
 	w_class = ITEMSIZE_NORMAL

code/game/objects/structures.dm

@@ -10,7 +10,7 @@
 /obj/structure/Destroy()
 	if(parts)
 		new parts(loc)
-	. = ..()
+	. = ..()
 
 /obj/structure/attack_hand(mob/user)
 	if(breakable)
@@ -177,7 +177,7 @@
 	return 1
 
 /obj/structure/attack_generic(var/mob/user, var/damage, var/attack_verb, var/wallbreaker)
-	if(!breakable || !damage || !wallbreaker)
+	if(!breakable || damage < 10 || !wallbreaker)
 		return 0
 	visible_message("<span class='danger'>[user] [attack_verb] the [src] apart!</span>")
 	user.do_attack_animation(src)

code/game/objects/structures/catwalk.dm

@@ -1,10 +1,11 @@
 // Based on catwalk.dm from https://github.com/Endless-Horizon/CEV-Eris
 /obj/structure/catwalk
-	layer = TURF_LAYER + 0.5
-	icon = 'icons/turf/catwalks.dmi'
-	icon_state = "catwalk"
 	name = "catwalk"
 	desc = "Cats really don't like these things."
+	plane = TURF_PLANE
+	layer = ABOVE_UTILITY
+	icon = 'icons/turf/catwalks.dmi'
+	icon_state = "catwalk"
 	density = 0
 	var/health = 100
 	var/maxhealth = 100

code/game/objects/structures/crates_lockers/closets.dm

@@ -5,6 +5,7 @@
 	icon_state = "closed"
 	density = 1
 	w_class = ITEMSIZE_HUGE
+	layer = UNDER_JUNK_LAYER
 	var/icon_closed = "closed"
 	var/icon_opened = "open"
 	var/opened = 0
@@ -21,12 +22,13 @@
 	var/store_items = 1
 	var/store_mobs = 1
 
-	var/list/will_contain
+	var/list/starts_with
 
 /obj/structure/closet/initialize()
 	. = ..()
-	if(will_contain)
-		create_objects_in_loc(src, will_contain)
+	if(starts_with)
+		create_objects_in_loc(src, starts_with)
+		starts_with = null
 
 	if(!opened)		// if closed, any item at the crate's loc is put in the contents
 		if(istype(loc, /mob/living)) return //VOREStation Edit - No collecting mob organs if spawned inside mob
@@ -346,7 +348,7 @@
 		icon_state = icon_opened
 
 /obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys", var/wallbreaker)
-	if(!damage || !wallbreaker)
+	if(damage < 10 || !wallbreaker)
 		return
 	user.do_attack_animation(src)
 	visible_message("<span class='danger'>[user] [attack_message] the [src]!</span>")

code/game/objects/structures/crates_lockers/closets/fireaxe.dm

@@ -14,91 +14,65 @@
 	var/locked = 1
 	var/smashed = 0
 
-	New()
-		..()
-		fireaxe = new /obj/item/weapon/material/twohanded/fireaxe(src)
+	starts_with = list(/obj/item/weapon/material/twohanded/fireaxe)
 
-	attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
-		//..() //That's very useful, Erro
+/obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
+	//..() //That's very useful, Erro
 
-		// This could stand to be put further in, made better, etc. but fuck you. Fuck whoever
-		// wrote this code. Fuck everything about this object. I hope you step on a Lego.
-		user.setClickCooldown(10)
-		// Seriously why the fuck is this even a closet aghasjdhasd I hate you
+	// This could stand to be put further in, made better, etc. but fuck you. Fuck whoever
+	// wrote this code. Fuck everything about this object. I hope you step on a Lego.
+	user.setClickCooldown(10)
+	// Seriously why the fuck is this even a closet aghasjdhasd I hate you
 
-		var/hasaxe = 0       //gonna come in handy later~ // FUCK YOUR TILDES.
-		if(fireaxe)
-			hasaxe = 1
+	var/hasaxe = 0       //gonna come in handy later~ // FUCK YOUR TILDES.
+	if(fireaxe)
+		hasaxe = 1
 
-		if (isrobot(usr) || src.locked)
-			if(istype(O, /obj/item/device/multitool))
-				user << "<span class='warning'>Resetting circuitry...</span>"
-				playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
-				if(do_after(user, 20 * O.toolspeed))
-					src.locked = 0
-					to_chat(user, "<span class = 'caution'> You disable the locking modules.</span>")
-					update_icon()
-				return
-			else if(istype(O, /obj/item/weapon))
-				var/obj/item/weapon/W = O
-				if(src.smashed || src.localopened)
-					if(localopened)
-						localopened = 0
-						icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
-						spawn(10) update_icon()
-					return
-				else
-					playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time
-				if(W.force < 15)
-					to_chat(user, "<span class='notice'>The cabinet's protective glass glances off the hit.</span>")
-				else
-					src.hitstaken++
-					if(src.hitstaken == 4)
-						playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
-						src.smashed = 1
-						src.locked = 0
-						src.localopened = 1
+	if (isrobot(usr) || src.locked)
+		if(istype(O, /obj/item/device/multitool))
+			user << "<span class='warning'>Resetting circuitry...</span>"
+			playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
+			if(do_after(user, 20 * O.toolspeed))
+				src.locked = 0
+				to_chat(user, "<span class = 'caution'> You disable the locking modules.</span>")
 				update_icon()
 			return
-		if (istype(O, /obj/item/weapon/material/twohanded/fireaxe) && src.localopened)
-			if(!fireaxe)
-				if(O:wielded)
-					O:wielded = 0
-					O.update_icon()
-					//to_chat(user, "<span class='warning'>Unwield the axe first.</span>")
-					//return
-				fireaxe = O
-				user.remove_from_mob(O)
-				src.contents += O
-				to_chat(user, "<span class='notice'>You place the fire axe back in the [src.name].</span>")
-				update_icon()
-			else
-				if(src.smashed)
-					return
-				else
-					localopened = !localopened
-					if(localopened)
-						icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
-						spawn(10) update_icon()
-					else
-						icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
-						spawn(10) update_icon()
-		else
-			if(src.smashed)
-				return
-			if(istype(O, /obj/item/device/multitool))
+		else if(istype(O, /obj/item/weapon))
+			var/obj/item/weapon/W = O
+			if(src.smashed || src.localopened)
 				if(localopened)
 					localopened = 0
 					icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
 					spawn(10) update_icon()
-					return
-				else
-					to_chat(user, "<span class='warning'>Resetting circuitry...</span>")
-					playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
-					if(do_after(user,20 * O.toolspeed))
-						src.locked = 1
-						to_chat(user, "<span class = 'caution'> You re-enable the locking modules.</span>")
-					return
+				return
+			else
+				playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time
+			if(W.force < 15)
+				to_chat(user, "<span class='notice'>The cabinet's protective glass glances off the hit.</span>")
+			else
+				src.hitstaken++
+				if(src.hitstaken == 4)
+					playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
+					src.smashed = 1
+					src.locked = 0
+					src.localopened = 1
+			update_icon()
+		return
+	if (istype(O, /obj/item/weapon/material/twohanded/fireaxe) && src.localopened)
+		if(!fireaxe)
+			if(O:wielded)
+				O:wielded = 0
+				O.update_icon()
+				//to_chat(user, "<span class='warning'>Unwield the axe first.</span>")
+				//return
+			fireaxe = O
+			user.remove_from_mob(O)
+			src.contents += O
+			to_chat(user, "<span class='notice'>You place the fire axe back in the [src.name].</span>")
+			update_icon()
+		else
+			if(src.smashed)
+				return
 			else
 				localopened = !localopened
 				if(localopened)
@@ -107,108 +81,129 @@
 				else
 					icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
 					spawn(10) update_icon()
-
-
-
-
-	attack_hand(mob/user as mob)
-
-		var/hasaxe = 0
-		if(fireaxe)
-			hasaxe = 1
-
-		if(src.locked)
-			to_chat(user, "<span class='warning'>The cabinet won't budge!</span>")
-			return
-		if(localopened)
-			if(fireaxe)
-				user.put_in_hands(fireaxe)
-				fireaxe = null
-				to_chat (user, "<span class='notice'>You take the fire axe from the [name].</span>")
-				src.add_fingerprint(user)
-				update_icon()
-			else
-				if(src.smashed)
-					return
-				else
-					localopened = !localopened
-					if(localopened)
-						src.icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
-						spawn(10) update_icon()
-					else
-						src.icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
-						spawn(10) update_icon()
-
-		else
-			localopened = !localopened //I'm pretty sure we don't need an if(src.smashed) in here. In case I'm wrong and it fucks up teh cabinet, **MARKER**. -Agouri
-			if(localopened)
-				src.icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
-				spawn(10) update_icon()
-			else
-				src.icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
-				spawn(10) update_icon()
-
-	attack_tk(mob/user as mob)
-		if(localopened && fireaxe)
-			fireaxe.forceMove(loc)
-			to_chat(user, "<span class='notice'>You telekinetically remove the fire axe.</span>")
-			fireaxe = null
-			update_icon()
-			return
-		attack_hand(user)
-
-	verb/toggle_openness() //nice name, huh? HUH?! -Erro //YEAH -Agouri
-		set name = "Open/Close"
-		set category = "Object"
-
-		if (isrobot(usr) || src.locked || src.smashed)
-			if(src.locked)
-				to_chat(usr, "<span class='warning'>The cabinet won't budge!</span>")
-			else if(src.smashed)
-				to_chat(usr, "<span class='notice'>The protective glass is broken!</span>")
-			return
-
-		localopened = !localopened
-		update_icon()
-
-	verb/remove_fire_axe()
-		set name = "Remove Fire Axe"
-		set category = "Object"
-
-		if (isrobot(usr))
-			return
-
-		if (localopened)
-			if(fireaxe)
-				usr.put_in_hands(fireaxe)
-				fireaxe = null
-				to_chat(usr, "<span class='notice'>You take the Fire axe from the [name].</span>")
-			else
-				to_chat(usr, "<span class='notice'>The [src.name] is empty.</span>")
-		else
-			to_chat(usr, "<span class='notice'>The [src.name] is closed.</span>")
-		update_icon()
-
-	attack_ai(mob/user as mob)
+	else
 		if(src.smashed)
-			to_chat(user, "<span class='warning'>The security of the cabinet is compromised.</span>")
 			return
-		else
-			locked = !locked
-			if(locked)
-				to_chat(user, "<span class='warning'>Cabinet locked.</span>")
+		if(istype(O, /obj/item/device/multitool))
+			if(localopened)
+				localopened = 0
+				icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+				spawn(10) update_icon()
+				return
 			else
-				to_chat(user, "<span class='notice'>Cabinet unlocked.</span>")
-			return
+				to_chat(user, "<span class='warning'>Resetting circuitry...</span>")
+				playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
+				if(do_after(user,20 * O.toolspeed))
+					src.locked = 1
+					to_chat(user, "<span class = 'caution'> You re-enable the locking modules.</span>")
+				return
+		else
+			localopened = !localopened
+			if(localopened)
+				icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
+				spawn(10) update_icon()
+			else
+				icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+				spawn(10) update_icon()
 
-	update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers
-		var/hasaxe = 0
+
+/obj/structure/closet/fireaxecabinet/attack_hand(mob/user as mob)
+	var/hasaxe = 0
+	if(fireaxe)
+		hasaxe = 1
+
+	if(src.locked)
+		to_chat(user, "<span class='warning'>The cabinet won't budge!</span>")
+		return
+	if(localopened)
 		if(fireaxe)
-			hasaxe = 1
-		icon_state = text("fireaxe[][][][]",hasaxe,src.localopened,src.hitstaken,src.smashed)
+			user.put_in_hands(fireaxe)
+			fireaxe = null
+			to_chat (user, "<span class='notice'>You take the fire axe from the [name].</span>")
+			src.add_fingerprint(user)
+			update_icon()
+		else
+			if(src.smashed)
+				return
+			else
+				localopened = !localopened
+				if(localopened)
+					src.icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
+					spawn(10) update_icon()
+				else
+					src.icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+					spawn(10) update_icon()
 
-	open()
+	else
+		localopened = !localopened //I'm pretty sure we don't need an if(src.smashed) in here. In case I'm wrong and it fucks up teh cabinet, **MARKER**. -Agouri
+		if(localopened)
+			src.icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
+			spawn(10) update_icon()
+		else
+			src.icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+			spawn(10) update_icon()
+
+/obj/structure/closet/fireaxecabinet/attack_tk(mob/user as mob)
+	if(localopened && fireaxe)
+		fireaxe.forceMove(loc)
+		to_chat(user, "<span class='notice'>You telekinetically remove the fire axe.</span>")
+		fireaxe = null
+		update_icon()
+		return
+	attack_hand(user)
+
+/obj/structure/closet/fireaxecabinet/verb/toggle_openness() //nice name, huh? HUH?! -Erro //YEAH -Agouri
+	set name = "Open/Close"
+	set category = "Object"
+
+	if (isrobot(usr) || src.locked || src.smashed)
+		if(src.locked)
+			to_chat(usr, "<span class='warning'>The cabinet won't budge!</span>")
+		else if(src.smashed)
+			to_chat(usr, "<span class='notice'>The protective glass is broken!</span>")
 		return
 
-	close()
+	localopened = !localopened
+	update_icon()
+
+/obj/structure/closet/fireaxecabinet/verb/remove_fire_axe()
+	set name = "Remove Fire Axe"
+	set category = "Object"
+
+	if (isrobot(usr))
 		return
+
+	if (localopened)
+		if(fireaxe)
+			usr.put_in_hands(fireaxe)
+			fireaxe = null
+			to_chat(usr, "<span class='notice'>You take the Fire axe from the [name].</span>")
+		else
+			to_chat(usr, "<span class='notice'>The [src.name] is empty.</span>")
+	else
+		to_chat(usr, "<span class='notice'>The [src.name] is closed.</span>")
+	update_icon()
+
+/obj/structure/closet/fireaxecabinet/attack_ai(mob/user as mob)
+	if(src.smashed)
+		to_chat(user, "<span class='warning'>The security of the cabinet is compromised.</span>")
+		return
+	else
+		locked = !locked
+		if(locked)
+			to_chat(user, "<span class='warning'>Cabinet locked.</span>")
+		else
+			to_chat(user, "<span class='notice'>Cabinet unlocked.</span>")
+		return
+
+/obj/structure/closet/fireaxecabinet/update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers
+	var/hasaxe = 0
+	if(fireaxe)
+		hasaxe = 1
+	icon_state = text("fireaxe[][][][]",hasaxe,src.localopened,src.hitstaken,src.smashed)
+
+/obj/structure/closet/fireaxecabinet/open()
+	return
+
+/obj/structure/closet/fireaxecabinet/close()
+	return

code/game/objects/structures/crates_lockers/closets/fitness.dm

@@ -4,49 +4,41 @@
 	icon_state = "mixed"
 	icon_closed = "mixed"
 
-/obj/structure/closet/athletic_mixed/New()
-	..()
-	new /obj/item/clothing/under/shorts/grey(src)
-	new /obj/item/clothing/under/shorts/black(src)
-	new /obj/item/clothing/under/shorts/red(src)
-	new /obj/item/clothing/under/shorts/blue(src)
-	new /obj/item/clothing/under/shorts/green(src)
-	new /obj/item/clothing/under/swimsuit/red(src)
-	new /obj/item/clothing/under/swimsuit/black(src)
-	new /obj/item/clothing/under/swimsuit/blue(src)
-	new /obj/item/clothing/under/swimsuit/green(src)
-	new /obj/item/clothing/under/swimsuit/purple(src)
-	new /obj/item/clothing/under/swimsuit/striped(src)
-	new /obj/item/clothing/under/swimsuit/white(src)
-	new /obj/item/clothing/under/swimsuit/earth(src) //Maybe at some point make it randomly choose swimsuits, so that it doesn't overflow as we add more.
-	new /obj/item/clothing/mask/snorkel(src)
-	new /obj/item/clothing/mask/snorkel(src)
-	new /obj/item/clothing/shoes/swimmingfins(src)
-	new /obj/item/clothing/shoes/swimmingfins(src)
-
-
+	starts_with = list(
+		/obj/item/clothing/under/shorts/grey,
+		/obj/item/clothing/under/shorts/black,
+		/obj/item/clothing/under/shorts/red,
+		/obj/item/clothing/under/shorts/blue,
+		/obj/item/clothing/under/shorts/green,
+		/obj/item/clothing/under/swimsuit/red,
+		/obj/item/clothing/under/swimsuit/black,
+		/obj/item/clothing/under/swimsuit/blue,
+		/obj/item/clothing/under/swimsuit/green,
+		/obj/item/clothing/under/swimsuit/purple,
+		/obj/item/clothing/under/swimsuit/striped,
+		/obj/item/clothing/under/swimsuit/white,
+		/obj/item/clothing/under/swimsuit/earth,
+		/obj/item/clothing/mask/snorkel = 2,
+		/obj/item/clothing/shoes/swimmingfins = 2)
 
 /obj/structure/closet/boxinggloves
 	name = "boxing gloves"
 	desc = "It's a storage unit for gloves for use in the boxing ring."
 
-/obj/structure/closet/boxinggloves/New()
-	..()
-	new /obj/item/clothing/gloves/boxing/blue(src)
-	new /obj/item/clothing/gloves/boxing/green(src)
-	new /obj/item/clothing/gloves/boxing/yellow(src)
-	new /obj/item/clothing/gloves/boxing(src)
-
+	starts_with = list(
+		/obj/item/clothing/gloves/boxing/blue,
+		/obj/item/clothing/gloves/boxing/green,
+		/obj/item/clothing/gloves/boxing/yellow,
+		/obj/item/clothing/gloves/boxing)
 
 /obj/structure/closet/masks
 	name = "mask closet"
 	desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
 
-/obj/structure/closet/masks/New()
-	..()
-	new /obj/item/clothing/mask/luchador(src)
-	new /obj/item/clothing/mask/luchador/rudos(src)
-	new /obj/item/clothing/mask/luchador/tecnicos(src)
+	starts_with = list(
+		/obj/item/clothing/mask/luchador,
+		/obj/item/clothing/mask/luchador/rudos,
+		/obj/item/clothing/mask/luchador/tecnicos)
 
 
 /obj/structure/closet/lasertag/red
@@ -55,18 +47,9 @@
 	icon_state = "red"
 	icon_closed = "red"
 
-/obj/structure/closet/lasertag/red/New()
-	..()
-	new /obj/item/weapon/gun/energy/lasertag/red(src)
-	new /obj/item/weapon/gun/energy/lasertag/red(src)
-	new /obj/item/weapon/gun/energy/lasertag/red(src)
-	new /obj/item/weapon/gun/energy/lasertag/red(src)
-	new /obj/item/weapon/gun/energy/lasertag/red(src)
-	new /obj/item/clothing/suit/redtag(src)
-	new /obj/item/clothing/suit/redtag(src)
-	new /obj/item/clothing/suit/redtag(src)
-	new /obj/item/clothing/suit/redtag(src)
-	new /obj/item/clothing/suit/redtag(src)
+	starts_with = list(
+		/obj/item/weapon/gun/energy/lasertag/red = 5,
+		/obj/item/clothing/suit/redtag = 5)
 
 
 /obj/structure/closet/lasertag/blue
@@ -75,15 +58,6 @@
 	icon_state = "blue"
 	icon_closed = "blue"
 
-/obj/structure/closet/lasertag/blue/New()
-	..()
-	new /obj/item/weapon/gun/energy/lasertag/blue(src)
-	new /obj/item/weapon/gun/energy/lasertag/blue(src)
-	new /obj/item/weapon/gun/energy/lasertag/blue(src)
-	new /obj/item/weapon/gun/energy/lasertag/blue(src)
-	new /obj/item/weapon/gun/energy/lasertag/blue(src)
-	new /obj/item/clothing/suit/bluetag(src)
-	new /obj/item/clothing/suit/bluetag(src)
-	new /obj/item/clothing/suit/bluetag(src)
-	new /obj/item/clothing/suit/bluetag(src)
-	new /obj/item/clothing/suit/bluetag(src)
+	starts_with = list(
+		/obj/item/weapon/gun/energy/lasertag/blue = 5,
+		/obj/item/clothing/suit/bluetag = 5)

code/game/objects/structures/crates_lockers/closets/gimmick.dm

@@ -34,18 +34,9 @@
 	icon_closed = "syndicate1"
 	icon_opened = "syndicate1open"
 
-/obj/structure/closet/gimmick/russian/New()
-	..()
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/under/soviet(src)
-	new /obj/item/clothing/under/soviet(src)
-	new /obj/item/clothing/under/soviet(src)
-	new /obj/item/clothing/under/soviet(src)
-	new /obj/item/clothing/under/soviet(src)
+	starts_with = list(
+		/obj/item/clothing/head/ushanka = 5,
+		/obj/item/clothing/under/soviet = 5)
 
 
 /obj/structure/closet/gimmick/tacticool
@@ -55,22 +46,15 @@
 	icon_closed = "syndicate1"
 	icon_opened = "syndicate1open"
 
-/obj/structure/closet/gimmick/tacticool/New()
-	..()
-	new /obj/item/clothing/glasses/eyepatch(src)
-	new /obj/item/clothing/glasses/sunglasses(src)
-	new /obj/item/clothing/gloves/swat(src)
-	new /obj/item/clothing/gloves/swat(src)
-	new /obj/item/clothing/head/helmet/swat(src)
-	new /obj/item/clothing/head/helmet/swat(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/clothing/shoes/boots/swat(src)
-	new /obj/item/clothing/shoes/boots/swat(src)
-	new /obj/item/clothing/suit/armor/swat(src)
-	new /obj/item/clothing/suit/armor/swat(src)
-	new /obj/item/clothing/under/syndicate/tacticool(src)
-	new /obj/item/clothing/under/syndicate/tacticool(src)
+	starts_with = list(
+		/obj/item/clothing/glasses/eyepatch,
+		/obj/item/clothing/glasses/sunglasses,
+		/obj/item/clothing/gloves/swat = 2,
+		/obj/item/clothing/head/helmet/swat = 2,
+		/obj/item/clothing/mask/gas = 2,
+		/obj/item/clothing/shoes/boots/swat = 2,
+		/obj/item/clothing/suit/armor/swat = 2,
+		/obj/item/clothing/under/syndicate/tacticool = 2)
 
 
 /obj/structure/closet/thunderdome
@@ -81,32 +65,16 @@
 	icon_opened = "syndicateopen"
 	anchored = 1
 
-/obj/structure/closet/thunderdome/New()
-	..()
-
 /obj/structure/closet/thunderdome/tdred
 	name = "red-team Thunderdome closet"
 
-/obj/structure/closet/thunderdome/tdred/New()
-	..()
-	new /obj/item/clothing/suit/armor/tdome/red(src)
-	new /obj/item/clothing/suit/armor/tdome/red(src)
-	new /obj/item/clothing/suit/armor/tdome/red(src)
-	new /obj/item/weapon/melee/energy/sword(src)
-	new /obj/item/weapon/melee/energy/sword(src)
-	new /obj/item/weapon/melee/energy/sword(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/melee/baton(src)
-	new /obj/item/weapon/melee/baton(src)
-	new /obj/item/weapon/melee/baton(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/clothing/head/helmet/thunderdome(src)
-	new /obj/item/clothing/head/helmet/thunderdome(src)
-	new /obj/item/clothing/head/helmet/thunderdome(src)
+	starts_with = list(
+		/obj/item/clothing/suit/armor/tdome/red = 3,
+		/obj/item/weapon/melee/energy/sword = 3,
+		/obj/item/weapon/gun/energy/laser = 3,
+		/obj/item/weapon/melee/baton = 3,
+		/obj/item/weapon/storage/box/flashbangs = 3,
+		/obj/item/clothing/head/helmet/thunderdome = 3)
 
 /obj/structure/closet/thunderdome/tdgreen
 	name = "green-team Thunderdome closet"
@@ -114,26 +82,13 @@
 	icon_closed = "syndicate1"
 	icon_opened = "syndicate1open"
 
-/obj/structure/closet/thunderdome/tdgreen/New()
-	..()
-	new /obj/item/clothing/suit/armor/tdome/green(src)
-	new /obj/item/clothing/suit/armor/tdome/green(src)
-	new /obj/item/clothing/suit/armor/tdome/green(src)
-	new /obj/item/weapon/melee/energy/sword(src)
-	new /obj/item/weapon/melee/energy/sword(src)
-	new /obj/item/weapon/melee/energy/sword(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/melee/baton(src)
-	new /obj/item/weapon/melee/baton(src)
-	new /obj/item/weapon/melee/baton(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/clothing/head/helmet/thunderdome(src)
-	new /obj/item/clothing/head/helmet/thunderdome(src)
-	new /obj/item/clothing/head/helmet/thunderdome(src)
+	starts_with = list(
+		/obj/item/clothing/suit/armor/tdome/green = 3,
+		/obj/item/weapon/melee/energy/sword = 3,
+		/obj/item/weapon/gun/energy/laser = 3,
+		/obj/item/weapon/melee/baton = 3,
+		/obj/item/weapon/storage/box/flashbangs = 3,
+		/obj/item/clothing/head/helmet/thunderdome = 3)
 
 /obj/structure/closet/alien
 	name = "alien container"
@@ -142,4 +97,4 @@
 	icon_state = "alien_locker"
 	icon_closed = "alien_locker"
 	icon_opened = "alien_locker_open"
-	anchored = TRUE
+	anchored = TRUE

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -14,29 +14,22 @@
 	icon_state = "black"
 	icon_closed = "black"
 
-/obj/structure/closet/gmcloset/New()
-	..()
-	new /obj/item/clothing/head/that(src)
-	new /obj/item/clothing/head/that(src)
-	new /obj/item/device/radio/headset/headset_service(src)
-	new /obj/item/device/radio/headset/headset_service(src)
-	new /obj/item/clothing/head/pin/flower(src)
-	new /obj/item/clothing/head/pin/flower/pink(src)
-	new /obj/item/clothing/head/pin/flower/yellow(src)
-	new /obj/item/clothing/head/pin/flower/blue(src)
-	new /obj/item/clothing/head/pin/pink(src)
-	new /obj/item/clothing/head/pin/magnetic(src)
-	new /obj/item/clothing/under/sl_suit(src)
-	new /obj/item/clothing/under/sl_suit(src)
-	new /obj/item/clothing/under/rank/bartender(src)
-	new /obj/item/clothing/under/rank/bartender(src)
-	new /obj/item/clothing/under/rank/bartender/skirt(src)
-	new /obj/item/clothing/under/dress/dress_saloon(src)
-	new /obj/item/clothing/accessory/wcoat(src)
-	new /obj/item/clothing/accessory/wcoat(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/laceup(src)
+	starts_with = list(
+		/obj/item/clothing/head/that = 2,
+		/obj/item/device/radio/headset/headset_service = 2,
+		/obj/item/clothing/head/pin/flower,
+		/obj/item/clothing/head/pin/flower/pink,
+		/obj/item/clothing/head/pin/flower/yellow,
+		/obj/item/clothing/head/pin/flower/blue,
+		/obj/item/clothing/head/pin/pink,
+		/obj/item/clothing/head/pin/magnetic,
+		/obj/item/clothing/under/sl_suit = 2,
+		/obj/item/clothing/under/rank/bartender = 2,
+		/obj/item/clothing/under/rank/bartender/skirt,
+		/obj/item/clothing/under/dress/dress_saloon,
+		/obj/item/clothing/accessory/wcoat = 2,
+		/obj/item/clothing/shoes/black = 2,
+		/obj/item/clothing/shoes/laceup)
 
 /*
  * Chef
@@ -47,19 +40,14 @@
 	icon_state = "black"
 	icon_closed = "black"
 
-/obj/structure/closet/chefcloset/New()
-	..()
-	new /obj/item/clothing/under/sundress(src)
-	new /obj/item/clothing/under/waiter(src)
-	new /obj/item/clothing/under/waiter(src)
-	new /obj/item/device/radio/headset/headset_service(src)
-	new /obj/item/device/radio/headset/headset_service(src)
-	new /obj/item/weapon/storage/box/mousetraps(src)
-	new /obj/item/weapon/storage/box/mousetraps(src)
-	new /obj/item/clothing/under/rank/chef(src)
-	new /obj/item/clothing/head/chefhat(src)
-	new /obj/item/weapon/storage/bag/food(src)
-	new /obj/item/weapon/storage/bag/food(src)
+	starts_with = list(
+		/obj/item/clothing/under/sundress,
+		/obj/item/clothing/under/waiter = 2,
+		/obj/item/device/radio/headset/headset_service = 2,
+		/obj/item/weapon/storage/box/mousetraps = 2,
+		/obj/item/clothing/under/rank/chef,
+		/obj/item/clothing/head/chefhat,
+		/obj/item/weapon/storage/bag/food = 2)
 
 /*
  * Janitor
@@ -70,24 +58,20 @@
 	icon_state = "mixed"
 	icon_closed = "mixed"
 
-/obj/structure/closet/jcloset/New()
-	..()
-	new /obj/item/clothing/under/rank/janitor(src)
-	new /obj/item/clothing/under/dress/maid/janitor(src)
-	new /obj/item/device/radio/headset/headset_service(src)
-	new /obj/item/weapon/cartridge/janitor(src)
-	new /obj/item/clothing/gloves/black(src)
-	new /obj/item/clothing/head/soft/purple(src)
-	new /obj/item/clothing/head/beret/purple(src)
-	new /obj/item/device/flashlight(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/device/lightreplacer(src)
-	new /obj/item/weapon/storage/bag/trash(src)
-	new /obj/item/weapon/storage/belt/janitor(src)
-	new /obj/item/clothing/shoes/galoshes(src)
+	starts_with = list(
+		/obj/item/clothing/under/rank/janitor,
+		/obj/item/clothing/under/dress/maid/janitor,
+		/obj/item/device/radio/headset/headset_service,
+		/obj/item/weapon/cartridge/janitor,
+		/obj/item/clothing/gloves/black,
+		/obj/item/clothing/head/soft/purple,
+		/obj/item/clothing/head/beret/purple,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/caution = 4,
+		/obj/item/device/lightreplacer,
+		/obj/item/weapon/storage/bag/trash,
+		/obj/item/weapon/storage/belt/janitor,
+		/obj/item/clothing/shoes/galoshes)
 
 /*
  * Lawyer
@@ -98,43 +82,23 @@
 	icon_state = "blue"
 	icon_closed = "blue"
 
-/obj/structure/closet/lawcloset/New()
-	..()
-	new /obj/item/clothing/under/lawyer/female(src)
-	new /obj/item/clothing/under/lawyer/female(src)
-	new /obj/item/clothing/under/lawyer/black(src)
-	new /obj/item/clothing/under/lawyer/black(src)
-	new /obj/item/clothing/under/lawyer/black/skirt(src)
-	new /obj/item/clothing/under/lawyer/black/skirt(src)
-	new /obj/item/clothing/under/lawyer/red(src)
-	new /obj/item/clothing/under/lawyer/red(src)
-	new /obj/item/clothing/under/lawyer/red/skirt(src)
-	new /obj/item/clothing/under/lawyer/red/skirt(src)
-	new /obj/item/clothing/suit/storage/toggle/internalaffairs(src)
-	new /obj/item/clothing/suit/storage/toggle/internalaffairs(src)
-	new /obj/item/clothing/under/lawyer/bluesuit(src)
-	new /obj/item/clothing/under/lawyer/bluesuit(src)
-	new /obj/item/clothing/under/lawyer/bluesuit/skirt(src)
-	new /obj/item/clothing/under/lawyer/bluesuit/skirt(src)
-	new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src)
-	new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src)
-	new /obj/item/clothing/under/lawyer/purpsuit(src)
-	new /obj/item/clothing/under/lawyer/purpsuit(src)
-	new /obj/item/clothing/under/lawyer/purpsuit/skirt(src)
-	new /obj/item/clothing/under/lawyer/purpsuit/skirt(src)
-	new /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket(src)
-	new /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket(src)
-	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/laceup(src)
-	new /obj/item/clothing/shoes/laceup(src)
-	new /obj/item/clothing/glasses/sunglasses/big(src)
-	new /obj/item/clothing/glasses/sunglasses/big(src)
-	new /obj/item/clothing/under/lawyer/blue(src)
-	new /obj/item/clothing/under/lawyer/blue(src)
-	new /obj/item/clothing/under/lawyer/blue/skirt(src)
-	new /obj/item/clothing/under/lawyer/blue/skirt(src)
-	new /obj/item/device/tape/random(src)
-	new /obj/item/device/tape/random(src)
+	starts_with = list(
+		/obj/item/clothing/under/lawyer/female = 2,
+		/obj/item/clothing/under/lawyer/black = 2,
+		/obj/item/clothing/under/lawyer/black/skirt = 2,
+		/obj/item/clothing/under/lawyer/red = 2,
+		/obj/item/clothing/under/lawyer/red/skirt = 2,
+		/obj/item/clothing/suit/storage/toggle/internalaffairs = 2,
+		/obj/item/clothing/under/lawyer/bluesuit = 2,
+		/obj/item/clothing/under/lawyer/bluesuit/skirt = 2,
+		/obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 2,
+		/obj/item/clothing/under/lawyer/purpsuit = 2,
+		/obj/item/clothing/under/lawyer/purpsuit/skirt = 2,
+		/obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 2,
+		/obj/item/clothing/shoes/brown = 2,
+		/obj/item/clothing/shoes/black = 2,
+		/obj/item/clothing/shoes/laceup = 2,
+		/obj/item/clothing/glasses/sunglasses/big = 2,
+		/obj/item/clothing/under/lawyer/blue = 2,
+		/obj/item/clothing/under/lawyer/blue/skirt = 2,
+		/obj/item/device/tape/random = 2)

code/game/objects/structures/crates_lockers/closets/l3closet.dm

@@ -10,10 +10,9 @@
 	icon_closed = "bio_general"
 	icon_opened = "bio_generalopen"
 
-/obj/structure/closet/l3closet/general/New()
-	..()
-	new /obj/item/clothing/suit/bio_suit/general(src)
-	new /obj/item/clothing/head/bio_hood/general(src)
+	starts_with = list(
+		/obj/item/clothing/suit/bio_suit/general,
+		/obj/item/clothing/head/bio_hood/general)
 
 
 /obj/structure/closet/l3closet/virology
@@ -21,12 +20,11 @@
 	icon_closed = "bio_virology"
 	icon_opened = "bio_virologyopen"
 
-/obj/structure/closet/l3closet/virology/New()
-	..()
-	new /obj/item/clothing/suit/bio_suit/virology(src)
-	new /obj/item/clothing/head/bio_hood/virology(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/weapon/tank/oxygen(src)
+	starts_with = list(
+		/obj/item/clothing/suit/bio_suit/virology,
+		/obj/item/clothing/head/bio_hood/virology,
+		/obj/item/clothing/mask/gas,
+		/obj/item/weapon/tank/oxygen)
 
 
 /obj/structure/closet/l3closet/security
@@ -34,27 +32,21 @@
 	icon_closed = "bio_security"
 	icon_opened = "bio_securityopen"
 
-/obj/structure/closet/l3closet/security/New()
-	..()
-	new /obj/item/clothing/suit/bio_suit/security(src)
-	new /obj/item/clothing/head/bio_hood/security(src)
-	// new /obj/item/weapon/gun/energy/taser/xeno/sec(src)  // VOREStation Edit - We don't need these
+	starts_with = list(
+		/obj/item/clothing/suit/bio_suit/security,
+		/obj/item/clothing/head/bio_hood/security)
+		///obj/item/weapon/gun/energy/taser/xeno/sec) //VOREStation Removal
 
 /obj/structure/closet/l3closet/janitor
 	icon_state = "bio_janitor"
 	icon_closed = "bio_janitor"
 	icon_opened = "bio_janitoropen"
 
-/obj/structure/closet/l3closet/janitor/New()
-	..()
-	new /obj/item/clothing/suit/bio_suit/janitor(src)
-	new /obj/item/clothing/suit/bio_suit/janitor(src)
-	new /obj/item/clothing/head/bio_hood/janitor(src)
-	new /obj/item/clothing/head/bio_hood/janitor(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/weapon/tank/emergency/oxygen/engi(src)
-	new /obj/item/weapon/tank/emergency/oxygen/engi(src)
+	starts_with = list(
+		/obj/item/clothing/suit/bio_suit/janitor = 2,
+		/obj/item/clothing/head/bio_hood/janitor = 2,
+		/obj/item/clothing/mask/gas = 2,
+		/obj/item/weapon/tank/emergency/oxygen/engi = 2)
 
 
 /obj/structure/closet/l3closet/scientist
@@ -62,15 +54,14 @@
 	icon_closed = "bio_scientist"
 	icon_opened = "bio_scientistopen"
 
-/obj/structure/closet/l3closet/scientist/New()
-	..()
-	new /obj/item/clothing/suit/bio_suit/scientist(src)
-	new /obj/item/clothing/head/bio_hood/scientist(src)
+	starts_with = list(
+		/obj/item/clothing/suit/bio_suit/scientist,
+		/obj/item/clothing/head/bio_hood/scientist)
 
-/obj/structure/closet/l3closet/scientist/double/New()
-	..()
-	new /obj/item/clothing/suit/bio_suit/scientist(src)
-	new /obj/item/clothing/head/bio_hood/scientist(src)
+/obj/structure/closet/l3closet/scientist/double
+	starts_with = list(
+		/obj/item/clothing/suit/bio_suit/scientist = 2,
+		/obj/item/clothing/head/bio_hood/scientist = 2)
 
 
 /obj/structure/closet/l3closet/medical
@@ -78,14 +69,7 @@
 	icon_closed = "bio_scientist"
 	icon_opened = "bio_scientistopen"
 
-/obj/structure/closet/l3closet/medical/New()
-	..()
-	new /obj/item/clothing/suit/bio_suit/general(src)
-	new /obj/item/clothing/suit/bio_suit/general(src)
-	new /obj/item/clothing/suit/bio_suit/general(src)
-	new /obj/item/clothing/head/bio_hood/general(src)
-	new /obj/item/clothing/head/bio_hood/general(src)
-	new /obj/item/clothing/head/bio_hood/general(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/clothing/mask/gas(src)
+	starts_with = list(
+		/obj/item/clothing/suit/bio_suit/general = 3,
+		/obj/item/clothing/head/bio_hood/general = 3,
+		/obj/item/clothing/mask/gas = 3)

code/game/objects/structures/crates_lockers/closets/malfunction.dm

@@ -4,12 +4,11 @@
 	icon_closed = "syndicate"
 	icon_opened = "syndicateopen"
 
-/obj/structure/closet/malf/suits/New()
-	..()
-	new /obj/item/weapon/tank/jetpack/void(src)
-	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/clothing/head/helmet/space/void(src)
-	new /obj/item/clothing/suit/space/void(src)
-	new /obj/item/weapon/crowbar(src)
-	new /obj/item/weapon/cell(src)
-	new /obj/item/device/multitool(src)
+	starts_with = list(
+		/obj/item/weapon/tank/jetpack/void,
+		/obj/item/clothing/mask/breath,
+		/obj/item/clothing/head/helmet/space/void,
+		/obj/item/clothing/suit/space/void,
+		/obj/item/weapon/crowbar,
+		/obj/item/weapon/cell,
+		/obj/item/device/multitool)

code/game/objects/structures/crates_lockers/closets/secure/bar.dm

@@ -8,7 +8,8 @@
 	icon_broken = "cabinetdetective_broken"
 	icon_off = "cabinetdetective_broken"
 
-	will_contain = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 10)
+	starts_with = list(
+		/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 10)
 
 /obj/structure/closet/secure_closet/bar/update_icon()
 	if(broken)

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -8,28 +8,28 @@
 	icon_broken = "securecargobroken"
 	icon_off = "securecargooff"
 
-	New()
-		..()
-		if(prob(75))
-			new /obj/item/weapon/storage/backpack(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/norm(src)
-		if(prob(25))
-			new /obj/item/weapon/storage/backpack/dufflebag(src)
-		new /obj/item/clothing/under/rank/cargotech(src)
-		new /obj/item/clothing/under/rank/cargotech/skirt(src)
-		new /obj/item/clothing/under/rank/cargotech/jeans(src)
-		new /obj/item/clothing/under/rank/cargotech/jeans/female(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/cargo(src)
-		new /obj/item/clothing/shoes/boots/winter/supply(src)
-		new /obj/item/clothing/shoes/black(src)
-		new /obj/item/device/radio/headset/headset_cargo(src)
-		new /obj/item/device/radio/headset/headset_cargo/alt(src)
-		new /obj/item/clothing/gloves/black(src)
-		new /obj/item/clothing/gloves/fingerless(src)
-		new /obj/item/clothing/head/soft(src)
-//		new /obj/item/weapon/cartridge/quartermaster(src)
-		return
+	starts_with = list(
+		/obj/item/clothing/under/rank/cargotech,
+		/obj/item/clothing/under/rank/cargotech/skirt,
+		/obj/item/clothing/under/rank/cargotech/jeans,
+		/obj/item/clothing/under/rank/cargotech/jeans/female,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
+		/obj/item/clothing/shoes/boots/winter/supply,
+		/obj/item/clothing/shoes/black,
+		/obj/item/device/radio/headset/headset_cargo,
+		/obj/item/device/radio/headset/headset_cargo/alt,
+		/obj/item/clothing/gloves/black,
+		/obj/item/clothing/gloves/fingerless,
+		/obj/item/clothing/head/soft)
+
+/obj/structure/closet/secure_closet/cargotech/initialize()
+	if(prob(75))
+		starts_with += /obj/item/weapon/storage/backpack
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/norm
+	if(prob(25))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag
+	return ..()
 
 /obj/structure/closet/secure_closet/quartermaster
 	name = "quartermaster's locker"
@@ -41,32 +41,32 @@
 	icon_broken = "secureqmbroken"
 	icon_off = "secureqmoff"
 
-	New()
-		..()
-		if(prob(75))
-			new /obj/item/weapon/storage/backpack(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/norm(src)
-		if(prob(25))
-			new /obj/item/weapon/storage/backpack/dufflebag(src)
-		new /obj/item/clothing/under/rank/cargo(src)
-		new /obj/item/clothing/under/rank/cargo/skirt(src)
-		new /obj/item/clothing/under/rank/cargo/jeans(src)
-		new /obj/item/clothing/under/rank/cargo/jeans/female(src)
-		new /obj/item/clothing/shoes/brown(src)
-		new /obj/item/device/radio/headset/headset_cargo(src)
-		new /obj/item/device/radio/headset/headset_cargo/alt(src)
-		new /obj/item/clothing/gloves/black(src)
-		new /obj/item/clothing/gloves/fingerless(src)
-//		new /obj/item/weapon/cartridge/quartermaster(src)
-		new /obj/item/clothing/suit/fire/firefighter(src)
-		new /obj/item/weapon/tank/emergency/oxygen(src)
-		new /obj/item/clothing/mask/gas(src)
-		new /obj/item/clothing/glasses/meson(src)
-		new /obj/item/clothing/head/soft(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/cargo(src)
-		new /obj/item/clothing/shoes/boots/winter/supply(src)
-		return
+	starts_with = list(
+		/obj/item/clothing/under/rank/cargo,
+		/obj/item/clothing/under/rank/cargo/skirt,
+		/obj/item/clothing/under/rank/cargo/jeans,
+		/obj/item/clothing/under/rank/cargo/jeans/female,
+		/obj/item/clothing/shoes/brown,
+		/obj/item/device/radio/headset/headset_cargo,
+		/obj/item/device/radio/headset/headset_cargo/alt,
+		/obj/item/clothing/gloves/black,
+		/obj/item/clothing/gloves/fingerless,
+		/obj/item/clothing/suit/fire/firefighter,
+		/obj/item/weapon/tank/emergency/oxygen,
+		/obj/item/clothing/mask/gas,
+		/obj/item/clothing/glasses/meson,
+		/obj/item/clothing/head/soft,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
+		/obj/item/clothing/shoes/boots/winter/supply)
+
+/obj/structure/closet/secure_closet/quartermaster/initialize()
+	if(prob(75))
+		starts_with += /obj/item/weapon/storage/backpack
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/norm
+	if(prob(25))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag
+	return ..()
 
 /obj/structure/closet/secure_closet/miner
 	name = "miner's equipment"
@@ -78,23 +78,24 @@
 	icon_off = "miningsecoff"
 	req_access = list(access_mining)
 
-/obj/structure/closet/secure_closet/miner/New()
-	..()
-	sleep(2)
+	starts_with = list(
+		/obj/item/device/radio/headset/headset_mine,
+		/obj/item/clothing/under/rank/miner,
+		/obj/item/clothing/gloves/black,
+		/obj/item/clothing/shoes/black,
+		/obj/item/device/analyzer,
+		/obj/item/weapon/storage/bag/ore,
+		/obj/item/device/flashlight/lantern,
+		/obj/item/weapon/shovel,
+		/obj/item/weapon/pickaxe,
+		/obj/item/clothing/glasses/material,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/miner,
+		/obj/item/clothing/shoes/boots/winter/mining,
+		/obj/item/stack/marker_beacon/thirty)
+
+/obj/structure/closet/secure_closet/miner/initialize()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/industrial(src)
+		starts_with += /obj/item/weapon/storage/backpack/industrial
 	else
-		new /obj/item/weapon/storage/backpack/satchel/eng(src)
-	new /obj/item/device/radio/headset/headset_mine(src)
-	new /obj/item/clothing/under/rank/miner(src)
-	new /obj/item/clothing/gloves/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/device/analyzer(src)
-	new /obj/item/weapon/storage/bag/ore(src)
-	new /obj/item/device/flashlight/lantern(src)
-	new /obj/item/weapon/shovel(src)
-	new /obj/item/weapon/pickaxe(src)
-	new /obj/item/clothing/glasses/material(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/miner(src)
-	new /obj/item/clothing/shoes/boots/winter/mining(src)
-	new /obj/item/stack/marker_beacon/thirty(src)
+		starts_with += /obj/item/weapon/storage/backpack/satchel/eng
+	return ..()

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -1,172 +1,145 @@
 /obj/structure/closet/secure_closet/engineering_chief
 	name = "chief engineer's locker"
-	req_access = list(access_ce)
 	icon_state = "securece1"
 	icon_closed = "securece"
 	icon_locked = "securece1"
 	icon_opened = "secureceopen"
 	icon_broken = "securecebroken"
 	icon_off = "secureceoff"
+	req_access = list(access_ce)
 
+	starts_with = list(
+		/obj/item/clothing/accessory/storage/brown_vest,
+		/obj/item/blueprints,
+		/obj/item/clothing/under/rank/chief_engineer,
+		/obj/item/clothing/under/rank/chief_engineer/skirt,
+		/obj/item/clothing/head/hardhat/white,
+		/obj/item/clothing/head/welding,
+		/obj/item/clothing/gloves/yellow,
+		/obj/item/clothing/shoes/brown,
+		/obj/item/weapon/cartridge/ce,
+		/obj/item/device/radio/headset/heads/ce,
+		/obj/item/device/radio/headset/heads/ce/alt,
+		/obj/item/weapon/storage/toolbox/mechanical,
+		/obj/item/clothing/suit/storage/hazardvest,
+		/obj/item/clothing/mask/gas,
+		/obj/item/device/multitool,
+		/obj/item/weapon/storage/belt/utility/chief/full,
+		/obj/item/device/flash,
+		/obj/item/device/t_scanner/upgraded,
+		/obj/item/taperoll/engineering,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/engineering,
+		/obj/item/clothing/shoes/boots/winter/engineering,
+		/obj/item/weapon/tank/emergency/oxygen/engi,
+		/obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add
 
-	New()
-		..()
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/industrial(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/eng(src)
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/dufflebag/eng(src)
-		new /obj/item/clothing/accessory/storage/brown_vest(src)
-		new /obj/item/blueprints(src)
-		new /obj/item/clothing/under/rank/chief_engineer(src)
-		new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
-		new /obj/item/clothing/head/hardhat/white(src)
-		new /obj/item/clothing/head/welding(src)
-		new /obj/item/clothing/gloves/yellow(src)
-		new /obj/item/clothing/shoes/brown(src)
-		new /obj/item/weapon/cartridge/ce(src)
-		new /obj/item/device/radio/headset/heads/ce(src)
-		new /obj/item/device/radio/headset/heads/ce/alt(src)
-		new /obj/item/weapon/storage/toolbox/mechanical(src)
-		new /obj/item/clothing/suit/storage/hazardvest(src)
-		new /obj/item/clothing/mask/gas(src)
-		new /obj/item/device/multitool(src)
-		new /obj/item/weapon/storage/belt/utility/chief/full(src)
-		new /obj/item/device/flash(src)
-		new /obj/item/device/t_scanner/upgraded
-		new /obj/item/taperoll/engineering(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
-		new /obj/item/clothing/shoes/boots/winter/engineering(src)
-		new /obj/item/weapon/tank/emergency/oxygen/engi(src)
-		new /obj/item/weapon/reagent_containers/spray/windowsealant(src) //vorestation addition
-		return
-
-
+/obj/structure/closet/secure_closet/engineering_chief/initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/industrial
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/eng
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
+	return ..()
 
 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies"
-	req_access = list(access_engine_equip)
 	icon_state = "secureengelec1"
 	icon_closed = "secureengelec"
 	icon_locked = "secureengelec1"
 	icon_opened = "toolclosetopen"
 	icon_broken = "secureengelecbroken"
 	icon_off = "secureengelecoff"
+	req_access = list(access_engine_equip)
 
-
-	New()
-		..()
-		new /obj/item/clothing/gloves/yellow(src)
-		new /obj/item/clothing/gloves/yellow(src)
-		new /obj/item/weapon/storage/toolbox/electrical(src)
-		new /obj/item/weapon/storage/toolbox/electrical(src)
-		new /obj/item/weapon/storage/toolbox/electrical(src)
-		new /obj/item/weapon/module/power_control(src)
-		new /obj/item/weapon/module/power_control(src)
-		new /obj/item/weapon/module/power_control(src)
-		new /obj/item/device/multitool(src)
-		new /obj/item/device/multitool(src)
-		new /obj/item/device/multitool(src)
-		return
-
+	starts_with = list(
+		/obj/item/clothing/gloves/yellow = 2,
+		/obj/item/weapon/storage/toolbox/electrical = 3,
+		/obj/item/weapon/module/power_control = 3,
+		/obj/item/device/multitool = 3)
 
 
 /obj/structure/closet/secure_closet/engineering_welding
 	name = "welding supplies"
-	req_access = list(access_construction)
 	icon_state = "secureengweld1"
 	icon_closed = "secureengweld"
 	icon_locked = "secureengweld1"
 	icon_opened = "toolclosetopen"
 	icon_broken = "secureengweldbroken"
 	icon_off = "secureengweldoff"
+	req_access = list(access_construction)
 
-
-	New()
-		..()
-		new /obj/item/clothing/head/welding(src)
-		new /obj/item/clothing/head/welding(src)
-		new /obj/item/clothing/head/welding(src)
-		new /obj/item/weapon/weldingtool/largetank(src)
-		new /obj/item/weapon/weldingtool/largetank(src)
-		new /obj/item/weapon/weldingtool/largetank(src)
-		new /obj/item/weapon/weldpack(src)
-		new /obj/item/weapon/weldpack(src)
-		new /obj/item/weapon/weldpack(src)
-		new /obj/item/clothing/glasses/welding(src)
-		new /obj/item/clothing/glasses/welding(src)
-		new /obj/item/clothing/glasses/welding(src)
-		return
-
-
+	starts_with = list(
+		/obj/item/clothing/head/welding = 3,
+		/obj/item/weapon/weldingtool/largetank = 3,
+		/obj/item/weapon/weldpack = 3,
+		/obj/item/clothing/glasses/welding = 3)
 
 /obj/structure/closet/secure_closet/engineering_personal
 	name = "engineer's locker"
-	req_access = list(access_engine_equip)
 	icon_state = "secureeng1"
 	icon_closed = "secureeng"
 	icon_locked = "secureeng1"
 	icon_opened = "secureengopen"
 	icon_broken = "secureengbroken"
 	icon_off = "secureengoff"
+	req_access = list(access_engine_equip)
 
+	starts_with = list(
+		/obj/item/clothing/accessory/storage/brown_vest,
+		/obj/item/weapon/storage/toolbox/mechanical,
+		/obj/item/device/radio/headset/headset_eng,
+		/obj/item/device/radio/headset/headset_eng/alt,
+		/obj/item/clothing/suit/storage/hazardvest,
+		/obj/item/clothing/mask/gas,
+		/obj/item/clothing/glasses/meson,
+		/obj/item/weapon/cartridge/engineering,
+		/obj/item/taperoll/engineering,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/engineering,
+		/obj/item/clothing/shoes/boots/winter/engineering,
+		/obj/item/weapon/tank/emergency/oxygen/engi,
+		/obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add
 
-	New()
-		..()
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/industrial(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/eng(src)
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/dufflebag/eng(src)
-		new /obj/item/clothing/accessory/storage/brown_vest(src)
-		new /obj/item/weapon/storage/toolbox/mechanical(src)
-		new /obj/item/device/radio/headset/headset_eng(src)
-		new /obj/item/device/radio/headset/headset_eng/alt(src)
-		new /obj/item/clothing/suit/storage/hazardvest(src)
-		new /obj/item/clothing/mask/gas(src)
-		new /obj/item/clothing/glasses/meson(src)
-		new /obj/item/weapon/cartridge/engineering(src)
-		new /obj/item/taperoll/engineering(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
-		new /obj/item/clothing/shoes/boots/winter/engineering(src)
-		new /obj/item/weapon/tank/emergency/oxygen/engi(src)
-		new /obj/item/weapon/reagent_containers/spray/windowsealant(src) //vorestation addition
-		return
-
+/obj/structure/closet/secure_closet/engineering_personal/initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/industrial
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/eng
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
+	return ..()
 
 
 /obj/structure/closet/secure_closet/atmos_personal
 	name = "technician's locker"
-	req_access = list(access_atmospherics)
 	icon_state = "secureatm1"
 	icon_closed = "secureatm"
 	icon_locked = "secureatm1"
 	icon_opened = "secureatmopen"
 	icon_broken = "secureatmbroken"
 	icon_off = "secureatmoff"
+	req_access = list(access_atmospherics)
 
+	starts_with = list(
+		/obj/item/clothing/accessory/storage/brown_vest,
+		/obj/item/clothing/suit/fire/firefighter,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/extinguisher,
+		/obj/item/device/radio/headset/headset_eng,
+		/obj/item/device/radio/headset/headset_eng/alt,
+		/obj/item/clothing/suit/storage/hazardvest,
+		/obj/item/clothing/mask/gas,
+		/obj/item/weapon/cartridge/atmos,
+		/obj/item/taperoll/atmos,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos,
+		/obj/item/clothing/shoes/boots/winter/atmos,
+		/obj/item/weapon/tank/emergency/oxygen/engi)
 
-	New()
-		..()
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/industrial(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/eng(src)
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/dufflebag/eng(src)
-		new /obj/item/clothing/accessory/storage/brown_vest(src)
-		new /obj/item/clothing/suit/fire/firefighter(src)
-		new /obj/item/device/flashlight(src)
-		new /obj/item/weapon/extinguisher(src)
-		new /obj/item/device/radio/headset/headset_eng(src)
-		new /obj/item/device/radio/headset/headset_eng/alt(src)
-		new /obj/item/clothing/suit/storage/hazardvest(src)
-		new /obj/item/clothing/mask/gas(src)
-		new /obj/item/weapon/cartridge/atmos(src)
-		new /obj/item/taperoll/atmos(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
-		new /obj/item/clothing/shoes/boots/winter/atmos(src)
-		new /obj/item/weapon/tank/emergency/oxygen/engi(src)
-		return
+/obj/structure/closet/secure_closet/atmos_personal/initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/industrial
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/eng
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
+	return ..()

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -16,20 +16,14 @@
 	name = "kitchen cabinet"
 	req_access = list(access_kitchen)
 
-	New()
-		..()
-		for(var/i = 1 to 7)
-			new /obj/item/weapon/reagent_containers/food/condiment/flour(src)
-		for(var/i = 1 to 2)
-			new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
-		return
-
+	starts_with = list(
+		/obj/item/weapon/reagent_containers/food/condiment/flour = 7,
+		/obj/item/weapon/reagent_containers/food/condiment/sugar = 2)
 
 /obj/structure/closet/secure_closet/freezer/kitchen/mining
 	req_access = list()
 
 
-
 /obj/structure/closet/secure_closet/freezer/meat
 	name = "meat fridge"
 	icon_state = "fridge1"
@@ -39,13 +33,8 @@
 	icon_broken = "fridgebroken"
 	icon_off = "fridge1"
 
-
-	New()
-		..()
-		for(var/i = 1 to 10)
-			new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
-		return
-
+	starts_with = list(
+		/obj/item/weapon/reagent_containers/food/snacks/meat/monkey = 10)
 
 
 /obj/structure/closet/secure_closet/freezer/fridge
@@ -57,17 +46,10 @@
 	icon_broken = "fridgebroken"
 	icon_off = "fridge1"
 
-
-	New()
-		..()
-		for(var/i = 1 to 6)
-			new /obj/item/weapon/reagent_containers/food/drinks/milk(src)
-		for(var/i = 1 to 4)
-			new /obj/item/weapon/reagent_containers/food/drinks/soymilk(src)
-		for(var/i = 1 to 4)
-			new /obj/item/weapon/storage/fancy/egg_box(src)
-		return
-
+	starts_with = list(
+		/obj/item/weapon/reagent_containers/food/drinks/milk = 6,
+		/obj/item/weapon/reagent_containers/food/drinks/soymilk = 4,
+		/obj/item/weapon/storage/fancy/egg_box = 4)
 
 
 /obj/structure/closet/secure_closet/freezer/money
@@ -81,12 +63,7 @@
 	req_access = list(access_heads_vault)
 
 
-	New()
-		..()
-		for(var/i = 1 to 3)
-			new /obj/item/weapon/spacecash/c1000(src)
-		for(var/i = 1 to 4)
-			new /obj/item/weapon/spacecash/c500(src)
-		for(var/i = 1 to 5)
-			new /obj/item/weapon/spacecash/c200(src)
-		return
+	starts_with = list(
+		/obj/item/weapon/spacecash/c1000 = 3,
+		/obj/item/weapon/spacecash/c500 = 4,
+		/obj/item/weapon/spacecash/c200 = 5)

code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm

@@ -1,6 +1,5 @@
 /obj/structure/closet/secure_closet/guncabinet
 	name = "gun cabinet"
-	req_one_access = list(access_armory)
 	icon = 'icons/obj/guncabinet.dmi'
 	icon_state = "base"
 	icon_off ="base"
@@ -8,9 +7,10 @@
 	icon_locked ="base"
 	icon_closed ="base"
 	icon_opened = "base"
+	req_one_access = list(access_armory)
 
-/obj/structure/closet/secure_closet/guncabinet/New()
-	..()
+/obj/structure/closet/secure_closet/guncabinet/initialize()
+	. = ..()
 	update_icon()
 
 /obj/structure/closet/secure_closet/guncabinet/toggle()
@@ -27,7 +27,7 @@
 		for (var/obj/item/weapon/gun/G in contents)
 			if (istype(G, /obj/item/weapon/gun/energy))
 				lazors++
-			if (istype(G, /obj/item/weapon/gun/projectile/))
+			if (istype(G, /obj/item/weapon/gun/projectile))
 				shottas++
 		for (var/i = 0 to 2)
 			if(lazors || shottas) // only make icons if we have one of the two types.

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -8,24 +8,22 @@
 	icon_broken = "hydrosecurebroken"
 	icon_off = "hydrosecureoff"
 
+	starts_with = list(
+		/obj/item/weapon/storage/bag/plants,
+		/obj/item/clothing/under/rank/hydroponics,
+		/obj/item/device/analyzer/plant_analyzer,
+		/obj/item/device/radio/headset/headset_service,
+		/obj/item/clothing/head/greenbandana,
+		/obj/item/weapon/material/minihoe,
+		/obj/item/weapon/material/knife/machete/hatchet,
+		/obj/item/weapon/wirecutters/clippers,
+		/obj/item/weapon/reagent_containers/spray/plantbgone,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/hydro,
+		/obj/item/clothing/shoes/boots/winter/hydro)
 
-	New()
-		..()
-		switch(rand(1,2))
-			if(1)
-				new /obj/item/clothing/suit/storage/apron(src)
-			if(2)
-				new /obj/item/clothing/suit/storage/apron/overalls(src)
-		new /obj/item/weapon/storage/bag/plants(src)
-		new /obj/item/clothing/under/rank/hydroponics(src)
-		new /obj/item/device/analyzer/plant_analyzer(src)
-		new /obj/item/device/radio/headset/headset_service(src)
-		new /obj/item/clothing/head/greenbandana(src)
-		new /obj/item/weapon/material/minihoe(src)
-		new /obj/item/weapon/material/knife/machete/hatchet(src)
-		new /obj/item/weapon/wirecutters/clippers(src)
-		new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/hydro(src)
-		new /obj/item/clothing/shoes/boots/winter/hydro(src)
-//		new /obj/item/weapon/bee_net(src) //No more bees, March 2014
-		return
+/obj/structure/closet/secure_closet/hydroponics/initialize()
+	if(prob(50))
+		starts_with += /obj/item/clothing/suit/storage/apron
+	else
+		starts_with += /obj/item/clothing/suit/storage/apron/overalls
+	return ..()

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -9,21 +9,13 @@
 	icon_off = "medicaloff"
 	req_access = list(access_medical)
 
-
-/obj/structure/closet/secure_closet/medical1/New()
-		..()
-		new /obj/item/weapon/storage/box/autoinjectors(src)
-		new /obj/item/weapon/storage/box/syringes(src)
-		new /obj/item/weapon/reagent_containers/dropper(src)
-		new /obj/item/weapon/reagent_containers/dropper(src)
-		new /obj/item/weapon/reagent_containers/glass/beaker(src)
-		new /obj/item/weapon/reagent_containers/glass/beaker(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
-		return
-
+	starts_with = list(
+		/obj/item/weapon/storage/box/autoinjectors,
+		/obj/item/weapon/storage/box/syringes,
+		/obj/item/weapon/reagent_containers/dropper = 2,
+		/obj/item/weapon/reagent_containers/glass/beaker = 2,
+		/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2,
+		/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2)
 
 
 /obj/structure/closet/secure_closet/medical2
@@ -37,17 +29,9 @@
 	icon_off = "medicaloff"
 	req_access = list(access_surgery)
 
-
-/obj/structure/closet/secure_closet/medical2/New()
-		..()
-		new /obj/item/weapon/tank/anesthetic(src)
-		new /obj/item/weapon/tank/anesthetic(src)
-		new /obj/item/weapon/tank/anesthetic(src)
-		new /obj/item/clothing/mask/breath/medical(src)
-		new /obj/item/clothing/mask/breath/medical(src)
-		new /obj/item/clothing/mask/breath/medical(src)
-		return
-
+	starts_with = list(
+		/obj/item/weapon/tank/anesthetic = 3,
+		/obj/item/clothing/mask/breath/medical = 3)
 
 
 /obj/structure/closet/secure_closet/medical3
@@ -60,63 +44,63 @@
 	icon_broken = "securemedbroken"
 	icon_off = "securemedoff"
 
-/obj/structure/closet/secure_closet/medical3/New()
-	..()
+	starts_with = list(
+		/obj/item/clothing/under/rank/medical,
+		/obj/item/clothing/under/rank/nurse,
+		/obj/item/clothing/under/rank/orderly,
+		/obj/item/clothing/suit/storage/toggle/labcoat,
+		/obj/item/clothing/suit/storage/toggle/fr_jacket,
+		/obj/item/clothing/shoes/white,
+		/obj/item/weapon/cartridge/medical,
+		/obj/item/device/radio/headset/headset_med,
+		/obj/item/device/radio/headset/headset_med/alt,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
+		/obj/item/clothing/shoes/boots/winter/medical,
+		/obj/item/clothing/under/rank/nursesuit,
+		/obj/item/clothing/head/nursehat,
+		/obj/item/weapon/storage/box/freezer = 3)
+
+/obj/structure/closet/secure_closet/medical3/initialize()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/medic(src)
+		starts_with += /obj/item/weapon/storage/backpack/medic
 	else
-		new /obj/item/weapon/storage/backpack/satchel/med(src)
+		starts_with += /obj/item/weapon/storage/backpack/satchel/med
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/dufflebag/med(src)
-	new /obj/item/clothing/under/rank/nursesuit (src)
-	new /obj/item/clothing/head/nursehat (src)
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
 	switch(pick("blue", "green", "purple", "black", "navyblue"))
 		if ("blue")
-			new /obj/item/clothing/under/rank/medical/scrubs(src)
-			new /obj/item/clothing/head/surgery/blue(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs
+			starts_with += /obj/item/clothing/head/surgery/blue
 		if ("green")
-			new /obj/item/clothing/under/rank/medical/scrubs/green(src)
-			new /obj/item/clothing/head/surgery/green(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
+			starts_with += /obj/item/clothing/head/surgery/green
 		if ("purple")
-			new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
-			new /obj/item/clothing/head/surgery/purple(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
+			starts_with += /obj/item/clothing/head/surgery/purple
 		if ("black")
-			new /obj/item/clothing/under/rank/medical/scrubs/black(src)
-			new /obj/item/clothing/head/surgery/black(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
+			starts_with += /obj/item/clothing/head/surgery/black
 		if ("navyblue")
-			new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src)
-			new /obj/item/clothing/head/surgery/navyblue(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
+			starts_with += /obj/item/clothing/head/surgery/navyblue
 	switch(pick("blue", "green", "purple", "black", "navyblue"))
 		if ("blue")
-			new /obj/item/clothing/under/rank/medical/scrubs(src)
-			new /obj/item/clothing/head/surgery/blue(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs
+			starts_with += /obj/item/clothing/head/surgery/blue
 		if ("green")
-			new /obj/item/clothing/under/rank/medical/scrubs/green(src)
-			new /obj/item/clothing/head/surgery/green(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
+			starts_with += /obj/item/clothing/head/surgery/green
 		if ("purple")
-			new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
-			new /obj/item/clothing/head/surgery/purple(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
+			starts_with += /obj/item/clothing/head/surgery/purple
 		if ("black")
-			new /obj/item/clothing/under/rank/medical/scrubs/black(src)
-			new /obj/item/clothing/head/surgery/black(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
+			starts_with += /obj/item/clothing/head/surgery/black
 		if ("navyblue")
-			new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src)
-			new /obj/item/clothing/head/surgery/navyblue(src)
-	new /obj/item/clothing/under/rank/medical(src)
-	new /obj/item/clothing/under/rank/nurse(src)
-	new /obj/item/clothing/under/rank/orderly(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/suit/storage/toggle/fr_jacket(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/weapon/cartridge/medical(src)
-	new /obj/item/device/radio/headset/headset_med(src)
-	new /obj/item/device/radio/headset/headset_med/alt(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
-	new /obj/item/clothing/shoes/boots/winter/medical(src)
-	new /obj/item/weapon/storage/box/freezer(src)
-	new /obj/item/weapon/storage/box/freezer(src)
-	new /obj/item/weapon/storage/box/freezer(src)
-	return
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
+			starts_with += /obj/item/clothing/head/surgery/navyblue
+	return ..()
+
 
 /obj/structure/closet/secure_closet/paramedic
 	name = "paramedic locker"
@@ -129,33 +113,30 @@
 	icon_off = "medicaloff"
 	req_access = list(access_medical_equip)
 
-
-/obj/structure/closet/secure_closet/paramedic/New()
-		..()
-		new /obj/item/weapon/storage/backpack/dufflebag/emt(src)
-		new /obj/item/weapon/storage/box/autoinjectors(src)
-		new /obj/item/weapon/storage/box/syringes(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
-		new /obj/item/weapon/storage/belt/medical/emt(src)
-		new /obj/item/clothing/mask/gas(src)
-		new /obj/item/clothing/suit/storage/toggle/fr_jacket(src)
-		new /obj/item/clothing/suit/storage/toggle/labcoat/emt(src)
-		new /obj/item/device/radio/headset/headset_med/alt(src)
-		new /obj/item/weapon/cartridge/medical(src)
-		new /obj/item/weapon/storage/briefcase/inflatable(src)
-		new /obj/item/device/flashlight(src)
-		new /obj/item/weapon/tank/emergency/oxygen/engi(src)
-		new /obj/item/clothing/glasses/hud/health(src)
-		new /obj/item/device/healthanalyzer(src)
-		new /obj/item/device/radio/off(src)
-		new /obj/random/medical(src)
-		new /obj/item/weapon/crowbar(src)
-		new /obj/item/weapon/extinguisher/mini(src)
-		new /obj/item/weapon/storage/box/freezer(src)
-		new /obj/item/clothing/accessory/storage/white_vest(src)
-		new /obj/item/taperoll/medical(src)
-		return
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/dufflebag/emt,
+		/obj/item/weapon/storage/box/autoinjectors,
+		/obj/item/weapon/storage/box/syringes,
+		/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
+		/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
+		/obj/item/weapon/storage/belt/medical/emt,
+		/obj/item/clothing/mask/gas,
+		/obj/item/clothing/suit/storage/toggle/fr_jacket,
+		/obj/item/clothing/suit/storage/toggle/labcoat/emt,
+		/obj/item/device/radio/headset/headset_med/alt,
+		/obj/item/weapon/cartridge/medical,
+		/obj/item/weapon/storage/briefcase/inflatable,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/tank/emergency/oxygen/engi,
+		/obj/item/clothing/glasses/hud/health,
+		/obj/item/device/healthanalyzer,
+		/obj/item/device/radio/off,
+		/obj/random/medical,
+		/obj/item/weapon/crowbar,
+		/obj/item/weapon/extinguisher/mini,
+		/obj/item/weapon/storage/box/freezer,
+		/obj/item/clothing/accessory/storage/white_vest,
+		/obj/item/taperoll/medical)
 
 /obj/structure/closet/secure_closet/CMO
 	name = "chief medical officer's locker"
@@ -167,67 +148,61 @@
 	icon_broken = "cmosecurebroken"
 	icon_off = "cmosecureoff"
 
-/obj/structure/closet/secure_closet/CMO/New()
-	..()
+	starts_with = list(
+		/obj/item/clothing/under/rank/chief_medical_officer,
+		/obj/item/clothing/under/rank/chief_medical_officer/skirt,
+		/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
+		/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
+		/obj/item/weapon/cartridge/cmo,
+		/obj/item/clothing/gloves/sterile/latex,
+		/obj/item/clothing/shoes/brown	,
+		/obj/item/device/radio/headset/heads/cmo,
+		/obj/item/device/radio/headset/heads/cmo/alt,
+		/obj/item/device/flash,
+		/obj/item/weapon/reagent_containers/hypospray/vial,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
+		/obj/item/clothing/shoes/boots/winter/medical,
+		/obj/item/weapon/storage/box/freezer,
+		/obj/item/clothing/mask/gas,
+		/obj/item/taperoll/medical,
+		/obj/item/clothing/suit/bio_suit/cmo,
+		/obj/item/clothing/head/bio_hood/cmo,
+		/obj/item/clothing/shoes/white,
+		/obj/item/weapon/reagent_containers/glass/beaker/vial) //VOREStation Add
+
+/obj/structure/closet/secure_closet/CMO/initialize()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/medic(src)
+		starts_with += /obj/item/weapon/storage/backpack/medic
 	else
-		new /obj/item/weapon/storage/backpack/satchel/med(src)
+		starts_with += /obj/item/weapon/storage/backpack/satchel/med
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/dufflebag/med(src)
-	new /obj/item/clothing/suit/bio_suit/cmo(src)
-	new /obj/item/clothing/head/bio_hood/cmo(src)
-	new /obj/item/clothing/shoes/white(src)
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
 	switch(pick("blue", "green", "purple", "black", "navyblue"))
 		if ("blue")
-			new /obj/item/clothing/under/rank/medical/scrubs(src)
-			new /obj/item/clothing/head/surgery/blue(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs
+			starts_with += /obj/item/clothing/head/surgery/blue
 		if ("green")
-			new /obj/item/clothing/under/rank/medical/scrubs/green(src)
-			new /obj/item/clothing/head/surgery/green(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
+			starts_with += /obj/item/clothing/head/surgery/green
 		if ("purple")
-			new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
-			new /obj/item/clothing/head/surgery/purple(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
+			starts_with += /obj/item/clothing/head/surgery/purple
 		if ("black")
-			new /obj/item/clothing/under/rank/medical/scrubs/black(src)
-			new /obj/item/clothing/head/surgery/black(src)
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
+			starts_with += /obj/item/clothing/head/surgery/black
 		if ("navyblue")
-			new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src)
-			new /obj/item/clothing/head/surgery/navyblue(src)
-	new /obj/item/clothing/under/rank/chief_medical_officer(src)
-	new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
-	new /obj/item/weapon/cartridge/cmo(src)
-	new /obj/item/clothing/gloves/sterile/latex(src)
-	new /obj/item/clothing/shoes/brown	(src)
-	new /obj/item/device/radio/headset/heads/cmo(src)
-	new /obj/item/device/radio/headset/heads/cmo/alt(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/weapon/reagent_containers/hypospray/vial(src)
-	new /obj/item/weapon/reagent_containers/glass/beaker/vial(src) //VOREStation Edit - An extra vial for the hypo
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
-	new /obj/item/clothing/shoes/boots/winter/medical(src)
-	new /obj/item/weapon/storage/box/freezer(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/taperoll/medical(src)
-	return
-
+			starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
+			starts_with += /obj/item/clothing/head/surgery/navyblue
+	return ..()
 
 
 /obj/structure/closet/secure_closet/animal
 	name = "animal control closet"
 	req_access = list(access_surgery)
 
-
-/obj/structure/closet/secure_closet/animal/New()
-		..()
-		new /obj/item/device/assembly/signaler(src)
-		new /obj/item/device/radio/electropack(src)
-		new /obj/item/device/radio/electropack(src)
-		new /obj/item/device/radio/electropack(src)
-		return
-
+	starts_with = list(
+		/obj/item/device/assembly/signaler,
+		/obj/item/device/radio/electropack = 3)
 
 
 /obj/structure/closet/secure_closet/chemical
@@ -241,37 +216,16 @@
 	icon_off = "medicaloff"
 	req_access = list(access_chemistry)
 
+	starts_with = list(
+		/obj/item/weapon/storage/box/pillbottles = 2,
+		/obj/item/weapon/storage/box/beakers,
+		/obj/item/weapon/storage/box/autoinjectors,
+		/obj/item/weapon/storage/box/syringes,
+		/obj/item/weapon/reagent_containers/dropper = 2,
+		/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2,
+		/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2,
+		/obj/item/weapon/storage/fancy/vials) //VOREStation Add
 
-/obj/structure/closet/secure_closet/chemical/New()
-		..()
-		new /obj/item/clothing/under/rank/psych(src)
-		new /obj/item/clothing/under/rank/psych/turtleneck(src)
-		new /obj/item/clothing/suit/straight_jacket(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src)
-		new /obj/item/weapon/reagent_containers/syringe(src)
-		new /obj/item/weapon/storage/pill_bottle/citalopram(src)
-		new /obj/item/weapon/reagent_containers/pill/methylphenidate(src)
-		new /obj/item/weapon/clipboard(src)
-		new /obj/item/weapon/folder/white(src)
-		new /obj/item/device/taperecorder(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/camera(src)
-		new /obj/item/weapon/storage/fancy/vials(src) //VOREStation Edit - adding vials for new hypo
-		new /obj/item/toy/plushie/therapy/blue(src)
-		new /obj/item/weapon/storage/box/pillbottles(src)
-		new /obj/item/weapon/storage/box/pillbottles(src)
-		new /obj/item/weapon/storage/box/beakers(src)
-		new /obj/item/weapon/storage/box/autoinjectors(src)
-		new /obj/item/weapon/storage/box/syringes(src)
-		new /obj/item/weapon/reagent_containers/dropper(src)
-		new /obj/item/weapon/reagent_containers/dropper(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
-		return
 
 /obj/structure/closet/secure_closet/psych
 	name = "psychiatric closet"
@@ -284,25 +238,21 @@
 	icon_off = "medicaloff"
 	req_access = list(access_psychiatrist)
 
+	starts_with = list(
+		/obj/item/clothing/under/rank/psych,
+		/obj/item/clothing/under/rank/psych/turtleneck,
+		/obj/item/clothing/suit/straight_jacket,
+		/obj/item/weapon/reagent_containers/glass/bottle/stoxin,
+		/obj/item/weapon/reagent_containers/syringe,
+		/obj/item/weapon/storage/pill_bottle/citalopram,
+		/obj/item/weapon/reagent_containers/pill/methylphenidate,
+		/obj/item/weapon/clipboard,
+		/obj/item/weapon/folder/white,
+		/obj/item/device/taperecorder,
+		/obj/item/device/tape/random = 3,
+		/obj/item/device/camera,
+		/obj/item/toy/plushie/therapy/blue)
 
-/obj/structure/closet/secure_closet/psych/New()
-		..()
-		new /obj/item/clothing/under/rank/psych(src)
-		new /obj/item/clothing/under/rank/psych/turtleneck(src)
-		new /obj/item/clothing/suit/straight_jacket(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src)
-		new /obj/item/weapon/reagent_containers/syringe(src)
-		new /obj/item/weapon/storage/pill_bottle/citalopram(src)
-		new /obj/item/weapon/reagent_containers/pill/methylphenidate(src)
-		new /obj/item/weapon/clipboard(src)
-		new /obj/item/weapon/folder/white(src)
-		new /obj/item/device/taperecorder(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/camera(src)
-		new /obj/item/toy/plushie/therapy/blue(src)
-		return
 
 /obj/structure/closet/secure_closet/medical_wall
 	name = "first aid closet"
@@ -335,25 +285,18 @@
 /obj/structure/closet/secure_closet/medical_wall/pills
 	name = "pill cabinet"
 
-/obj/structure/closet/secure_closet/medical_wall/pills/New()
-		..()
-		new /obj/item/weapon/storage/pill_bottle/tramadol(src)
-		new /obj/item/weapon/storage/pill_bottle/antitox(src)
-		new /obj/item/weapon/storage/pill_bottle/carbon(src)
-		new /obj/random/medical/pillbottle(src)
-		return
+	starts_with = list(
+		/obj/item/weapon/storage/pill_bottle/tramadol,
+		/obj/item/weapon/storage/pill_bottle/antitox,
+		/obj/item/weapon/storage/pill_bottle/carbon,
+		/obj/random/medical/pillbottle)
+
 
 /obj/structure/closet/secure_closet/medical_wall/anesthetics
 	name = "anesthetics wall closet"
 	desc = "Used to knock people out."
 	req_access = list(access_surgery)
 
-/obj/structure/closet/secure_closet/medical_wall/anesthetics/New()
-		..()
-		new /obj/item/weapon/tank/anesthetic(src)
-		new /obj/item/weapon/tank/anesthetic(src)
-		new /obj/item/weapon/tank/anesthetic(src)
-		new /obj/item/clothing/mask/breath/medical(src)
-		new /obj/item/clothing/mask/breath/medical(src)
-		new /obj/item/clothing/mask/breath/medical(src)
-		return
+	starts_with = list(
+		/obj/item/weapon/tank/anesthetic = 3,
+		/obj/item/clothing/mask/breath/medical = 3)

code/game/objects/structures/crates_lockers/closets/secure/personal.dm

@@ -4,31 +4,23 @@
 	req_access = list(access_all_personal_lockers)
 	var/registered_name = null
 
-/obj/structure/closet/secure_closet/personal/New()
-	..()
-	spawn(2)
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/norm(src)
-		new /obj/item/device/radio/headset( src )
-	return
+	starts_with = list(
+		/obj/item/device/radio/headset)
 
+/obj/structure/closet/secure_closet/personal/initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/norm
+	return ..()
 
 /obj/structure/closet/secure_closet/personal/patient
 	name = "patient's closet"
 
-/obj/structure/closet/secure_closet/personal/patient/New()
-	..()
-	spawn(4)
-		// Not really the best way to do this, but it's better than "contents = list()"!
-		for(var/atom/movable/AM in contents)
-			qdel(AM)
-		new /obj/item/clothing/under/medigown(src)
-		new /obj/item/clothing/under/color/white( src )
-		new /obj/item/clothing/shoes/white( src )
-	return
-
+	starts_with = list(
+		/obj/item/clothing/under/medigown,
+		/obj/item/clothing/under/color/white,
+		/obj/item/clothing/shoes/white)
 
 
 /obj/structure/closet/secure_closet/personal/cabinet
@@ -39,6 +31,11 @@
 	icon_broken = "cabinetdetective_broken"
 	icon_off = "cabinetdetective_broken"
 
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/satchel/withwallet,
+		/obj/item/device/radio/headset
+		)
+
 /obj/structure/closet/secure_closet/personal/cabinet/update_icon()
 	if(broken)
 		icon_state = icon_broken
@@ -51,20 +48,11 @@
 		else
 			icon_state = icon_opened
 
-/obj/structure/closet/secure_closet/personal/cabinet/New()
-	..()
-	spawn(4)
-		// Not really the best way to do this, but it's better than "contents = list()"!
-		for(var/atom/movable/AM in contents)
-			qdel(AM)
-		new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
-		new /obj/item/device/radio/headset( src )
-	return
-
 /obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (src.opened)
 		if (istype(W, /obj/item/weapon/grab))
-			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
+			var/obj/item/weapon/grab/G = W
+			src.MouseDrop_T(G.affecting, user)      //act like they were dragged onto the closet
 		user.drop_item()
 		if (W) W.forceMove(src.loc)
 	else if(W.GetID())

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -1,61 +1,57 @@
 /obj/structure/closet/secure_closet/scientist
 	name = "scientist's locker"
-	req_access = list(access_tox_storage)
 	icon_state = "secureres1"
 	icon_closed = "secureres"
 	icon_locked = "secureres1"
 	icon_opened = "secureresopen"
 	icon_broken = "secureresbroken"
 	icon_off = "secureresoff"
+	req_access = list(access_tox_storage)
 
-	New()
-		..()
-		new /obj/item/clothing/under/rank/scientist(src)
-		//new /obj/item/clothing/suit/labcoat/science(src)
-		new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-		new /obj/item/clothing/shoes/white(src)
-//		new /obj/item/weapon/cartridge/signal/science(src)
-		new /obj/item/device/radio/headset/headset_sci(src)
-		new /obj/item/weapon/tank/air(src)
-		new /obj/item/clothing/mask/gas(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
-		new /obj/item/clothing/shoes/boots/winter/science(src)
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
-		else
-			new /obj/item/weapon/storage/backpack/toxins(src)
-		return
+	starts_with = list(
+		/obj/item/clothing/under/rank/scientist,
+		/obj/item/clothing/suit/storage/toggle/labcoat,
+		/obj/item/clothing/shoes/white,
+		/obj/item/device/radio/headset/headset_sci,
+		/obj/item/weapon/tank/air,
+		/obj/item/clothing/mask/gas,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/science,
+		/obj/item/clothing/shoes/boots/winter/science)
 
+/obj/structure/closet/secure_closet/scientist/initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
+	else
+		starts_with += /obj/item/weapon/storage/backpack/toxins
+	return ..()
 
 
 /obj/structure/closet/secure_closet/RD
 	name = "research director's locker"
-	req_access = list(access_rd)
 	icon_state = "rdsecure1"
 	icon_closed = "rdsecure"
 	icon_locked = "rdsecure1"
 	icon_opened = "rdsecureopen"
 	icon_broken = "rdsecurebroken"
 	icon_off = "rdsecureoff"
+	req_access = list(access_rd)
 
-	New()
-		..()
-		new /obj/item/clothing/suit/bio_suit/scientist(src)
-		new /obj/item/clothing/head/bio_hood/scientist(src)
-		new /obj/item/clothing/under/rank/research_director(src)
-		new /obj/item/clothing/under/rank/research_director/rdalt(src)
-		new /obj/item/clothing/under/rank/research_director/dress_rd(src)
-		new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-		new /obj/item/weapon/cartridge/rd(src)
-		new /obj/item/clothing/shoes/white(src)
-		new /obj/item/clothing/shoes/leather(src)
-		new /obj/item/clothing/gloves/sterile/latex(src)
-		new /obj/item/device/radio/headset/heads/rd(src)
-		new /obj/item/device/radio/headset/heads/rd/alt(src)
-		new /obj/item/weapon/bluespace_harpoon(src) //VOREStation Edit
-		new /obj/item/weapon/tank/air(src)
-		new /obj/item/clothing/mask/gas(src)
-		new /obj/item/device/flash(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
-		new /obj/item/clothing/shoes/boots/winter/science(src)
-		return
+	starts_with = list(
+		/obj/item/clothing/suit/bio_suit/scientist,
+		/obj/item/clothing/head/bio_hood/scientist,
+		/obj/item/clothing/under/rank/research_director,
+		/obj/item/clothing/under/rank/research_director/rdalt,
+		/obj/item/clothing/under/rank/research_director/dress_rd,
+		/obj/item/clothing/suit/storage/toggle/labcoat,
+		/obj/item/weapon/cartridge/rd,
+		/obj/item/clothing/shoes/white,
+		/obj/item/clothing/shoes/leather,
+		/obj/item/clothing/gloves/sterile/latex,
+		/obj/item/device/radio/headset/heads/rd,
+		/obj/item/device/radio/headset/heads/rd/alt,
+		/obj/item/weapon/tank/air,
+		/obj/item/clothing/mask/gas,
+		/obj/item/device/flash,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/science,
+		/obj/item/clothing/shoes/boots/winter/science,
+		/obj/item/weapon/bluespace_harpoon) //VOREStation Add

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -1,90 +1,82 @@
 /obj/structure/closet/secure_closet/captains
 	name = "colony director's locker"
-	req_access = list(access_captain)
 	icon_state = "capsecure1"
 	icon_closed = "capsecure"
 	icon_locked = "capsecure1"
 	icon_opened = "capsecureopen"
 	icon_broken = "capsecurebroken"
 	icon_off = "capsecureoff"
+	req_access = list(access_captain)
 
-	New()
-		..()
-		new /obj/item/weapon/storage/backpack/dufflebag/captain(src)
-		new /obj/item/clothing/head/helmet(src)
-		new /obj/item/clothing/suit/storage/vest(src)
-		new /obj/item/weapon/cartridge/captain(src)
-		new /obj/item/weapon/storage/lockbox/medal(src)
-		new /obj/item/device/radio/headset/heads/captain(src)
-		new /obj/item/device/radio/headset/heads/captain/alt(src)
-		new /obj/item/weapon/gun/energy/gun(src)
-		new /obj/item/weapon/melee/telebaton(src)
-		new /obj/item/device/flash(src)
-		new /obj/item/weapon/storage/box/ids(src)
-		return
-
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/dufflebag/captain,
+		/obj/item/clothing/head/helmet,
+		/obj/item/clothing/suit/storage/vest,
+		/obj/item/weapon/cartridge/captain,
+		/obj/item/weapon/storage/lockbox/medal,
+		/obj/item/device/radio/headset/heads/captain,
+		/obj/item/device/radio/headset/heads/captain/alt,
+		/obj/item/weapon/gun/energy/gun,
+		/obj/item/weapon/melee/telebaton,
+		/obj/item/device/flash,
+		/obj/item/weapon/storage/box/ids)
 
 
 /obj/structure/closet/secure_closet/hop
 	name = "head of personnel's locker"
-	req_access = list(access_hop)
 	icon_state = "hopsecure1"
 	icon_closed = "hopsecure"
 	icon_locked = "hopsecure1"
 	icon_opened = "hopsecureopen"
 	icon_broken = "hopsecurebroken"
 	icon_off = "hopsecureoff"
+	req_access = list(access_hop)
 
-	New()
-		..()
-		new /obj/item/clothing/suit/storage/vest(src)
-		new /obj/item/clothing/head/helmet(src)
-		new /obj/item/weapon/cartridge/hop(src)
-		new /obj/item/device/radio/headset/heads/hop(src)
-		new /obj/item/device/radio/headset/heads/hop/alt(src)
-		new /obj/item/weapon/storage/box/ids(src)
-		new /obj/item/weapon/storage/box/ids( src )
-		new /obj/item/weapon/gun/energy/gun/martin(src) //VOREStation Edit
-		//new /obj/item/weapon/gun/projectile/sec/flash(src) //VOREStation Edit
-		new /obj/item/device/flash(src)
-		return
+	starts_with = list(
+		/obj/item/clothing/suit/storage/vest,
+		/obj/item/clothing/head/helmet,
+		/obj/item/weapon/cartridge/hop,
+		/obj/item/device/radio/headset/heads/hop,
+		/obj/item/device/radio/headset/heads/hop/alt,
+		/obj/item/weapon/storage/box/ids = 2,
+		/obj/item/weapon/gun/energy/gun,
+		/obj/item/weapon/gun/energy/gun/martin, //VOREStation Add,
+		///obj/item/weapon/gun/projectile/sec/flash, //VOREStation Removal,
+		/obj/item/device/flash)
 
 /obj/structure/closet/secure_closet/hop2
 	name = "head of personnel's attire"
-	req_access = list(access_hop)
 	icon_state = "hopsecure1"
 	icon_closed = "hopsecure"
 	icon_locked = "hopsecure1"
 	icon_opened = "hopsecureopen"
 	icon_broken = "hopsecurebroken"
 	icon_off = "hopsecureoff"
+	req_access = list(access_hop)
 
-	New()
-		..()
-		new /obj/item/clothing/under/rank/head_of_personnel(src)
-		new /obj/item/clothing/under/dress/dress_hop(src)
-		new /obj/item/clothing/under/dress/dress_hr(src)
-		new /obj/item/clothing/under/lawyer/female(src)
-		new /obj/item/clothing/under/lawyer/black(src)
-		new /obj/item/clothing/under/lawyer/black/skirt(src)
-		new /obj/item/clothing/under/lawyer/red(src)
-		new /obj/item/clothing/under/lawyer/red/skirt(src)
-		new /obj/item/clothing/under/lawyer/oldman(src)
-		new /obj/item/clothing/shoes/brown(src)
-		new /obj/item/clothing/shoes/black(src)
-		new /obj/item/clothing/shoes/leather(src)
-		new /obj/item/clothing/shoes/white(src)
-		new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
-		new /obj/item/clothing/head/caphat/hop(src)
-		new /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit(src)
-		new /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt(src)
-		new /obj/item/clothing/glasses/sunglasses(src)
-		return
-
+	starts_with = list(
+		/obj/item/clothing/under/rank/head_of_personnel,
+		/obj/item/clothing/under/dress/dress_hop,
+		/obj/item/clothing/under/dress/dress_hr,
+		/obj/item/clothing/under/lawyer/female,
+		/obj/item/clothing/under/lawyer/black,
+		/obj/item/clothing/under/lawyer/black/skirt,
+		/obj/item/clothing/under/lawyer/red,
+		/obj/item/clothing/under/lawyer/red/skirt,
+		/obj/item/clothing/under/lawyer/oldman,
+		/obj/item/clothing/shoes/brown,
+		/obj/item/clothing/shoes/black,
+		/obj/item/clothing/shoes/leather,
+		/obj/item/clothing/shoes/white,
+		/obj/item/clothing/under/rank/head_of_personnel_whimsy,
+		/obj/item/clothing/head/caphat/hop,
+		/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit,
+		/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt,
+		/obj/item/clothing/glasses/sunglasses)
 
 
 /obj/structure/closet/secure_closet/hos
-	name = "head of security's attire" //VOREStation Edit
+	name = "head of security's locker"
 	req_access = list(access_hos)
 	icon_state = "hossecure1"
 	icon_closed = "hossecure"
@@ -92,231 +84,193 @@
 	icon_opened = "hossecureopen"
 	icon_broken = "hossecurebroken"
 	icon_off = "hossecureoff"
-	storage_capacity = 2.5 * MOB_MEDIUM
-	//VOREStation Edit - This list split into two lockers
-	New()
-		..()
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/security(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/sec(src)
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
-		new /obj/item/clothing/head/helmet/HoS(src)
-		new /obj/item/clothing/head/helmet/HoS/hat(src)
-		new /obj/item/clothing/suit/storage/vest/hos(src)
-		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
-		new /obj/item/clothing/under/rank/head_of_security/corp(src)
-		new /obj/item/clothing/suit/storage/vest/hoscoat/jensen(src)
-		new /obj/item/clothing/suit/storage/vest/hoscoat(src)
-		new /obj/item/clothing/head/helmet/dermal(src)
-		new /obj/item/device/radio/headset/heads/hos(src)
-		new /obj/item/device/radio/headset/heads/hos/alt(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
-		new /obj/item/weapon/storage/belt/security(src)
-		new /obj/item/clothing/accessory/holster/waist(src)
-		new /obj/item/clothing/head/beret/sec/corporate/hos(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
-		new /obj/item/clothing/mask/gas/half(src)
-		return
-
-//VOREStation Edit - Locker has too much junk in it, splitting it up
-/obj/structure/closet/secure_closet/hos2
-	name = "head of security's gear"
 	req_access = list(access_hos)
-	icon_state = "hossecure1"
-	icon_closed = "hossecure"
-	icon_locked = "hossecure1"
-	icon_opened = "hossecureopen"
-	icon_broken = "hossecurebroken"
-	icon_off = "hossecureoff"
 	storage_capacity = 2.5 * MOB_MEDIUM
 
-	New()
-		..()
-		new /obj/item/weapon/cartridge/hos(src)
-		new /obj/item/taperoll/police(src)
-		new /obj/item/weapon/shield/riot/tele(src)
-		new /obj/item/weapon/storage/box/holobadge/hos(src)
-		new /obj/item/clothing/accessory/badge/holo/hos(src)
-		new /obj/item/weapon/reagent_containers/spray/pepper(src)
-		new /obj/item/weapon/crowbar/red(src)
-		new /obj/item/weapon/storage/box/flashbangs(src)
-		new /obj/item/device/flash(src)
-		new /obj/item/weapon/melee/baton/loaded(src)
-		/*new /obj/item/weapon/gun/projectile/lamia(src)
-		new /obj/item/ammo_magazine/m44/rubber(src)
-		new /obj/item/ammo_magazine/m44(src)
-		new /obj/item/ammo_magazine/m44(src)*/ // NO YOU DO NOT GET A .44 MAGNUM! -Ace
-		//new /obj/item/weapon/gun/energy/gun(src) //VOREStation Edit
-		new /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos(src) //VOREStation Edit - No need with NSFW
-		//new /obj/item/weapon/cell/device/weapon(src) //VOREStation Edit - No need with NSFW
-		new /obj/item/weapon/melee/telebaton(src)
-		new /obj/item/clothing/head/beret/sec/corporate/hos(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
-		new /obj/item/clothing/shoes/boots/winter/security(src)
-		new /obj/item/device/flashlight/maglight(src)
-		return
-//VOREStation Edit End
+	starts_with = list(
+		/obj/item/clothing/head/helmet/HoS,
+		/obj/item/clothing/head/helmet/HoS/hat,
+		/obj/item/clothing/suit/storage/vest/hos,
+		/obj/item/clothing/under/rank/head_of_security/jensen,
+		/obj/item/clothing/under/rank/head_of_security/corp,
+		/obj/item/clothing/suit/storage/vest/hoscoat/jensen,
+		/obj/item/clothing/suit/storage/vest/hoscoat,
+		/obj/item/clothing/head/helmet/dermal,
+		/obj/item/weapon/cartridge/hos,
+		/obj/item/device/radio/headset/heads/hos,
+		/obj/item/device/radio/headset/heads/hos/alt,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/taperoll/police,
+		/obj/item/weapon/shield/riot,
+		/obj/item/weapon/shield/riot/tele,
+		/obj/item/weapon/storage/box/holobadge/hos,
+		/obj/item/clothing/accessory/badge/holo/hos,
+		/obj/item/weapon/reagent_containers/spray/pepper,
+		/obj/item/weapon/crowbar/red,
+		/obj/item/weapon/storage/box/flashbangs,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/device/flash,
+		/obj/item/weapon/melee/baton/loaded,
+		/obj/item/weapon/gun/energy/gun,
+		/obj/item/weapon/cell/device/weapon,
+		/obj/item/clothing/accessory/holster/waist,
+		/obj/item/weapon/melee/telebaton,
+		/obj/item/clothing/head/beret/sec/corporate/hos,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/security,
+		/obj/item/clothing/shoes/boots/winter/security,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/clothing/mask/gas/half)
+
+/obj/structure/closet/secure_closet/hos/initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
+	return ..()
+
 
 /obj/structure/closet/secure_closet/warden
 	name = "warden's locker"
-	req_access = list(access_armory)
 	icon_state = "wardensecure1"
 	icon_closed = "wardensecure"
 	icon_locked = "wardensecure1"
 	icon_opened = "wardensecureopen"
 	icon_broken = "wardensecurebroken"
 	icon_off = "wardensecureoff"
+	req_access = list(access_armory)
 
+	starts_with = list(
+		/obj/item/clothing/suit/storage/vest/warden,
+		/obj/item/clothing/under/rank/warden,
+		/obj/item/clothing/under/rank/warden/corp,
+		/obj/item/clothing/suit/storage/vest/wardencoat,
+		/obj/item/clothing/suit/storage/vest/wardencoat/alt,
+		/obj/item/clothing/head/helmet/dermal,
+		/obj/item/clothing/head/helmet/warden,
+		/obj/item/clothing/head/helmet/warden/hat,
+		/obj/item/weapon/cartridge/security,
+		/obj/item/device/radio/headset/headset_sec,
+		/obj/item/device/radio/headset/headset_sec/alt,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/taperoll/police,
+		/obj/item/clothing/accessory/badge/holo/warden,
+		/obj/item/weapon/storage/box/flashbangs,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/weapon/reagent_containers/spray/pepper,
+		/obj/item/weapon/melee/baton/loaded,
+		/obj/item/weapon/gun/energy/gun,
+		/obj/item/weapon/cell/device/weapon,
+		/obj/item/weapon/storage/box/holobadge,
+		/obj/item/clothing/head/beret/sec/corporate/warden,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/security,
+		/obj/item/clothing/shoes/boots/winter/security,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/device/megaphone,
+		/obj/item/clothing/mask/gas/half,
+		/obj/item/clothing/gloves/warden) // Chompstation Edit
 
-	New()
-		..()
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/security(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/sec(src)
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
-		new /obj/item/clothing/suit/storage/vest/warden(src)
-		new /obj/item/clothing/under/rank/warden(src)
-		new /obj/item/clothing/under/rank/warden/corp(src)
-		new /obj/item/clothing/suit/storage/vest/wardencoat(src)
-		new /obj/item/clothing/suit/storage/vest/wardencoat/alt(src)
-		new /obj/item/clothing/head/helmet/dermal(src)
-		new /obj/item/clothing/head/helmet/warden(src)
-		new /obj/item/clothing/head/helmet/warden/hat(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/device/radio/headset/headset_sec(src)
-		new /obj/item/device/radio/headset/headset_sec/alt(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
-		new /obj/item/taperoll/police(src)
-		new /obj/item/clothing/accessory/badge/holo/warden(src)
-		new /obj/item/weapon/storage/box/flashbangs(src)
-		new /obj/item/weapon/storage/belt/security(src)
-		new /obj/item/weapon/reagent_containers/spray/pepper(src)
-		new /obj/item/weapon/melee/baton/loaded(src)
-		new /obj/item/weapon/gun/energy/gun(src)
-		new /obj/item/weapon/cell/device/weapon(src)
-		new /obj/item/weapon/storage/box/holobadge(src)
-		new /obj/item/clothing/head/beret/sec/corporate/warden(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
-		new /obj/item/clothing/shoes/boots/winter/security(src)
-		new /obj/item/device/flashlight/maglight(src)
-		new /obj/item/device/megaphone(src)
-		new /obj/item/clothing/mask/gas/half(src)
-		new /obj/item/clothing/gloves/warden(src)
-		return
-
-
+/obj/structure/closet/secure_closet/warden/initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
+	return ..()
 
 /obj/structure/closet/secure_closet/security
 	name = "security officer's locker"
-	req_access = list(access_brig)
 	icon_state = "sec1"
 	icon_closed = "sec"
 	icon_locked = "sec1"
 	icon_opened = "secopen"
 	icon_broken = "secbroken"
 	icon_off = "secoff"
+	req_access = list(access_brig)
 
-	New()
-		..()
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/security(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/sec(src)
-		if(prob(50))
-			new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
-		new /obj/item/clothing/suit/storage/vest/officer(src)
-		new /obj/item/clothing/head/helmet(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/device/radio/headset/headset_sec(src)
-		new /obj/item/device/radio/headset/headset_sec/alt(src)
-		new /obj/item/weapon/storage/belt/security(src)
-		new /obj/item/device/flash(src)
-		new /obj/item/weapon/reagent_containers/spray/pepper(src)
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/melee/baton/loaded(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
-		new /obj/item/taperoll/police(src)
-		new /obj/item/device/hailer(src)
-		new /obj/item/device/flashlight/flare(src)
-		new /obj/item/clothing/accessory/storage/black_vest(src)
-		new /obj/item/clothing/head/soft/sec/corp(src)
-		new /obj/item/clothing/under/rank/security/corp(src)
-		//new /obj/item/ammo_magazine/m45/rubber(src) //VOREStation Edit
-		new /obj/item/weapon/gun/energy/taser(src)
-		new /obj/item/weapon/cell/device/weapon(src)
-		new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
-		new /obj/item/clothing/shoes/boots/winter/security(src)
-		new /obj/item/device/flashlight/maglight(src)
-		return
+	starts_with = list(
+		/obj/item/clothing/suit/storage/vest/officer,
+		/obj/item/clothing/head/helmet,
+		/obj/item/weapon/cartridge/security,
+		/obj/item/device/radio/headset/headset_sec,
+		/obj/item/device/radio/headset/headset_sec/alt,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/device/flash,
+		/obj/item/weapon/reagent_containers/spray/pepper,
+		/obj/item/weapon/grenade/flashbang,
+		/obj/item/weapon/melee/baton/loaded,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/taperoll/police,
+		/obj/item/device/hailer,
+		/obj/item/device/flashlight/flare,
+		/obj/item/clothing/accessory/storage/black_vest,
+		/obj/item/clothing/head/soft/sec/corp,
+		/obj/item/clothing/under/rank/security/corp,
+		///obj/item/ammo_magazine/m45/rubber, //VOREStation Removal,
+		/obj/item/weapon/gun/energy/taser,
+		/obj/item/weapon/cell/device/weapon,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/security,
+		/obj/item/clothing/shoes/boots/winter/security,
+		/obj/item/device/flashlight/maglight)
 
+/obj/structure/closet/secure_closet/security/initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
+	return ..()
 
-/obj/structure/closet/secure_closet/security/cargo
+/obj/structure/closet/secure_closet/security/cargo/initialize()
+	starts_with += /obj/item/clothing/accessory/armband/cargo
+	starts_with += /obj/item/device/encryptionkey/headset_cargo
+	return ..()
 
-	New()
-		..()
-		new /obj/item/clothing/accessory/armband/cargo(src)
-		new /obj/item/device/encryptionkey/headset_cargo(src)
-		return
+/obj/structure/closet/secure_closet/security/engine/initialize()
+	starts_with += /obj/item/clothing/accessory/armband/engine
+	starts_with += /obj/item/device/encryptionkey/headset_eng
+	return ..()
 
-/obj/structure/closet/secure_closet/security/engine
+/obj/structure/closet/secure_closet/security/science/initialize()
+	starts_with += /obj/item/clothing/accessory/armband/science
+	starts_with += /obj/item/device/encryptionkey/headset_sci
+	return ..()
 
-	New()
-		..()
-		new /obj/item/clothing/accessory/armband/engine(src)
-		new /obj/item/device/encryptionkey/headset_eng(src)
-		return
-
-/obj/structure/closet/secure_closet/security/science
-
-	New()
-		..()
-		new /obj/item/clothing/accessory/armband/science(src)
-		new /obj/item/device/encryptionkey/headset_sci(src)
-		return
-
-/obj/structure/closet/secure_closet/security/med
-
-	New()
-		..()
-		new /obj/item/clothing/accessory/armband/medblue(src)
-		new /obj/item/device/encryptionkey/headset_med(src)
-		return
+/obj/structure/closet/secure_closet/security/med/initialize()
+	starts_with += /obj/item/clothing/accessory/armband/medblue
+	starts_with += /obj/item/device/encryptionkey/headset_med
+	return ..()
 
 
 /obj/structure/closet/secure_closet/detective
 	name = "detective's cabinet"
-	req_access = list(access_forensics_lockers)
 	icon_state = "cabinetdetective_locked"
 	icon_closed = "cabinetdetective"
 	icon_locked = "cabinetdetective_locked"
 	icon_opened = "cabinetdetective_open"
 	icon_broken = "cabinetdetective_broken"
 	icon_off = "cabinetdetective_broken"
+	req_access = list(access_forensics_lockers)
 
-	New()
-		..()
-		new /obj/item/clothing/accessory/badge/holo/detective(src)
-		new /obj/item/clothing/gloves/black(src)
-		//new /obj/item/gunbox(src) // Vorestation edit. If you can't be trusted to not be stupid with lethals, you can't be trusted with less-than-lethals either.
-		new /obj/item/weapon/storage/belt/detective(src)
-		new /obj/item/weapon/storage/box/evidence(src)
-		new /obj/item/device/radio/headset/headset_sec(src)
-		new /obj/item/device/radio/headset/headset_sec/alt(src)
-		new /obj/item/clothing/suit/storage/vest/detective(src)
-		new /obj/item/taperoll/police(src)
-		new /obj/item/clothing/accessory/holster/armpit(src)
-		new /obj/item/device/flashlight/maglight(src)
-		new /obj/item/weapon/reagent_containers/food/drinks/flask/detflask(src)
-		new /obj/item/weapon/storage/briefcase/crimekit(src)
-		new /obj/item/device/taperecorder(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/tape/random(src)
-		return
+	starts_with = list(
+		/obj/item/clothing/accessory/badge/holo/detective,
+		/obj/item/clothing/gloves/black,
+		///obj/item/gunbox, //VOREStation Removal,
+		/obj/item/weapon/storage/belt/detective,
+		/obj/item/weapon/storage/box/evidence,
+		/obj/item/device/radio/headset/headset_sec,
+		/obj/item/device/radio/headset/headset_sec/alt,
+		/obj/item/clothing/suit/storage/vest/detective,
+		/obj/item/taperoll/police,
+		/obj/item/clothing/accessory/holster/armpit,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/weapon/reagent_containers/food/drinks/flask/detflask,
+		/obj/item/weapon/storage/briefcase/crimekit,
+		/obj/item/device/taperecorder,
+		/obj/item/device/tape/random = 3)
 
 /obj/structure/closet/secure_closet/detective/update_icon()
 	if(broken)
@@ -330,18 +284,15 @@
 		else
 			icon_state = icon_opened
 
+
 /obj/structure/closet/secure_closet/injection
 	name = "lethal injections locker"
 	req_access = list(access_captain)
 
+	starts_with = list(
+		/obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral = 2)
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral(src)
-		new /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral(src)
-		return
-
-
+GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/brig)
 
 /obj/structure/closet/secure_closet/brig
 	name = "brig locker"
@@ -349,40 +300,34 @@
 	anchored = 1
 	var/id = null
 
-	New()
-		..()
-		new /obj/item/clothing/under/color/orange( src )
-		new /obj/item/clothing/shoes/orange( src )
-		return
-
+	starts_with = list(
+		/obj/item/clothing/under/color/orange,
+		/obj/item/clothing/shoes/orange)
 
 
 /obj/structure/closet/secure_closet/courtroom
 	name = "courtroom locker"
 	req_access = list(access_lawyer)
 
-	New()
-		..()
-		new /obj/item/clothing/shoes/brown(src)
-		new /obj/item/weapon/paper/Court (src)
-		new /obj/item/weapon/paper/Court (src)
-		new /obj/item/weapon/paper/Court (src)
-		new /obj/item/weapon/pen (src)
-		new /obj/item/clothing/suit/judgerobe (src)
-		new /obj/item/clothing/head/powdered_wig (src)
-		new /obj/item/weapon/storage/briefcase(src)
-		return
+	starts_with = list(
+		/obj/item/clothing/shoes/brown,
+		/obj/item/weapon/paper/Court = 3,
+		/obj/item/weapon/pen,
+		/obj/item/clothing/suit/judgerobe,
+		/obj/item/clothing/head/powdered_wig,
+		/obj/item/weapon/storage/briefcase)
+
 
 /obj/structure/closet/secure_closet/wall
 	name = "wall locker"
-	req_access = list(access_security)
 	icon_state = "wall-locker1"
-	density = 1
 	icon_closed = "wall-locker"
 	icon_locked = "wall-locker1"
 	icon_opened = "wall-lockeropen"
 	icon_broken = "wall-lockerbroken"
 	icon_off = "wall-lockeroff"
+	req_access = list(access_security)
+	density = 1
 
 	//too small to put a man in
 	large = 0

code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm

@@ -1,19 +1,64 @@
 /obj/structure/closet/secure_closet/hos
-	name = "head of security's locker"
-	req_access = list(access_hos)
+	name = "head of security's attire"
 	icon_state = "hossecure1"
 	icon_closed = "hossecure"
 	icon_locked = "hossecure1"
 	icon_opened = "hossecureopen"
 	icon_broken = "hossecurebroken"
 	icon_off = "hossecureoff"
-	storage_capacity = 3 * MOB_MEDIUM
+	req_access = list(access_hos)
+	storage_capacity = 2.5 * MOB_MEDIUM
+
+	starts_with = list(
+		/obj/item/clothing/head/helmet/HoS,
+		/obj/item/clothing/head/helmet/HoS/hat,
+		/obj/item/clothing/suit/storage/vest/hos,
+		/obj/item/clothing/under/rank/head_of_security/jensen,
+		/obj/item/clothing/under/rank/head_of_security/corp,
+		/obj/item/clothing/suit/storage/vest/hoscoat/jensen,
+		/obj/item/clothing/suit/storage/vest/hoscoat,
+		/obj/item/clothing/head/helmet/dermal,
+		/obj/item/device/radio/headset/heads/hos,
+		/obj/item/device/radio/headset/heads/hos/alt,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/clothing/accessory/holster/waist,
+		/obj/item/clothing/head/beret/sec/corporate/hos,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/security,
+		/obj/item/clothing/mask/gas/half)
+
+/obj/structure/closet/secure_closet/hos2
+	name = "head of security's gear"
+	icon_state = "hossecure1"
+	icon_closed = "hossecure"
+	icon_locked = "hossecure1"
+	icon_opened = "hossecureopen"
+	icon_broken = "hossecurebroken"
+	icon_off = "hossecureoff"
+	req_access = list(access_hos)
+	storage_capacity = 2.5 * MOB_MEDIUM
+
+	starts_with = list(
+		/obj/item/weapon/cartridge/hos,
+		/obj/item/taperoll/police,
+		/obj/item/weapon/shield/riot/tele,
+		/obj/item/weapon/storage/box/holobadge/hos,
+		/obj/item/clothing/accessory/badge/holo/hos,
+		/obj/item/weapon/reagent_containers/spray/pepper,
+		/obj/item/weapon/crowbar/red,
+		/obj/item/weapon/storage/box/flashbangs,
+		/obj/item/device/flash,
+		/obj/item/weapon/melee/baton/loaded,
+		/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos,
+		/obj/item/weapon/melee/telebaton,
+		/obj/item/clothing/head/beret/sec/corporate/hos,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/security,
+		/obj/item/clothing/shoes/boots/winter/security,
+		/obj/item/device/flashlight/maglight)
 
 //Custom NT Security Lockers, Only found at central command
-
 /obj/structure/closet/secure_closet/nanotrasen_security
 	name = "NanoTrasen security officer's locker"
-	req_access = list(access_brig)
 	icon = 'icons/obj/closet_vr.dmi'
 	icon_state = "secC1"
 	icon_closed = "secC"
@@ -21,45 +66,46 @@
 	icon_opened = "secCopen"
 	icon_broken = "secCbroken"
 	icon_off = "seCcoff"
+	req_access = list(access_brig)
 	storage_capacity = 3.5 * MOB_MEDIUM
 
-	New()
-		..()
-		if(prob(25))
-			new /obj/item/weapon/storage/backpack/security(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/sec(src)
-		if(prob(75))
-			new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
-		new /obj/item/clothing/suit/storage/vest/nanotrasen(src)
-		new /obj/item/clothing/head/helmet(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/device/radio/headset/headset_sec(src)
-		new /obj/item/device/radio/headset/headset_sec/alt(src)
-		new /obj/item/weapon/storage/belt/security(src)
-		new /obj/item/device/flash(src)
-		new /obj/item/weapon/reagent_containers/spray/pepper(src)
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/melee/baton/loaded(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
-		new /obj/item/taperoll/police(src)
-		new /obj/item/device/hailer(src)
-		new /obj/item/device/flashlight/flare(src)
-		new /obj/item/clothing/accessory/storage/black_vest(src)
-		new /obj/item/weapon/gun/energy/taser(src)
-		new /obj/item/weapon/cell/device/weapon(src)
-		new /obj/item/device/flashlight/maglight(src)
-		new /obj/item/clothing/head/soft/nanotrasen(src)
-		new /obj/item/clothing/head/beret/nanotrasen(src)
-		new /obj/item/clothing/under/nanotrasen/security(src)
-		new /obj/item/clothing/gloves/black(src)
-		new /obj/item/clothing/shoes/boots/jackboots(src)
-		new /obj/item/clothing/shoes/boots/jackboots/toeless(src)
-		return
+	starts_with = list(
+		/obj/item/clothing/suit/storage/vest/nanotrasen,
+		/obj/item/clothing/head/helmet,
+		/obj/item/weapon/cartridge/security,
+		/obj/item/device/radio/headset/headset_sec,
+		/obj/item/device/radio/headset/headset_sec/alt,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/device/flash,
+		/obj/item/weapon/reagent_containers/spray/pepper,
+		/obj/item/weapon/grenade/flashbang,
+		/obj/item/weapon/melee/baton/loaded,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/taperoll/police,
+		/obj/item/device/hailer,
+		/obj/item/device/flashlight/flare,
+		/obj/item/clothing/accessory/storage/black_vest,
+		/obj/item/weapon/gun/energy/taser,
+		/obj/item/weapon/cell/device/weapon,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/clothing/head/soft/nanotrasen,
+		/obj/item/clothing/head/beret/nanotrasen,
+		/obj/item/clothing/under/nanotrasen/security,
+		/obj/item/clothing/gloves/black,
+		/obj/item/clothing/shoes/boots/jackboots,
+		/obj/item/clothing/shoes/boots/jackboots/toeless)
+
+/obj/structure/closet/secure_closet/nanotrasen_security/initialize()
+	if(prob(25))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+	if(prob(75))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
+	return ..()
 
 /obj/structure/closet/secure_closet/nanotrasen_commander
 	name = "NanoTrasen commander's locker"
-	req_access = list(access_brig)
 	icon = 'icons/obj/closet_vr.dmi'
 	icon_state = "secC1"
 	icon_closed = "secC"
@@ -67,52 +113,53 @@
 	icon_opened = "secCopen"
 	icon_broken = "secCbroken"
 	icon_off = "seCcoff"
+	req_access = list(access_brig)
 	storage_capacity = 3.5 * MOB_MEDIUM
 
-	New()
-		..()
-		if(prob(25))
-			new /obj/item/weapon/storage/backpack/security(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/sec(src)
-		if(prob(75))
-			new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
-		new /obj/item/clothing/head/helmet/HoS(src)
-		new /obj/item/clothing/suit/storage/vest/hos(src)
-		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
-		new /obj/item/clothing/suit/storage/vest/hoscoat/jensen(src)
-		new /obj/item/clothing/suit/storage/vest/hoscoat(src)
-		new /obj/item/clothing/head/helmet/dermal(src)
-		new /obj/item/weapon/cartridge/hos(src)
-		new /obj/item/device/radio/headset/heads/hos(src)
-		new /obj/item/device/radio/headset/heads/hos/alt(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
-		new /obj/item/taperoll/police(src)
-		new /obj/item/weapon/shield/riot(src)
-		new /obj/item/weapon/shield/riot/tele(src)
-		new /obj/item/weapon/storage/box/holobadge/hos(src)
-		new /obj/item/clothing/accessory/badge/holo/hos(src)
-		new /obj/item/weapon/reagent_containers/spray/pepper(src)
-		new /obj/item/weapon/crowbar/red(src)
-		new /obj/item/weapon/storage/box/flashbangs(src)
-		new /obj/item/weapon/storage/belt/security(src)
-		new /obj/item/device/flash(src)
-		new /obj/item/weapon/melee/baton/loaded(src)
-		new /obj/item/weapon/gun/energy/gun(src)
-		new /obj/item/weapon/cell/device/weapon(src)
-		new /obj/item/clothing/accessory/holster/waist(src)
-		new /obj/item/weapon/melee/telebaton(src)
-		new /obj/item/clothing/head/beret/sec/corporate/hos(src)
-		new /obj/item/device/flashlight/maglight(src)
-		new /obj/item/clothing/gloves/black(src)
-		new /obj/item/clothing/shoes/boots/jackboots(src)
-		new /obj/item/clothing/shoes/boots/jackboots/toeless(src)
-		new /obj/item/clothing/under/nanotrasen/security/commander(src)
-		return
+	starts_with = list(
+		/obj/item/clothing/head/helmet/HoS,
+		/obj/item/clothing/suit/storage/vest/hos,
+		/obj/item/clothing/under/rank/head_of_security/jensen,
+		/obj/item/clothing/suit/storage/vest/hoscoat/jensen,
+		/obj/item/clothing/suit/storage/vest/hoscoat,
+		/obj/item/clothing/head/helmet/dermal,
+		/obj/item/weapon/cartridge/hos,
+		/obj/item/device/radio/headset/heads/hos,
+		/obj/item/device/radio/headset/heads/hos/alt,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/taperoll/police,
+		/obj/item/weapon/shield/riot,
+		/obj/item/weapon/shield/riot/tele,
+		/obj/item/weapon/storage/box/holobadge/hos,
+		/obj/item/clothing/accessory/badge/holo/hos,
+		/obj/item/weapon/reagent_containers/spray/pepper,
+		/obj/item/weapon/crowbar/red,
+		/obj/item/weapon/storage/box/flashbangs,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/device/flash,
+		/obj/item/weapon/melee/baton/loaded,
+		/obj/item/weapon/gun/energy/gun,
+		/obj/item/weapon/cell/device/weapon,
+		/obj/item/clothing/accessory/holster/waist,
+		/obj/item/weapon/melee/telebaton,
+		/obj/item/clothing/head/beret/sec/corporate/hos,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/clothing/gloves/black,
+		/obj/item/clothing/shoes/boots/jackboots,
+		/obj/item/clothing/shoes/boots/jackboots/toeless,
+		/obj/item/clothing/under/nanotrasen/security/commander)
+
+/obj/structure/closet/secure_closet/nanotrasen_commander/initialize()
+	if(prob(25))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+	if(prob(75))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
+	return ..()
 
 /obj/structure/closet/secure_closet/nanotrasen_warden
 	name = "NanoTrasen warden's locker"
-	req_access = list(access_brig)
 	icon = 'icons/obj/closet_vr.dmi'
 	icon_state = "secC1"
 	icon_closed = "secC"
@@ -120,38 +167,39 @@
 	icon_opened = "secCopen"
 	icon_broken = "secCbroken"
 	icon_off = "seCcoff"
+	req_access = list(access_brig)
 	storage_capacity = 3.5 * MOB_MEDIUM
 
+	starts_with = list(
+		/obj/item/clothing/suit/storage/vest/warden,
+		/obj/item/clothing/under/nanotrasen/security/warden,
+		/obj/item/clothing/suit/storage/vest/wardencoat/alt,
+		/obj/item/clothing/head/helmet/warden,
+		/obj/item/weapon/cartridge/security,
+		/obj/item/device/radio/headset/headset_sec,
+		/obj/item/device/radio/headset/headset_sec/alt,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/taperoll/police,
+		/obj/item/clothing/accessory/badge/holo/warden,
+		/obj/item/weapon/storage/box/flashbangs,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/weapon/reagent_containers/spray/pepper,
+		/obj/item/weapon/melee/baton/loaded,
+		/obj/item/weapon/gun/energy/gun,
+		/obj/item/weapon/cell/device/weapon,
+		/obj/item/weapon/storage/box/holobadge,
+		/obj/item/clothing/head/beret/sec/corporate/warden,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/device/megaphone,
+		/obj/item/clothing/gloves/black,
+		/obj/item/clothing/shoes/boots/jackboots,
+		/obj/item/clothing/shoes/boots/jackboots/toeless)
 
-	New()
-		..()
-		if(prob(25))
-			new /obj/item/weapon/storage/backpack/security(src)
-		else
-			new /obj/item/weapon/storage/backpack/satchel/sec(src)
-		if(prob(75))
-			new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
-		new /obj/item/clothing/suit/storage/vest/warden(src)
-		new /obj/item/clothing/under/nanotrasen/security/warden(src)
-		new /obj/item/clothing/suit/storage/vest/wardencoat/alt(src)
-		new /obj/item/clothing/head/helmet/warden(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/device/radio/headset/headset_sec(src)
-		new /obj/item/device/radio/headset/headset_sec/alt(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
-		new /obj/item/taperoll/police(src)
-		new /obj/item/clothing/accessory/badge/holo/warden(src)
-		new /obj/item/weapon/storage/box/flashbangs(src)
-		new /obj/item/weapon/storage/belt/security(src)
-		new /obj/item/weapon/reagent_containers/spray/pepper(src)
-		new /obj/item/weapon/melee/baton/loaded(src)
-		new /obj/item/weapon/gun/energy/gun(src)
-		new /obj/item/weapon/cell/device/weapon(src)
-		new /obj/item/weapon/storage/box/holobadge(src)
-		new /obj/item/clothing/head/beret/sec/corporate/warden(src)
-		new /obj/item/device/flashlight/maglight(src)
-		new /obj/item/device/megaphone(src)
-		new /obj/item/clothing/gloves/black(src)
-		new /obj/item/clothing/shoes/boots/jackboots(src)
-		new /obj/item/clothing/shoes/boots/jackboots/toeless(src)
-		return
+/obj/structure/closet/secure_closet/nanotrasen_warden/initialize()
+	if(prob(25))
+		new /obj/item/weapon/storage/backpack/security(src)
+	else
+		new /obj/item/weapon/storage/backpack/satchel/sec(src)
+	if(prob(75))
+		new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
+	return ..()

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -5,77 +5,57 @@
 	icon_closed = "syndicate"
 	icon_opened = "syndicateopen"
 
-
 /obj/structure/closet/syndicate/personal
 	desc = "It's a storage unit for operative gear."
 
-/obj/structure/closet/syndicate/personal/New()
-	..()
-	new /obj/item/weapon/tank/jetpack/oxygen(src)
-	new /obj/item/clothing/mask/gas/syndicate(src)
-	new /obj/item/clothing/under/syndicate(src)
-	new /obj/item/clothing/head/helmet/space/void/merc(src)
-	new /obj/item/clothing/suit/space/void/merc(src)
-	new /obj/item/weapon/crowbar/red(src)
-	new /obj/item/weapon/cell/high(src)
-	new /obj/item/weapon/card/id/syndicate(src)
-	new /obj/item/device/multitool(src)
-	new /obj/item/weapon/shield/energy(src)
-	new /obj/item/clothing/shoes/magboots(src)
+	starts_with = list(
+		/obj/item/weapon/tank/jetpack/oxygen,
+		/obj/item/clothing/mask/gas/syndicate,
+		/obj/item/clothing/under/syndicate,
+		/obj/item/clothing/head/helmet/space/void/merc,
+		/obj/item/clothing/suit/space/void/merc,
+		/obj/item/weapon/crowbar/red,
+		/obj/item/weapon/cell/high,
+		/obj/item/weapon/card/id/syndicate,
+		/obj/item/device/multitool,
+		/obj/item/weapon/shield/energy,
+		/obj/item/clothing/shoes/magboots)
 
 
 /obj/structure/closet/syndicate/suit
 	desc = "It's a storage unit for voidsuits."
-
-/obj/structure/closet/syndicate/suit/New()
-	..()
-	new /obj/item/weapon/tank/jetpack/oxygen(src)
-	new /obj/item/clothing/shoes/magboots(src)
-	new /obj/item/clothing/suit/space/void/merc(src)
-	new /obj/item/clothing/mask/gas/syndicate(src)
-	new /obj/item/clothing/head/helmet/space/void/merc(src)
+	
+	starts_with = list(
+		/obj/item/weapon/tank/jetpack/oxygen,
+		/obj/item/clothing/shoes/magboots,
+		/obj/item/clothing/suit/space/void/merc,
+		/obj/item/clothing/mask/gas/syndicate,
+		/obj/item/clothing/head/helmet/space/void/merc)
 
 
 /obj/structure/closet/syndicate/nuclear
 	desc = "It's a storage unit for nuclear-operative gear."
 
-/obj/structure/closet/syndicate/nuclear/New()
-	..()
+	starts_with = list(
+	/obj/item/ammo_magazine/m10mm = 5,
+	/obj/item/weapon/storage/box/handcuffs,
+	/obj/item/weapon/storage/box/flashbangs,
+	/obj/item/weapon/gun/energy/gun = 5,
+	/obj/item/weapon/pinpointer/nukeop = 5,
+	/obj/item/device/pda/syndicate,
+	/obj/item/device/radio/uplink)
 
-	new /obj/item/ammo_magazine/m10mm(src)
-	new /obj/item/ammo_magazine/m10mm(src)
-	new /obj/item/ammo_magazine/m10mm(src)
-	new /obj/item/ammo_magazine/m10mm(src)
-	new /obj/item/ammo_magazine/m10mm(src)
-	new /obj/item/weapon/storage/box/handcuffs(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/gun/energy/gun(src)
-	new /obj/item/weapon/gun/energy/gun(src)
-	new /obj/item/weapon/gun/energy/gun(src)
-	new /obj/item/weapon/gun/energy/gun(src)
-	new /obj/item/weapon/gun/energy/gun(src)
-	new /obj/item/weapon/pinpointer/nukeop(src)
-	new /obj/item/weapon/pinpointer/nukeop(src)
-	new /obj/item/weapon/pinpointer/nukeop(src)
-	new /obj/item/weapon/pinpointer/nukeop(src)
-	new /obj/item/weapon/pinpointer/nukeop(src)
-	new /obj/item/device/pda/syndicate(src)
-	new /obj/item/device/radio/uplink(src)
-	//U.hidden_uplink.uses = 40
-	return
-
-/obj/structure/closet/syndicate/resources/
+/obj/structure/closet/syndicate/resources
 	desc = "An old, dusty locker."
 
-	New()
-		..()
+/obj/structure/closet/syndicate/resources/initialize()
+	. = ..()
+	if(!contents.len)
 		var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
 		var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
 		var/rare_min = 5  //Minimum HONK of HONK in the stack HONK HONK rare minerals
 		var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
 
-
-
 		var/pickednum = rand(1, 50)
 
 		//Sad trombone
@@ -120,13 +100,11 @@
 		if(pickednum == 50)
 			new /obj/item/weapon/tank/jetpack/carbondioxide(src)
 
-		return
-
 /obj/structure/closet/syndicate/resources/everything
 	desc = "It's an emergency storage closet for repairs."
 
-	New()
-		var/list/resources = list(
+/obj/structure/closet/syndicate/resources/everything/initialize()
+	var/list/resources = list(
 		/obj/item/stack/material/steel,
 		/obj/item/stack/material/glass,
 		/obj/item/stack/material/gold,
@@ -136,12 +114,11 @@
 		/obj/item/stack/material/diamond,
 		/obj/item/stack/material/plasteel,
 		/obj/item/stack/rods
-		)
+	)
 
+	for(var/i = 0, i<2, i++)
+		for(var/res in resources)
+			var/obj/item/stack/R = new res(src)
+			R.amount = R.max_amount
 
-		for(var/i = 0, i<2, i++)
-			for(var/res in resources)
-				var/obj/item/stack/R = new res(src)
-				R.amount = R.max_amount
-
-		return
+	return ..()

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -14,48 +14,46 @@
  */
 /obj/structure/closet/emcloset
 	name = "emergency closet"
-	desc = "It's a storage unit for emergency breathmasks and o2 tanks."
+	desc = "It's a storage unit for emergency breathmasks and O2 tanks."
 	icon_state = "emergency"
 	icon_closed = "emergency"
 	icon_opened = "emergencyopen"
 
-/obj/structure/closet/emcloset/New()
-	..()
-
+/obj/structure/closet/emcloset/initialize()
 	switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
 		if ("small")
-			new /obj/item/weapon/tank/emergency/oxygen(src)
-			new /obj/item/weapon/tank/emergency/oxygen(src)
-			new /obj/item/clothing/mask/breath(src)
-			new /obj/item/clothing/mask/breath(src)
-			new /obj/item/clothing/suit/space/emergency(src)
-			new /obj/item/clothing/head/helmet/space/emergency(src)
+			starts_with = list(
+				/obj/item/weapon/tank/emergency/oxygen = 2,
+				/obj/item/clothing/mask/breath = 2,
+				/obj/item/clothing/suit/space/emergency,
+				/obj/item/clothing/head/helmet/space/emergency)
 		if ("aid")
-			new /obj/item/weapon/tank/emergency/oxygen(src)
-			new /obj/item/weapon/storage/toolbox/emergency(src)
-			new /obj/item/clothing/mask/breath(src)
-			new /obj/item/weapon/storage/firstaid/o2(src)
-			new /obj/item/clothing/suit/space/emergency(src)
-			new /obj/item/clothing/head/helmet/space/emergency(src)
+			starts_with = list(
+				/obj/item/weapon/tank/emergency/oxygen,
+				/obj/item/weapon/storage/toolbox/emergency,
+				/obj/item/clothing/mask/breath,
+				/obj/item/weapon/storage/firstaid/o2,
+				/obj/item/clothing/suit/space/emergency,
+				/obj/item/clothing/head/helmet/space/emergency)
 		if ("tank")
-			new /obj/item/weapon/tank/emergency/oxygen/engi(src)
-			new /obj/item/clothing/mask/breath(src)
-			new /obj/item/weapon/tank/emergency/oxygen/engi(src)
-			new /obj/item/clothing/mask/breath(src)
+			starts_with = list(
+				/obj/item/weapon/tank/emergency/oxygen/engi = 2,
+				/obj/item/clothing/mask/breath = 2)
 		if ("both")
-			new /obj/item/weapon/storage/toolbox/emergency(src)
-			new /obj/item/weapon/tank/emergency/oxygen/engi(src)
-			new /obj/item/clothing/mask/breath(src)
-			new /obj/item/weapon/storage/firstaid/o2(src)
-			new /obj/item/clothing/suit/space/emergency(src)
-			new /obj/item/clothing/suit/space/emergency(src)
-			new /obj/item/clothing/head/helmet/space/emergency(src)
-			new /obj/item/clothing/head/helmet/space/emergency(src)
+			starts_with = list(
+				/obj/item/weapon/storage/toolbox/emergency,
+				/obj/item/weapon/tank/emergency/oxygen/engi,
+				/obj/item/clothing/mask/breath,
+				/obj/item/weapon/storage/firstaid/o2,
+				/obj/item/clothing/suit/space/emergency = 2,
+				/obj/item/clothing/head/helmet/space/emergency = 2)
 
-/obj/structure/closet/emcloset/legacy/New()
-	..()
-	new /obj/item/weapon/tank/oxygen(src)
-	new /obj/item/clothing/mask/gas(src)
+	return ..()
+
+/obj/structure/closet/emcloset/legacy
+	starts_with = list(
+		/obj/item/weapon/tank/oxygen,
+		/obj/item/clothing/mask/gas)
 
 /*
  * Fire Closet
@@ -67,35 +65,30 @@
 	icon_closed = "firecloset"
 	icon_opened = "fireclosetopen"
 
-/obj/structure/closet/firecloset/New()
-	..()
+	starts_with = list(
+		/obj/item/clothing/suit/fire/firefighter,
+		/obj/item/clothing/mask/gas,
+		/obj/item/weapon/tank/oxygen/red,
+		/obj/item/weapon/extinguisher,
+		/obj/item/clothing/head/hardhat/red)
 
-	new /obj/item/clothing/suit/fire/firefighter(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/weapon/tank/oxygen/red(src)
-	new /obj/item/weapon/extinguisher(src)
-	new /obj/item/clothing/head/hardhat/red(src)
+/obj/structure/closet/firecloset/full
+	starts_with = list(
+		/obj/item/clothing/suit/fire/firefighter,
+		/obj/item/clothing/mask/gas,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/tank/oxygen/red,
+		/obj/item/weapon/extinguisher,
+		/obj/item/clothing/head/hardhat/red)
 
-/obj/structure/closet/firecloset/full/New()
-	..()
-	sleep(4)
-	contents = list()
-
-	new /obj/item/clothing/suit/fire/firefighter(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/device/flashlight(src)
-	new /obj/item/weapon/tank/oxygen/red(src)
-	new /obj/item/weapon/extinguisher(src)
-	new /obj/item/clothing/head/hardhat/red(src)
-
-/obj/structure/closet/firecloset/full/double/New()
-	..()
-	new /obj/item/clothing/suit/fire/firefighter(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/device/flashlight(src)
-	new /obj/item/weapon/tank/oxygen/red(src)
-	new /obj/item/weapon/extinguisher(src)
-	new /obj/item/clothing/head/hardhat/red(src)
+/obj/structure/closet/firecloset/full/double
+	starts_with = list(
+		/obj/item/clothing/suit/fire/firefighter = 2,
+		/obj/item/clothing/mask/gas = 2,
+		/obj/item/device/flashlight = 2,
+		/obj/item/weapon/tank/oxygen/red = 2,
+		/obj/item/weapon/extinguisher = 2,
+		/obj/item/clothing/head/hardhat/red = 2)
 
 /obj/structure/closet/firecloset/update_icon()
 	if(!opened)
@@ -103,7 +96,6 @@
 	else
 		icon_state = icon_opened
 
-
 /*
  * Tool Closet
  */
@@ -114,40 +106,41 @@
 	icon_closed = "toolcloset"
 	icon_opened = "toolclosetopen"
 
-/obj/structure/closet/toolcloset/New()
-	..()
+/obj/structure/closet/toolcloset/initialize()
+	starts_with = list()
 	if(prob(40))
-		new /obj/item/clothing/suit/storage/hazardvest(src)
+		starts_with += /obj/item/clothing/suit/storage/hazardvest
 	if(prob(70))
-		new /obj/item/device/flashlight(src)
+		starts_with += /obj/item/device/flashlight
 	if(prob(70))
-		new /obj/item/weapon/screwdriver(src)
+		starts_with += /obj/item/weapon/screwdriver
 	if(prob(70))
-		new /obj/item/weapon/wrench(src)
+		starts_with += /obj/item/weapon/wrench
 	if(prob(70))
-		new /obj/item/weapon/weldingtool(src)
+		starts_with += /obj/item/weapon/weldingtool
 	if(prob(70))
-		new /obj/item/weapon/crowbar(src)
+		starts_with += /obj/item/weapon/crowbar
 	if(prob(70))
-		new /obj/item/weapon/wirecutters(src)
+		starts_with += /obj/item/weapon/wirecutters
 	if(prob(70))
-		new /obj/item/device/t_scanner(src)
+		starts_with += /obj/item/device/t_scanner
 	if(prob(20))
-		new /obj/item/weapon/storage/belt/utility(src)
+		starts_with += /obj/item/weapon/storage/belt/utility
 	if(prob(30))
-		new /obj/item/stack/cable_coil/random(src)
+		starts_with += /obj/item/stack/cable_coil/random
 	if(prob(30))
-		new /obj/item/stack/cable_coil/random(src)
+		starts_with += /obj/item/stack/cable_coil/random
 	if(prob(30))
-		new /obj/item/stack/cable_coil/random(src)
+		starts_with += /obj/item/stack/cable_coil/random
 	if(prob(20))
-		new /obj/item/device/multitool(src)
+		starts_with += /obj/item/device/multitool
 	if(prob(5))
-		new /obj/item/clothing/gloves/yellow(src)
+		starts_with += /obj/item/clothing/gloves/yellow
 	if(prob(40))
-		new /obj/item/clothing/head/hardhat(src)
+		starts_with += /obj/item/clothing/head/hardhat
 	if(prob(30))
-		new /obj/item/weapon/reagent_containers/spray/windowsealant(src) //vorestation addition
+		starts_with += /obj/item/weapon/reagent_containers/spray/windowsealant //VOREStation Add
+	return ..()
 
 /*
  * Radiation Closet
@@ -159,14 +152,10 @@
 	icon_opened = "toolclosetopen"
 	icon_closed = "radsuitcloset"
 
-/obj/structure/closet/radiation/New()
-	..()
-	new /obj/item/clothing/suit/radiation(src)
-	new /obj/item/clothing/head/radiation(src)
-	new /obj/item/clothing/suit/radiation(src)
-	new /obj/item/clothing/head/radiation(src)
-	new /obj/item/device/geiger(src)
-	new /obj/item/device/geiger(src)
+	starts_with = list(
+		/obj/item/clothing/suit/radiation = 2,
+		/obj/item/clothing/head/radiation = 2,
+		/obj/item/device/geiger = 2)
 
 /*
  * Bombsuit closet
@@ -178,19 +167,18 @@
 	icon_closed = "bombsuit"
 	icon_opened = "bombsuitopen"
 
-/obj/structure/closet/bombcloset/New()
-	..()
-	new /obj/item/clothing/suit/bomb_suit( src )
-	new /obj/item/clothing/under/color/black( src )
-	new /obj/item/clothing/shoes/black( src )
-	new /obj/item/clothing/head/bomb_hood( src )
+	starts_with = list(
+		/obj/item/clothing/suit/bomb_suit,
+		/obj/item/clothing/under/color/black,
+		/obj/item/clothing/shoes/black,
+		/obj/item/clothing/head/bomb_hood)
 
-/obj/structure/closet/bombcloset/double/New() // Makes two suits.
-	..()
-	new /obj/item/clothing/suit/bomb_suit( src )
-	new /obj/item/clothing/under/color/black( src )
-	new /obj/item/clothing/shoes/black( src )
-	new /obj/item/clothing/head/bomb_hood( src )
+/obj/structure/closet/bombcloset/double
+	starts_with = list(
+		/obj/item/clothing/suit/bomb_suit = 2,
+		/obj/item/clothing/under/color/black = 2,
+		/obj/item/clothing/shoes/black = 2,
+		/obj/item/clothing/head/bomb_hood = 2)
 
 /obj/structure/closet/bombclosetsecurity
 	name = "\improper EOD closet"
@@ -199,12 +187,11 @@
 	icon_closed = "bombsuitsec"
 	icon_opened = "bombsuitsecopen"
 
-/obj/structure/closet/bombclosetsecurity/New()
-	..()
-	new /obj/item/clothing/suit/bomb_suit/security( src )
-	new /obj/item/clothing/under/rank/security( src )
-	new /obj/item/clothing/shoes/brown( src )
-	new /obj/item/clothing/head/bomb_hood/security( src )
+	starts_with = list(
+		/obj/item/clothing/suit/bomb_suit/security,
+		/obj/item/clothing/under/rank/security,
+		/obj/item/clothing/shoes/brown,
+		/obj/item/clothing/head/bomb_hood/security)
 
 /*
  * Hydrant
@@ -221,14 +208,13 @@
 	density = 0
 	wall_mounted = 1
 
-/obj/structure/closet/hydrant/New()
-	..()
-	new /obj/item/clothing/suit/fire/firefighter(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/device/flashlight(src)
-	new /obj/item/weapon/tank/oxygen/red(src)
-	new /obj/item/weapon/extinguisher(src)
-	new /obj/item/clothing/head/hardhat/red(src)
+	starts_with = list(
+		/obj/item/clothing/suit/fire/firefighter,
+		/obj/item/clothing/mask/gas,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/tank/oxygen/red,
+		/obj/item/weapon/extinguisher,
+		/obj/item/clothing/head/hardhat/red)
 
 /*
  * First Aid

code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm

@@ -1,26 +1,7 @@
-/obj/structure/closet/radiation/New()
-	..()
-	new /obj/item/clothing/head/radiation(src)
-	new /obj/item/device/geiger(src)
-
-
-/obj/structure/closet/bombcloset/New()
-	..()
-	new /obj/item/clothing/under/color/black(src)
-	new /obj/item/clothing/shoes/black(src )
-	new /obj/item/clothing/head/bomb_hood(src)
-
-
-/obj/structure/closet/bombclosetsecurity/New()
-	..()
-	new /obj/item/clothing/under/rank/security(src)
-	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/head/bomb_hood/security(src)
-
-/obj/structure/closet/firecloset/New()
-	..()
-	new /obj/item/weapon/storage/toolbox/emergency(src)
+/obj/structure/closet/firecloset/initialize()
+	starts_with += /obj/item/weapon/storage/toolbox/emergency
+	return ..()
 
 /obj/structure/closet/hydrant/New()
-	..()
-	new /obj/item/weapon/storage/toolbox/emergency(src)
+	starts_with += /obj/item/weapon/storage/toolbox/emergency
+	return ..()

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -9,54 +9,34 @@
 	icon_state = "red"
 	icon_closed = "red"
 
-/obj/structure/closet/wardrobe/red/New()
-	..()
-	if(prob(50))
-		new /obj/item/weapon/storage/backpack/security(src)
-	else
-		new /obj/item/weapon/storage/backpack/satchel/sec(src)
-	if(prob(50))
-		new /obj/item/weapon/storage/backpack/security(src)
-	else
-		new /obj/item/weapon/storage/backpack/satchel/sec(src)
-	if(prob(50))
-		new /obj/item/weapon/storage/backpack/security(src)
-	else
-		new /obj/item/weapon/storage/backpack/satchel/sec(src)
-	new /obj/item/clothing/under/rank/security(src)
-	new /obj/item/clothing/under/rank/security(src)
-	new /obj/item/clothing/under/rank/security(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security/skirt(src)
-	new /obj/item/clothing/under/rank/security/skirt(src)
-	new /obj/item/clothing/shoes/boots/jackboots(src)
-	new /obj/item/clothing/shoes/boots/jackboots(src)
-	new /obj/item/clothing/shoes/boots/jackboots(src)
-	new /obj/item/clothing/head/soft/sec(src)
-	new /obj/item/clothing/head/soft/sec(src)
-	new /obj/item/clothing/head/soft/sec(src)
-	new /obj/item/clothing/head/beret/sec(src)
-	new /obj/item/clothing/head/beret/sec(src)
-	new /obj/item/clothing/head/beret/sec(src)
-	new /obj/item/clothing/head/beret/sec/corporate/officer(src)
-	new /obj/item/clothing/head/beret/sec/corporate/officer(src)
-	new /obj/item/clothing/head/beret/sec/corporate/officer(src)
-	new /obj/item/clothing/mask/bandana/red(src)
-	new /obj/item/clothing/mask/bandana/red(src)
-	new /obj/item/clothing/mask/bandana/red(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
-	new /obj/item/clothing/accessory/armband(src)
-	new /obj/item/clothing/accessory/armband(src)
-	new /obj/item/clothing/accessory/armband(src)
-	new /obj/item/clothing/accessory/holster/waist(src)
-	new /obj/item/clothing/accessory/holster/waist(src)
-	new /obj/item/clothing/accessory/holster/waist(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/rank/security = 3,
+		/obj/item/clothing/under/rank/security2 = 3,
+		/obj/item/clothing/under/rank/security/skirt = 2,
+		/obj/item/clothing/shoes/boots/jackboots = 3,
+		/obj/item/clothing/head/soft/sec = 3,
+		/obj/item/clothing/head/beret/sec = 3,
+		/obj/item/clothing/head/beret/sec/corporate/officer = 3,
+		/obj/item/clothing/mask/bandana/red = 3,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/security = 3,
+		/obj/item/clothing/accessory/armband = 3,
+		/obj/item/clothing/accessory/holster/waist = 3)
 
+/obj/structure/closet/wardrobe/red/initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+
+	return ..()
 
 /obj/structure/closet/wardrobe/detective
 	name = "detective wardrobe"
@@ -64,78 +44,44 @@
 	icon_closed = "cabinet_closed"
 	icon_opened = "cabinet_open"
 
-/obj/structure/closet/wardrobe/detective/New()
-	..()
-	new /obj/item/clothing/head/det(src)
-	new /obj/item/clothing/head/det(src)
-	new /obj/item/clothing/head/det/grey(src)
-	new /obj/item/clothing/head/det/grey(src)
-	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/shoes/laceup(src)
-	new /obj/item/clothing/shoes/laceup(src)
-	new /obj/item/clothing/under/det(src)
-	new /obj/item/clothing/under/det(src)
-	new /obj/item/clothing/under/det/waistcoat(src)
-	new /obj/item/clothing/under/det/waistcoat(src)
-	new /obj/item/clothing/under/det/grey(src)
-	new /obj/item/clothing/under/det/grey(src)
-	new /obj/item/clothing/under/det/grey/waistcoat(src)
-	new /obj/item/clothing/under/det/grey/waistcoat(src)
-	new /obj/item/clothing/under/det/black(src)
-	new /obj/item/clothing/under/det/black(src)
-	new /obj/item/clothing/under/det/skirt(src)
-	new /obj/item/clothing/under/det/corporate(src)
-	new /obj/item/clothing/under/det/corporate(src)
-	new /obj/item/clothing/suit/storage/det_trench(src)
-	new /obj/item/clothing/suit/storage/det_trench(src)
-	new /obj/item/clothing/suit/storage/det_trench/grey(src)
-	new /obj/item/clothing/suit/storage/det_trench/grey(src)
-	new /obj/item/clothing/suit/storage/forensics/blue(src)
-	new /obj/item/clothing/suit/storage/forensics/blue(src)
-	new /obj/item/clothing/suit/storage/forensics/red(src)
-	new /obj/item/clothing/suit/storage/forensics/red(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/head/det = 2,
+		/obj/item/clothing/head/det/grey = 2,
+		/obj/item/clothing/shoes/brown = 2,
+		/obj/item/clothing/shoes/laceup = 2,
+		/obj/item/clothing/under/det = 2,
+		/obj/item/clothing/under/det/waistcoat = 2,
+		/obj/item/clothing/under/det/grey = 2,
+		/obj/item/clothing/under/det/grey/waistcoat = 2,
+		/obj/item/clothing/under/det/black = 2,
+		/obj/item/clothing/under/det/skirt,
+		/obj/item/clothing/under/det/corporate = 2,
+		/obj/item/clothing/suit/storage/det_trench = 2,
+		/obj/item/clothing/suit/storage/det_trench/grey = 2,
+		/obj/item/clothing/suit/storage/forensics/blue = 2,
+		/obj/item/clothing/suit/storage/forensics/red = 2)
 
 /obj/structure/closet/wardrobe/pink
 	name = "pink wardrobe"
 	icon_state = "pink"
 	icon_closed = "pink"
 
-/obj/structure/closet/wardrobe/pink/New()
-	..()
-	new /obj/item/clothing/under/color/pink(src)
-	new /obj/item/clothing/under/color/pink(src)
-	new /obj/item/clothing/under/color/pink(src)
-	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/shoes/brown(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/color/pink = 3,
+		/obj/item/clothing/shoes/brown = 3)
 
 /obj/structure/closet/wardrobe/black
 	name = "black wardrobe"
 	icon_state = "black"
 	icon_closed = "black"
 
-/obj/structure/closet/wardrobe/black/New()
-	..()
-	new /obj/item/clothing/under/color/black(src)
-	new /obj/item/clothing/under/color/black(src)
-	new /obj/item/clothing/under/color/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/head/that(src)
-	new /obj/item/clothing/head/that(src)
-	new /obj/item/clothing/head/that(src)
-	new /obj/item/clothing/head/soft/black(src)
-	new /obj/item/clothing/head/soft/black(src)
-	new /obj/item/clothing/head/soft/black(src)
-	new /obj/item/clothing/mask/bandana(src)
-	new /obj/item/clothing/mask/bandana(src)
-	new /obj/item/clothing/mask/bandana(src)
-	new /obj/item/weapon/storage/backpack/messenger/black(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/color/black = 3,
+		/obj/item/clothing/shoes/black = 3,
+		/obj/item/clothing/head/that = 3,
+		/obj/item/clothing/head/soft/black = 3,
+		/obj/item/clothing/mask/bandana = 3,
+		/obj/item/weapon/storage/backpack/messenger/black)
 
 
 /obj/structure/closet/wardrobe/chaplain_black
@@ -144,21 +90,18 @@
 	icon_state = "black"
 	icon_closed = "black"
 
-/obj/structure/closet/wardrobe/chaplain_black/New()
-	..()
-	new /obj/item/clothing/under/rank/chaplain(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/suit/nun(src)
-	new /obj/item/clothing/head/nun_hood(src)
-	new /obj/item/clothing/suit/storage/hooded/chaplain_hoodie(src)
-	new /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout(src)
-	new /obj/item/clothing/suit/holidaypriest(src)
-	new /obj/item/clothing/under/wedding/bride_white(src)
-	new /obj/item/weapon/storage/backpack/cultpack (src)
-	new /obj/item/weapon/storage/fancy/candle_box(src)
-	new /obj/item/weapon/storage/fancy/candle_box(src)
-	new /obj/item/weapon/deck/tarot(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/rank/chaplain,
+		/obj/item/clothing/shoes/black,
+		/obj/item/clothing/suit/nun,
+		/obj/item/clothing/head/nun_hood,
+		/obj/item/clothing/suit/storage/hooded/chaplain_hoodie,
+		/obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout,
+		/obj/item/clothing/suit/holidaypriest,
+		/obj/item/clothing/under/wedding/bride_white,
+		/obj/item/weapon/storage/backpack/cultpack,
+		/obj/item/weapon/storage/fancy/candle_box = 2,
+		/obj/item/weapon/deck/tarot)
 
 
 /obj/structure/closet/wardrobe/green
@@ -166,40 +109,24 @@
 	icon_state = "green"
 	icon_closed = "green"
 
-/obj/structure/closet/wardrobe/green/New()
-	..()
-	new /obj/item/clothing/under/color/green(src)
-	new /obj/item/clothing/under/color/green(src)
-	new /obj/item/clothing/under/color/green(src)
-	new /obj/item/clothing/shoes/green(src)
-	new /obj/item/clothing/shoes/green(src)
-	new /obj/item/clothing/shoes/green(src)
-	new /obj/item/clothing/head/soft/green(src)
-	new /obj/item/clothing/head/soft/green(src)
-	new /obj/item/clothing/head/soft/green(src)
-	new /obj/item/clothing/mask/bandana/green(src)
-	new /obj/item/clothing/mask/bandana/green(src)
-	new /obj/item/clothing/mask/bandana/green(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/color/green = 3,
+		/obj/item/clothing/shoes/green = 3,
+		/obj/item/clothing/head/soft/green = 3,
+		/obj/item/clothing/mask/bandana/green = 3)
 
 /obj/structure/closet/wardrobe/xenos
 	name = "xenos wardrobe"
 	icon_state = "green"
 	icon_closed = "green"
 
-/obj/structure/closet/wardrobe/xenos/New()
-	..()
-	new /obj/item/clothing/suit/unathi/mantle(src)
-	new /obj/item/clothing/suit/unathi/robe(src)
-	new /obj/item/clothing/shoes/sandal(src)
-	new /obj/item/clothing/shoes/sandal(src)
-	new /obj/item/clothing/shoes/footwraps(src)
-	new /obj/item/clothing/shoes/footwraps(src)
-	new /obj/item/clothing/shoes/boots/winter(src)
-	new /obj/item/clothing/shoes/boots/winter(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/suit/unathi/mantle,
+		/obj/item/clothing/suit/unathi/robe,
+		/obj/item/clothing/shoes/sandal = 2,
+		/obj/item/clothing/shoes/footwraps = 2,
+		/obj/item/clothing/shoes/boots/winter = 2,
+		/obj/item/clothing/suit/storage/hooded/wintercoat = 2)
 
 
 /obj/structure/closet/wardrobe/orange
@@ -208,15 +135,9 @@
 	icon_state = "orange"
 	icon_closed = "orange"
 
-/obj/structure/closet/wardrobe/orange/New()
-	..()
-	new /obj/item/clothing/under/color/orange(src)
-	new /obj/item/clothing/under/color/orange(src)
-	new /obj/item/clothing/under/color/orange(src)
-	new /obj/item/clothing/shoes/orange(src)
-	new /obj/item/clothing/shoes/orange(src)
-	new /obj/item/clothing/shoes/orange(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/color/orange = 3,
+		/obj/item/clothing/shoes/orange = 3)
 
 
 /obj/structure/closet/wardrobe/yellow
@@ -224,21 +145,11 @@
 	icon_state = "yellow"
 	icon_closed = "yellow"
 
-/obj/structure/closet/wardrobe/yellow/New()
-	..()
-	new /obj/item/clothing/under/color/yellow(src)
-	new /obj/item/clothing/under/color/yellow(src)
-	new /obj/item/clothing/under/color/yellow(src)
-	new /obj/item/clothing/shoes/yellow(src)
-	new /obj/item/clothing/shoes/yellow(src)
-	new /obj/item/clothing/shoes/yellow(src)
-	new /obj/item/clothing/head/soft/yellow(src)
-	new /obj/item/clothing/head/soft/yellow(src)
-	new /obj/item/clothing/head/soft/yellow(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/color/yellow = 3,
+		/obj/item/clothing/shoes/yellow = 3,
+		/obj/item/clothing/head/soft/yellow = 3,
+		/obj/item/clothing/mask/bandana/gold = 3)
 
 
 /obj/structure/closet/wardrobe/atmospherics_yellow
@@ -246,88 +157,42 @@
 	icon_state = "yellow"
 	icon_closed = "yellow"
 
-/obj/structure/closet/wardrobe/atmospherics_yellow/New()
-	..()
-	new /obj/item/clothing/under/rank/atmospheric_technician(src)
-	new /obj/item/clothing/under/rank/atmospheric_technician(src)
-	new /obj/item/clothing/under/rank/atmospheric_technician(src)
-	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
-	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
-	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/head/hardhat/red(src)
-	new /obj/item/clothing/head/hardhat/red(src)
-	new /obj/item/clothing/head/hardhat/red(src)
-	new /obj/item/clothing/head/beret/engineering(src)
-	new /obj/item/clothing/head/beret/engineering(src)
-	new /obj/item/clothing/head/beret/engineering(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
-	new /obj/item/clothing/shoes/boots/winter/atmos(src)
-	new /obj/item/clothing/shoes/boots/winter/atmos(src)
-	new /obj/item/clothing/shoes/boots/winter/atmos(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/rank/atmospheric_technician = 3,
+		/obj/item/clothing/under/rank/atmospheric_technician/skirt = 3,
+		/obj/item/clothing/shoes/black = 3,
+		/obj/item/clothing/head/hardhat/red = 3,
+		/obj/item/clothing/head/beret/engineering = 3,
+		/obj/item/clothing/mask/bandana/gold = 3,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos = 3,
+		/obj/item/clothing/shoes/boots/winter/atmos = 3)
 
 /obj/structure/closet/wardrobe/engineering_yellow
 	name = "engineering wardrobe"
 	icon_state = "yellow"
 	icon_closed = "yellow"
 
-/obj/structure/closet/wardrobe/engineering_yellow/New()
-	..()
-	new /obj/item/clothing/under/rank/engineer(src)
-	new /obj/item/clothing/under/rank/engineer(src)
-	new /obj/item/clothing/under/rank/engineer(src)
-	new /obj/item/clothing/under/rank/engineer/skirt(src)
-	new /obj/item/clothing/under/rank/engineer/skirt(src)
-	new /obj/item/clothing/under/rank/engineer/skirt(src)
-	new /obj/item/clothing/shoes/orange(src)
-	new /obj/item/clothing/shoes/orange(src)
-	new /obj/item/clothing/shoes/orange(src)
-	new /obj/item/clothing/head/hardhat(src)
-	new /obj/item/clothing/head/hardhat(src)
-	new /obj/item/clothing/head/hardhat(src)
-	new /obj/item/clothing/head/beret/engineering(src)
-	new /obj/item/clothing/head/beret/engineering(src)
-	new /obj/item/clothing/head/beret/engineering(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
-	new /obj/item/clothing/shoes/boots/winter/engineering(src)
-	new /obj/item/clothing/shoes/boots/winter/engineering(src)
-	new /obj/item/clothing/shoes/boots/winter/engineering(src)
-	new /obj/item/clothing/shoes/boots/workboots(src)
-	new /obj/item/clothing/shoes/boots/workboots(src)
-	new /obj/item/clothing/shoes/boots/workboots(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/rank/engineer = 3,
+		/obj/item/clothing/under/rank/engineer/skirt = 3,
+		/obj/item/clothing/shoes/orange = 3,
+		/obj/item/clothing/head/hardhat = 3,
+		/obj/item/clothing/head/beret/engineering = 3,
+		/obj/item/clothing/mask/bandana/gold = 3,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/engineering = 3,
+		/obj/item/clothing/shoes/boots/winter/engineering = 3,
+		/obj/item/clothing/shoes/boots/workboots = 3)
 
 
 /obj/structure/closet/wardrobe/white
 	name = "white wardrobe"
 	icon_state = "white"
 	icon_closed = "white"
-
-/obj/structure/closet/wardrobe/white/New()
-	..()
-	new /obj/item/clothing/under/color/white(src)
-	new /obj/item/clothing/under/color/white(src)
-	new /obj/item/clothing/under/color/white(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/head/soft/mime(src)
-	new /obj/item/clothing/head/soft/mime(src)
-	new /obj/item/clothing/head/soft/mime(src)
-	return
+	
+	starts_with = list(
+		/obj/item/clothing/under/color/white = 3,
+		/obj/item/clothing/shoes/white = 3,
+		/obj/item/clothing/head/soft/mime = 3)
 
 
 /obj/structure/closet/wardrobe/pjs
@@ -335,17 +200,11 @@
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/pjs/New()
-	..()
-	new /obj/item/clothing/under/pj/red(src)
-	new /obj/item/clothing/under/pj/red(src)
-	new /obj/item/clothing/under/pj/blue(src)
-	new /obj/item/clothing/under/pj/blue(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/slippers(src)
-	new /obj/item/clothing/shoes/slippers(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/pj/red = 2,
+		/obj/item/clothing/under/pj/blue = 2,
+		/obj/item/clothing/shoes/white = 2,
+		/obj/item/clothing/shoes/slippers = 2)
 
 
 /obj/structure/closet/wardrobe/science_white
@@ -353,60 +212,50 @@
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/science_white/New()
-	..()
-	new /obj/item/clothing/under/rank/scientist(src)
-	new /obj/item/clothing/under/rank/scientist(src)
-	new /obj/item/clothing/under/rank/scientist(src)
-	new /obj/item/clothing/under/rank/scientist/skirt(src)
-	new /obj/item/clothing/under/rank/scientist/skirt(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/slippers(src)
-	new /obj/item/clothing/shoes/slippers(src)
-	new /obj/item/clothing/shoes/slippers(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
-	new /obj/item/clothing/shoes/boots/winter/science(src)
-	new /obj/item/weapon/storage/backpack/toxins(src)
-	new /obj/item/weapon/storage/backpack/satchel/tox(src)
+	starts_with = list(
+		/obj/item/clothing/under/rank/scientist = 3,
+		/obj/item/clothing/under/rank/scientist/skirt = 2,
+		/obj/item/clothing/suit/storage/toggle/labcoat = 3,
+		/obj/item/clothing/shoes/white = 3,
+		/obj/item/clothing/shoes/slippers = 3,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/science,
+		/obj/item/clothing/shoes/boots/winter/science,
+		/obj/item/weapon/storage/backpack/toxins,
+		/obj/item/weapon/storage/backpack/satchel/tox)
+
+/obj/structure/closet/wardrobe/science_white/initialize()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
 	else
-		new /obj/item/weapon/storage/backpack/satchel/tox(src)
+		starts_with += /obj/item/weapon/storage/backpack/satchel/tox
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
 	else
-		new /obj/item/weapon/storage/backpack/satchel/tox(src)
+		starts_with += /obj/item/weapon/storage/backpack/satchel/tox
+
+	return ..()
+
+
 /obj/structure/closet/wardrobe/robotics_black
 	name = "robotics wardrobe"
 	icon_state = "black"
 	icon_closed = "black"
 
-/obj/structure/closet/wardrobe/robotics_black/New()
-	..()
-	new /obj/item/clothing/under/rank/roboticist(src)
-	new /obj/item/clothing/under/rank/roboticist(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/gloves/black(src)
-	new /obj/item/clothing/gloves/black(src)
-	new /obj/item/weapon/storage/backpack/toxins(src)
+	starts_with = list(
+		/obj/item/clothing/under/rank/roboticist = 2,
+		/obj/item/clothing/suit/storage/toggle/labcoat = 2,
+		/obj/item/clothing/shoes/black = 2,
+		/obj/item/clothing/gloves/black = 2,
+		/obj/item/weapon/storage/backpack/toxins,
+		/obj/item/weapon/storage/backpack/satchel/tox)
+
+/obj/structure/closet/wardrobe/robotics_black/initialize()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
 	else
-		new /obj/item/weapon/storage/backpack/satchel/tox(src)
-	new /obj/item/weapon/storage/backpack/satchel/tox(src)
-	if(prob(50))
-		new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
-	else
-		new /obj/item/weapon/storage/backpack/satchel/tox(src)
-	return
+		starts_with += /obj/item/weapon/storage/backpack/satchel/tox
+	
+	return ..()
 
 
 /obj/structure/closet/wardrobe/chemistry_white
@@ -414,23 +263,14 @@
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/chemistry_white/New()
-	..()
-	new /obj/item/clothing/under/rank/chemist(src)
-	new /obj/item/clothing/under/rank/chemist(src)
-	new /obj/item/clothing/under/rank/chemist/skirt(src)
-	new /obj/item/clothing/under/rank/chemist/skirt(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
-	new /obj/item/weapon/storage/backpack/chemistry(src)
-	new /obj/item/weapon/storage/backpack/chemistry(src)
-	new /obj/item/weapon/storage/backpack/satchel/chem(src)
-	new /obj/item/weapon/storage/backpack/satchel/chem(src)
-	new /obj/item/weapon/storage/bag/chemistry(src)
-	new /obj/item/weapon/storage/bag/chemistry(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/rank/chemist = 2,
+		/obj/item/clothing/under/rank/chemist/skirt = 2,
+		/obj/item/clothing/shoes/white = 2,
+		/obj/item/clothing/suit/storage/toggle/labcoat/chemist = 2,
+		/obj/item/weapon/storage/backpack/chemistry = 2,
+		/obj/item/weapon/storage/backpack/satchel/chem = 2,
+		/obj/item/weapon/storage/bag/chemistry = 2,)
 
 
 /obj/structure/closet/wardrobe/genetics_white
@@ -438,21 +278,13 @@
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/genetics_white/New()
-	..()
-	new /obj/item/clothing/under/rank/geneticist(src)
-	new /obj/item/clothing/under/rank/geneticist(src)
-	new /obj/item/clothing/under/rank/geneticist/skirt(src)
-	new /obj/item/clothing/under/rank/geneticist/skirt(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src)
-	new /obj/item/weapon/storage/backpack/genetics(src)
-	new /obj/item/weapon/storage/backpack/genetics(src)
-	new /obj/item/weapon/storage/backpack/satchel/gen(src)
-	new /obj/item/weapon/storage/backpack/satchel/gen(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/rank/geneticist = 2,
+		/obj/item/clothing/under/rank/geneticist/skirt = 2,
+		/obj/item/clothing/shoes/white = 2,
+		/obj/item/clothing/suit/storage/toggle/labcoat/genetics = 2,
+		/obj/item/weapon/storage/backpack/genetics = 2,
+		/obj/item/weapon/storage/backpack/satchel/gen = 2)
 
 
 /obj/structure/closet/wardrobe/virology_white
@@ -460,23 +292,14 @@
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/virology_white/New()
-	..()
-	new /obj/item/clothing/under/rank/virologist(src)
-	new /obj/item/clothing/under/rank/virologist(src)
-	new /obj/item/clothing/under/rank/virologist/skirt(src)
-	new /obj/item/clothing/under/rank/virologist/skirt(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)
-	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/weapon/storage/backpack/virology(src)
-	new /obj/item/weapon/storage/backpack/virology(src)
-	new /obj/item/weapon/storage/backpack/satchel/vir(src)
-	new /obj/item/weapon/storage/backpack/satchel/vir(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/rank/virologist = 2,
+		/obj/item/clothing/under/rank/virologist/skirt = 2,
+		/obj/item/clothing/shoes/white = 2,
+		/obj/item/clothing/suit/storage/toggle/labcoat/virologist = 2,
+		/obj/item/clothing/mask/surgical = 2,
+		/obj/item/weapon/storage/backpack/virology = 2,
+		/obj/item/weapon/storage/backpack/satchel/vir = 2)
 
 
 /obj/structure/closet/wardrobe/medic_white
@@ -484,33 +307,24 @@
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/medic_white/New()
-	..()
-	new /obj/item/clothing/under/rank/medical(src)
-	new /obj/item/clothing/under/rank/medical(src)
-	new /obj/item/clothing/under/rank/medical/skirt(src)
-	new /obj/item/clothing/under/rank/medical/skirt(src)
-	new /obj/item/clothing/under/rank/medical/scrubs(src)
-	new /obj/item/clothing/under/rank/medical/scrubs/green(src)
-	new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
-	new /obj/item/clothing/under/rank/medical/scrubs/black(src)
-	new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src)
-	new /obj/item/clothing/head/surgery/navyblue(src)
-	new /obj/item/clothing/head/surgery/purple(src)
-	new /obj/item/clothing/head/surgery/blue(src)
-	new /obj/item/clothing/head/surgery/green(src)
-	new /obj/item/clothing/head/surgery/black(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
-	new /obj/item/clothing/shoes/boots/winter/medical(src)
-	new /obj/item/clothing/shoes/boots/winter/medical(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/rank/medical = 2,
+		/obj/item/clothing/under/rank/medical/skirt = 2,
+		/obj/item/clothing/under/rank/medical/scrubs,
+		/obj/item/clothing/under/rank/medical/scrubs/green,
+		/obj/item/clothing/under/rank/medical/scrubs/purple,
+		/obj/item/clothing/under/rank/medical/scrubs/black,
+		/obj/item/clothing/under/rank/medical/scrubs/navyblue,
+		/obj/item/clothing/head/surgery/navyblue,
+		/obj/item/clothing/head/surgery/purple,
+		/obj/item/clothing/head/surgery/blue,
+		/obj/item/clothing/head/surgery/green,
+		/obj/item/clothing/head/surgery/black,
+		/obj/item/clothing/shoes/white = 2,
+		/obj/item/clothing/suit/storage/toggle/labcoat = 2,
+		/obj/item/clothing/mask/surgical = 2,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/medical = 2,
+		/obj/item/clothing/shoes/boots/winter/medical = 2)
 
 
 /obj/structure/closet/wardrobe/medic_gown
@@ -518,71 +332,57 @@
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/medic_gown/New()
-	..()
-	new /obj/item/clothing/under/medigown(src)
-	new /obj/item/clothing/under/medigown(src)
-	new /obj/item/clothing/under/medigown(src)
-	new /obj/item/clothing/under/medigown(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/medigown = 4)
 
 
 /obj/structure/closet/wardrobe/grey
 	name = "grey wardrobe"
 	icon_state = "grey"
 	icon_closed = "grey"
-
-/obj/structure/closet/wardrobe/grey/New()
-	..()
-	new /obj/item/clothing/under/color/grey(src)
-	new /obj/item/clothing/under/color/grey(src)
-	new /obj/item/clothing/under/color/grey(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/head/soft/grey(src)
-	new /obj/item/clothing/head/soft/grey(src)
-	new /obj/item/clothing/head/soft/grey(src)
-	return
-
+	
+	starts_with = list(
+		/obj/item/clothing/under/color/grey = 3,
+		/obj/item/clothing/shoes/black = 3,
+		/obj/item/clothing/head/soft/grey = 3)
+		
 
 /obj/structure/closet/wardrobe/mixed
 	name = "mixed wardrobe"
 	icon_state = "mixed"
 	icon_closed = "mixed"
 
-/obj/structure/closet/wardrobe/mixed/New()
-	..()
-	new /obj/item/clothing/under/color/blue(src)
-	new /obj/item/clothing/under/color/yellow(src)
-	new /obj/item/clothing/under/color/green(src)
-	new /obj/item/clothing/under/color/pink(src)
-	new /obj/item/clothing/under/skirt/outfit/plaid_blue(src)
-	new /obj/item/clothing/under/skirt/outfit/plaid_red(src)
-	new /obj/item/clothing/under/skirt/outfit/plaid_purple(src)
-	new /obj/item/clothing/shoes/blue(src)
-	new /obj/item/clothing/shoes/yellow(src)
-	new /obj/item/clothing/shoes/green(src)
-	new /obj/item/clothing/shoes/purple(src)
-	new /obj/item/clothing/shoes/red(src)
-	new /obj/item/clothing/shoes/leather(src)
-	new /obj/item/clothing/under/pants/classicjeans(src)
-	new /obj/item/clothing/under/pants/mustangjeans(src)
-	new /obj/item/clothing/under/pants/blackjeans(src)
-	new /obj/item/clothing/under/pants/youngfolksjeans(src)
-	new /obj/item/clothing/under/pants/white(src)
-	new /obj/item/clothing/under/pants/red(src)
-	new /obj/item/clothing/under/pants/black(src)
-	new /obj/item/clothing/under/pants/tan(src)
-	new /obj/item/clothing/under/pants/track(src)
-	new /obj/item/clothing/suit/storage/toggle/track(src)
-	new /obj/item/clothing/under/pants(src)
-	new /obj/item/clothing/under/pants/khaki(src)
-	new /obj/item/clothing/mask/bandana/blue(src)
-	new /obj/item/clothing/mask/bandana/blue(src)
-	new /obj/item/clothing/accessory/hawaii(src)
-	new /obj/item/clothing/accessory/hawaii/random(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/color/blue,
+		/obj/item/clothing/under/color/yellow,
+		/obj/item/clothing/under/color/green,
+		/obj/item/clothing/under/color/pink,
+		/obj/item/clothing/under/skirt/outfit/plaid_blue,
+		/obj/item/clothing/under/skirt/outfit/plaid_red,
+		/obj/item/clothing/under/skirt/outfit/plaid_purple,
+		/obj/item/clothing/shoes/blue,
+		/obj/item/clothing/shoes/yellow,
+		/obj/item/clothing/shoes/green,
+		/obj/item/clothing/shoes/purple,
+		/obj/item/clothing/shoes/red,
+		/obj/item/clothing/shoes/leather,
+		/obj/item/clothing/under/pants/classicjeans,
+		/obj/item/clothing/under/pants/mustangjeans,
+		/obj/item/clothing/under/pants/blackjeans,
+		/obj/item/clothing/under/pants/youngfolksjeans,
+		/obj/item/clothing/under/pants/white,
+		/obj/item/clothing/under/pants/red,
+		/obj/item/clothing/under/pants/black,
+		/obj/item/clothing/under/pants/tan,
+		/obj/item/clothing/under/pants/track,
+		/obj/item/clothing/suit/storage/toggle/track,
+		/obj/item/clothing/under/pants,
+		/obj/item/clothing/under/pants/khaki,
+		/obj/item/clothing/mask/bandana/blue,
+		/obj/item/clothing/mask/bandana/blue,
+		/obj/item/clothing/accessory/hawaii,
+		/obj/item/clothing/accessory/hawaii/random)
+
 
 /obj/structure/closet/wardrobe/tactical
 	name = "tactical equipment"
@@ -590,24 +390,26 @@
 	icon_closed = "syndicate1"
 	icon_opened = "syndicate1open"
 
-/obj/structure/closet/wardrobe/tactical/New()
-	..()
-	new /obj/item/clothing/under/tactical(src)
-	new /obj/item/clothing/suit/armor/tactical(src)
-	new /obj/item/clothing/head/helmet/tactical(src)
-	new /obj/item/clothing/mask/balaclava/tactical(src)
-	new /obj/item/clothing/mask/balaclava(src)
-	new /obj/item/clothing/glasses/sunglasses/sechud/tactical(src)
+	starts_with = list(
+		/obj/item/clothing/under/tactical,
+		/obj/item/clothing/suit/armor/tactical,
+		/obj/item/clothing/head/helmet/tactical,
+		/obj/item/clothing/mask/balaclava/tactical,
+		/obj/item/clothing/mask/balaclava,
+		/obj/item/clothing/glasses/sunglasses/sechud/tactical,
+		/obj/item/clothing/shoes/boots/jackboots,
+		/obj/item/clothing/gloves/black,
+		/obj/item/clothing/under/pants/camo)
+
+/obj/structure/closet/wardrobe/tactical/initialize()
 	if(prob(25))
-		new /obj/item/weapon/storage/belt/security/tactical/bandolier(src)
+		starts_with += /obj/item/weapon/storage/belt/security/tactical/bandolier
 	else
-		new /obj/item/weapon/storage/belt/security/tactical(src)
+		starts_with += /obj/item/weapon/storage/belt/security/tactical
 	if(prob(10))
-		new /obj/item/clothing/mask/bandana/skull(src)
-	new /obj/item/clothing/shoes/boots/jackboots(src)
-	new /obj/item/clothing/gloves/black(src)
-	new /obj/item/clothing/under/pants/camo(src)
-	return
+		starts_with += /obj/item/clothing/mask/bandana/skull
+
+	return ..()
 
 /obj/structure/closet/wardrobe/ert
 	name = "emergency response team equipment"
@@ -615,52 +417,47 @@
 	icon_closed = "syndicate1"
 	icon_opened = "syndicate1open"
 
-/obj/structure/closet/wardrobe/ert/New()
-	..()
-	new /obj/item/clothing/under/rank/centcom(src)
-	new /obj/item/clothing/under/ert(src)
-	new /obj/item/clothing/under/syndicate/combat(src)
-	new /obj/item/device/radio/headset/ert/alt(src)
-	new /obj/item/clothing/glasses/sunglasses(src)
-	new /obj/item/clothing/shoes/boots/swat(src)
-	new /obj/item/clothing/gloves/swat(src)
-	new /obj/item/clothing/mask/balaclava/tactical(src)
-	new /obj/item/clothing/mask/balaclava(src)
-	new /obj/item/clothing/mask/bandana/skull(src)
-	new /obj/item/clothing/mask/bandana/skull(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/rank/centcom,
+		/obj/item/clothing/under/ert,
+		/obj/item/clothing/under/syndicate/combat,
+		/obj/item/device/radio/headset/ert/alt,
+		/obj/item/clothing/glasses/sunglasses,
+		/obj/item/clothing/shoes/boots/swat,
+		/obj/item/clothing/gloves/swat,
+		/obj/item/clothing/mask/balaclava/tactical,
+		/obj/item/clothing/mask/balaclava,
+		/obj/item/clothing/mask/bandana/skull = 2)
+
 
 /obj/structure/closet/wardrobe/suit
 	name = "suit locker"
 	icon_state = "mixed"
 	icon_closed = "mixed"
 
-/obj/structure/closet/wardrobe/suit/New()
-	..()
-	new /obj/item/clothing/under/assistantformal(src)
-	new /obj/item/clothing/under/suit_jacket/charcoal(src)
-	new /obj/item/clothing/under/suit_jacket/charcoal/skirt(src)
-	new /obj/item/clothing/under/suit_jacket/navy(src)
-	new /obj/item/clothing/under/suit_jacket/navy/skirt(src)
-	new /obj/item/clothing/under/suit_jacket/burgundy(src)
-	new /obj/item/clothing/under/suit_jacket/burgundy/skirt(src)
-	new /obj/item/clothing/under/suit_jacket/checkered(src)
-	new /obj/item/clothing/under/suit_jacket/checkered/skirt(src)
-	new /obj/item/clothing/under/suit_jacket/tan(src)
-	new /obj/item/clothing/under/suit_jacket/tan/skirt(src)
-	new /obj/item/clothing/under/sl_suit(src)
-	new /obj/item/clothing/under/suit_jacket(src)
-	new /obj/item/clothing/under/suit_jacket/female(src)
-	new /obj/item/clothing/under/suit_jacket/female/skirt(src)
-	new /obj/item/clothing/under/suit_jacket/really_black(src)
-	new /obj/item/clothing/under/suit_jacket/really_black/skirt(src)
-	new /obj/item/clothing/under/suit_jacket/red(src)
-	new /obj/item/clothing/under/suit_jacket/red/skirt(src)
-	new /obj/item/clothing/under/scratch(src)
-	new /obj/item/clothing/under/scratch/skirt(src)
-	new /obj/item/weapon/storage/backpack/satchel(src)
-	new /obj/item/weapon/storage/backpack/satchel(src)
-	return
+	starts_with = list(
+		/obj/item/clothing/under/assistantformal,
+		/obj/item/clothing/under/suit_jacket/charcoal,
+		/obj/item/clothing/under/suit_jacket/charcoal/skirt,
+		/obj/item/clothing/under/suit_jacket/navy,
+		/obj/item/clothing/under/suit_jacket/navy/skirt,
+		/obj/item/clothing/under/suit_jacket/burgundy,
+		/obj/item/clothing/under/suit_jacket/burgundy/skirt,
+		/obj/item/clothing/under/suit_jacket/checkered,
+		/obj/item/clothing/under/suit_jacket/checkered/skirt,
+		/obj/item/clothing/under/suit_jacket/tan,
+		/obj/item/clothing/under/suit_jacket/tan/skirt,
+		/obj/item/clothing/under/sl_suit,
+		/obj/item/clothing/under/suit_jacket,
+		/obj/item/clothing/under/suit_jacket/female,
+		/obj/item/clothing/under/suit_jacket/female/skirt,
+		/obj/item/clothing/under/suit_jacket/really_black,
+		/obj/item/clothing/under/suit_jacket/really_black/skirt,
+		/obj/item/clothing/under/suit_jacket/red,
+		/obj/item/clothing/under/suit_jacket/red/skirt,
+		/obj/item/clothing/under/scratch,
+		/obj/item/clothing/under/scratch/skirt,
+		/obj/item/weapon/storage/backpack/satchel = 2)
 
 /obj/structure/closet/wardrobe/captain
 	name = "colony director's wardrobe"
@@ -668,24 +465,22 @@
 	icon_closed = "cabinet_closed"
 	icon_opened = "cabinet_open"
 
-/obj/structure/closet/wardrobe/captain/New()
-	..()
-	new /obj/item/weapon/storage/backpack/captain(src)
-	new /obj/item/clothing/suit/captunic(src)
-	new /obj/item/clothing/suit/captunic/capjacket(src)
-	new /obj/item/clothing/head/caphat/cap(src)
-	new /obj/item/clothing/under/rank/captain(src)
-	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/gloves/captain(src)
-	new /obj/item/clothing/under/dress/dress_cap(src)
-	new /obj/item/weapon/storage/backpack/satchel/cap(src)
-	new /obj/item/clothing/head/caphat/formal(src)
-	new /obj/item/clothing/under/captainformal(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/captain(src)
-	new /obj/item/clothing/shoes/boots/winter/command(src)
-	new /obj/item/clothing/head/beret/centcom/captain(src)
-	new /obj/item/clothing/under/gimmick/rank/captain/suit(src)
-	new /obj/item/clothing/under/gimmick/rank/captain/suit/skirt(src)
-	new /obj/item/clothing/glasses/sunglasses(src)
-	new /obj/item/clothing/head/caphat(src)
-	return
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/captain,
+		/obj/item/clothing/suit/captunic,
+		/obj/item/clothing/suit/captunic/capjacket,
+		/obj/item/clothing/head/caphat/cap,
+		/obj/item/clothing/under/rank/captain,
+		/obj/item/clothing/shoes/brown,
+		/obj/item/clothing/gloves/captain,
+		/obj/item/clothing/under/dress/dress_cap,
+		/obj/item/weapon/storage/backpack/satchel/cap,
+		/obj/item/clothing/head/caphat/formal,
+		/obj/item/clothing/under/captainformal,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/captain,
+		/obj/item/clothing/shoes/boots/winter/command,
+		/obj/item/clothing/head/beret/centcom/captain,
+		/obj/item/clothing/under/gimmick/rank/captain/suit,
+		/obj/item/clothing/under/gimmick/rank/captain/suit/skirt,
+		/obj/item/clothing/glasses/sunglasses,
+		/obj/item/clothing/head/caphat)

code/game/objects/structures/crates_lockers/crates.dm

@@ -287,42 +287,18 @@
 	icon_opened = "engi_crateopen"
 	icon_closed = "engi_crate"
 
-/obj/structure/closet/crate/rcd/New()
-	..()
-	new /obj/item/weapon/rcd_ammo(src)
-	new /obj/item/weapon/rcd_ammo(src)
-	new /obj/item/weapon/rcd_ammo(src)
-	new /obj/item/weapon/rcd(src)
+	starts_with = list(
+		/obj/item/weapon/rcd_ammo = 3,
+		/obj/item/weapon/rcd)
 
 /obj/structure/closet/crate/solar
 	name = "solar pack crate"
 
-/obj/structure/closet/crate/solar/New()
-	..()
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/solar_assembly(src)
-	new /obj/item/weapon/circuitboard/solar_control(src)
-	new /obj/item/weapon/tracker_electronics(src)
-	new /obj/item/weapon/paper/solar(src)
+	starts_with = list(
+		/obj/item/solar_assembly = 21,
+		/obj/item/weapon/circuitboard/solar_control,
+		/obj/item/weapon/tracker_electronics,
+		/obj/item/weapon/paper/solar)
 
 /obj/structure/closet/crate/freezer
 	name = "freezer"
@@ -366,13 +342,9 @@
 	name = "emergency rations"
 	desc = "A crate of emergency rations."
 
+	starts_with = list(
+		/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 4)
 
-/obj/structure/closet/crate/freezer/rations/New()
-	..()
-	new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
 
 /obj/structure/closet/crate/bin
 	name = "large bin"
@@ -381,6 +353,7 @@
 	icon_opened = "largebinopen"
 	icon_closed = "largebin"
 
+
 /obj/structure/closet/crate/radiation
 	name = "radioactive gear crate"
 	desc = "A crate with a radiation sign on it."
@@ -388,16 +361,10 @@
 	icon_opened = "radiationopen"
 	icon_closed = "radiation"
 
-/obj/structure/closet/crate/radiation/New()
-	..()
-	new /obj/item/clothing/suit/radiation(src)
-	new /obj/item/clothing/head/radiation(src)
-	new /obj/item/clothing/suit/radiation(src)
-	new /obj/item/clothing/head/radiation(src)
-	new /obj/item/clothing/suit/radiation(src)
-	new /obj/item/clothing/head/radiation(src)
-	new /obj/item/clothing/suit/radiation(src)
-	new /obj/item/clothing/head/radiation(src)
+	starts_with = list(
+		/obj/item/clothing/suit/radiation = 4,
+		/obj/item/clothing/head/radiation = 4)
+
 
 /obj/structure/closet/crate/secure/weapon
 	name = "weapons crate"
@@ -406,6 +373,7 @@
 	icon_opened = "weaponcrateopen"
 	icon_closed = "weaponcrate"
 
+
 /obj/structure/closet/crate/secure/phoron
 	name = "phoron crate"
 	desc = "A secure phoron crate."
@@ -413,6 +381,7 @@
 	icon_opened = "phoroncrateopen"
 	icon_closed = "phoroncrate"
 
+
 /obj/structure/closet/crate/secure/gear
 	name = "gear crate"
 	desc = "A secure gear crate."
@@ -420,6 +389,7 @@
 	icon_opened = "secgearcrateopen"
 	icon_closed = "secgearcrate"
 
+
 /obj/structure/closet/crate/secure/hydrosec
 	name = "secure hydroponics crate"
 	desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
@@ -427,6 +397,7 @@
 	icon_opened = "hydrosecurecrateopen"
 	icon_closed = "hydrosecurecrate"
 
+
 /obj/structure/closet/crate/secure/engineering
 	desc = "A crate with a lock on it, painted in the scheme of the station's engineers."
 	name = "secure engineering crate"
@@ -434,6 +405,7 @@
 	icon_opened = "engi_secure_crateopen"
 	icon_closed = "engi_secure_crate"
 
+
 /obj/structure/closet/crate/secure/science
 	name = "secure science crate"
 	desc = "A crate with a lock on it, painted in the scheme of the station's scientists."
@@ -441,6 +413,7 @@
 	icon_opened = "scisecurecrateopen"
 	icon_closed = "scisecurecrate"
 
+
 /obj/structure/closet/crate/secure/bin
 	name = "secure bin"
 	desc = "A secure bin."
@@ -452,6 +425,7 @@
 	sparks = "largebinsparks"
 	emag = "largebinemag"
 
+
 /obj/structure/closet/crate/large
 	name = "large crate"
 	desc = "A hefty metal crate."
@@ -460,6 +434,7 @@
 	icon_opened = "largemetalopen"
 	icon_closed = "largemetal"
 
+
 /obj/structure/closet/crate/large/close()
 	. = ..()
 	if (.)//we can hold up to one large item
@@ -478,6 +453,7 @@
 					break
 	return
 
+
 /obj/structure/closet/crate/secure/large
 	name = "large crate"
 	desc = "A hefty metal crate with an electronic locking system."
@@ -488,6 +464,7 @@
 	redlight = "largemetalr"
 	greenlight = "largemetalg"
 
+
 /obj/structure/closet/crate/secure/large/close()
 	. = ..()
 	if (.)//we can hold up to one large item
@@ -506,6 +483,7 @@
 					break
 	return
 
+
 //fluff variant
 /obj/structure/closet/crate/secure/large/reinforced
 	desc = "A hefty, reinforced metal crate with an electronic locking system."
@@ -537,16 +515,8 @@
 	icon_opened = "hydrocrateopen"
 	icon_closed = "hydrocrate"
 
-/obj/structure/closet/crate/hydroponics/prespawned
-	//This exists so the prespawned hydro crates spawn with their contents.
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
-		new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
-		new /obj/item/weapon/material/minihoe(src)
-//		new /obj/item/weapon/weedspray(src)
-//		new /obj/item/weapon/weedspray(src)
-//		new /obj/item/weapon/pestspray(src)
-//		new /obj/item/weapon/pestspray(src)
-//		new /obj/item/weapon/pestspray(src)
+/obj/structure/closet/crate/hydroponics/prespawned
+	starts_with = list(
+		/obj/item/weapon/reagent_containers/spray/plantbgone = 2,
+		/obj/item/weapon/material/minihoe)

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -4,9 +4,13 @@
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "densecrate"
 	density = 1
+	var/list/starts_with
 
 /obj/structure/largecrate/initialize()
 	. = ..()
+	if(starts_with)
+		create_objects_in_loc(src, starts_with)
+		starts_with = null
 	for(var/obj/I in src.loc)
 		if(I.density || I.anchored || I == src || !I.simulated)
 			continue
@@ -50,38 +54,30 @@
 
 /obj/structure/largecrate/animal
 	icon_state = "mulecrate"
-	var/held_count = 1
-	var/held_type
-
-/obj/structure/largecrate/animal/New()
-	..()
-	for(var/i = 1;i<=held_count;i++)
-		new held_type(src)
 
 /obj/structure/largecrate/animal/mulebot
 	name = "Mulebot crate"
-	held_type = /mob/living/bot/mulebot
+	starts_with = list(/mob/living/bot/mulebot)
 
 /obj/structure/largecrate/animal/corgi
 	name = "corgi carrier"
-	held_type = /mob/living/simple_animal/corgi
+	starts_with = list(/mob/living/simple_animal/corgi)
 
 /obj/structure/largecrate/animal/cow
 	name = "cow crate"
-	held_type = /mob/living/simple_animal/cow
+	starts_with = list(/mob/living/simple_animal/cow)
 
 /obj/structure/largecrate/animal/goat
 	name = "goat crate"
-	held_type = /mob/living/simple_animal/retaliate/goat
+	starts_with = list(/mob/living/simple_animal/retaliate/goat)
 
 /obj/structure/largecrate/animal/cat
 	name = "cat carrier"
-	held_type = /mob/living/simple_animal/cat
+	starts_with = list(/mob/living/simple_animal/cat)
 
 /obj/structure/largecrate/animal/cat/bones
-	held_type = /mob/living/simple_animal/cat/fluff/bones
+	starts_with = list(/mob/living/simple_animal/cat/fluff/bones)
 
 /obj/structure/largecrate/animal/chick
 	name = "chicken crate"
-	held_count = 5
-	held_type = /mob/living/simple_animal/chick
+	starts_with = list(/mob/living/simple_animal/chick = 5)

code/game/objects/structures/crates_lockers/largecrate_vr.dm

@@ -39,11 +39,10 @@
 
 /obj/structure/largecrate/animal/pred
 	name = "Predator carrier"
-	held_type = /mob/living/simple_animal/catgirl
+	starts_with = list(/mob/living/simple_animal/catgirl)
 
-/obj/structure/largecrate/animal/pred/New() //This is nessesary to get a random one each time.
-
-	held_type = pick(/mob/living/simple_animal/retaliate/bee,
+/obj/structure/largecrate/animal/pred/initialize() //This is nessesary to get a random one each time.
+	starts_with = list(pick(/mob/living/simple_animal/retaliate/bee,
 						/mob/living/simple_animal/catgirl;3,
 						/mob/living/simple_animal/hostile/frog,
 						/mob/living/simple_animal/horse,
@@ -55,17 +54,16 @@
 						/mob/living/simple_animal/hostile/carp,
 						/mob/living/simple_animal/hostile/mimic,
 						/mob/living/simple_animal/hostile/rat,
-						/mob/living/simple_animal/otie;0.5)
-	..()
-
+						/mob/living/simple_animal/hostile/rat/passive,
+						/mob/living/simple_animal/otie;0.5))
+	return ..()
 
 /obj/structure/largecrate/animal/dangerous
 	name = "Dangerous Predator carrier"
-	held_type = /mob/living/simple_animal/hostile/alien
+	starts_with = list(/mob/living/simple_animal/hostile/alien)
 
-/obj/structure/largecrate/animal/dangerous/New() //This is nessesary to get a random one each time.
-
-	held_type = pick(/mob/living/simple_animal/hostile/carp/pike,
+/obj/structure/largecrate/animal/dangerous/initialize()
+	starts_with = list(pick(/mob/living/simple_animal/hostile/carp/pike,
 						/mob/living/simple_animal/hostile/deathclaw,
 						/mob/living/simple_animal/hostile/dino,
 						/mob/living/simple_animal/hostile/alien,
@@ -73,35 +71,35 @@
 						/mob/living/simple_animal/hostile/alien/sentinel,
 						/mob/living/simple_animal/hostile/alien/queen,
 						/mob/living/simple_animal/otie/feral,
-						/mob/living/simple_animal/hostile/corrupthound)
-	..()
+						/mob/living/simple_animal/hostile/corrupthound))
+	return ..()
 
 /obj/structure/largecrate/animal/guardbeast
 	name = "VARMAcorp autoNOMous security solution"
 	desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs."
 	icon = 'icons/obj/storage_vr.dmi'
 	icon_state = "sotiecrate"
-	held_type = /mob/living/simple_animal/otie/security
+	starts_with = list(/mob/living/simple_animal/otie/security)
 
 /obj/structure/largecrate/animal/guardmutant
 	name = "VARMAcorp autoNOMous security solution for hostile environments."
 	desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs. This one can survive hostile atmosphere."
 	icon = 'icons/obj/storage_vr.dmi'
 	icon_state = "sotiecrate"
-	held_type = /mob/living/simple_animal/otie/security/phoron
+	starts_with = list(/mob/living/simple_animal/otie/security/phoron)
 
 /obj/structure/largecrate/animal/otie
 	name = "VARMAcorp adoptable reject (Dangerous!)"
 	desc = "A warning on the side says the creature inside was returned to the supplier after injuring or devouring several unlucky members of the previous adoption family. It was given a second chance with the next customer. Godspeed and good luck with your new pet!"
 	icon = 'icons/obj/storage_vr.dmi'
 	icon_state = "otiecrate2"
-	held_type = /mob/living/simple_animal/otie/cotie
+	starts_with = list(/mob/living/simple_animal/otie/cotie)
 	var/taped = 1
 
 /obj/structure/largecrate/animal/otie/phoron
 	name = "VARMAcorp adaptive beta subject (Experimental)"
 	desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!"
-	held_type = /mob/living/simple_animal/otie/cotie/phoron
+	starts_with = list(/mob/living/simple_animal/otie/cotie/phoron)
 
 /obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao
 	if(taped == 1)
@@ -113,9 +111,9 @@
 /obj/structure/largecrate/animal/catgirl
 	name = "Catgirl Crate"
 	desc = "A sketchy looking crate with airholes that seems to have had most marks and stickers removed. You can almost make out 'genetically-engineered subject' written on it."
-	held_type = /mob/living/simple_animal/catgirl
+	starts_with = list(/mob/living/simple_animal/catgirl)
 
 /obj/structure/largecrate/animal/wolfgirl
 	name = "Wolfgirl Crate"
 	desc = "A sketchy looking crate with airholes that shakes and thuds every now and then. Someone seems to be demanding they be let out."
-	held_type = /mob/living/simple_animal/retaliate/awoo
+	starts_with = list(/mob/living/simple_animal/retaliate/awoo)

code/game/objects/structures/flora.dm

@@ -197,7 +197,7 @@
 	desc = "This is an unusual plant. It's bulbous ends emit a soft blue light."
 	icon_state = "plant-09"
 	light_range = 2
-	light_power = 1
+	light_power = 0.6
 	light_color = "#33CCFF"
 
 /obj/structure/flora/pottedplant/orientaltree
@@ -255,7 +255,7 @@
 	desc = "This is a subterranean plant. It's bulbous ends glow faintly."
 	icon_state = "plant-20"
 	light_range = 2
-	light_power = 1
+	light_power = 0.6
 	light_color = "#FF6633"
 
 /obj/structure/flora/pottedplant/minitree
@@ -301,7 +301,7 @@
 	desc = "This is a subterranean plant. It's bulbous ends glow faintly."
 	icon_state = "glowplant"
 	light_range = 2
-	light_power = 1
+	light_power = 0.6
 	light_color = "#FF6633"
 
 /obj/structure/flora/sif/subterranean/initialize()
@@ -315,4 +315,4 @@
 
 /obj/structure/flora/sif/eyes/initialize()
 	icon_state = "[initial(icon_state)][rand(1,3)]"
-	. = ..()
+	. = ..()

code/game/objects/structures/grille.dm

@@ -7,7 +7,7 @@
 	anchored = 1
 	flags = CONDUCT
 	pressure_resistance = 5*ONE_ATMOSPHERE
-	layer = UNDER_JUNK_LAYER
+	layer = TABLE_LAYER
 	explosion_resistance = 1
 	var/health = 10
 	var/destroyed = 0

code/game/objects/structures/janicart.dm

@@ -1,3 +1,5 @@
+GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
+
 /obj/structure/janitorialcart
 	name = "janitorial cart"
 	desc = "The ultimate in janitorial carts! Has space for water, mops, signs, trash bags, and more!"

code/game/objects/structures/mop_bucket.dm

@@ -10,6 +10,7 @@
 	flags = OPENCONTAINER
 	var/amount_per_transfer_from_this = 5	//shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 
+GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket)
 
 /obj/structure/mopbucket/New()
 	create_reagents(300)

code/game/objects/structures/morgue.dm

@@ -196,6 +196,8 @@
  * Crematorium
  */
 
+GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium)
+
 /obj/structure/morgue/crematorium
 	name = "crematorium"
 	desc = "A human incinerator. Works well on barbeque nights."
@@ -342,7 +344,7 @@
 	if(..())
 		return
 	if(src.allowed(user))
-		for (var/obj/structure/morgue/crematorium/C in world)
+		for (var/obj/structure/morgue/crematorium/C in all_crematoriums)
 			if (C.id == id)
 				if (!C.cremating)
 					C.cremate(user)

code/game/objects/structures/signs.dm

@@ -3,8 +3,8 @@
 	anchored = 1
 	opacity = 0
 	density = 0
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	plane = OBJ_PLANE //VOREStation Edit
+	layer = ABOVE_JUNK_LAYER //VOREStation Edit
 	w_class = ITEMSIZE_NORMAL
 
 /obj/structure/sign/ex_act(severity)