cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 14:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

The Great Spanning (#9320)

Browse Source 
This PR get rid of all (most of) the span("thing", spans and replaces them with the SPAN_THING( variant, which has gained more popularity recently.
This commit is contained in:
Geeves
2020-07-12 14:53:28 +02:00
committed by GitHub
parent 29cfd74770
commit 33ad8096fb
260 changed files with 1527 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/reagent_containers/food.dm
View File

@@ -31,5 +31,5 @@
var/obj/item/trash_item = new trash(user)
user.put_in_hands(trash_item)
target.visible_message("<b>[target]</b> finishes [is_liquid ? "drinking" : "eating"] \the [src].",
span("notice","You finish [is_liquid ? "drinking" : "eating"] \the [src]."))
SPAN_NOTICE("You finish [is_liquid ? "drinking" : "eating"] \the [src]."))
qdel(src)

80
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -57,7 +57,7 @@
m_bitesize = min(m_bitesize, reagents.total_volume)
if (!SA.can_eat() || ((user.reagents.maximum_volume - user.reagents.total_volume) < m_bitesize * 0.5))
to_chat(user,span("danger","\The [target.name] can't stomach anymore food!"))
to_chat(user, SPAN_DANGER("\The [target.name] can't stomach anymore food!"))
return
amount_eaten = reagents.trans_to_mob(SA, min(reagents.total_volume,m_bitesize), CHEM_INGEST)
@@ -65,13 +65,13 @@
if (amount_eaten)
bitecount++
if (amount_eaten >= m_bitesize)
user.visible_message(span("notice","\The [user] feeds \the [target] \the [src]."))
user.visible_message(SPAN_NOTICE("\The [user] feeds \the [target] \the [src]."))
if (!istype(target.loc, /turf))//held mobs don't see visible messages
to_chat(target,span("notice","\The [user] feeds you \the [src]."))
to_chat(target, SPAN_NOTICE("\The [user] feeds you \the [src]."))
else
user.visible_message(span("notice","\The [user] feeds \the [target] a tiny bit of \the [src]. <b>It looks full.</b>"))
user.visible_message(SPAN_NOTICE("\The [user] feeds \the [target] a tiny bit of \the [src]. <b>It looks full.</b>"))
if (!istype(target.loc, /turf))
to_chat(target,span("notice","\The [user] feeds you a tiny bit of \the [src]. <b>You feel pretty full!</b>"))
to_chat(target, SPAN_NOTICE("\The [user] feeds you a tiny bit of \the [src]. <b>You feel pretty full!</b>"))
return 1
else
var/fullness = 0
@@ -103,14 +103,14 @@
feedback_message = "You unwillingly [is_liquid ? "sip" : "chew"] a bit of \the [src]."
if(is_full)
to_chat(user,span("danger",feedback_message))
to_chat(user, SPAN_DANGER(feedback_message))
return
reagents.trans_to_mob(target, min(reagents.total_volume,bitesize), CHEM_INGEST)
else
if(!target.can_force_feed(user, src))
return
if(is_full)
to_chat(user,span("warning","\The [target] can't stomach any more food!"))
to_chat(user, SPAN_WARNING("\The [target] can't stomach any more food!"))
return
other_feed_message_start(user,target)
@@ -134,17 +134,17 @@
if(!..(user, 1))
return
if(name != initial(name))
to_chat(user, span("notice", "You know the item as [initial(name)], however a little piece of propped up paper indicates it's \a [name]."))
to_chat(user, SPAN_NOTICE("You know the item as [initial(name)], however a little piece of propped up paper indicates it's \a [name]."))
if (coating)
to_chat(user, span("notice", "It's coated in [coating.name]!"))
to_chat(user, SPAN_NOTICE("It's coated in [coating.name]!"))
if (bitecount==0)
return
else if (bitecount==1)
to_chat(user, span("notice", "\The [src] was bitten by someone!"))
to_chat(user, SPAN_NOTICE("\The [src] was bitten by someone!"))
else if (bitecount<=3)
to_chat(user, span("notice", "\The [src] was bitten [bitecount] time\s!"))
to_chat(user, SPAN_NOTICE("\The [src] was bitten [bitecount] time\s!"))
else
to_chat(user, span("notice", "\The [src] was bitten multiple times!"))
to_chat(user, SPAN_NOTICE("\The [src] was bitten multiple times!"))
/obj/item/reagent_containers/food/snacks/attackby(obj/item/W, mob/living/user)
@@ -154,14 +154,14 @@
if(selection == "Name")
var/input_clean_name = sanitize(input(user,"What is the name of this food?", "Set Food Name") as text|null, MAX_LNAME_LEN)
if(input_clean_name)
user.visible_message(span("notice", "\The [user] labels \the [name] as \"[input_clean_name]\"."))
user.visible_message(SPAN_NOTICE("\The [user] labels \the [name] as \"[input_clean_name]\"."))
name = input_clean_name
else
name = initial(name)
else if(selection == "Description")
var/input_clean_desc = sanitize(input(user,"What is the description of this food?", "Set Food Description") as text|null, MAX_MESSAGE_LEN)
if(input_clean_desc)
user.visible_message(span("notice", "\The [user] adds a note to \the [name]."))
user.visible_message(SPAN_NOTICE("\The [user] adds a note to \the [name]."))
desc = input_clean_desc
else
desc = initial(desc)
@@ -175,7 +175,7 @@
if(istype(W,/obj/item/material/kitchen/utensil))
var/obj/item/material/kitchen/utensil/U = W
if(istype(W,/obj/item/material/kitchen/utensil/fork)&&(is_liquid))
to_chat(user, span("notice", "You uselessly pass \the [U] through \the [src]."))
to_chat(user, SPAN_NOTICE("You uselessly pass \the [U] through \the [src]."))
playsound(user.loc, 'sound/effects/pour.ogg', 10, 1)
return
else
@@ -184,12 +184,12 @@
U.create_reagents(5)
if (U.reagents.total_volume > 0)
to_chat(user, span("warning", "You already have \the [src] on \the [U]."))
to_chat(user, SPAN_WARNING("You already have \the [src] on \the [U]."))
return
user.visible_message( \
"\The [user] scoops up some of \the [src] with \the [U]!", \
span("notice", "You scoop up some of \the [src] with \the [U]!") \
SPAN_NOTICE("You scoop up some of \the [src] with \the [U]!") \
)
bitecount++
@@ -218,7 +218,7 @@
if (W.w_class >= src.w_class || is_robot_module(W))
return
to_chat(user, span("warning", "You slip \the [W] inside \the [src]."))
to_chat(user, SPAN_WARNING("You slip \the [W] inside \the [src]."))
user.remove_from_mob(W)
W.dropped(user)
add_fingerprint(user)
@@ -227,15 +227,15 @@
if(has_edge(W))
if (!can_slice_here)
to_chat(user, span("warning", "You cannot slice \the [src] here! You need a table or at least a tray to do it."))
to_chat(user, SPAN_WARNING("You cannot slice \the [src] here! You need a table or at least a tray to do it."))
return
var/slices_lost = 0
if(W.w_class > 3)
user.visible_message(span("notice", "\The [user] crudely slices \the [src] with [W]!"), span("notice", "You crudely slice \the [src] with your [W]!"))
user.visible_message(SPAN_NOTICE("\The [user] crudely slices \the [src] with [W]!"), SPAN_NOTICE("You crudely slice \the [src] with your [W]!"))
slices_lost = rand(1,min(1,round(slices_num/2)))
else
user.visible_message(span("notice", "\The [user] slices \the [src]!"), span("notice", "You slice \the [src]!"))
user.visible_message(SPAN_NOTICE("\The [user] slices \the [src]!"), SPAN_NOTICE("You slice \the [src]!"))
var/reagents_per_slice = reagents.total_volume/slices_num
for(var/i=1 to (slices_num-slices_lost))
@@ -288,7 +288,7 @@
return 0
if (C.volume < req)
to_chat(user, span("warning", "There's not enough [C.name] to coat the [src]!"))
to_chat(user, SPAN_WARNING("There's not enough [C.name] to coat the [src]!"))
return 0
var/id = C.type
@@ -323,7 +323,7 @@
add_overlay(J)
if (user)
user.visible_message(span("notice", "[user] dips \the [src] into \the [coating.name]"), span("notice", "You dip \the [src] into \the [coating.name]"))
user.visible_message(SPAN_NOTICE("[user] dips \the [src] into \the [coating.name]"), SPAN_NOTICE("You dip \the [src] into \the [coating.name]"))
return 1
@@ -382,13 +382,13 @@
var/mob/living/simple_animal/SA = user
m_bitesize = bitesize * SA.bite_factor //Modified bitesize based on creature size
if(!SA.can_eat())
to_chat(user, span("danger", "You're too full to eat anymore!"))
to_chat(user, SPAN_DANGER("You're too full to eat anymore!"))
return
if(reagents && user.reagents)
m_bitesize = min(m_bitesize, reagents.total_volume)
if(((user.reagents.maximum_volume - user.reagents.total_volume) < m_bitesize * 0.5)) //If the creature can't even stomach half a bite, then it eats nothing
to_chat(user, span("danger", "You're too full to eat anymore!"))
to_chat(user, SPAN_DANGER("You're too full to eat anymore!"))
return
reagents.trans_to_mob(user, m_bitesize, CHEM_INGEST)
@@ -726,7 +726,7 @@
..()
new/obj/effect/decal/cleanable/egg_smudge(src.loc)
src.reagents.splash(hit_atom, reagents.total_volume)
src.visible_message(span("warning", "\The [src] has been squashed!"),span("warning", "You hear a smack."))
src.visible_message(SPAN_WARNING("\The [src] has been squashed!"), SPAN_WARNING("You hear a smack."))
qdel(src)
/obj/item/reagent_containers/food/snacks/egg/attackby(obj/item/W as obj, mob/user as mob)
@@ -735,10 +735,10 @@
var/clr = C.colourName
if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
to_chat(usr, span("notice", "The egg refuses to take on this color!"))
to_chat(usr, SPAN_NOTICE("The egg refuses to take on this color!"))
return
to_chat(usr, span("notice", "You color \the [src] [clr]"))
to_chat(usr, SPAN_NOTICE("You color \the [src] [clr]"))
icon_state = "egg-[clr]"
else
..()
@@ -966,10 +966,10 @@
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user)
if(has_been_heated)
to_chat(user, span("notice", "The heating chemicals have already been spent."))
to_chat(user, SPAN_NOTICE("The heating chemicals have already been spent."))
return
has_been_heated = TRUE
user.visible_message(span("notice", "[user] crushes \the [src] package."), "You crush \the [src] package and feel it rapidly heat up.")
user.visible_message(SPAN_NOTICE("[user] crushes \the [src] package."), "You crush \the [src] package and feel it rapidly heat up.")
name = "cooked Sin-pocket"
desc = "The food of choice for the veteran. Do <B>NOT</B> overconsume."
reagents.add_reagent(/datum/reagent/drink/doctorsdelight, 5)
@@ -1160,7 +1160,7 @@
/obj/item/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom)
..()
new/obj/effect/decal/cleanable/pie_smudge(src.loc)
src.visible_message(span("danger", "\The [src.name] splats."),span("danger", "You hear a splat."))
src.visible_message(SPAN_DANGER("\The [src.name] splats."), SPAN_DANGER("You hear a splat."))
qdel(src)
/obj/item/reagent_containers/food/snacks/berryclafoutis
@@ -1358,7 +1358,7 @@
/obj/item/reagent_containers/food/snacks/popcorn/on_consume()
if(prob(unpopped)) //lol ...what's the point? // IMPLEMENT DENTISTRY WHEN?
to_chat(usr, span("warning", "You bite down on an un-popped kernel!"))
to_chat(usr, SPAN_WARNING("You bite down on an un-popped kernel!"))
unpopped = max(0, unpopped-1)
..()
@@ -1758,7 +1758,7 @@
Unwrap(user)
/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
src.visible_message(span("notice", "\The [src] expands!"))
src.visible_message(SPAN_NOTICE("\The [src] expands!"))
if(istype(loc, /obj/item/gripper)) // fixes ghost cube when using syringe
var/obj/item/gripper/G = loc
G.drop_item()
@@ -3420,7 +3420,7 @@
if( open && pizza )
user.put_in_hands( pizza )
to_chat(user, span("warning", "You take \the [src.pizza] out of \the [src]."))
to_chat(user, SPAN_WARNING("You take \the [src.pizza] out of \the [src]."))
src.pizza = null
update_icon()
return
@@ -3434,7 +3434,7 @@
boxes -= box
user.put_in_hands( box )
to_chat(user, span("warning", "You remove the topmost [src] from your hand."))
to_chat(user, SPAN_WARNING("You remove the topmost [src] from your hand."))
box.update_icon()
update_icon()
return
@@ -3471,11 +3471,11 @@
box.update_icon()
update_icon()
to_chat(user, span("warning", "You put \the [box] ontop of \the [src]!"))
to_chat(user, SPAN_WARNING("You put \the [box] ontop of \the [src]!"))
else
to_chat(user, span("warning", "The stack is too high!"))
to_chat(user, SPAN_WARNING("The stack is too high!"))
else
to_chat(user, span("warning", "Close \the [box] first!"))
to_chat(user, SPAN_WARNING("Close \the [box] first!"))
return
@@ -3487,9 +3487,9 @@
update_icon()
to_chat(user, span("warning", "You put \the [I] in \the [src]!"))
to_chat(user, SPAN_WARNING("You put \the [I] in \the [src]!"))
else
to_chat(user, span("warning", "You try to push \the [I] through the lid but it doesn't work!"))
to_chat(user, SPAN_WARNING("You try to push \the [I] through the lid but it doesn't work!"))
return
if( I.ispen() )

2
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -61,7 +61,7 @@
/obj/item/reagent_containers/glass/proc/shatter(var/mob/user)
if(reagents.total_volume)
reagents.splash(src.loc, reagents.total_volume) // splashes the mob holding it or the turf it's on
audible_message(span("warning", "\The [src] shatters with a resounding crash!"), span("warning", "\The [src] breaks."))
audible_message(SPAN_WARNING("\The [src] shatters with a resounding crash!"), SPAN_WARNING("\The [src] breaks."))
playsound(src, "shatter", 70, 1)
new /obj/item/material/shard(loc, "glass")
qdel(src)

24
code/modules/reagents/reagent_containers/hypospray.dm
View File

@@ -48,7 +48,7 @@
. = ..()
var/mob/living/carbon/human/H = M
if(istype(H))
user.visible_message(span("warning", "\The [user] is trying to inject \the [M] with \the [src]!"),span("notice", "You are trying to inject \the [M] with \the [src]."))
user.visible_message(SPAN_WARNING("\The [user] is trying to inject \the [M] with \the [src]!"), SPAN_NOTICE("You are trying to inject \the [M] with \the [src]."))
var/inj_time = time
if(armorcheck && H.run_armor_check(target_zone,"melee",0,"Your armor slows down the injection!","Your armor slows down the injection!"))
inj_time += 6 SECONDS
@@ -78,13 +78,13 @@
return
if(!reagents.total_volume)
to_chat(user,span("warning", "\The [src] is empty."))
to_chat(user, SPAN_WARNING("\The [src] is empty."))
return
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
user.do_attack_animation(M)
to_chat(user,span("notice", "You inject \the [M] with \the [src]."))
to_chat(M,span("notice", "You feel a tiny prick!"))
to_chat(user, SPAN_NOTICE("You inject \the [M] with \the [src]."))
to_chat(M, SPAN_NOTICE("You feel a tiny prick!"))
playsound(src, 'sound/items/hypospray.ogg',25)
if(M.reagents)
@@ -92,7 +92,7 @@
var/temp = reagents.get_temperature()
var/trans = reagents.trans_to_mob(M, amount_per_transfer_from_this, CHEM_BLOOD)
admin_inject_log(user, M, src, contained, temp, trans)
to_chat(user,span("notice", "[trans] units injected. [reagents.total_volume] units remaining in \the [src]."))
to_chat(user, SPAN_NOTICE("[trans] units injected. [reagents.total_volume] units remaining in \the [src]."))
update_icon()
return TRUE
@@ -116,25 +116,25 @@
/obj/item/reagent_containers/hypospray/autoinjector/attack(var/mob/M, var/mob/user, target_zone)
if(is_open_container())
to_chat(user,span("notice", "You must secure the reagents inside \the [src] before using it!"))
to_chat(user, SPAN_NOTICE("You must secure the reagents inside \the [src] before using it!"))
return FALSE
. = ..()
/obj/item/reagent_containers/hypospray/autoinjector/attack_self(mob/user as mob)
if(is_open_container())
if(reagents && reagents.reagent_list.len)
to_chat(user,span("notice", "With a quick twist of \the [src]'s lid, you secure the reagents inside."))
to_chat(user, SPAN_NOTICE("With a quick twist of \the [src]'s lid, you secure the reagents inside."))
flags &= ~OPENCONTAINER
update_icon()
else
to_chat(user,span("notice", "You can't secure \the [src] without putting reagents in!"))
to_chat(user, SPAN_NOTICE("You can't secure \the [src] without putting reagents in!"))
else
to_chat(user,span("notice", "The reagents inside \the [src] are already secured."))
to_chat(user, SPAN_NOTICE("The reagents inside \the [src] are already secured."))
return
/obj/item/reagent_containers/hypospray/autoinjector/attackby(obj/item/W, mob/user)
if(W.isscrewdriver() && !is_open_container())
to_chat(user,span("notice", "Using \the [W], you unsecure the autoinjector's lid.")) // it locks shut after being secured
to_chat(user, SPAN_NOTICE("Using \the [W], you unsecure the autoinjector's lid.")) // it locks shut after being secured
flags |= OPENCONTAINER
update_icon()
return
@@ -151,9 +151,9 @@
/obj/item/reagent_containers/hypospray/autoinjector/examine(mob/user)
..(user)
if(reagents && reagents.reagent_list.len)
to_chat(user, span("notice", "It is currently loaded."))
to_chat(user, SPAN_NOTICE("It is currently loaded."))
else
to_chat(user, span("notice", "It is empty."))
to_chat(user, SPAN_NOTICE("It is empty."))
/obj/item/reagent_containers/hypospray/autoinjector/norepinephrine

12
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -30,7 +30,7 @@
if(!M.can_eat(src))
return
M.visible_message("<b>[M]</b> swallows a pill.", span("notice", "You swallow \the [src]."), null, 2)
M.visible_message("<b>[M]</b> swallows a pill.", SPAN_NOTICE("You swallow \the [src]."), null, 2)
if(reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
qdel(src)
@@ -40,13 +40,13 @@
if(!M.can_force_feed(user, src))
return
user.visible_message(span("warning", "[user] attempts to force [M] to swallow \the [src]!"))
user.visible_message(SPAN_WARNING("[user] attempts to force [M] to swallow \the [src]!"))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(!do_mob(user, M))
return
user.visible_message(span("warning", "[user] forces [M] to swallow \the [src]."))
user.visible_message(SPAN_WARNING("[user] forces [M] to swallow \the [src]."))
var/contained = reagentlist()
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [name] by [key_name(user)] Reagents: [contained]</font>")
@@ -65,16 +65,16 @@
if(proximity && target.is_open_container() && target.reagents)
if(!target.reagents.total_volume)
to_chat(user, span("notice", "[target] is empty. Can't dissolve \the [src]."))
to_chat(user, SPAN_NOTICE("[target] is empty. Can't dissolve \the [src]."))
return
to_chat(user, span("notice", "You dissolve \the [src] in [target]."))
to_chat(user, SPAN_NOTICE("You dissolve \the [src] in [target]."))
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Spiked \a [target] with a pill. Reagents: [reagentlist()]</font>")
msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",ckey=key_name(user),ckey_target=key_name(target))
reagents.trans_to(target, reagents.total_volume)
for(var/mob/O in viewers(2, user))
O.show_message(span("warning", "[user] puts something in \the [target]."), 1)
O.show_message(SPAN_WARNING("[user] puts something in \the [target]."), 1)
qdel(src)
return

64
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -88,7 +88,7 @@
switch(mode)
if(SYRINGE_CAPPED)
mode = SYRINGE_DRAW
to_chat(user, span("notice", "You uncap the syringe."))
to_chat(user, SPAN_NOTICE("You uncap the syringe."))
if(SYRINGE_DRAW)
mode = SYRINGE_INJECT
if(SYRINGE_INJECT)
@@ -109,10 +109,10 @@
return
if(mode == SYRINGE_CAPPED)
to_chat(user, span("notice", "This syringe is capped!"))
to_chat(user, SPAN_NOTICE("This syringe is capped!"))
return
if(mode == SYRINGE_BROKEN)
to_chat(user, span("warning", "This syringe is broken!"))
to_chat(user, SPAN_WARNING("This syringe is broken!"))
return
if(user.a_intent == I_GRAB && ishuman(user) && ishuman(target)) // we could add other things here eventually. trepanation maybe
@@ -120,10 +120,10 @@
if (check_zone(user.zone_sel.selecting) == BP_CHEST) // impromptu needle thoracostomy, re-inflate a collapsed lung
var/P = (user == target) ? "their" : (target.name + "\'s")
var/SM = (user == target) ? "your" : (target.name + "\'s")
user.visible_message(span("danger", "[user] aims \the [src] between [P] ribs!"), span("danger", "You aim \the [src] between [SM] ribs!"))
user.visible_message(SPAN_DANGER("[user] aims \the [src] between [P] ribs!"), SPAN_DANGER("You aim \the [src] between [SM] ribs!"))
if(!do_mob(user, target, 1.5 SECONDS))
return
user.visible_message(span("warning", "[user] jabs \the [src] between [P] ribs with \the [src]!"), span("warning", "You jab \the [src] between [SM] ribs!"))
user.visible_message(SPAN_WARNING("[user] jabs \the [src] between [P] ribs with \the [src]!"), SPAN_WARNING("You jab \the [src] between [SM] ribs!"))
if(H.is_lung_ruptured())
var/obj/item/organ/internal/lungs/L = H.internal_organs_by_name[BP_LUNGS]
if(!L.rescued)
@@ -144,25 +144,25 @@
if(SYRINGE_DRAW)
if(!reagents.get_free_space())
to_chat(user, span("warning", "The syringe is full."))
to_chat(user, SPAN_WARNING("The syringe is full."))
mode = SYRINGE_INJECT
return
if(ismob(target))//Blood!
if(reagents.has_reagent(/datum/reagent/blood))
to_chat(user, span("notice", "There is already a blood sample in this syringe."))
to_chat(user, SPAN_NOTICE("There is already a blood sample in this syringe."))
return
if(istype(target, /mob/living/carbon))
if(istype(target, /mob/living/carbon/slime))
to_chat(user, span("warning", "You are unable to locate any blood."))
to_chat(user, SPAN_WARNING("You are unable to locate any blood."))
return
var/amount = reagents.get_free_space()
var/mob/living/carbon/T = target
if(!T.dna)
to_chat(user, span("warning", "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)."))
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("warning", "You are unable to locate any blood."))
to_chat(user, SPAN_WARNING("You are unable to locate any blood."))
return
var/datum/reagent/B
@@ -180,21 +180,21 @@
reagents.update_total()
on_reagent_change()
reagents.handle_reactions()
to_chat(user, span("notice", "You take a blood sample from [target]."))
to_chat(user, SPAN_NOTICE("You take a blood sample from [target]."))
for(var/mob/O in viewers(4, user))
O.show_message(span("notice", "[user] takes a blood sample from [target]."), 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("notice", "[target] is empty."))
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))
to_chat(user, span("notice", "You cannot directly remove reagents from this object."))
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("notice", "You fill the syringe with [trans] units of the solution."))
to_chat(user, SPAN_NOTICE("You fill the syringe with [trans] units of the solution."))
update_icon()
if(!reagents.get_free_space())
@@ -203,17 +203,17 @@
if(SYRINGE_INJECT)
if(!reagents.total_volume)
to_chat(user, span("notice", "The syringe is empty."))
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("notice", "You cannot directly fill this object."))
to_chat(user, SPAN_NOTICE("You cannot directly fill this object."))
return
if(!target.reagents.get_free_space())
to_chat(user, span("notice", "[target] is full."))
to_chat(user, SPAN_NOTICE("[target] is full."))
return
var/mob/living/carbon/human/H = target
@@ -221,10 +221,10 @@
if(istype(H))
affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
to_chat(user, span("danger", "\The [H] is missing that limb!"))
to_chat(user, SPAN_DANGER("\The [H] is missing that limb!"))
return
else if(affected.status & ORGAN_ROBOT)
to_chat(user, span("danger", "You cannot inject a robotic limb."))
to_chat(user, SPAN_DANGER("You cannot inject a robotic limb."))
return
if(ismob(target) && target != user)
@@ -247,12 +247,12 @@
return
if(injtime == time)
user.visible_message(span("warning", "[user] is trying to inject [target] with [visible_name]!"))
user.visible_message(SPAN_WARNING("[user] is trying to inject [target] with [visible_name]!"))
else
if(isvaurca(H))
user.visible_message(span("warning", "[user] begins hunting for an injection port on [target]'s carapace!"))
user.visible_message(SPAN_WARNING("[user] begins hunting for an injection port on [target]'s carapace!"))
else
user.visible_message(span("warning", "[user] begins hunting for an injection port on [target]'s suit!"))
user.visible_message(SPAN_WARNING("[user] begins hunting for an injection port on [target]'s suit!"))
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
user.do_attack_animation(target)
@@ -260,7 +260,7 @@
if(!do_mob(user, target, injtime))
return
user.visible_message(span("warning", "[user] injects [target] with the syringe!"))
user.visible_message(SPAN_WARNING("[user] injects [target] with the syringe!"))
var/trans
if(ismob(target))
@@ -270,7 +270,7 @@
admin_inject_log(user, target, src, contained, reagents.get_temperature(), trans)
else
trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, span("notice", "You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units."))
to_chat(user, SPAN_NOTICE("You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units."))
if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
mode = SYRINGE_DRAW
update_icon()
@@ -316,7 +316,7 @@
/obj/item/reagent_containers/syringe/proc/syringestab(mob/living/carbon/target as mob, mob/living/carbon/user as mob)
if(mode == SYRINGE_CAPPED)
to_chat(user, span("danger", "You can't stab someone with a capped syringe!"))
to_chat(user, SPAN_DANGER("You can't stab someone with a capped syringe!"))
if(istype(target, /mob/living/carbon/human))
@@ -326,7 +326,7 @@
var/obj/item/organ/external/affecting = H.get_organ(target_zone)
if (!affecting || affecting.is_stump())
to_chat(user, span("danger", "They are missing that limb!"))
to_chat(user, SPAN_DANGER("They are missing that limb!"))
return
var/hit_area = affecting.name
@@ -336,7 +336,7 @@
if (target != user && H.getarmor(target_zone, "melee") > 5 && prob(50))
for(var/mob/O in viewers(world.view, user))
O.show_message(text(span("danger", "[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!")), 1)
O.show_message(text(SPAN_DANGER("[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!")), 1)
user.remove_from_mob(src)
qdel(src)
@@ -346,13 +346,13 @@
return
user.visible_message(span("danger", "[user] stabs [target] in \the [hit_area] with [src.name]!"))
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("danger", "[user] stabs [target] with [src.name]!"))
user.visible_message(SPAN_DANGER("[user] stabs [target] with [src.name]!"))
target.take_organ_damage(3)// 7 is the same as crowbar punch
var/syringestab_amount_transferred = rand(0, (reagents.total_volume - 5)) //nerfed by popular demand
@@ -381,10 +381,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("notice", "This needle isn't designed for drawing blood."))
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("notice", "This syringe is too big to stab someone with it."))
to_chat(user, SPAN_NOTICE("This syringe is too big to stab someone with it."))
..()
////////////////////////////////////////////////////////////////////////////////