cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 10:34:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactors most spans

Browse Source
This commit is contained in:
Kashargul
2024-10-02 21:10:31 +02:00
parent 5417c7772c
commit a2c673ab7a
1517 changed files with 12436 additions and 12347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/_reagent_containers.dm
+17 -17
View File
@@ -22,7 +22,7 @@
if(!possible_transfer_amounts)
src.verbs -= /obj/item/reagent_containers/verb/set_APTFT
create_reagents(volume)
if(starts_with)
var/total_so_far = 0
for(var/string in starts_with)
@@ -49,15 +49,15 @@
return 0
if(!target.reagents || !target.reagents.total_volume)
to_chat(user, "<span class='notice'>[target] is empty.</span>")
to_chat(user, span_notice("[target] is empty."))
return 1
if(reagents && !reagents.get_free_space())
to_chat(user, "<span class='notice'>[src] is full.</span>")
to_chat(user, span_notice("[src] is full."))
return 1
var/trans = target.reagents.trans_to_obj(src, target:amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You fill [src] with [trans] units of the contents of [target].</span>")
to_chat(user, span_notice("You fill [src] with [trans] units of the contents of [target]."))
return 1
/obj/item/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack
@@ -65,27 +65,27 @@
return
if(!reagents || !reagents.total_volume)
to_chat(user, "<span class='notice'>[src] is empty.</span>")
to_chat(user, span_notice("[src] is empty."))
return 1
if(target.reagents && !target.reagents.get_free_space())
to_chat(user, "<span class='notice'>[target] is full.</span>")
to_chat(user, span_notice("[target] is full."))
return 1
var/contained = reagentlist()
add_attack_logs(user,target,"Splashed with [src.name] containing [contained]")
user.visible_message("<span class='danger'>[target] has been splashed with something by [user]!</span>", "<span class = 'notice'>You splash the solution onto [target].</span>")
user.visible_message(span_danger("[target] has been splashed with something by [user]!"), "<span class = 'notice'>You splash the solution onto [target].</span>")
reagents.splash(target, reagents.total_volume)
return 1
/obj/item/reagent_containers/proc/self_feed_message(var/mob/user)
to_chat(user, "<span class='notice'>You eat \the [src]</span>")
to_chat(user, span_notice("You eat \the [src]"))
/obj/item/reagent_containers/proc/other_feed_message_start(var/mob/user, var/mob/target)
user.visible_message("<span class='warning'>[user] is trying to feed [target] \the [src]!</span>")
user.visible_message(span_warning("[user] is trying to feed [target] \the [src]!"))
/obj/item/reagent_containers/proc/other_feed_message_finish(var/mob/user, var/mob/target)
user.visible_message("<span class='warning'>[user] has fed [target] \the [src]!</span>")
user.visible_message(span_warning("[user] has fed [target] \the [src]!"))
/obj/item/reagent_containers/proc/feed_sound(var/mob/user)
return
@@ -95,7 +95,7 @@
return FALSE
if(!reagents || !reagents.total_volume)
to_chat(user, "<span class='notice'>\The [src] is empty.</span>")
to_chat(user, span_notice("\The [src] is empty."))
return TRUE
if(ishuman(target))
@@ -105,16 +105,16 @@
return FALSE
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
to_chat(user, span_warning("\The [blocked] is in the way!"))
return FALSE
user.setClickCooldown(user.get_attack_speed(src)) //puts a limit on how fast people can eat/drink things
if(user == target)
if(user == target)
self_feed_message(user)
reagents.trans_to_mob(user, issmall(user) ? CEILING(amount_per_transfer_from_this/2, 1) : amount_per_transfer_from_this, CHEM_INGEST)
feed_sound(user)
return TRUE
else
other_feed_message_start(user, target)
if(!do_mob(user, target))
@@ -132,13 +132,13 @@
return 0
if(!reagents || !reagents.total_volume)
to_chat(user, "<span class='notice'>[src] is empty.</span>")
to_chat(user, span_notice("[src] is empty."))
return 1
if(!target.reagents.get_free_space())
to_chat(user, "<span class='notice'>[target] is full.</span>")
to_chat(user, span_notice("[target] is full."))
return 1
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You transfer [trans] units of the solution to [target].</span>")
to_chat(user, span_notice("You transfer [trans] units of the solution to [target]."))
return 1
code/modules/reagents/reagent_containers/blood_pack.dm
+4 -4
View File
@@ -58,13 +58,13 @@
if(istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen))
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, "<span class='notice'>The label can be at most 50 characters long.</span>")
to_chat(user, span_notice("The label can be at most 50 characters long."))
else if(length(tmp_label) > 10)
to_chat(user, "<span class='notice'>You set the label.</span>")
to_chat(user, span_notice("You set the label."))
label_text = tmp_label
update_iv_label()
else
to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
to_chat(user, span_notice("You set the label to \"[tmp_label]\"."))
label_text = tmp_label
update_iv_label()
@@ -108,4 +108,4 @@
name = "Empty BloodPack"
desc = "Seems pretty useless... Maybe if there were a way to fill it?"
icon_state = "empty"
item_state = "bloodpack_empty"
item_state = "bloodpack_empty"
code/modules/reagents/reagent_containers/blood_pack_vr.dm
+3 -3
View File
@@ -5,17 +5,17 @@
var/reagent_to_remove = reagents.get_master_reagent_id()
switch(reagents.get_master_reagent_id())
if("blood")
user.show_message("<span class='warning'>You sink your fangs into \the [src] and suck the blood out of it!</span>")
user.show_message(span_warning("You sink your fangs into \the [src] and suck the blood out of it!"))
user.visible_message(span_red("[user] sinks their fangs into \the [src] and drains it!"))
user.adjust_nutrition(remove_volume*5)
reagents.remove_reagent(reagent_to_remove, remove_volume)
update_icon()
return
else
user.show_message("<span class='warning'>You take a look at \the [src] and notice that it is not filled with blood!</span>")
user.show_message(span_warning("You take a look at \the [src] and notice that it is not filled with blood!"))
return
else
user.show_message("<span class='warning'>You take a look at \the [src] and notice it has nothing in it!</span>")
user.show_message(span_warning("You take a look at \the [src] and notice it has nothing in it!"))
return
else
return
code/modules/reagents/reagent_containers/borghypo.dm
+11 -11
View File
@@ -67,31 +67,31 @@
return
if(!reagent_volumes[reagent_ids[mode]])
to_chat(user, "<span class='warning'>The injector is empty.</span>")
to_chat(user, span_warning("The injector is empty."))
return
var/mob/living/carbon/human/H = M
if(istype(H))
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
to_chat(user, "<span class='danger'>\The [H] is missing that limb!</span>")
to_chat(user, span_danger("\The [H] is missing that limb!"))
return
/* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity.
else if(affected.robotic >= ORGAN_ROBOT)
to_chat(user, "<span class='danger'>You cannot inject a robotic limb.</span>")
to_chat(user, span_danger("You cannot inject a robotic limb."))
return
*/
if(M.can_inject(user, 1, ignore_thickness = bypass_protection))
to_chat(user, "<span class='notice'>You inject [M] with the injector.</span>")
to_chat(M, "<span class='notice'>You feel a tiny prick!</span>")
to_chat(user, span_notice("You inject [M] with the injector."))
to_chat(M, span_notice("You feel a tiny prick!"))
if(M.reagents)
var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]])
M.reagents.add_reagent(reagent_ids[mode], t)
reagent_volumes[reagent_ids[mode]] -= t
add_attack_logs(user, M, "Borg injected with [reagent_ids[mode]]")
to_chat(user, "<span class='notice'>[t] units injected. [reagent_volumes[reagent_ids[mode]]] units remaining.</span>")
to_chat(user, span_notice("[t] units injected. [reagent_volumes[reagent_ids[mode]]] units remaining."))
return
/obj/item/reagent_containers/borghypo/attack_self(mob/user as mob) //Change the mode
@@ -115,13 +115,13 @@
playsound(src, 'sound/effects/pop.ogg', 50, 0)
mode = t
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
to_chat(usr, "<span class='notice'>Synthesizer is now producing '[R.name]'.</span>")
to_chat(usr, span_notice("Synthesizer is now producing '[R.name]'."))
/obj/item/reagent_containers/borghypo/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
. += "<span class='notice'>It is currently producing [R.name] and has [reagent_volumes[reagent_ids[mode]]] out of [volume] units left.</span>"
. += span_notice("It is currently producing [R.name] and has [reagent_volumes[reagent_ids[mode]]] out of [volume] units left.")
/obj/item/reagent_containers/borghypo/service
name = "cyborg drink synthesizer"
@@ -187,15 +187,15 @@
return
if(!reagent_volumes[reagent_ids[mode]])
to_chat(user, "<span class='notice'>[src] is out of this reagent, give it some time to refill.</span>")
to_chat(user, span_notice("[src] is out of this reagent, give it some time to refill."))
return
if(!target.reagents.get_free_space())
to_chat(user, "<span class='notice'>[target] is full.</span>")
to_chat(user, span_notice("[target] is full."))
return
var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]])
target.reagents.add_reagent(reagent_ids[mode], t)
reagent_volumes[reagent_ids[mode]] -= t
to_chat(user, "<span class='notice'>You transfer [t] units of the solution to [target].</span>")
to_chat(user, span_notice("You transfer [t] units of the solution to [target]."))
return
code/modules/reagents/reagent_containers/dropper.dm
+11 -11
View File
@@ -18,9 +18,9 @@
. = ..()
if(get_dist(user, src) <= 2)
if(reagents && reagents.reagent_list.len)
. += "<span class='notice'>It contains [reagents.total_volume] units of liquid.</span>"
. += span_notice("It contains [reagents.total_volume] units of liquid.")
else
. += "<span class='notice'>It is empty.</span>"
. += span_notice("It is empty.")
/obj/item/reagent_containers/dropper/afterattack(var/obj/target, var/mob/user, var/proximity)
if(!target.reagents || !proximity) return
@@ -28,11 +28,11 @@
if(reagents.total_volume)
if(!target.reagents.get_free_space())
to_chat(user, "<span class='notice'>[target] is full.</span>")
to_chat(user, span_notice("[target] is full."))
return
if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/smokable/cigarette)) //You can inject humans and food but you cant remove the shit.
to_chat(user, "<span class='notice'>You cannot directly fill this object.</span>")
to_chat(user, span_notice("You cannot directly fill this object."))
return
var/trans = 0
@@ -40,7 +40,7 @@
if(ismob(target))
var/time = 20 //2/3rds the time of a syringe
user.visible_message("<span class='warning'>[user] is trying to squirt something into [target]'s eyes!</span>")
user.visible_message(span_warning("[user] is trying to squirt something into [target]'s eyes!"))
if(!do_mob(user, target, time))
return
@@ -61,7 +61,7 @@
if(safe_thing)
trans = reagents.splash(safe_thing, min(amount_per_transfer_from_this, reagents.total_volume), max_spill=30)
user.visible_message("<span class='warning'>[user] tries to squirt something into [target]'s eyes, but fails!</span>", "<span class='notice'>You transfer [trans] units of the solution.</span>")
user.visible_message(span_warning("[user] tries to squirt something into [target]'s eyes, but fails!"), span_notice("You transfer [trans] units of the solution."))
return
var/contained = reagentlist()
@@ -69,27 +69,27 @@
trans += reagents.trans_to_mob(target, min(amount_per_transfer_from_this, reagents.total_volume)/2, CHEM_INGEST) //Half injected, half ingested
trans += reagents.trans_to_mob(target, min(amount_per_transfer_from_this, reagents.total_volume), CHEM_BLOOD) //I guess it gets into the bloodstream through the eyes or something
user.visible_message("<span class='warning'>[user] squirts something into [target]'s eyes!</span>", "<span class='notice'>You transfer [trans] units of the solution.</span>")
user.visible_message(span_warning("[user] squirts something into [target]'s eyes!"), span_notice("You transfer [trans] units of the solution."))
return
else
trans = reagents.trans_to_obj(target, amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You transfer [trans] units of the solution.</span>")
to_chat(user, span_notice("You transfer [trans] units of the solution."))
else // Taking from something
if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers))
to_chat(user, "<span class='notice'>You cannot directly remove reagents from [target].</span>")
to_chat(user, span_notice("You cannot directly remove reagents from [target]."))
return
if(!target.reagents || !target.reagents.total_volume)
to_chat(user, "<span class='notice'>[target] is empty.</span>")
to_chat(user, span_notice("[target] is empty."))
return
var/trans = target.reagents.trans_to_obj(src, amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You fill the dropper with [trans] units of the solution.</span>")
to_chat(user, span_notice("You fill the dropper with [trans] units of the solution."))
return
code/modules/reagents/reagent_containers/glass.dm
+17 -17
View File
@@ -66,11 +66,11 @@
. = ..()
if(get_dist(user, src) <= 2)
if(reagents && reagents.reagent_list.len)
. += "<span class='notice'>It contains [reagents.total_volume] units of liquid.</span>"
. += span_notice("It contains [reagents.total_volume] units of liquid.")
else
. += "<span class='notice'>It is empty.</span>"
. += span_notice("It is empty.")
if(!is_open_container())
. += "<span class='notice'>Airtight lid seals it completely.</span>"
. += span_notice("Airtight lid seals it completely.")
/obj/item/reagent_containers/glass/attack_self()
..()
@@ -101,7 +101,7 @@
return ..()
/obj/item/reagent_containers/glass/self_feed_message(var/mob/user)
to_chat(user, "<span class='notice'>You swallow a gulp from \the [src].</span>")
to_chat(user, span_notice("You swallow a gulp from \the [src]."))
/obj/item/reagent_containers/glass/proc/attempt_snake_milking(mob/living/user, mob/living/target)
var/reagent
@@ -142,7 +142,7 @@
if(standard_splash_mob(user,target))
return 1
if(reagents && reagents.total_volume)
to_chat(user, "<span class='notice'>You splash the solution onto [target].</span>") //They are on harm intent, aka wanting to spill it.
to_chat(user, span_notice("You splash the solution onto [target].")) //They are on harm intent, aka wanting to spill it.
reagents.splash(target, reagents.total_volume)
return 1
..()
@@ -151,19 +151,19 @@
if(istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen))
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, "<span class='notice'>The label can be at most 50 characters long.</span>")
to_chat(user, span_notice("The label can be at most 50 characters long."))
else if(length(tmp_label) > 10)
to_chat(user, "<span class='notice'>You set the label.</span>")
to_chat(user, span_notice("You set the label."))
label_text = tmp_label
update_name_label()
else
to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
to_chat(user, span_notice("You set the label to \"[tmp_label]\"."))
label_text = tmp_label
update_name_label()
if(istype(W,/obj/item/storage/bag))
..()
if(W && W.w_class <= w_class && (flags & OPENCONTAINER) && user.a_intent != I_HELP)
to_chat(user, "<span class='notice'>You dip \the [W] into \the [src].</span>")
to_chat(user, span_notice("You dip \the [W] into \the [src]."))
reagents.touch_obj(W, reagents.total_volume)
/obj/item/reagent_containers/glass/proc/update_name_label()
@@ -324,7 +324,7 @@
qdel(src)
return
else if(D.has_tool_quality(TOOL_WIRECUTTER))
to_chat(user, "<span class='notice'>You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now.</span>")
to_chat(user, span_notice("You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now."))
user.put_in_hands(new /obj/item/clothing/head/helmet/bucket)
user.drop_from_inventory(src)
qdel(src)
@@ -334,19 +334,19 @@
if (M.use(1))
var/obj/item/secbot_assembly/edCLN_assembly/B = new /obj/item/secbot_assembly/edCLN_assembly
B.loc = get_turf(src)
to_chat(user, "<span class='notice'>You armed the robot frame.</span>")
to_chat(user, span_notice("You armed the robot frame."))
if (user.get_inactive_hand()==src)
user.remove_from_mob(src)
user.put_in_inactive_hand(B)
qdel(src)
else
to_chat(user, "<span class='warning'>You need one sheet of metal to arm the robot frame.</span>")
to_chat(user, span_warning("You need one sheet of metal to arm the robot frame."))
else if(istype(D, /obj/item/mop) || istype(D, /obj/item/soap) || istype(D, /obj/item/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on buckets"
if(reagents.total_volume < 1)
to_chat(user, "<span class='warning'>\The [src] is empty!</span>")
to_chat(user, span_warning("\The [src] is empty!"))
else
reagents.trans_to_obj(D, 5)
to_chat(user, "<span class='notice'>You wet \the [D] in \the [src].</span>")
to_chat(user, span_notice("You wet \the [D] in \the [src]."))
playsound(src, 'sound/effects/slosh.ogg', 25, 1)
else
return ..()
@@ -378,17 +378,17 @@
to_chat(user, "This wooden bucket doesn't play well with electronics.")
return
else if(istype(D, /obj/item/material/knife/machete/hatchet))
to_chat(user, "<span class='notice'>You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now.</span>")
to_chat(user, span_notice("You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now."))
user.put_in_hands(new /obj/item/clothing/head/helmet/bucket/wood)
user.drop_from_inventory(src)
qdel(src)
return
else if(istype(D, /obj/item/mop))
if(reagents.total_volume < 1)
to_chat(user, "<span class='warning'>\The [src] is empty!</span>")
to_chat(user, span_warning("\The [src] is empty!"))
else
reagents.trans_to_obj(D, 5)
to_chat(user, "<span class='notice'>You wet \the [D] in \the [src].</span>")
to_chat(user, span_notice("You wet \the [D] in \the [src]."))
playsound(src, 'sound/effects/slosh.ogg', 25, 1)
return
else
code/modules/reagents/reagent_containers/hypospray.dm
+13 -13
View File
@@ -31,7 +31,7 @@
/obj/item/reagent_containers/hypospray/attack(mob/living/M as mob, mob/user as mob)
if(!reagents.total_volume)
to_chat(user, "<span class='warning'>[src] is empty.</span>")
to_chat(user, span_warning("[src] is empty."))
return
if (!istype(M))
return
@@ -40,26 +40,26 @@
if(istype(H))
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
to_chat(user, "<span class='danger'>\The [H] is missing that limb!</span>")
to_chat(user, span_danger("\The [H] is missing that limb!"))
return
/* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity.
else if(affected.robotic >= ORGAN_ROBOT)
to_chat(user, "<span class='danger'>You cannot inject a robotic limb.</span>")
to_chat(user, span_danger("You cannot inject a robotic limb."))
return
*/
//VOREStation Add Start - Adds Prototype Hypo functionality
if(H != user && prototype)
to_chat(user, "<span class='notice'>You begin injecting [H] with \the [src].</span>")
to_chat(H, "<span class='danger'> [user] is trying to inject you with \the [src]!</span>")
to_chat(user, span_notice("You begin injecting [H] with \the [src]."))
to_chat(H, span_danger(" [user] is trying to inject you with \the [src]!"))
if(!do_after(user, 30, H))
return
//VOREstation Add End
else if(!H.stat && !prototype) //VOREStation Edit
if(H != user)
if(H.a_intent != I_HELP)
to_chat(user, "<span class='notice'>[H] is resisting your attempt to inject them with \the [src].</span>")
to_chat(H, "<span class='danger'> [user] is trying to inject you with \the [src]!</span>")
to_chat(user, span_notice("[H] is resisting your attempt to inject them with \the [src]."))
to_chat(H, span_danger(" [user] is trying to inject you with \the [src]!"))
if(!do_after(user, 30, H))
return
@@ -109,7 +109,7 @@
loaded_vial.update_icon()
user.put_in_hands(loaded_vial)
loaded_vial = null
to_chat(user, "<span class='notice'>You remove the vial from the [src].</span>")
to_chat(user, span_notice("You remove the vial from the [src]."))
update_icon()
playsound(src, 'sound/weapons/flipblade.ogg', 50, 1)
return
@@ -127,7 +127,7 @@
/obj/item/reagent_containers/hypospray/vial/attackby(obj/item/W, mob/user as mob)
if(istype(W, /obj/item/reagent_containers/glass/beaker/vial))
if(!loaded_vial)
user.visible_message("<span class='notice'>[user] begins loading [W] into \the [src].</span>","<span class='notice'>You start loading [W] into \the [src].</span>")
user.visible_message(span_notice("[user] begins loading [W] into \the [src]."),span_notice("You start loading [W] into \the [src]."))
if(!do_after(user,30) || loaded_vial || !(W in user))
return 0
if(W.is_open_container())
@@ -138,11 +138,11 @@
loaded_vial = W
reagents.maximum_volume = loaded_vial.reagents.maximum_volume
loaded_vial.reagents.trans_to_holder(reagents,volume)
user.visible_message("<span class='notice'>[user] has loaded [W] into \the [src].</span>","<span class='notice'>You have loaded [W] into \the [src].</span>")
user.visible_message(span_notice("[user] has loaded [W] into \the [src]."),span_notice("You have loaded [W] into \the [src]."))
update_icon()
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
else
to_chat(user, "<span class='notice'>\The [src] already has a vial.</span>")
to_chat(user, span_notice("\The [src] already has a vial."))
else
..()
@@ -186,9 +186,9 @@
/obj/item/reagent_containers/hypospray/autoinjector/examine(mob/user)
. = ..()
if(reagents && reagents.reagent_list.len)
. += "<span class='notice'>It is currently loaded.</span>"
. += span_notice("It is currently loaded.")
else
. += "<span class='notice'>It is spent.</span>"
. += span_notice("It is spent.")
/obj/item/reagent_containers/hypospray/autoinjector/detox
code/modules/reagents/reagent_containers/patch.dm
+11 -11
View File
@@ -27,17 +27,17 @@
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/affecting = H.get_organ(check_zone(L.zone_sel.selecting))
if(!affecting)
to_chat(user, "<span class='warning'>The limb is missing!</span>")
to_chat(user, span_warning("The limb is missing!"))
return
if(affecting.status >= ORGAN_ROBOT)
to_chat(user, "<span class='notice'>\The [src] won't work on a robotic limb!</span>")
to_chat(user, span_notice("\The [src] won't work on a robotic limb!"))
return
if(!H.can_inject(user, FALSE, L.zone_sel.selecting, pierce_material))
to_chat(user, "<span class='notice'>\The [src] can't be applied through such a thick material!</span>")
to_chat(user, span_notice("\The [src] can't be applied through such a thick material!"))
return
to_chat(H, "<span class='notice'>\The [src] is placed on your [affecting].</span>")
to_chat(H, span_notice("\The [src] is placed on your [affecting]."))
M.drop_from_inventory(src) //icon update
if(reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_BLOOD) //CHEM_TOUCH
@@ -48,29 +48,29 @@
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/affecting = H.get_organ(check_zone(L.zone_sel.selecting))
if(!affecting)
to_chat(user, "<span class='warning'>The limb is missing!</span>")
to_chat(user, span_warning("The limb is missing!"))
return
if(affecting.status >= ORGAN_ROBOT)
to_chat(user, "<span class='notice'>\The [src] won't work on a robotic limb!</span>")
to_chat(user, span_notice("\The [src] won't work on a robotic limb!"))
return
if(!H.can_inject(user, FALSE, L.zone_sel.selecting, pierce_material))
to_chat(user, "<span class='notice'>\The [src] can't be applied through such a thick material!</span>")
to_chat(user, span_notice("\The [src] can't be applied through such a thick material!"))
return
user.visible_message("<span class='warning'>[user] attempts to place \the [src] onto [H]`s [affecting].</span>")
user.visible_message(span_warning("[user] attempts to place \the [src] onto [H]`s [affecting]."))
user.setClickCooldown(user.get_attack_speed(src))
if(!do_mob(user, M))
return
user.drop_from_inventory(src) //icon update
user.visible_message("<span class='warning'>[user] applies \the [src] to [H].</span>")
user.visible_message(span_warning("[user] applies \the [src] to [H]."))
var/contained = reagentlist()
add_attack_logs(user,M,"Applied a patch containing [contained]")
to_chat(H, "<span class='notice'>\The [src] is placed on your [affecting].</span>")
to_chat(H, span_notice("\The [src] is placed on your [affecting]."))
M.drop_from_inventory(src) //icon update
if(reagents.total_volume)
@@ -79,4 +79,4 @@
return 1
return 0
return 0
code/modules/reagents/reagent_containers/pill.dm
+10 -10
View File
@@ -31,10 +31,10 @@
return
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
to_chat(user, span_warning("\The [blocked] is in the way!"))
return
to_chat(M, "<span class='notice'>You swallow \the [src].</span>")
to_chat(M, span_notice("You swallow \the [src]."))
M.drop_from_inventory(src) //icon update
if(reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
@@ -49,17 +49,17 @@
return
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
to_chat(user, span_warning("\The [blocked] is in the way!"))
return
user.visible_message("<span class='warning'>[user] attempts to force [M] to swallow \the [src].</span>")
user.visible_message(span_warning("[user] attempts to force [M] to swallow \the [src]."))
user.setClickCooldown(user.get_attack_speed(src))
if(!do_mob(user, M))
return
user.drop_from_inventory(src) //icon update
user.visible_message("<span class='warning'>[user] forces [M] to swallow \the [src].</span>")
user.visible_message(span_warning("[user] forces [M] to swallow \the [src]."))
var/contained = reagentlist()
add_attack_logs(user,M,"Fed a pill containing [contained]")
@@ -77,15 +77,15 @@
if(target.is_open_container() && target.reagents)
if(!target.reagents.total_volume)
to_chat(user, "<span class='notice'>[target] is empty. Can't dissolve \the [src].</span>")
to_chat(user, span_notice("[target] is empty. Can't dissolve \the [src]."))
return
to_chat(user, "<span class='notice'>You dissolve \the [src] in [target].</span>")
to_chat(user, span_notice("You dissolve \the [src] in [target]."))
add_attack_logs(user,null,"Spiked [target.name] with a pill containing [reagentlist()]")
reagents.trans_to(target, reagents.total_volume)
for(var/mob/O in viewers(2, user))
O.show_message("<span class='warning'>[user] puts something in \the [target].</span>", 1)
O.show_message(span_warning("[user] puts something in \the [target]."), 1)
qdel(src)
@@ -94,7 +94,7 @@
/obj/item/reagent_containers/pill/attackby(obj/item/W as obj, mob/user as mob)
if(is_sharp(W))
var/obj/item/reagent_containers/powder/J = new /obj/item/reagent_containers/powder(src.loc)
user.visible_message("<span class='warning'>[user] gently cuts up [src] with [W]!</span>")
user.visible_message(span_warning("[user] gently cuts up [src] with [W]!"))
playsound(src.loc, 'sound/effects/chop.ogg', 50, 1)
if(reagents)
@@ -104,7 +104,7 @@
if(istype(W, /obj/item/card/id))
var/obj/item/reagent_containers/powder/J = new /obj/item/reagent_containers/powder(src.loc)
user.visible_message("<span class='warning'>[user] clumsily chops up [src] with [W]!</span>")
user.visible_message(span_warning("[user] clumsily chops up [src] with [W]!"))
playsound(src.loc, 'sound/effects/chop.ogg', 50, 1)
if(reagents)
code/modules/reagents/reagent_containers/spray.dm
+5 -5
View File
@@ -35,7 +35,7 @@
return
if(reagents.total_volume < amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>\The [src] is empty!</span>")
to_chat(user, span_notice("\The [src] is empty!"))
return
Spray_at(A, user, proximity)
@@ -75,7 +75,7 @@
return
amount_per_transfer_from_this = next_in_list(amount_per_transfer_from_this, possible_transfer_amounts)
spray_size = next_in_list(spray_size, spray_sizes)
to_chat(user, "<span class='notice'>You adjusted the pressure nozzle. You'll now use [amount_per_transfer_from_this] units per spray.</span>")
to_chat(user, span_notice("You adjusted the pressure nozzle. You'll now use [amount_per_transfer_from_this] units per spray."))
/obj/item/reagent_containers/spray/examine(mob/user)
. = ..()
@@ -91,7 +91,7 @@
if (tgui_alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", list("Yes", "No")) != "Yes")
return
if(isturf(usr.loc))
to_chat(usr, "<span class='notice'>You empty \the [src] onto the floor.</span>")
to_chat(usr, span_notice("You empty \the [src] onto the floor."))
reagents.splash(usr.loc, reagents.total_volume)
//space cleaner
@@ -245,7 +245,7 @@
/obj/item/reagent_containers/spray/chemsprayer/hosed/AltClick(mob/living/carbon/user)
if(++spray_particles > 3) spray_particles = 1
to_chat(user, "<span class='notice'>You turn the dial on \the [src] to [spray_particles].</span>")
to_chat(user, span_notice("You turn the dial on \the [src] to [spray_particles]."))
return
/obj/item/reagent_containers/spray/chemsprayer/hosed/CtrlClick(var/mob/user)
@@ -264,7 +264,7 @@
var/list/the_targets = list(T, T1, T2)
if(src.reagents.total_volume < 1)
to_chat(usr, "<span class='notice'>\The [src] is empty.</span>")
to_chat(usr, span_notice("\The [src] is empty."))
return
if(!heavy_spray)
code/modules/reagents/reagent_containers/syringes.dm
+26 -26
View File
@@ -67,7 +67,7 @@
switch(mode)
if(SYRINGE_CAPPED)
mode = SYRINGE_DRAW
to_chat(user,"<span class='notice'>You uncap the syringe.</span>")
to_chat(user,span_notice("You uncap the syringe."))
if(SYRINGE_DRAW)
mode = SYRINGE_INJECT
if(SYRINGE_INJECT)
@@ -88,7 +88,7 @@
return
if(mode == SYRINGE_BROKEN)
to_chat(user, "<span class='warning'>This syringe is broken!</span>")
to_chat(user, span_warning("This syringe is broken!"))
return
if(user.a_intent == I_HURT && ismob(target))
@@ -101,23 +101,23 @@
switch(mode)
if(SYRINGE_DRAW)
if(!reagents.get_free_space())
to_chat(user, "<span class='warning'>The syringe is full.</span>")
to_chat(user, span_warning("The syringe is full."))
mode = SYRINGE_INJECT
return
if(ismob(target))//Blood!
if(reagents.has_reagent("blood"))
to_chat(user, "<span class='notice'>There is already a blood sample in this syringe.</span>")
to_chat(user, span_notice("There is already a blood sample in this syringe."))
return
if(istype(target, /mob/living/carbon))
var/amount = reagents.get_free_space()
var/mob/living/carbon/T = target
if(!T.dna)
to_chat(user, "<span class='warning'>You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum).</span>")
to_chat(user, span_warning("You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)."))
return
if(NOCLONE in T.mutations) //target done been et, no more blood in him
to_chat(user, "<span class='warning'>You are unable to locate any blood.</span>")
to_chat(user, span_warning("You are unable to locate any blood."))
return
if(T.isSynthetic())
@@ -125,7 +125,7 @@
return
if(drawing)
to_chat(user, "<span class='warning'>You are already drawing blood from [T.name].</span>")
to_chat(user, span_warning("You are already drawing blood from [T.name]."))
return
var/datum/reagent/B
@@ -153,21 +153,21 @@
reagents.update_total()
on_reagent_change()
reagents.handle_reactions()
to_chat(user, "<span class='notice'>You take a blood sample from [target].</span>")
to_chat(user, span_notice("You take a blood sample from [target]."))
for(var/mob/O in viewers(4, user))
O.show_message("<span class='notice'>[user] takes a blood sample from [target].</span>", 1)
O.show_message(span_notice("[user] takes a blood sample from [target]."), 1)
else //if not mob
if(!target.reagents.total_volume)
to_chat(user, "<span class='notice'>[target] is empty.</span>")
to_chat(user, span_notice("[target] is empty."))
return
if(!target.is_open_container() && !istype(target, /obj/structure/reagent_dispensers) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/reagent_containers/food))
to_chat(user, "<span class='notice'>You cannot directly remove reagents from this object.</span>")
to_chat(user, span_notice("You cannot directly remove reagents from this object."))
return
var/trans = target.reagents.trans_to_obj(src, amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You fill the syringe with [trans] units of the solution.</span>")
to_chat(user, span_notice("You fill the syringe with [trans] units of the solution."))
update_icon()
@@ -177,17 +177,17 @@
if(SYRINGE_INJECT)
if(!reagents.total_volume)
to_chat(user, "<span class='notice'>The syringe is empty.</span>")
to_chat(user, span_notice("The syringe is empty."))
mode = SYRINGE_DRAW
return
if(istype(target, /obj/item/implantcase/chem))
return
if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/smokable/cigarette) && !istype(target, /obj/item/storage/fancy/cigarettes))
to_chat(user, "<span class='notice'>You cannot directly fill this object.</span>")
to_chat(user, span_notice("You cannot directly fill this object."))
return
if(!target.reagents.get_free_space())
to_chat(user, "<span class='notice'>[target] is full.</span>")
to_chat(user, span_notice("[target] is full."))
return
var/mob/living/carbon/human/H = target
@@ -195,11 +195,11 @@
if(istype(H))
affected = H.get_organ(user.zone_sel.selecting) //VOREStation Edit - See above comment.
if(!affected)
to_chat(user, "<span class='danger'>\The [H] is missing that limb!</span>")
to_chat(user, span_danger("\The [H] is missing that limb!"))
return
/* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity.
else if(affected.robotic >= ORGAN_ROBOT)
to_chat(user, "<span class='danger'>You cannot inject a robotic limb.</span>")
to_chat(user, span_danger("You cannot inject a robotic limb."))
return
*/
@@ -223,9 +223,9 @@
return
if(injtime == time)
user.visible_message("<span class='warning'>[user] is trying to inject [target] with [visible_name]!</span>","<span class='notice'>You begin injecting [target] with [visible_name].</span>")
user.visible_message(span_warning("[user] is trying to inject [target] with [visible_name]!"),span_notice("You begin injecting [target] with [visible_name]."))
else
user.visible_message("<span class='warning'>[user] begins hunting for an injection port on [target]'s suit!</span>","<span class='notice'>You begin hunting for an injection port on [target]'s suit!</span>")
user.visible_message(span_warning("[user] begins hunting for an injection port on [target]'s suit!"),span_notice("You begin hunting for an injection port on [target]'s suit!"))
//The warmup
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
@@ -248,11 +248,11 @@
update_icon()
if(trans)
to_chat(user, "<span class='notice'>You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.</span>")
to_chat(user, span_notice("You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units."))
if(ismob(target))
add_attack_logs(user,target,"Injected with [src.name] containing [contained], trasferred [trans] units")
else
to_chat(user, "<span class='notice'>The syringe is empty.</span>")
to_chat(user, span_notice("The syringe is empty."))
// dirty(target,affected) //VOREStation Add -- Removed by Request
return
@@ -266,7 +266,7 @@
var/obj/item/organ/external/affecting = H.get_organ(target_zone)
if (!affecting || affecting.is_stump())
to_chat(user, "<span class='danger'>They are missing that limb!</span>")
to_chat(user, span_danger("They are missing that limb!"))
return
var/hit_area = affecting.name
@@ -284,13 +284,13 @@
return
user.visible_message("<span class='danger'>[user] stabs [target] in \the [hit_area] with [src.name]!</span>")
user.visible_message(span_danger("[user] stabs [target] in \the [hit_area] with [src.name]!"))
if(affecting.take_damage(3))
H.UpdateDamageIcon()
else
user.visible_message("<span class='danger'>[user] stabs [target] with [src.name]!</span>")
user.visible_message(span_danger("[user] stabs [target] with [src.name]!"))
target.take_organ_damage(3)// 7 is the same as crowbar punch
@@ -322,10 +322,10 @@
/obj/item/reagent_containers/syringe/ld50_syringe/afterattack(obj/target, mob/user, flag)
if(mode == SYRINGE_DRAW && ismob(target)) // No drawing 50 units of blood at once
to_chat(user, "<span class='notice'>This needle isn't designed for drawing blood.</span>")
to_chat(user, span_notice("This needle isn't designed for drawing blood."))
return
if(user.a_intent == "hurt" && ismob(target)) // No instant injecting
to_chat(user, "<span class='notice'>This syringe is too big to stab someone with it.</span>")
to_chat(user, span_notice("This syringe is too big to stab someone with it."))
..()
////////////////////////////////////////////////////////////////////////////////