diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index f50cb697983..f73c95b0821 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -177,7 +177,7 @@
desc = "Contains a Mk II Hypospray and its hypovials. It can only hold mk.II related items."
icon = 'icons/obj/storage.dmi'
icon_state = "firstaid-mini"
- max_storage_space = ITEMSIZE_COST_NORMAL * 7 // 4*7 = 28 / 2 = 14 vials total
+ max_storage_space = ITEMSIZE_COST_NORMAL * 7 // 4*7 = 28 / 2 = 14 vials total
starts_with = list(/obj/item/weapon/hypospray_mkii, /obj/item/weapon/reagent_containers/glass/bottle/hypovial/small = 3)
can_hold = list(/obj/item/weapon/hypospray_mkii, /obj/item/weapon/reagent_containers/glass/bottle/hypovial)
//can fit large and small vials, and any of the mkiis. but that's it. No free Analyzer either.
@@ -203,11 +203,11 @@
starts_with = list(/obj/item/weapon/hypospray_mkii/burn, /obj/item/weapon/reagent_containers/glass/bottle/hypovial/small/preloaded/kelotane = 3)
item_state_slots = list(slot_r_hand_str = "firstaid-ointment", slot_l_hand_str = "firstaid-ointment")
-/obj/item/weapon/storage/firstaid/hypokit/toxin
- name = "hypospray mk.II toxin kit"
+/obj/item/weapon/storage/firstaid/hypokit/antitoxin
+ name = "hypospray mk.II antitoxin kit"
icon_state = "firstaid-toxin-mini"
desc = "Contains a Mk II Hypospray and its hypovials. It can only hold mk.II related items. This one is prefilled with Dylovene."
- starts_with = list(/obj/item/weapon/hypospray_mkii/toxin, /obj/item/weapon/reagent_containers/glass/bottle/hypovial/small/preloaded/antitoxin = 3)
+ starts_with = list(/obj/item/weapon/hypospray_mkii/antitoxin, /obj/item/weapon/reagent_containers/glass/bottle/hypovial/small/preloaded/antitoxin = 3)
item_state_slots = list(slot_r_hand_str = "firstaid-toxin", slot_l_hand_str = "firstaid-toxin")
/obj/item/weapon/storage/firstaid/hypokit/oxy
@@ -218,7 +218,7 @@
item_state_slots = list(slot_r_hand_str = "firstaid-o2", slot_l_hand_str = "firstaid-o2")
/obj/item/weapon/storage/firstaid/hypokit/cmo
- name = "CMO's mk.II Kit"
+ name = "CMO's mk.II kit"
desc = "Contains a large Deluxe Mk II Hypospray and its hypovials. It can only hold mk.II related items."
icon_state = "firstaid-tactical-mini"
starts_with = list(/obj/item/weapon/hypospray_mkii/CMO,
diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm
index 67effe84d6a..ae6ea181d42 100644
--- a/code/modules/economy/vending_machines.dm
+++ b/code/modules/economy/vending_machines.dm
@@ -413,7 +413,7 @@
/obj/item/weapon/storage/firstaid/hypokit/empty = 10,
/obj/item/weapon/storage/firstaid/hypokit/brute = 2,
/obj/item/weapon/storage/firstaid/hypokit/burn = 2,
- /obj/item/weapon/storage/firstaid/hypokit/toxin = 2,
+ /obj/item/weapon/storage/firstaid/hypokit/antitoxin = 2,
/obj/item/weapon/storage/firstaid/hypokit/oxy = 2,
/obj/item/device/healthanalyzer = 5,
/obj/item/weapon/reagent_containers/glass/beaker = 4,
diff --git a/code/modules/reagents/reagent_containers/hypospraymkii.dm b/code/modules/reagents/reagent_containers/hypospraymkii.dm
index 3a4043447f7..d819526b611 100644
--- a/code/modules/reagents/reagent_containers/hypospraymkii.dm
+++ b/code/modules/reagents/reagent_containers/hypospraymkii.dm
@@ -49,7 +49,7 @@
/obj/item/weapon/hypospray_mkii/brute
start_vial = /obj/item/weapon/reagent_containers/glass/bottle/hypovial/small/preloaded/bicaridine
-/obj/item/weapon/hypospray_mkii/toxin
+/obj/item/weapon/hypospray_mkii/antitoxin
start_vial = /obj/item/weapon/reagent_containers/glass/bottle/hypovial/small/preloaded/antitoxin
/obj/item/weapon/hypospray_mkii/oxygen
@@ -104,8 +104,8 @@
/obj/item/weapon/hypospray_mkii/examine(mob/user)
. = ..()
- . += "Alt-Click it to toggle its mode from spraying to injecting and vice versa."
- . += "Ctrl-Click it to unload a vial."
+ . += span_notice("Alt-Click it to toggle its mode from spraying to injecting and vice versa.")
+ . += span_notice("Ctrl-Click it to unload a vial.")
if(vial)
. += "[vial] has [vial.reagents.total_volume]u remaining."
else
@@ -117,46 +117,46 @@
var/obj/item/weapon/reagent_containers/glass/bottle/hypovial/V = I
V.forceMove(user.loc)
user.put_in_hands(V)
- to_chat(user, "You remove [vial] from [src].")
+ to_chat(user, span_notice("You remove [vial] from [src]."))
vial = null
update_icon()
playsound(loc, 'sound/weapons/empty.ogg', 50, 1)
else
- to_chat(user, "This hypo isn't loaded!")
+ to_chat(user, span_notice("This hypo isn't loaded!"))
return
/obj/item/weapon/hypospray_mkii/attackby(obj/item/I, mob/living/user)
if(istype(I, /obj/item/weapon/reagent_containers/glass/bottle/hypovial) && vial != null)
if(!quickload)
- to_chat(user, "[src] can not hold more than one vial!")
+ to_chat(user, span_warning("[src] can not hold more than one vial!"))
return FALSE
unload_hypo(vial, user)
else if(istype(I, /obj/item/weapon/reagent_containers/glass/bottle/hypovial))
var/obj/item/weapon/reagent_containers/glass/bottle/hypovial/V = I
if(!is_type_in_list(V, allowed_containers))
- to_chat(user, "[src] doesn't accept this type of vial.")
+ to_chat(user, span_notice("[src] doesn't accept this type of vial."))
return FALSE
user.drop_from_inventory(V,src)
vial = V
- user.visible_message("[user] has loaded a vial into [src].","You have loaded [vial] into [src].")
+ user.visible_message(span_notice("[user] has loaded a vial into [src]."),span_notice("You have loaded [vial] into [src]."))
update_icon()
playsound(loc, 'sound/weapons/empty.ogg', 35, 1)
return TRUE
else
- to_chat(user, "This doesn't fit in [src].")
+ to_chat(user, span_notice("This doesn't fit in [src]."))
return FALSE
/obj/item/weapon/hypospray_mkii/emag_act(mob/user)
. = ..()
if(emagged)
- to_chat(user, "[src] happens to be already overcharged.")
+ to_chat(user, span_warning("[src] happens to be already overcharged."))
return
inject_wait = COMBAT_WAIT_INJECT
spray_wait = COMBAT_WAIT_SPRAY
spray_self = COMBAT_SELF_INJECT
inject_self = COMBAT_SELF_SPRAY
- to_chat(user, "You overcharge [src]'s control circuit.")
+ to_chat(user, span_warning("You overcharge [src]'s control circuit."))
emagged = TRUE
return TRUE
@@ -177,26 +177,26 @@
if(iscarbon(L))
var/obj/item/organ/external/affected = L.get_organ(user.zone_sel.selecting)
if(!affected)
- to_chat(user, "The limb is missing!")
+ to_chat(user, span_warning("The limb is missing!"))
return
if(affected.status != ORGAN_FLESH)
- to_chat(user, "Medicine won't work on a robotic limb!")
+ to_chat(user, span_notice("Medicine won't work on a robotic limb!"))
return
//Always log attemped injections for admins
var/contained = vial.reagentlist()
if(!vial)
- to_chat(user, "[src] doesn't have any vial installed!")
+ to_chat(user, span_notice("[src] doesn't have any vial installed!"))
return
if(!vial.reagents.total_volume)
- to_chat(user, "[src]'s vial is empty!")
+ to_chat(user, span_notice("[src]'s vial is empty!"))
return
var/fp_verb = mode == HYPO_SPRAY ? "spray" : "inject"
if(L != user)
- L.visible_message("\The [user] is trying to [fp_verb] \the [L] with \the [src]!", \
- "\The [user] is trying to [fp_verb] you with \the [src]!")
+ L.visible_message(span_danger("\The [user] is trying to [fp_verb] \the [L] with \the [src]!"), \
+ span_danger("\The [user] is trying to [fp_verb] you with \the [src]!"))
add_attack_logs(user, L, "[user] attemped to use [src] on [L] which had [contained]")
if(!do_mob(user, L, inject_wait))
@@ -206,8 +206,8 @@
return
add_attack_logs(user, L, "[user] applied [src] to [L], which had [contained] (INTENT: [uppertext(user.a_intent)]) (MODE: [fp_verb])")
if(L != user)
- L.visible_message("\The [user] [fp_verb]s \the [L] with \the [src]!", \
- "\The [user] [fp_verb]s you with \the [src]!")
+ L.visible_message(span_danger("\The [user] [fp_verb]s \the [L] with \the [src]!"), \
+ span_danger("\The [user] [fp_verb]s you with \the [src]!"))
else
add_attack_logs(user, L, "[user] applied [src] on [L] with [src] which had [contained]")
@@ -218,7 +218,7 @@
playsound(loc, 'sound/effects/hypospray.ogg', 50)
playsound(loc, 'sound/effects/refill.ogg', 50)
- to_chat(user, "You [fp_verb] [vial.amount_per_transfer_from_this] units of the solution. The hypospray's cartridge now contains [vial.reagents.total_volume] units.")
+ to_chat(user, span_notice("You [fp_verb] [vial.amount_per_transfer_from_this] units of the solution. The hypospray's cartridge now contains [vial.reagents.total_volume] units."))
/obj/item/weapon/hypospray_mkii/attack_self(mob/living/user)
if(user)
@@ -311,10 +311,10 @@
/obj/item/weapon/reagent_containers/glass/bottle/hypovial/attack(mob/M as mob, mob/user as mob)
if(M == user)
- to_chat(user, "This is a sealed container, you cannot drink from it.")
+ to_chat(user, span_notice("This is a sealed container, you cannot drink from it."))
return
else if(istype(M, /mob/living/carbon/human))
- to_chat(user, "This is a sealed container, [M] cannot drink from it.")
+ to_chat(user, span_notice("This is a sealed container, [M] cannot drink from it."))
return
/obj/item/weapon/reagent_containers/glass/bottle/hypovial/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -328,13 +328,13 @@
if("Label")
var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a label for [name]", "Label", label_text, MAX_NAME_LEN), MAX_NAME_LEN)
if(length(tmp_label) > 50)
- to_chat(user, "The label can be at most 50 characters long.")
+ to_chat(user, span_notice("The label can be at most 50 characters long."))
else if(length(tmp_label) > 10)
- to_chat(user, "You set the label.")
+ to_chat(user, span_notice("You set the label."))
label_text = tmp_label
update_name_label()
else
- to_chat(user, "You set the label to \"[tmp_label]\".")
+ to_chat(user, span_notice("You set the label to \"[tmp_label]\"."))
label_text = tmp_label
update_name_label()
if("Recolor")
@@ -434,7 +434,7 @@
comes_with = list("bicaridine" = 30)
/obj/item/weapon/reagent_containers/glass/bottle/hypovial/small/preloaded/antitoxin
- name = "vial (Anti-Tox)"
+ name = "vial (Dylovene)"
icon_state = "hypovial-a"
comes_with = list("anti_toxin" = 30)
@@ -469,7 +469,7 @@
comes_with = list("bicaridine" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/hypovial/large/preloaded/antitoxin
- name = "large vial (Anti-Tox)"
+ name = "large vial (Dylovene)"
icon_state = "hypoviallarge-a"
comes_with = list("anti_toxin" = 60)