diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index dbbdee3711..085c72f143 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -243,21 +243,17 @@
 
 	New()
 		..()
-		new /obj/item/clothing/under/rank/psych(src)
-		new /obj/item/clothing/under/rank/psych/turtleneck(src)
-		new /obj/item/clothing/suit/straight_jacket(src)
-		new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src)
-		new /obj/item/weapon/reagent_containers/syringe(src)
-		new /obj/item/weapon/storage/pill_bottle/citalopram(src)
-		new /obj/item/weapon/reagent_containers/pill/methylphenidate(src)
-		new /obj/item/weapon/clipboard(src)
-		new /obj/item/weapon/folder/white(src)
-		new /obj/item/device/taperecorder(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/tape/random(src)
-		new /obj/item/device/camera(src)
-		new /obj/item/toy/plushie/therapy/blue(src)
+		new /obj/item/weapon/storage/box/pillbottles(src)
+ 		new /obj/item/weapon/storage/box/pillbottles(src)
+		new /obj/item/weapon/storage/box/beakers(src)
+		new /obj/item/weapon/storage/box/autoinjectors(src)
+		new /obj/item/weapon/storage/box/syringes(src)
+		new /obj/item/weapon/reagent_containers/dropper(src)
+ 		new /obj/item/weapon/reagent_containers/dropper(src)
+ 		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
+ 		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
+ 		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
+ 		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
 		return
 
 /obj/structure/closet/secure_closet/psych
@@ -274,8 +270,21 @@
 
 	New()
 		..()
-		new /obj/item/weapon/storage/box/pillbottles(src)
-		new /obj/item/weapon/storage/box/pillbottles(src)
+		new /obj/item/clothing/under/rank/psych(src)
+ 		new /obj/item/clothing/under/rank/psych/turtleneck(src)
+ 		new /obj/item/clothing/suit/straight_jacket(src)
+ 		new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src)
+ 		new /obj/item/weapon/reagent_containers/syringe(src)
+ 		new /obj/item/weapon/storage/pill_bottle/citalopram(src)
+ 		new /obj/item/weapon/reagent_containers/pill/methylphenidate(src)
+ 		new /obj/item/weapon/clipboard(src)
+ 		new /obj/item/weapon/folder/white(src)
+ 		new /obj/item/device/taperecorder(src)
+ 		new /obj/item/device/tape/random(src)
+ 		new /obj/item/device/tape/random(src)
+ 		new /obj/item/device/tape/random(src)
+ 		new /obj/item/device/camera(src)
+ 		new /obj/item/toy/plushie/therapy/blue(src)
 		return
 
 /obj/structure/closet/secure_closet/medical_wall
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 44dce0a7ad..b1d75062a6 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -209,6 +209,7 @@
 	desc = "A small glass vial."
 	icon_state = "vial"
 	matter = list("glass" = 250)
+ 	w_class = ITEMSIZE_TINY
 	volume = 30
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25)
diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm
index 2ec87999e2..12beb62806 100644
--- a/maps/northern_star/polaris-1.dmm
+++ b/maps/northern_star/polaris-1.dmm
@@ -4933,7 +4933,7 @@
 "bQS" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
 "bQT" = (/obj/machinery/chem_master,/turf/simulated/floor/tiled/white,/area/medical/chemistry)
 "bQU" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
-"bQV" = (/obj/structure/closet/secure_closet/chemical,/obj/item/weapon/storage/box/pillbottles,/obj/item/device/radio/headset/headset_med,/obj/effect/floor_decal/corner/beige,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
+"bQV" = (/obj/structure/closet/secure_closet/chemical,/obj/item/device/radio/headset/headset_med,/obj/effect/floor_decal/corner/beige,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/clothing/suit/straight_jacket,/turf/simulated/floor/tiled/white,/area/medical/chemistry)
 "bQW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/chemistry)
 "bQX" = (/obj/item/weapon/stool/padded,/obj/effect/landmark/start{name = "Paramedic"},/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/camera/network/medbay{c_tag = "MED - EMT Bay"; dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)
 "bQY" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)