Merge pull request #5775 from Trilbyspaceclone/map_reduction

map reduction and locker post spawning

code/game/machinery/smelter.dm

@@ -97,6 +97,10 @@
 		/*if(istype(O, /obj/structure/scrap_cube))
 			current_item = O
 			return*/
+		if(istype(O, /obj/structure/closet))
+			var/obj/structure/closet/C = O
+			C.populate_contents()
+
 		var/list/materials = result_materials(O)
 		if(!materials?.len || !are_valid_materials(materials))
 			eject(O, refuse_output_side)
@@ -200,6 +204,7 @@
 	if(T.density)
 		return
 	O.loc = T
+	O.reset_plane_and_layer()
 
 /obj/machinery/smelter/proc/eject_material_stack(material)
 	var/obj/item/stack/material/stack_type = material_stack_type(material)

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

@@ -46,14 +46,14 @@
 	var/has_mobs_to_spawn = FALSE
 	var/chance_old_mobs = 20
 	var/mobs_to_spawn = /obj/random/cluster/roaches
+	var/populated_contents = FALSE
 
 /obj/structure/closet/can_prevent_fall()
 	return TRUE
 
 /obj/structure/closet/Initialize(mapload)
 	..()
 
-	populate_contents()
 	update_icon()
 	hack_require = rand(6,8)
 
@@ -95,6 +95,7 @@
 			storage_capacity = content_size + 5
 
 /obj/structure/closet/Destroy()
+	populate_contents()
 	dump_contents()
 	. = ..()
 
@@ -106,16 +107,19 @@
 		for(var/obj/item/I in src.contents)
 			if(!I.anchored)
 				content_size += CEILING(I.w_class * 0.5, 1)
-		if(!content_size)
-			to_chat(user, "It is empty.")
-		else if(storage_capacity > content_size*4)
-			to_chat(user, "It is barely filled.")
-		else if(storage_capacity > content_size*2)
-			to_chat(user, "It is less than half full.")
-		else if(storage_capacity > content_size)
-			to_chat(user, "There is still some free space.")
+		if(populated_contents)
+			if(!content_size)
+				to_chat(user, "It is empty.")
+			else if(storage_capacity > content_size*4)
+				to_chat(user, "It is barely filled.")
+			else if(storage_capacity > content_size*2)
+				to_chat(user, "It is less than half full.")
+			else if(storage_capacity > content_size)
+				to_chat(user, "There is still some free space.")
+			else
+				to_chat(user, "It is full.")
 		else
-			to_chat(user, "It is full.")
+			to_chat(user, "It's hard to tell how full [src] is.")
 
 /obj/structure/closet/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(air_group || (height==0 || wall_mounted)) return 1
@@ -204,6 +208,8 @@
 	if(opened || !can_open(user))
 		return FALSE
 
+	populate_contents()
+
 	if(rigged && (locate(/obj/item/device/radio/electropack) in src) && istype(user))
 		if(user.electrocute_act(20, src))
 			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -336,6 +342,7 @@
 
 // this should probably use dump_contents()
 /obj/structure/closet/ex_act(severity)
+	populate_contents()
 	switch(severity)
 		if(1)
 			for(var/atom/movable/A as mob|obj in src)//pulls everything out of the locker and hits it with an explosion
@@ -355,10 +362,13 @@
 				health -= 50
 
 /obj/structure/closet/proc/populate_contents()
-	return
+	populated_contents = TRUE
+	if(populated_contents)
+		return FALSE
 
 /obj/structure/closet/proc/damage(var/damage)
 	health -= damage
+	populate_contents()
 	if(health <= 0)
 		qdel(src)
 
@@ -563,6 +573,7 @@
 // tk grab then use on self
 /obj/structure/closet/attack_self_tk(mob/user as mob)
 	src.add_fingerprint(user)
+	populate_contents()
 	if(!src.toggle())
 		to_chat(usr, SPAN_NOTICE("It won't budge!"))
 
@@ -571,6 +582,7 @@
 		locked = FALSE
 		broken = TRUE
 		update_icon()
+		populate_contents()
 		playsound(src.loc, "sparks", 60, 1)
 		to_chat(user, SPAN_NOTICE("You unlock \the [src]."))
 		return TRUE
@@ -586,6 +598,7 @@
 			playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
 		broken = TRUE
 	update_icon()
+	populate_contents()
 	..()
 
 /obj/structure/closet/verb/verb_toggleopen()
@@ -705,6 +718,7 @@
 /obj/structure/closet/proc/break_open()
 	welded = 0
 	update_icon()
+	populate_contents()
 	//Do this to prevent contents from being opened into nullspace (read: bluespace)
 	if(istype(loc, /obj/structure/bigDelivery))
 		var/obj/structure/bigDelivery/BD = loc

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

@@ -4,6 +4,9 @@
 	icon_door = "mixed"
 
 /obj/structure/closet/athletic_mixed/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/under/shorts/athleticgrey(src)
 	new /obj/item/clothing/under/shorts/athleticblack(src)
 	new /obj/item/clothing/under/shorts(src)
@@ -27,6 +30,9 @@
 	desc = "It's a storage unit for gloves for use in the boxing ring."
 
 /obj/structure/closet/boxinggloves/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/gloves/boxing/blue(src)
 	new /obj/item/clothing/gloves/boxing/green(src)
 	new /obj/item/clothing/gloves/boxing/yellow(src)
@@ -37,6 +43,9 @@
 	desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
 
 /obj/structure/closet/masks/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/mask/costume/job/luchador(src)
 	new /obj/item/clothing/mask/costume/job/luchador/rudos(src)
 	new /obj/item/clothing/mask/costume/job/luchador/tecnicos(src)
@@ -47,6 +56,9 @@
 	icon_door = "red"
 
 /obj/structure/closet/lasertag/red/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/gun/energy/lasertag/red(src)
 	new /obj/item/gun/energy/lasertag/red(src)
 	new /obj/item/gun/energy/lasertag/red(src)
@@ -78,6 +90,9 @@
 	icon_door = "blue"
 
 /obj/structure/closet/lasertag/blue/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/gun/energy/lasertag/blue(src)
 	new /obj/item/gun/energy/lasertag/blue(src)
 	new /obj/item/gun/energy/lasertag/blue(src)
@@ -109,6 +124,9 @@
 	icon_door = "green"
 
 /obj/structure/closet/lasertag/green/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/gun/energy/lasertag/green(src)
 	new /obj/item/gun/energy/lasertag/green(src)
 	new /obj/item/gun/energy/lasertag/green(src)
@@ -140,6 +158,9 @@
 	icon_door = "yellow"
 
 /obj/structure/closet/lasertag/yellow/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/gun/energy/lasertag/yellow(src)
 	new /obj/item/gun/energy/lasertag/yellow(src)
 	new /obj/item/gun/energy/lasertag/yellow(src)

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

@@ -15,6 +15,9 @@
 	icon_state = "syndicate"
 
 /obj/structure/closet/gimmick/russian/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/head/ushanka(src)
 	new /obj/item/clothing/head/ushanka(src)
 	new /obj/item/clothing/head/ushanka(src)
@@ -34,12 +37,17 @@
 	anchored = 1
 
 /obj/structure/closet/thunderdome/New()
-	..()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 
 /obj/structure/closet/thunderdome/tdred
 	name = "red-team Thunderdome closet"
 
 /obj/structure/closet/thunderdome/tdred/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/suit/armor/heavy/red(src)
 	new /obj/item/clothing/suit/armor/heavy/red(src)
 	new /obj/item/clothing/suit/armor/heavy/red(src)
@@ -64,6 +72,9 @@
 	icon_state = "syndicate"
 
 /obj/structure/closet/thunderdome/tdgreen/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/suit/armor/heavy/green(src)
 	new /obj/item/clothing/suit/armor/heavy/green(src)
 	new /obj/item/clothing/suit/armor/heavy/green(src)

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

@@ -15,6 +15,9 @@
 	icon_door = "black"
 
 /obj/structure/closet/gmcloset/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/head/tophat(src)
 	new /obj/item/clothing/head/tophat(src)
 	new /obj/item/device/radio/headset/headset_service(src)
@@ -37,6 +40,9 @@
 	icon_door = "black"
 
 /obj/structure/closet/chefcloset/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/under/costume/job/waiter(src)
 	new /obj/item/clothing/under/costume/job/waiter(src)
 	new /obj/item/clothing/under/rank/bartender(src)
@@ -62,6 +68,9 @@
 	icon_door = "mixed"
 
 /obj/structure/closet/jcloset/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	if(prob(50))
 		new /obj/item/storage/backpack/sport/purple(src)
 	else
@@ -94,6 +103,9 @@
 	icon_state = "custodian"
 
 /obj/structure/closet/custodial/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/storage/belt/utility/neotheology(src)
 	new /obj/item/device/lighting/toggleable/flashlight(src)
 	new /obj/item/gun/matter/launcher/nt_sprayer(src)
@@ -118,6 +130,9 @@
 	icon_state = "acolyte"
 
 /obj/structure/closet/acolyte/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	if(prob(25))
 		new /obj/item/storage/backpack/neotheology(src)
 	else if(prob(25))

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

@@ -4,12 +4,18 @@
 	icon_state = "bio"
 
 /obj/structure/closet/l3closet/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/suit/bio_suit/general(src)
 	new /obj/item/clothing/head/bio_hood/general(src)
 
 /obj/structure/closet/l3closet/general
 
 /obj/structure/closet/l3closet/general/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/suit/bio_suit/general(src)
 	new /obj/item/clothing/head/bio_hood/general(src)
 	new /obj/item/reagent_containers/spray/sterilizine(src)
@@ -18,6 +24,9 @@
 	icon_door = "bio_viro"
 
 /obj/structure/closet/l3closet/virology/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/suit/bio_suit/virology(src)
 	new /obj/item/clothing/head/bio_hood/virology(src)
 	new /obj/item/clothing/mask/breath(src)
@@ -28,18 +37,27 @@
 	icon_door = "bio_sec"
 
 /obj/structure/closet/l3closet/security/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/suit/bio_suit/security(src)
 	new /obj/item/clothing/head/bio_hood/security(src)
 
 /obj/structure/closet/l3closet/janitor
 	icon_door = "bio_jan"
 
 /obj/structure/closet/l3closet/janitor/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/suit/bio_suit/janitor(src)
 	new /obj/item/clothing/head/bio_hood/janitor(src)
 
 /obj/structure/closet/l3closet/scientist
 
 /obj/structure/closet/l3closet/scientist/populate_contents()
+	if(populated_contents)
+		return
+	populated_contents = TRUE
 	new /obj/item/clothing/suit/bio_suit/scientist(src)
 	new /obj/item/clothing/head/bio_hood/scientist(src)