Merge pull request #12054 from Incoming5643/Boxes_of_the_Spessmen

Dials back the boxes [poll]

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

@@ -26,9 +26,6 @@
 
 /obj/structure/closet/New()
 	..()
-	if(type == /obj/structure/closet && ticker && ticker.current_state == GAME_STATE_PREGAME && prob(20)) //only roundstart generic closets
-		new /obj/structure/closet/cardboard(src.loc)
-		qdel(src)
 	update_icon()
 
 /obj/structure/closet/initialize()

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

@@ -11,7 +11,7 @@
 	cutting_sound = 'sound/items/poster_ripped.ogg'
 	material_drop = /obj/item/stack/sheet/cardboard
 	var/move_delay = 0
-	var/egg_cooldown = 0
+	var/egged = 0
 
 /obj/structure/closet/cardboard/relaymove(mob/user, direction)
 	if(opened || move_delay || user.stat || user.stunned || user.weakened || user.paralysis || !isturf(loc) || !has_gravity(loc))
@@ -24,7 +24,7 @@
 /obj/structure/closet/cardboard/open()
 	if(opened || !can_open())
 		return 0
-	if(!egg_cooldown)
+	if(!egged)
 		var/mob/living/Snake = null
 		for(var/mob/living/L in src.contents)
 			Snake = L
@@ -35,10 +35,8 @@
 				for(var/mob/living/L in alerted)
 					if(!L.stat)
 						L.do_alert_animation(L)
+						egged = 1
 				alerted << sound('sound/machines/chime.ogg')
-				egg_cooldown = 1
-				spawn(3000)
-					egg_cooldown = 0
 	..()
 
 /mob/living/proc/do_alert_animation(atom/A)