Hypospray Revamp

code/game/machinery/cryopod.dm

@@ -185,6 +185,7 @@
 	icon_state = "cryo_rear"
 	anchored = TRUE
 	dir = WEST
+	density = TRUE
 
 //Cryopods themselves.
 /obj/machinery/cryopod
@@ -522,13 +523,13 @@
 	control_computer.frozen_crew += "[to_despawn.real_name], [to_despawn.mind.role_alt_title] - [stationtime2text()]"
 	control_computer._admin_logs += "[key_name(to_despawn)] ([to_despawn.mind.role_alt_title]) at [stationtime2text()]"
 	log_and_message_admins("[key_name(to_despawn)] ([to_despawn.mind.role_alt_title]) entered cryostorage.")
-	
+
 	//VOREStation Edit Start
 	var/depart_announce = TRUE
 
 	if(istype(to_despawn, /mob/living/dominated_brain))
 		depart_announce = FALSE
-	
+
 	if(depart_announce)
 		announce.autosay("[to_despawn.real_name], [to_despawn.mind.role_alt_title], [on_store_message]", "[on_store_name]", announce_channel, using_map.get_map_levels(z, TRUE, om_range = DEFAULT_OVERMAP_RANGE))
 		visible_message("<span class='notice'>\The [initial(name)] [on_store_visible_message_1] [to_despawn.real_name] [on_store_visible_message_2]</span>", 3)

code/modules/reagents/reagent_containers/hypospray.dm

@@ -6,8 +6,8 @@
 	name = "hypospray"
 	desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
 	icon = 'icons/obj/syringe.dmi'
-	item_state = "hypo"
 	icon_state = "hypo"
+	item_state = "hypo"
 	amount_per_transfer_from_this = 5
 	unacidable = TRUE
 	volume = 30
@@ -88,13 +88,15 @@
 
 //A vial-loaded hypospray. Cartridge-based!
 /obj/item/weapon/reagent_containers/hypospray/vial
-	name = "hypospray mkII"
+	name = "advanced hypospray"
+	icon_state = "advhypo"
 	desc = "A new development from DeForest Medical, this new hypospray takes 30-unit vials as the drug supply for easy swapping."
 	var/obj/item/weapon/reagent_containers/glass/beaker/vial/loaded_vial //Wow, what a name.
 	volume = 0
 
 /obj/item/weapon/reagent_containers/hypospray/vial/Initialize()
 	. = ..()
+	icon_state = "[initial(icon_state)]"
 	loaded_vial = new /obj/item/weapon/reagent_containers/glass/beaker/vial(src) //Comes with an empty vial
 	volume = loaded_vial.volume
 	reagents.maximum_volume = loaded_vial.reagents.maximum_volume
@@ -115,6 +117,13 @@
 	else
 		return ..()
 
+/obj/item/weapon/reagent_containers/hypospray/vial/update_icon()
+	..()
+	if(loaded_vial)
+		icon_state = "[initial(icon_state)]"
+	else
+		icon_state = "[initial(icon_state)]_empty"
+
 /obj/item/weapon/reagent_containers/hypospray/vial/attackby(obj/item/weapon/W, mob/user as mob)
 	if(istype(W, /obj/item/weapon/reagent_containers/glass/beaker/vial))
 		if(!loaded_vial)