diff --git a/_maps/birdstation.dm b/_maps/birdstation.dm
index e35fa7106cf..b1f4350ed1e 100644
--- a/_maps/birdstation.dm
+++ b/_maps/birdstation.dm
@@ -31,7 +31,6 @@ A small map intended for lowpop(40 players and less).
 		#if !defined(MAP_OVERRIDE_FILES)
 				#define MAP_OVERRIDE_FILES
 				#include "map_files\BirdStation\telecomms.dm"
-				#include "map_files\BirdStation\misc.dm"
 				#include "map_files\BirdStation\job\job_changes.dm"
 		        #include "map_files\BirdStation\job\removed_jobs.dm"
 		#endif
@@ -40,4 +39,4 @@ A small map intended for lowpop(40 players and less).
 
 	#warn a map has already been included, ignoring birdstation.
 
-#endif
\ No newline at end of file
+#endif
diff --git a/_maps/map_files/BirdStation/job/job_changes.dm b/_maps/map_files/BirdStation/job/job_changes.dm
index 679c212c7ee..cca341cc117 100644
--- a/_maps/map_files/BirdStation/job/job_changes.dm
+++ b/_maps/map_files/BirdStation/job/job_changes.dm
@@ -6,7 +6,7 @@
 	supervisors = "the captain and the head of personnel"
 
 /datum/outfit/job/New()
-	box = /obj/item/weapon/storage/box/birdsurv
+	box = /obj/item/weapon/storage/box/survival/radio
 
 /datum/job/assistant // Here so assistant appears on the top of the select job list.
 
@@ -29,7 +29,7 @@
 	..()
 
 /datum/outfit/job/hos/New()
-	box = /obj/item/weapon/storage/box/birdsec
+	box = /obj/item/weapon/storage/box/security/radio
 
 /datum/job/officer/New()
 	..()
@@ -39,7 +39,7 @@
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers)
 
 /datum/outfit/job/officer/New()
-	box = /obj/item/weapon/storage/box/birdsec
+	box = /obj/item/weapon/storage/box/security/radio
 
 /datum/job/detective/New()
 	..()
@@ -47,7 +47,7 @@
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers)
 
 /datum/outfit/job/detective/New()
-	box = /obj/item/weapon/storage/box/birdsec
+	box = /obj/item/weapon/storage/box/security/radio
 
 //Medbay
 
@@ -69,7 +69,7 @@
 	minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_tcomsat)
 
 /datum/outfit/job/engineer/New()
-	box = /obj/item/weapon/storage/box/birdeng
+	box = /obj/item/weapon/storage/box/engineer/radio
 
 //Science
 
@@ -93,7 +93,7 @@
 	minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom)
 
 /datum/outfit/job/mining/New()
-	box = /obj/item/weapon/storage/box/birdeng
+	box = /obj/item/weapon/storage/box/engineer/radio
 
 //Service
 
@@ -123,4 +123,4 @@
 
 /datum/job/clown/New()
 	..()
-	supervisors = "nobody but yourself" //Honk
\ No newline at end of file
+	supervisors = "nobody but yourself" //Honk
diff --git a/_maps/map_files/BirdStation/misc.dm b/_maps/map_files/BirdStation/misc.dm
deleted file mode 100644
index 109392cfcde..00000000000
--- a/_maps/map_files/BirdStation/misc.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-//special birdstation survival boxes
-
-/obj/item/weapon/storage/box/birdsurv/New()
-	..()
-	contents = list()
-	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/weapon/tank/internals/emergency_oxygen(src)
-	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
-	new /obj/item/device/radio/off(src)
-	return
-
-/obj/item/weapon/storage/box/birdeng/New()
-	..()
-	contents = list()
-	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
-	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
-	new /obj/item/device/radio/off(src)
-	return
-
-/obj/item/weapon/storage/box/birdsec/New()
-	..()
-	contents = list()
-	new /obj/item/clothing/mask/gas/sechailer(src)
-	new /obj/item/weapon/tank/internals/emergency_oxygen(src)
-	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
-	new /obj/item/device/radio/off(src)
-	return
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 64fa803eb9a..03ccef5fd1d 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -57,37 +57,45 @@
 	return ..()
 
 
-/obj/item/weapon/storage/box/survival
-
+// Ordinary survival box
 /obj/item/weapon/storage/box/survival/New()
 	..()
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/weapon/tank/internals/emergency_oxygen(src)
 	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
 
-/obj/item/weapon/storage/box/engineer
+/obj/item/weapon/storage/box/survival/radio/New()
+	..()
+	new /obj/item/device/radio/off(src)
 
+// Engineer survival box
 /obj/item/weapon/storage/box/engineer/New()
 	..()
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
 
-/obj/item/weapon/storage/box/syndie
+/obj/item/weapon/storage/box/engineer/radio/New()
+	..()
+	new /obj/item/device/radio/off(src)
 
+// Syndie survival box
 /obj/item/weapon/storage/box/syndie/New()
 	..()
 	new /obj/item/clothing/mask/gas/syndicate(src)
 	new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
 
-/obj/item/weapon/storage/box/security
-
+// Security survival box
 /obj/item/weapon/storage/box/security/New()
 	..()
 	new /obj/item/clothing/mask/gas/sechailer(src)
 	new /obj/item/weapon/tank/internals/emergency_oxygen(src)
 	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
 
+/obj/item/weapon/storage/box/security/radio/New()
+	..()
+	new /obj/item/device/radio/off(src)
+
 /obj/item/weapon/storage/box/gloves
 	name = "box of latex gloves"
 	desc = "Contains sterile latex gloves."