diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index a8217f91d02..c8c101bc12e 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -3,10 +3,9 @@ desc = "A syringe that can hold up to 15 units." icon = 'icons/obj/syringe.dmi' base_icon_state = "syringe" - inhand_icon_state = "syringe_0" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - icon_state = "0" + icon_state = "syringe_0" worn_icon_state = "pen" amount_per_transfer_from_this = 5 possible_transfer_amounts = list(5, 10, 15) @@ -18,6 +17,10 @@ custom_price = PAYCHECK_EASY * 0.5 sharpness = SHARP_POINTY +/obj/item/reagent_containers/syringe/Initialize() + . = ..() + AddElement(/datum/element/update_icon_updates_onmob) + /obj/item/reagent_containers/syringe/attackby(obj/item/I, mob/user, params) return @@ -138,8 +141,7 @@ /obj/item/reagent_containers/syringe/update_icon_state() var/rounded_vol = get_rounded_vol() - icon_state = "[rounded_vol]" - inhand_icon_state = "[base_icon_state]_[rounded_vol]" + icon_state = "[base_icon_state]_[rounded_vol]" return ..() /obj/item/reagent_containers/syringe/update_overlays() @@ -219,6 +221,8 @@ /obj/item/reagent_containers/syringe/bluespace name = "bluespace syringe" desc = "An advanced syringe that can hold 60 units of chemicals." + icon_state = "bluespace_0" + base_icon_state = "bluespace" amount_per_transfer_from_this = 20 possible_transfer_amounts = list(10, 20, 30, 40, 50, 60) volume = 60 @@ -226,6 +230,8 @@ /obj/item/reagent_containers/syringe/piercing name = "piercing syringe" desc = "A diamond-tipped syringe that pierces armor when launched at high velocity. It can hold up to 10 units." + icon_state = "piercing_0" + base_icon_state = "piercing" volume = 10 possible_transfer_amounts = list(5, 10) proj_piercing = 1 diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi index a47b319c5ff..f1187b7f752 100644 Binary files a/icons/mob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/inhands/equipment/medical_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi index d72231c4b94..5d54fcc7f30 100644 Binary files a/icons/mob/inhands/equipment/medical_righthand.dmi and b/icons/mob/inhands/equipment/medical_righthand.dmi differ diff --git a/icons/obj/guns/projectiles.dmi b/icons/obj/guns/projectiles.dmi index 904090dab2e..bb3c2ad2d9c 100644 Binary files a/icons/obj/guns/projectiles.dmi and b/icons/obj/guns/projectiles.dmi differ diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index 2981293d1a8..b6522cffb34 100644 Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ