diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 68f7327551..3f3bacc64f 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -36,12 +36,11 @@
 	RefreshParts()
 	add_inital_chems()
 
-/obj/machinery/sleeper/Destroy()
-	var/obj/item/reagent_containers/sleeper_buffer/buffer = new /obj/item/reagent_containers/sleeper_buffer(loc)
+/obj/machinery/sleeper/on_deconstruction()
+	var/obj/item/reagent_containers/sleeper_buffer/buffer = new (loc)
 	buffer.volume = reagents.maximum_volume
 	buffer.reagents.maximum_volume = reagents.maximum_volume
 	reagents.trans_to(buffer.reagents, reagents.total_volume)
-	..()
 
 /obj/machinery/sleeper/proc/add_inital_chems()
 	for(var/i in available_chems)
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 822a1d5011..0d9b86fd68 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -18,6 +18,12 @@
 	throw_speed = 3
 	throw_range = 7
 	var/empty = FALSE
+	var/list/possible_icons = list("firstaid","firstaid2","firstaid3","firstaid4")
+
+/obj/item/storage/firstaid/Initialize(mapload)
+	. = ..()
+	if(LAZYLEN(possible_icons))
+		icon_state = pick(possible_icons)
 
 /obj/item/storage/firstaid/regular
 	icon_state = "firstaid"
@@ -56,17 +62,14 @@
 /obj/item/storage/firstaid/fire
 	name = "burn treatment kit"
 	desc = "A specialized medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
-	icon_state = "ointment"
+	icon_state = "burn"
 	item_state = "firstaid-ointment"
+	possible_icons = list("burn","burn2","burn3","burn4")
 
 /obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins rubbing \the [src] against [user.p_them()]self! It looks like [user.p_theyre()] trying to start a fire!</span>")
 	return FIRELOSS
 
-/obj/item/storage/firstaid/fire/Initialize(mapload)
-	. = ..()
-	icon_state = pick("ointment","firefirstaid")
-
 /obj/item/storage/firstaid/fire/PopulateContents()
 	if(empty)
 		return
@@ -80,17 +83,14 @@
 /obj/item/storage/firstaid/toxin
 	name = "toxin treatment kit"
 	desc = "Used to treat toxic blood content and radiation poisoning."
-	icon_state = "antitoxin"
+	icon_state = "toxin"
 	item_state = "firstaid-toxin"
+	possible_icons = list("toxin","toxin2","toxin3","toxin4")
 
 /obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return TOXLOSS
 
-/obj/item/storage/firstaid/toxin/Initialize(mapload)
-	. = ..()
-	icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
-
 /obj/item/storage/firstaid/toxin/PopulateContents()
 	if(empty)
 		return
@@ -103,8 +103,9 @@
 /obj/item/storage/firstaid/radbgone
 	name = "radiation treatment kit"
 	desc = "Used to treat minor toxic blood content and major radiation poisoning."
-	icon_state = "antitoxin"
+	icon_state = "rad"
 	item_state = "firstaid-toxin"
+	possible_icons = list("rad","rad2","rad3")
 
 /obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -128,8 +129,9 @@
 /obj/item/storage/firstaid/o2
 	name = "oxygen deprivation treatment kit"
 	desc = "A box full of oxygen goodies."
-	icon_state = "o2"
+	icon_state = "oxy"
 	item_state = "firstaid-o2"
+	possible_icons = list("oxy", "oxy2", "oxy3", "oxy4")
 
 /obj/item/storage/firstaid/o2/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -149,6 +151,7 @@
 	desc = "A first aid kit for when you get toolboxed."
 	icon_state = "brute"
 	item_state = "firstaid-brute"
+	possible_icons = list("brute", "brute2", "brute3", "brute4")
 
 /obj/item/storage/firstaid/brute/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -166,7 +169,8 @@
 /obj/item/storage/firstaid/tactical
 	name = "combat medical kit"
 	desc = "I hope you've got insurance."
-	icon_state = "bezerk"
+	icon_state = "tactical"
+	possible_icons = null
 
 /obj/item/storage/firstaid/tactical/ComponentInitialize()
 	. = ..()
@@ -389,3 +393,141 @@
 	/obj/item/organ_storage
 	))
 
+//hijacking the minature first aids for hypospray boxes. <3
+/obj/item/storage/hypospraykit
+	name = "hypospray kit"
+	desc = "It's a kit containing a hypospray and specific treatment chemical-filled vials."
+	icon_state = "firstaid-mini"
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+	throw_speed = 3
+	throw_range = 7
+	var/empty = FALSE
+	item_state = "firstaid"
+
+/obj/item/storage/hypospraykit/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_items = 12
+	STR.can_hold = typecacheof(list(
+	/obj/item/hypospray/mkii,
+	/obj/item/reagent_containers/glass/bottle/vial))
+
+/obj/item/storage/hypospraykit/regular
+	icon_state = "firstaid-mini"
+	desc = "A hypospray kit with general use vials."
+
+/obj/item/storage/hypospraykit/regular/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src)
+
+/obj/item/storage/hypospraykit/fire
+	name = "burn treatment hypospray kit"
+	desc = "A specialized hypospray kit for burn treatments. Apply with sass."
+	icon_state = "burn-mini"
+	item_state = "firstaid-ointment"
+
+/obj/item/storage/hypospraykit/fire/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/burn(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)
+
+/obj/item/storage/hypospraykit/toxin
+	name = "toxin treatment hypospray kit"
+	icon_state = "toxin-mini"
+	item_state = "firstaid-toxin"
+
+/obj/item/storage/hypospraykit/toxin/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/toxin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)
+
+/obj/item/storage/hypospraykit/o2
+	name = "oxygen deprivation hypospray kit"
+	icon_state = "oxy-mini"
+	item_state = "firstaid-o2"
+
+/obj/item/storage/hypospraykit/o2/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/oxygen(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
+
+/obj/item/storage/hypospraykit/enlarge
+	name = "organomegaly trauma hypospray kit"
+	icon_state = "enlarge-mini"
+	item_state = "firstaid-brute"
+
+/obj/item/storage/hypospraykit/enlarge/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/enlarge(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
+
+/obj/item/storage/hypospraykit/brute
+	name = "brute trauma hypospray kit"
+	icon_state = "brute-mini"
+	item_state = "firstaid-brute"
+
+/obj/item/storage/hypospraykit/brute/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/brute(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)
+
+/obj/item/storage/hypospraykit/tactical
+	name = "combat hypospray kit"
+	desc = "A hypospray kit best suited for combat situations."
+	icon_state = "tactical-mini"
+
+/obj/item/storage/hypospraykit/tactical/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/defibrillator/compact/combat/loaded(src)
+	new /obj/item/hypospray/mkii/CMO/combat(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src)
+
+/obj/item/storage/hypospraykit/cmo
+	name = "deluxe hypospray kit"
+	desc = "A kit containing a Deluxe hypospray and Vials."
+	icon_state = "tactical-mini"
+
+/obj/item/storage/hypospraykit/cmo/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_items = 6
+	STR.can_hold = typecacheof(list(
+	/obj/item/hypospray/mkii,
+	/obj/item/reagent_containers/glass/bottle/vial))
+
+/obj/item/storage/hypospraykit/cmo/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/CMO(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/charcoal(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/salglu(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/synthflesh(src)
+
+/obj/item/storage/box/vials
+	name = "box of hypovials"
+
+/obj/item/storage/box/vials/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_containers/glass/bottle/vial/small( src )
diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
index 0378b0b9ee..f2ab3e56ed 100644
--- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
+++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
@@ -135,7 +135,7 @@
 	var/atom/Tsec = drop_location()
 
 	var/obj/item/bot_assembly/secbot/Sa = new (Tsec)
-	Sa.build_step = 1
+	Sa.build_step = ASSEMBLY_SECOND_STEP
 	Sa.add_overlay("hs_hole")
 	Sa.created_name = name
 	new /obj/item/assembly/prox_sensor(Tsec)
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 77df764b43..6c4680a477 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -101,7 +101,7 @@
 
 		if(ASSEMBLY_FOURTH_STEP)
 			if(istype(W, /obj/item/weldingtool))
-				if(W.use_tool(src, user, 0, volume=40) && build_step == 4)
+				if(W.use_tool(src, user, 0, volume=40) && build_step == ASSEMBLY_FOURTH_STEP)
 					name = "shielded frame assembly"
 					to_chat(user, "<span class='notice'>You weld the vest to [src].</span>")
 					build_step++
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index e272878574..cbd985c358 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -379,7 +379,7 @@ Auto Patrol[]"},
 	var/atom/Tsec = drop_location()
 
 	var/obj/item/bot_assembly/ed209/Sa = new (Tsec)
-	Sa.build_step = 1
+	Sa.build_step = ASSEMBLY_SECOND_STEP
 	Sa.add_overlay("hs_hole")
 	Sa.created_name = name
 	new /obj/item/assembly/prox_sensor(Tsec)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index b164605e2f..c0a9a2082f 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -411,7 +411,7 @@ Auto Patrol: []"},
 	var/atom/Tsec = drop_location()
 
 	var/obj/item/bot_assembly/secbot/Sa = new (Tsec)
-	Sa.build_step = 1
+	Sa.build_step = ASSEMBLY_SECOND_STEP
 	Sa.add_overlay("hs_hole")
 	Sa.created_name = name
 	new /obj/item/assembly/prox_sensor(Tsec)
diff --git a/html/changelogs/AutoChangeLog-pr-10031.yml b/html/changelogs/AutoChangeLog-pr-10031.yml
new file mode 100644
index 0000000000..707cb80f66
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10031.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Fixed holodeck sleepers leaving sleeper buffers behind when deleted."
diff --git a/html/changelogs/AutoChangeLog-pr-9988.yml b/html/changelogs/AutoChangeLog-pr-9988.yml
new file mode 100644
index 0000000000..7fb1c5c6d8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9988.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Fixed ED-209 being unbuildable past the welding step."
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 3b8b67ea5c..8ede8c66ab 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/modular_citadel/code/game/objects/items/storage/firstaid.dm b/modular_citadel/code/game/objects/items/storage/firstaid.dm
deleted file mode 100755
index 3845cb6fd7..0000000000
--- a/modular_citadel/code/game/objects/items/storage/firstaid.dm
+++ /dev/null
@@ -1,175 +0,0 @@
-//help I have no idea what I'm doing
-
-/obj/item/storage/firstaid
-	icon = 'modular_citadel/icons/firstaid.dmi'
-
-/obj/item/storage/firstaid/Initialize(mapload)
-	. = ..()
-	icon_state = pick("[initial(icon_state)]","[initial(icon_state)]2","[initial(icon_state)]3","[initial(icon_state)]4")
-
-/obj/item/storage/firstaid/fire
-	icon_state = "burn"
-
-/obj/item/storage/firstaid/fire/Initialize(mapload)
-	. = ..()
-	icon_state = pick("[initial(icon_state)]","[initial(icon_state)]2","[initial(icon_state)]3","[initial(icon_state)]4")
-
-/obj/item/storage/firstaid/toxin
-	icon_state = "toxin"
-
-/obj/item/storage/firstaid/toxin/Initialize(mapload)
-	. = ..()
-	icon_state = pick("[initial(icon_state)]","[initial(icon_state)]2","[initial(icon_state)]3","[initial(icon_state)]4")
-
-/obj/item/storage/firstaid/o2
-	icon_state = "oxy"
-
-/obj/item/storage/firstaid/radbgone
-	icon_state = "rad"
-
-/obj/item/storage/firstaid/radbgone/Initialize(mapload)
-	. = ..()
-	icon_state = pick("[initial(icon_state)]","[initial(icon_state)]2","[initial(icon_state)]3","[initial(icon_state)]4")
-
-/obj/item/storage/firstaid/tactical
-	icon_state = "tactical"
-
-//hijacking the minature first aids for hypospray boxes. <3
-/obj/item/storage/hypospraykit
-	name = "hypospray kit"
-	desc = "It's a kit containing a hypospray and specific treatment chemical-filled vials."
-	icon = 'modular_citadel/icons/firstaid.dmi'
-	icon_state = "firstaid-mini"
-	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
-	throw_speed = 3
-	throw_range = 7
-	var/empty = FALSE
-	item_state = "firstaid"
-
-/obj/item/storage/hypospraykit/ComponentInitialize()
-	. = ..()
-	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
-	STR.max_items = 12
-	STR.can_hold = typecacheof(list(
-	/obj/item/hypospray/mkii,
-	/obj/item/reagent_containers/glass/bottle/vial))
-
-/obj/item/storage/hypospraykit/regular
-	icon_state = "firstaid-mini"
-	desc = "A hypospray kit with general use vials."
-
-/obj/item/storage/hypospraykit/regular/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/hypospray/mkii/tricord(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src)
-
-/obj/item/storage/hypospraykit/fire
-	name = "burn treatment hypospray kit"
-	desc = "A specialized hypospray kit for burn treatments. Apply with sass."
-	icon_state = "burn-mini"
-	item_state = "firstaid-ointment"
-
-/obj/item/storage/hypospraykit/fire/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/hypospray/mkii/burn(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)
-
-/obj/item/storage/hypospraykit/toxin
-	name = "toxin treatment hypospray kit"
-	icon_state = "toxin-mini"
-	item_state = "firstaid-toxin"
-
-/obj/item/storage/hypospraykit/toxin/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/hypospray/mkii/toxin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)
-
-/obj/item/storage/hypospraykit/o2
-	name = "oxygen deprivation hypospray kit"
-	icon_state = "oxy-mini"
-	item_state = "firstaid-o2"
-
-/obj/item/storage/hypospraykit/o2/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/hypospray/mkii/oxygen(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
-
-/obj/item/storage/hypospraykit/enlarge
-	name = "organomegaly trauma hypospray kit"
-	icon_state = "enlarge-mini"
-	item_state = "firstaid-brute"
-
-/obj/item/storage/hypospraykit/enlarge/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/hypospray/mkii/enlarge(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
-
-/obj/item/storage/hypospraykit/brute
-	name = "brute trauma hypospray kit"
-	icon_state = "brute-mini"
-	item_state = "firstaid-brute"
-
-/obj/item/storage/hypospraykit/brute/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/hypospray/mkii/brute(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)
-
-/obj/item/storage/hypospraykit/tactical
-	name = "combat hypospray kit"
-	desc = "A hypospray kit best suited for combat situations."
-	icon_state = "tactical-mini"
-
-/obj/item/storage/hypospraykit/tactical/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/defibrillator/compact/combat/loaded(src)
-	new /obj/item/hypospray/mkii/CMO/combat(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src)
-
-/obj/item/storage/hypospraykit/cmo
-	name = "deluxe hypospray kit"
-	desc = "A kit containing a Deluxe hypospray and Vials."
-	icon_state = "tactical-mini"
-
-/obj/item/storage/hypospraykit/cmo/ComponentInitialize()
-	. = ..()
-	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
-	STR.max_items = 6
-	STR.can_hold = typecacheof(list(
-	/obj/item/hypospray/mkii,
-	/obj/item/reagent_containers/glass/bottle/vial))
-
-/obj/item/storage/hypospraykit/cmo/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/hypospray/mkii/CMO(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/tricord(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/charcoal(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/salglu(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/dexalin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/synthflesh(src)
-
-/obj/item/storage/box/vials
-	name = "box of hypovials"
-
-/obj/item/storage/box/vials/PopulateContents()
-	for(var/i in 1 to 7)
-		new /obj/item/reagent_containers/glass/bottle/vial/small( src )
diff --git a/modular_citadel/icons/firstaid.dmi b/modular_citadel/icons/firstaid.dmi
deleted file mode 100644
index d061adf9f2..0000000000
Binary files a/modular_citadel/icons/firstaid.dmi and /dev/null differ
diff --git a/tgstation.dme b/tgstation.dme
index 702d07b8c4..07915f2e04 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3027,7 +3027,6 @@
 #include "modular_citadel\code\game\objects\items\devices\radio\encryptionkey.dm"
 #include "modular_citadel\code\game\objects\items\devices\radio\headset.dm"
 #include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm"
-#include "modular_citadel\code\game\objects\items\storage\firstaid.dm"
 #include "modular_citadel\code\game\objects\structures\tables_racks.dm"
 #include "modular_citadel\code\game\objects\structures\beds_chairs\chair.dm"
 #include "modular_citadel\code\modules\admin\admin.dm"