Merge pull request #4216 from Tastyfish/420blazeit

Makes the game startup time significantly faster

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

@@ -19,11 +19,17 @@
 
 /obj/item/device/radio/headset/New()
 	..()
+	headsets += src
 	internal_channels.Cut()
+
+/obj/item/device/radio/headset/initialize()
+	..()
+
 	if(ks1type)
 		keyslot1 = new ks1type(src)
 	if(ks2type)
 		keyslot2 = new ks2type(src)
+
 	recalculateChannels(1)
 
 /obj/item/device/radio/headset/Destroy()
@@ -33,6 +39,7 @@
 		qdel(keyslot2)
 	keyslot1 = null
 	keyslot2 = null
+	headsets -= src
 	return ..()
 
 /obj/item/device/radio/headset/list_channels(var/mob/user)
@@ -383,8 +390,6 @@
 
 
 	for (var/ch_name in channels)
-		if(!radio_controller)
-			sleep(30) // Waiting for the radio_controller to be created.
 		if(!radio_controller)
 			src.name = "broken radio headset"
 			return

code/game/objects/items/random_items.dm

@@ -152,7 +152,6 @@
 
 	New()
 		..()
-		sleep(2)
 		new/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem(src)
 		new/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem(src)
 		new/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem(src)
@@ -169,7 +168,6 @@
 		new/obj/item/weapon/storage/pill_bottle/random_meds(src)
 		while(prob(25))
 			new/obj/item/weapon/storage/pill_bottle/random_meds(src)
-		return
 
 /obj/structure/closet/crate/secure/chemicals
 	name		= "chemical supply kit"
@@ -178,7 +176,6 @@
 
 	New()
 		..()
-		sleep(2)
 		for(var/chem in standard_chemicals)
 			var/obj/item/weapon/reagent_containers/glass/bottle/B = new(src)
 			B.reagents.add_reagent(chem,B.volume)
@@ -240,7 +237,6 @@
 
 	New()
 		..()
-		sleep(2)
 		new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink(src)
 		new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink(src)
 		new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink(src)
@@ -248,7 +244,6 @@
 		new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink(src)
 		while(prob(25))
 			new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_reagent(src)
-		return
 
 
 // -------------------------------------
@@ -276,8 +271,9 @@
 				while(prob(15))
 					new menace(get_step_rand(src.loc))
 				..()
+			return 1
 		else
-			..()
+			return ..()
 
 
 //
@@ -307,7 +303,7 @@
 				qdel(Cat1)
 			else
 				qdel(Cat2)
-		..()
+		return ..()
 
 // --------------------------------------
 //   Collen's box of wonder and mystery