Merge branch 'master' into init_update_and_stuff

code/game/objects/items/bees_items.dm

@@ -18,10 +18,12 @@
 /obj/item/beezeez
 	name = "bottle of BeezEez"
 	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle17"
-	New()
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
+	icon_state = "bottle-1"
+
+/obj/item/beezeez/Initialize() // Better than hardsprited in stuff.
+	var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[icon_state]-100")
+	filling.color = COLOR_BLUE
+	add_overlay(filling)
 
 /obj/item/reagent_containers/food/snacks/honeycomb
 	name = "honeycomb"

code/game/objects/items/weapons/implants/implant.dm

@@ -565,7 +565,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 			STOP_PROCESSING(SSprocessing, src)
 		if ("emp")
 			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
-			var/name = prob(50) ? t.name : pick(teleportlocs)
+			var/name = prob(50) ? t.name : pick(the_station_areas)
 			a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
 			qdel(a)
 		else

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

@@ -346,8 +346,8 @@
 	req_access = list(access_captain)
 
 /obj/structure/closet/secure_closet/injection/fill()
-	new /obj/item/reagent_containers/syringe/ld50_syringe/chloral(src)
-	new /obj/item/reagent_containers/syringe/ld50_syringe/chloral(src)
+	new /obj/item/reagent_containers/syringe/large/ld50_syringe/chloral(src)
+	new /obj/item/reagent_containers/syringe/large/ld50_syringe/chloral(src)
 
 
 // These are special snowflakes that need to be in a global list.