diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 4d656180e27..6922d419b40 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -67,6 +67,7 @@ filling.color = reagents.get_color() add_overlay(filling) + /obj/item/reagent_containers/hypospray/afterattack(var/mob/M, var/mob/user, proximity) if (!istype(M)) @@ -156,7 +157,6 @@ /obj/item/reagent_containers/hypospray/autoinjector/norepinephrine name = "autoinjector (norepinephrine)" - desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel." volume = 5 amount_per_transfer_from_this = 20 flags = 0 diff --git a/html/changelogs/wezzy_combat_hyposprays.yml b/html/changelogs/wezzy_combat_hyposprays.yml new file mode 100644 index 00000000000..eeae940ab61 --- /dev/null +++ b/html/changelogs/wezzy_combat_hyposprays.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Adds new sprites for combat hyposprays." diff --git a/icons/mob/items/lefthand_medical.dmi b/icons/mob/items/lefthand_medical.dmi index b2645b4790e..3802deee275 100644 Binary files a/icons/mob/items/lefthand_medical.dmi and b/icons/mob/items/lefthand_medical.dmi differ diff --git a/icons/mob/items/righthand_medical.dmi b/icons/mob/items/righthand_medical.dmi index d2205cd567a..7062f815bc9 100644 Binary files a/icons/mob/items/righthand_medical.dmi and b/icons/mob/items/righthand_medical.dmi differ diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index a8c56c4926b..ed75d052a19 100644 Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ