Hypospray Revamp

This commit is contained in:
Casey
2022-04-04 16:01:53 -04:00
committed by Darlantan
parent 35ec6a2bbb
commit a6e052cc9b
5 changed files with 14 additions and 4 deletions

View File

@@ -185,6 +185,7 @@
icon_state = "cryo_rear" icon_state = "cryo_rear"
anchored = TRUE anchored = TRUE
dir = WEST dir = WEST
density = TRUE
//Cryopods themselves. //Cryopods themselves.
/obj/machinery/cryopod /obj/machinery/cryopod

View File

@@ -6,8 +6,8 @@
name = "hypospray" name = "hypospray"
desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients." desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
icon = 'icons/obj/syringe.dmi' icon = 'icons/obj/syringe.dmi'
item_state = "hypo"
icon_state = "hypo" icon_state = "hypo"
item_state = "hypo"
amount_per_transfer_from_this = 5 amount_per_transfer_from_this = 5
unacidable = TRUE unacidable = TRUE
volume = 30 volume = 30
@@ -88,13 +88,15 @@
//A vial-loaded hypospray. Cartridge-based! //A vial-loaded hypospray. Cartridge-based!
/obj/item/weapon/reagent_containers/hypospray/vial /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." 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. var/obj/item/weapon/reagent_containers/glass/beaker/vial/loaded_vial //Wow, what a name.
volume = 0 volume = 0
/obj/item/weapon/reagent_containers/hypospray/vial/Initialize() /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 loaded_vial = new /obj/item/weapon/reagent_containers/glass/beaker/vial(src) //Comes with an empty vial
volume = loaded_vial.volume volume = loaded_vial.volume
reagents.maximum_volume = loaded_vial.reagents.maximum_volume reagents.maximum_volume = loaded_vial.reagents.maximum_volume
@@ -115,6 +117,13 @@
else else
return ..() 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) /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(istype(W, /obj/item/weapon/reagent_containers/glass/beaker/vial))
if(!loaded_vial) if(!loaded_vial)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB