cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 00:49:06 +01: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 15:53:28 +03: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
code/game/objects/items/devices/aicard.dm
+3 -3
View File
@@ -16,11 +16,11 @@
if(!carded_ai)
message = "There is no AI loaded to the card."
else if(carded_ai.stat == DEAD)
message += span("danger", "terminated.")
message += SPAN_DANGER("terminated.")
else if(!carded_ai.client)
message += span("notice", "active.")
message += SPAN_NOTICE("active.")
else
message += span("warning", "inactive.")
message += SPAN_WARNING("inactive.")
to_chat(user, message)
/obj/item/aicard/attack(mob/living/silicon/decoy/M as mob, mob/user as mob, var/target_zone)
code/game/objects/items/devices/drop_targeter/_droptargeter.dm
+8 -8
View File
@@ -36,23 +36,23 @@
/obj/item/device/orbital_dropper/proc/laser_act(var/atom/target, var/mob/living/user)
if(has_dropped >= drop_amount)
to_chat(user, span("warning", "You can't use this device again!"))
to_chat(user, SPAN_WARNING("You can't use this device again!"))
return
var/turf/targloc = get_turf(target)
if(!emagged)
for(var/turf/t in block(locate(targloc.x+3,targloc.y+3,targloc.z), locate(targloc.x-3,targloc.y-3,targloc.z)))
if (!istype(t.loc, /area/mine))
to_chat(user, span("warning", "You can't do this so close to the station, point the laser further into the mine!"))
to_chat(user, SPAN_WARNING("You can't do this so close to the station, point the laser further into the mine!"))
return
if (!isfloor(targloc))
to_chat(user, span("warning", "You cannot request this on unstable flooring!"))
to_chat(user, SPAN_WARNING("You cannot request this on unstable flooring!"))
return
if(!(user in (viewers(paint_distance, target))) )
to_chat(user, span("warning", "You can't paint the target that far away!"))
to_chat(user, SPAN_WARNING("You can't paint the target that far away!"))
return
if (!user.IsAdvancedToolUser())
to_chat(user, span("warning", "You don't have the dexterity to do this!"))
to_chat(user, SPAN_WARNING("You don't have the dexterity to do this!"))
return
add_fingerprint(user)
@@ -66,7 +66,7 @@
I.pixel_x = target.pixel_x + rand(-5,5)
I.pixel_y = target.pixel_y + rand(-5,5)
to_chat(user, span("notice", "You paint the target at [target]."))
to_chat(user, SPAN_NOTICE("You paint the target at [target]."))
var/obj/item/device/radio/intercom/announcer = new /obj/item/device/radio/intercom(null)
announcer.config(list("Common" = FALSE, "Entertainment" = FALSE, "Response Team" = FALSE, "Science" = FALSE, "Command" = FALSE, "Medical" = FALSE, "Engineering" = FALSE, "Security" = FALSE, "Supply" = FALSE, "Service" = FALSE, "Mercenary" = FALSE, "Raider" = FALSE, "Ninja" = FALSE, "AI Private" = FALSE))
@@ -93,7 +93,7 @@
/obj/item/device/orbital_dropper/emag_act(var/remaining_charges, var/mob/user)
if(!emagged)
emagged = TRUE
to_chat(user, span("danger", "You override \the [src]'s area safety checks!"))
to_chat(user, SPAN_DANGER("You override \the [src]'s area safety checks!"))
return TRUE
else
to_chat(user, span("danger", "\The [src]'s area safety checks have already been disabled."))
to_chat(user, SPAN_DANGER("\The [src]'s area safety checks have already been disabled."))
code/game/objects/items/devices/hacktool.dm
+1 -1
View File
@@ -54,7 +54,7 @@
to_chat(user, "<span class='warning'>You are already hacking!</span>")
return 0
if(target in current_hacks)
to_chat(user, span("warning", "You are already hacking this door!"))
to_chat(user, SPAN_WARNING("You are already hacking this door!"))
return 0
if(!is_type_in_list(target, supported_types))
to_chat(user, "\icon[src] <span class='warning'>Unable to hack this target!</span>")
code/game/objects/items/devices/lighting/flashlight.dm
+11 -11
View File
@@ -85,39 +85,39 @@
var/mob/living/carbon/human/H = M //mob has protective eyewear
if(istype(H))
if(M:eyecheck())
to_chat(user, span("warning", "You're going to need to remove \The [M]'s eye protection first."))
to_chat(user, SPAN_WARNING("You're going to need to remove \The [M]'s eye protection first."))
return
var/obj/item/organ/vision
if(H.species.vision_organ)
vision = H.internal_organs_by_name[H.species.vision_organ]
if(!vision)
to_chat(user, span("warning", "You can't find any [H.species.vision_organ ? H.species.vision_organ : "eyes"] on [H]!"))
to_chat(user, SPAN_WARNING("You can't find any [H.species.vision_organ ? H.species.vision_organ : "eyes"] on [H]!"))
user.visible_message(span("notice", "\The [user] directs [src] to [M]'s eyes."), span("notice", "You direct [src] to [M]'s eyes."))
user.visible_message(SPAN_NOTICE("\The [user] directs [src] to [M]'s eyes."), SPAN_NOTICE("You direct [src] to [M]'s eyes."))
if (H != user) //can't look into your own eyes buster
if(M.stat == DEAD || M.blinded) //mob is dead or fully blind
to_chat(user, span("warning","\The [M]'s pupils do not react to the light!"))
to_chat(user, SPAN_WARNING("\The [M]'s pupils do not react to the light!"))
return
if(XRAY in M.mutations)
to_chat(user, span("notice", "\The [M]'s pupils give an eerie glow!"))
to_chat(user, SPAN_NOTICE("\The [M]'s pupils give an eerie glow!"))
if(vision.damage)
to_chat(user, span("warning", "There's visible damage to [M]'s [vision.name]!"))
to_chat(user, SPAN_WARNING("There's visible damage to [M]'s [vision.name]!"))
else if(M.eye_blurry)
to_chat(user, span("notice", "\The [M]'s pupils react slower than normally."))
to_chat(user, SPAN_NOTICE("\The [M]'s pupils react slower than normally."))
if(M.getBrainLoss() > 15)
to_chat(user, span("notice", "There's visible lag between left and right pupils' reactions."))
to_chat(user, SPAN_NOTICE("There's visible lag between left and right pupils' reactions."))
var/list/pinpoint = list(/datum/reagent/oxycodone=1,/datum/reagent/tramadol=5)
var/list/dilating = list(/datum/reagent/space_drugs=5,/datum/reagent/mindbreaker=1)
var/datum/reagents/ingested = H.get_ingested_reagents()
if(H.reagents.has_any_reagent(pinpoint) || ingested.has_any_reagent(pinpoint))
to_chat(user, span("notice", "\The [M]'s pupils are already pinpoint and cannot narrow any more."))
to_chat(user, SPAN_NOTICE("\The [M]'s pupils are already pinpoint and cannot narrow any more."))
else if(H.shock_stage >= 30 || H.reagents.has_any_reagent(dilating) || ingested.has_any_reagent(dilating) || H.breathing.has_any_reagent(dilating))
to_chat(user, span("notice", "\The [M]'s pupils narrow slightly, but are still very dilated."))
to_chat(user, SPAN_NOTICE("\The [M]'s pupils narrow slightly, but are still very dilated."))
else
to_chat(user, span("notice", "\The [M]'s pupils narrow."))
to_chat(user, SPAN_NOTICE("\The [M]'s pupils narrow."))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) //can be used offensively
flick("flash", M.flash)
code/game/objects/items/devices/lightmeter.dm
+2 -2
View File
@@ -20,7 +20,7 @@
/obj/item/device/light_meter/attack_self(mob/user as mob)
var/turf/T = get_turf(user.loc)
if (!T)
to_chat(user, span("alert", "Unable to read light levels."))
to_chat(user, SPAN_ALERT("Unable to read light levels."))
return
var/visible_reading = T.get_lumcount(low, high)
@@ -30,7 +30,7 @@
reading += "Visible light: <b>[visible_reading]</b> lx<br>"
reading += "Ultraviolet light: <b>[uv_reading]</b> lx ([uv_reading * 5.5 - 1.5] adlx)"
to_chat(usr, span("notice", reading))
to_chat(usr, SPAN_NOTICE(reading))
/obj/item/device/light_meter/verb/set_low_bound()
set category = "Object"
code/game/objects/items/devices/magnetic_lock.dm
+21 -21
View File
@@ -130,7 +130,7 @@
update_icon()
else
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1)
to_chat(user, span("warning", "\The [src] buzzes as you swipe your [I]."))
to_chat(user, SPAN_WARNING("\The [src] buzzes as you swipe your [I]."))
return
else
to_chat(user, "<span class='danger'>You cannot swipe your [I] through [src] with it partially dismantled!</span>")
@@ -166,11 +166,11 @@
if (I.iswelder())
var/obj/item/weldingtool/WT = I
if (WT.remove_fuel(2, user))
user.visible_message(span("notice", "[user] starts welding the metal shell of [src]."), span("notice", "You start [hacked ? "repairing" : "welding open"] the metal covering of [src]."))
user.visible_message(SPAN_NOTICE("[user] starts welding the metal shell of [src]."), SPAN_NOTICE("You start [hacked ? "repairing" : "welding open"] the metal covering of [src]."))
playsound(loc, 'sound/items/Welder.ogg', 50, 1)
add_overlay("overlay_welding")
if (do_after(user, 25/I.toolspeed))
to_chat(user, span("notice", "You are able to [hacked ? "repair" : "weld through"] the metal shell of [src]."))
to_chat(user, SPAN_NOTICE("You are able to [hacked ? "repair" : "weld through"] the metal shell of [src]."))
if (hacked) locked = 1
else locked = 0
hacked = !hacked
@@ -182,38 +182,38 @@
if (I.iscrowbar())
if (!locked)
to_chat(user, span("notice", "You pry the cover off [src]."))
to_chat(user, SPAN_NOTICE("You pry the cover off [src]."))
setconstructionstate(1)
else
to_chat(user, span("notice", "You try to pry the cover off [src] but it doesn't budge."))
to_chat(user, SPAN_NOTICE("You try to pry the cover off [src] but it doesn't budge."))
return
if (1)
if (istype(I, /obj/item/cell))
if (powercell)
to_chat(user, span("notice","There's already a powercell in \the [src]."))
to_chat(user, SPAN_NOTICE("There's already a powercell in \the [src]."))
return
if (I.iscrowbar())
to_chat(user, span("notice", "You wedge the cover back in place."))
to_chat(user, SPAN_NOTICE("You wedge the cover back in place."))
setconstructionstate(0)
return
if (2)
if (I.isscrewdriver())
to_chat(user, span("notice", "You unscrew and remove the wiring cover from \the [src]."))
to_chat(user, SPAN_NOTICE("You unscrew and remove the wiring cover from \the [src]."))
playsound(loc, I.usesound, 50, 1)
setconstructionstate(3)
return
if (I.iscrowbar())
to_chat(user, span("notice", "You wedge the cover back in place."))
to_chat(user, SPAN_NOTICE("You wedge the cover back in place."))
setconstructionstate(0)
return
if (istype(I, /obj/item/cell))
if (!powercell)
to_chat(user, span("notice","You place the [I] inside \the [src]."))
to_chat(user, SPAN_NOTICE("You place the [I] inside \the [src]."))
user.drop_from_inventory(I,src)
powercell = I
setconstructionstate(1)
@@ -221,20 +221,20 @@
if (3)
if (I.iswirecutter())
to_chat(user, span("notice", "You cut the wires connecting the [src]'s magnets to their internal powersupply, [target ? "making the device fall off [target] and rendering it unusable." : "rendering the device unusable."]"))
to_chat(user, SPAN_NOTICE("You cut the wires connecting the [src]'s magnets to their internal powersupply, [target ? "making the device fall off [target] and rendering it unusable." : "rendering the device unusable."]"))
playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
setconstructionstate(4)
return
if (I.isscrewdriver())
to_chat(user, span("notice", "You replace and screw tight the wiring cover from \the [src]."))
to_chat(user, SPAN_NOTICE("You replace and screw tight the wiring cover from \the [src]."))
playsound(loc, I.usesound, 50, 1)
setconstructionstate(2)
return
if (4)
if (I.iswirecutter())
to_chat(user, span("notice", "You repair the wires connecting the [src]'s magnets to their internal powersupply"))
to_chat(user, SPAN_NOTICE("You repair the wires connecting the [src]'s magnets to their internal powersupply"))
setconstructionstate(3)
return
@@ -262,35 +262,35 @@
BU.charge -= diff
else
BU.charge = 0
visible_message(span("danger", "[src] beeps loudly and falls off \the [target]; its powercell having run out of power."))
visible_message(SPAN_DANGER("[src] beeps loudly and falls off \the [target]; its powercell having run out of power."))
detach(0)
else if (BU.charge > drainamount)
BU.charge -= drainamount
else
BU.charge = 0
visible_message(span("danger", "[src] beeps loudly and falls off \the [target]; its powercell having run out of power."))
visible_message(SPAN_DANGER("[src] beeps loudly and falls off \the [target]; its powercell having run out of power."))
detach(0)
last_process_time = world.time
/obj/item/device/magnetic_lock/proc/check_target(var/obj/machinery/door/airlock/newtarget, var/mob/user as mob)
if (status == STATUS_BROKEN)
to_chat(user, span("danger", "[src] is damaged beyond repair! It cannot be used!"))
to_chat(user, SPAN_DANGER("[src] is damaged beyond repair! It cannot be used!"))
return 0
if (hacked)
to_chat(user, span("danger", "[src] buzzes; it can't be used until you repair it!"))
to_chat(user, SPAN_DANGER("[src] buzzes; it can't be used until you repair it!"))
return 0
if (!newtarget.density || newtarget.operating)
to_chat(user, span("danger", "[newtarget] must be closed before you can attach [src] to it!"))
to_chat(user, SPAN_DANGER("[newtarget] must be closed before you can attach [src] to it!"))
return 0
if (newtarget.p_open)
to_chat(user, span("danger", "You must close [newtarget]'s maintenance panel before attaching [src] to it!"))
to_chat(user, SPAN_DANGER("You must close [newtarget]'s maintenance panel before attaching [src] to it!"))
return 0
if (!user.Adjacent(newtarget))
to_chat(user, span("danger", "You must stand next to [newtarget] while attaching it!"))
to_chat(user, SPAN_DANGER("You must stand next to [newtarget] while attaching it!"))
return 0
return 1
@@ -505,7 +505,7 @@
ui.close()
else
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1)
to_chat(usr, span("warning", "\The [src] buzzes as you enter passcode."))
to_chat(usr, SPAN_WARNING("\The [src] buzzes as you enter passcode."))
return
if(href_list["set_passcode"])
if(!locked)
code/game/objects/items/devices/radio/radio.dm
+1 -1
View File
@@ -311,7 +311,7 @@ var/global/list/default_medbay_channels = list(
if (iscarbon(M))
var/mob/living/carbon/C = M
if (CE_UNDEXTROUS in C.chem_effects)
to_chat(M, span("warning", "Your can't move your arms enough to activate the radio..."))
to_chat(M, SPAN_WARNING("Your can't move your arms enough to activate the radio..."))
return
if(istype(M))
code/game/objects/items/devices/scanners.dm
+14 -14
View File
@@ -456,27 +456,27 @@ BREATH ANALYZER
/obj/item/device/slime_scanner/attack(mob/living/M, mob/living/user)
if(!isslime(M))
to_chat(user, span("warning", "This device can only scan slimes!"))
to_chat(user, SPAN_WARNING("This device can only scan slimes!"))
return
var/mob/living/carbon/slime/T = M
to_chat(user, span("notice", "**************************"))
to_chat(user, span("notice", "Slime scan results:"))
to_chat(user, span("notice", capitalize_first_letters("[T.colour] [T.is_adult ? "adult" : "baby"] slime")))
to_chat(user, span("notice", "Health: [T.health]"))
to_chat(user, span("notice", "Nutrition: [T.nutrition]/[T.get_max_nutrition()]"))
to_chat(user, SPAN_NOTICE("**************************"))
to_chat(user, SPAN_NOTICE("Slime scan results:"))
to_chat(user, SPAN_NOTICE(capitalize_first_letters("[T.colour] [T.is_adult ? "adult" : "baby"] slime")))
to_chat(user, SPAN_NOTICE("Health: [T.health]"))
to_chat(user, SPAN_NOTICE("Nutrition: [T.nutrition]/[T.get_max_nutrition()]"))
if(T.nutrition < T.get_starve_nutrition())
to_chat(user, span("alert", "Warning: slime is starving!"))
to_chat(user, SPAN_ALERT("Warning: slime is starving!"))
else if (T.nutrition < T.get_hunger_nutrition())
to_chat(user, span("warning", "Warning: slime is hungry!"))
to_chat(user, span("notice", "Electric charge strength: [T.powerlevel]"))
to_chat(user, span("notice", "Growth progress: [T.amount_grown]/10"))
to_chat(user, SPAN_WARNING("Warning: slime is hungry!"))
to_chat(user, SPAN_NOTICE("Electric charge strength: [T.powerlevel]"))
to_chat(user, SPAN_NOTICE("Growth progress: [T.amount_grown]/10"))
if(T.cores > 1)
to_chat(user, span("warning", "Anomalous number of slime cores detected."))
to_chat(user, SPAN_WARNING("Anomalous number of slime cores detected."))
else if(!T.cores)
to_chat(user, span("warning", "No slime cores detected."))
to_chat(user, span("notice", "Genetic Information:"))
to_chat(user, SPAN_WARNING("No slime cores detected."))
to_chat(user, SPAN_NOTICE("Genetic Information:"))
if(T.slime_mutation[4] == T.colour)
to_chat(user, span("warning", "This slime cannot evolve any further."))
to_chat(user, SPAN_WARNING("This slime cannot evolve any further."))
else
var/list/poss_mutations = uniquelist(T.slime_mutation)
var/mutation_message = capitalize(english_list(poss_mutations))
code/game/objects/items/devices/suit_cooling.dm
+15 -15
View File
@@ -116,7 +116,7 @@
/obj/item/device/suit_cooling_unit/proc/turn_off()
if(ismob(src.loc))
var/mob/M = src.loc
to_chat(M, span("warning", "\The [src] clicks and whines as it powers down."))
to_chat(M, SPAN_WARNING("\The [src] clicks and whines as it powers down."))
on = FALSE
update_icon()
@@ -130,7 +130,7 @@
cell.add_fingerprint(user)
cell.update_icon()
to_chat(user, span("notice", "You remove the [src.cell]."))
to_chat(user, SPAN_NOTICE("You remove the [src.cell]."))
src.cell = null
update_icon()
return
@@ -141,27 +141,27 @@
else
turn_on()
if(on)
to_chat(user, span("notice", "You switch on the [src]."))
to_chat(user, SPAN_NOTICE("You switch on the [src]."))
/obj/item/device/suit_cooling_unit/attackby(obj/item/W, mob/user)
if(W.isscrewdriver())
if(cover_open)
cover_open = FALSE
to_chat(user, span("notice", "You screw the panel into place."))
to_chat(user, SPAN_NOTICE("You screw the panel into place."))
else
cover_open = TRUE
to_chat(user, span("notice", "You unscrew the panel."))
to_chat(user, SPAN_NOTICE("You unscrew the panel."))
update_icon()
return
if(istype(W, /obj/item/cell))
if(cover_open)
if(cell)
to_chat(user, span("warning", "There is a [cell] already installed here."))
to_chat(user, SPAN_WARNING("There is a [cell] already installed here."))
else
user.drop_from_inventory(W,src)
cell = W
to_chat(user, span("notice", "You insert the [cell]."))
to_chat(user, SPAN_NOTICE("You insert the [cell]."))
update_icon()
return
@@ -201,26 +201,26 @@
if(on)
if(attached_to_suit(src.loc))
to_chat(user, span("notice", "It's switched on and running."))
to_chat(user, SPAN_NOTICE("It's switched on and running."))
else if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.species.flags & ACCEPTS_COOLER)
to_chat(user, span("notice", "It's switched on and running, connected to the cooling systems of [H]."))
to_chat(user, SPAN_NOTICE("It's switched on and running, connected to the cooling systems of [H]."))
else
to_chat(user, span("notice", "It's switched on, but not attached to anything."))
to_chat(user, SPAN_NOTICE("It's switched on, but not attached to anything."))
else
to_chat(user, span("notice", "It is switched off."))
to_chat(user, SPAN_NOTICE("It is switched off."))
if(cover_open)
if(cell)
to_chat(user, span("notice", "The panel is open, exposing the [cell]."))
to_chat(user, SPAN_NOTICE("The panel is open, exposing the [cell]."))
else
to_chat(user, span("notice", "The panel is open."))
to_chat(user, SPAN_NOTICE("The panel is open."))
if(cell)
to_chat(user, span("notice", "The charge meter reads [round(cell.percent())]%."))
to_chat(user, SPAN_NOTICE("The charge meter reads [round(cell.percent())]%."))
else
to_chat(user, span("notice", "It doesn't have a power cell installed."))
to_chat(user, SPAN_NOTICE("It doesn't have a power cell installed."))
/obj/item/device/suit_cooling_unit/no_cell
celltype = null
code/game/objects/items/devices/t_scanner.dm
+2 -2
View File
@@ -28,7 +28,7 @@
icon_state = "t-ray[on]"
/obj/item/device/t_scanner/emp_act()
audible_message(src, span("notice", "\The [src] buzzes oddly."))
audible_message(src, SPAN_NOTICE("\The [src] buzzes oddly."))
set_active(FALSE)
/obj/item/device/t_scanner/attack_self(mob/user)
@@ -38,7 +38,7 @@
/obj/item/device/t_scanner/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
var/obj/structure/disposalpipe/D = target
if(D && istype(D))
to_chat(user, span("info", "Pipe segment integrity: [(D.health / 10) * 100]%"))
to_chat(user, SPAN_INFO("Pipe segment integrity: [(D.health / 10) * 100]%"))
/obj/item/device/t_scanner/proc/set_active(var/active)
on = active
code/game/objects/items/skrell.dm
+4 -4
View File
@@ -185,14 +185,14 @@
// Could add some stuff to this in the future? I dunno. I just couldn't figure out how to callback to_chat LOL - geeves
/obj/item/jargontag/proc/do_loyalty(var/mob/wearer)
to_chat(wearer, span("good", "You feel an intense feeling of loyalty towards the Jargon Federation surge through your brain."))
to_chat(wearer, SPAN_GOOD("You feel an intense feeling of loyalty towards the Jargon Federation surge through your brain."))
/obj/item/jargontag/proc/clamp_on(var/mob/wearer)
if(fried)
return
canremove = FALSE
icon_state = "[initial(icon_state)]_active"
to_chat(wearer, span("warning", "\The [src] clamps down around your ear, releasing a burst of static before going silent. Something probes at your ear canal..."))
to_chat(wearer, SPAN_WARNING("\The [src] clamps down around your ear, releasing a burst of static before going silent. Something probes at your ear canal..."))
addtimer(CALLBACK(src, .proc/do_loyalty, wearer), 15)
/obj/item/jargontag/proc/unclamp()
@@ -200,7 +200,7 @@
return
if(!canremove)
icon_state = initial(icon_state)
visible_message(span("warning", "\The [src] fizzles loudly, then clicks open!"))
visible_message(SPAN_WARNING("\The [src] fizzles loudly, then clicks open!"))
canremove = TRUE
fried = TRUE
@@ -212,5 +212,5 @@
unclamp()
return TRUE
else
to_chat(user, span("notice", "\The [src] isn't locked down, your e-mag has no effect!"))
to_chat(user, SPAN_NOTICE("\The [src] isn't locked down, your e-mag has no effect!"))
return FALSE
code/game/objects/items/stacks/stack.dm
+1 -1
View File
@@ -198,7 +198,7 @@
/obj/item/stack/proc/can_use(var/used, var/mob/user=null)
if (get_amount() < used)
if(user && isrobot(user))
to_chat(user, span("warning", "You don't have enough charge left in your synthesizer!"))
to_chat(user, SPAN_WARNING("You don't have enough charge left in your synthesizer!"))
return 0
return 1
code/game/objects/items/stacks/wrap.dm
+3 -3
View File
@@ -15,12 +15,12 @@
/obj/item/stack/wrapping_paper/attackby(obj/item/W, mob/user)
..()
if (!isturf(loc))
to_chat(user, span("warning", "The paper must be set down for you to wrap a gift!"))
to_chat(user, SPAN_WARNING("The paper must be set down for you to wrap a gift!"))
return
if (W.w_class < 4)
var/a_used = 2 * (src.w_class - 1)
if (src.amount < a_used)
to_chat(user, span("warning", "You need more paper!"))
to_chat(user, SPAN_WARNING("You need more paper!"))
return
else
if(istype(W, /obj/item/smallDelivery) || istype(W, /obj/item/gift)) //No gift wrapping gifts!
@@ -43,7 +43,7 @@
return
else
to_chat(user, span("warning", "This object is far too large to wrap!"))
to_chat(user, SPAN_WARNING("This object is far too large to wrap!"))
return
code/game/objects/items/weapons/autopsy.dm
+5 -5
View File
@@ -140,7 +140,7 @@
scan_data += "<br>"
for(var/mob/O in viewers(usr))
O.show_message(span("notice", "\The [src] rattles and prints out a sheet of paper."), 1)
O.show_message(SPAN_NOTICE("\The [src] rattles and prints out a sheet of paper."), 1)
playsound(loc, "sound/bureaucracy/print_short.ogg", 50, 1)
sleep(10)
@@ -164,19 +164,19 @@
src.wdata = list()
src.chemtraces = list()
src.timeofdeath = null
to_chat(user, span("notice", "A new patient has been registered. Purging data for previous patient."))
to_chat(user, SPAN_NOTICE("A new patient has been registered. Purging data for previous patient."))
src.timeofdeath = M.timeofdeath
var/obj/item/organ/external/S = M.get_organ(user.zone_sel.selecting)
if(!S)
to_chat(usr, span("warning", "You can't scan this body part."))
to_chat(usr, SPAN_WARNING("You can't scan this body part."))
return
if(!S.open)
to_chat(usr, span("warning", "You have to cut the limb open first!"))
to_chat(usr, SPAN_WARNING("You have to cut the limb open first!"))
return
for(var/mob/O in viewers(M))
O.show_message(span("notice", "\The [user] scans the wounds on [M.name]'s [S.name] with \the [src]"), 1)
O.show_message(SPAN_NOTICE("\The [user] scans the wounds on [M.name]'s [S.name] with \the [src]"), 1)
src.add_data(S)
code/game/objects/items/weapons/candle.dm
+5 -5
View File
@@ -30,15 +30,15 @@
var/obj/item/weldingtool/WT = W
if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
light()
to_chat(user, span("notice", "\The [user] casually lights \the [name] with [W]."))
to_chat(user, SPAN_NOTICE("\The [user] casually lights \the [name] with [W]."))
else if(W.isFlameSource())
light()
to_chat(user, span("notice", "\The [user] lights \the [name]."))
to_chat(user, SPAN_NOTICE("\The [user] lights \the [name]."))
else if(istype(W, /obj/item/flame/candle))
var/obj/item/flame/candle/C = W
if(C.lit)
light()
to_chat(user, span("notice", "\The [user] lights \the [name]."))
to_chat(user, SPAN_NOTICE("\The [user] lights \the [name]."))
/obj/item/flame/candle/proc/light()
if(!src.lit)
@@ -58,7 +58,7 @@
new /obj/item/trash/candle(src.loc)
if(istype(src.loc, /mob))
src.dropped()
to_chat(user, span("notice", "The candle burns out."))
to_chat(user, SPAN_NOTICE("The candle burns out."))
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
STOP_PROCESSING(SSprocessing, src)
qdel(src)
@@ -70,7 +70,7 @@
/obj/item/flame/candle/attack_self(mob/user as mob)
if(lit)
lit = 0
to_chat(user, span("notice", "You snuff out the flame."))
to_chat(user, SPAN_NOTICE("You snuff out the flame."))
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
update_icon()
set_light(0)
code/game/objects/items/weapons/chaplain_items.dm
+15 -15
View File
@@ -56,7 +56,7 @@
if(!ispath(nullchoices[picked]))
return
to_chat(user, span("notice", "You start reassembling your obsidian relic."))
to_chat(user, SPAN_NOTICE("You start reassembling your obsidian relic."))
if(!do_after(user, 2 SECONDS))
return
@@ -72,16 +72,16 @@
if(LAZYLEN(user.spell_list))
user.silence_spells(300) //30 seconds
to_chat(user, span("danger", "You've been silenced!"))
to_chat(user, SPAN_DANGER("You've been silenced!"))
return
if(!user.IsAdvancedToolUser())
to_chat(user, span("danger", "You don't have the dexterity to use this!"))
to_chat(user, SPAN_DANGER("You don't have the dexterity to use this!"))
return
if((user.is_clumsy()) && prob(50))
to_chat(user, span("danger", "The [src] slips out of your hand and you hit yourself!"))
visible_message(span("danger", "[user] fumbles with the [src] and hits themselves in the process!"))
to_chat(user, SPAN_DANGER("The [src] slips out of your hand and you hit yourself!"))
visible_message(SPAN_DANGER("[user] fumbles with the [src] and hits themselves in the process!"))
user.take_organ_damage(10)
user.Paralyse(20)
return
@@ -90,25 +90,25 @@
var/mob/living/K = M
if(cult && (K.mind in cult.current_antagonists) && prob(75))
if(do_after(user, 15))
K.visible_message(span("danger", "[user] waves \the [src] over \the [K]'s head, [K] looks captivated by it."), span("warning", "[user] waves the [src] over your head. <b>You see a foreign light, asking you to follow it. Its presence burns and blinds.</b>"))
K.visible_message(SPAN_DANGER("[user] waves \the [src] over \the [K]'s head, [K] looks captivated by it."), SPAN_WARNING("[user] waves the [src] over your head. <b>You see a foreign light, asking you to follow it. Its presence burns and blinds.</b>"))
var/choice = alert(K,"Do you want to give up your goal?","Become cleansed","Resist","Give in")
switch(choice)
if("Resist")
K.visible_message(span("warning", "The gaze in [K]'s eyes remains determined."), span("notice", "You turn away from the light, remaining true to the Geometer!"))
K.visible_message(SPAN_WARNING("The gaze in [K]'s eyes remains determined."), SPAN_NOTICE("You turn away from the light, remaining true to the Geometer!"))
K.say("*scream")
K.take_overall_damage(5, 15)
admin_attack_log(user, M, "attempted to deconvert", "was unsuccessfully deconverted by", "attempted to deconvert")
if("Give in")
K.visible_message(span("notice", "[K]'s eyes become clearer, the evil gone, but not without leaving scars."))
K.visible_message(SPAN_NOTICE("[K]'s eyes become clearer, the evil gone, but not without leaving scars."))
K.take_overall_damage(10, 20)
cult.remove_antagonist(K.mind)
admin_attack_log(user, M, "successfully deconverted", "was successfully deconverted by", "successfully deconverted")
else
user.visible_message(span("warning", "[user]'s concentration is broken!"), span("warning", "Your concentration is broken! You and your target need to stay uninterrupted for longer!"))
user.visible_message(SPAN_WARNING("[user]'s concentration is broken!"), SPAN_WARNING("Your concentration is broken! You and your target need to stay uninterrupted for longer!"))
return
else
to_chat(user, span("danger", "The [src] appears to do nothing."))
M.visible_message(span("danger", "\The [user] waves \the [src] over \the [M]'s head."))
to_chat(user, SPAN_DANGER("The [src] appears to do nothing."))
M.visible_message(SPAN_DANGER("\The [user] waves \the [src] over \the [M]'s head."))
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(prob(25))
@@ -117,7 +117,7 @@
H.cure_all_traumas(cure_type = CURE_CRYSTAL)
return
else if(user.a_intent != I_HURT) // to prevent the chaplain from hurting peoples accidentally
to_chat(user, span("notice", "The [src] appears to do nothing."))
to_chat(user, SPAN_NOTICE("The [src] appears to do nothing."))
return
else
return ..()
@@ -127,7 +127,7 @@
return
if(istype(A, /turf/simulated/floor) && (cooldown + 5 SECONDS < world.time))
cooldown = world.time
user.visible_message(span("notice", "[user] loudly taps their [src.name] against the floor."))
user.visible_message(SPAN_NOTICE("[user] loudly taps their [src.name] against the floor."))
playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
var/rune_found = FALSE
for(var/obj/effect/rune/R in orange(2, get_turf(src)))
@@ -164,7 +164,7 @@
return ..()
else if(proximity)
if(contents.len)
to_chat(user, span("warning", "\The [src] is already full!"))
to_chat(user, SPAN_WARNING("\The [src] is already full!"))
return
user.visible_message("[user] scoops \the [A] into \the [src], securing the lid.", "You scoop \the [A] into \the [src], securing the lid.")
desc = "A vase used to store the ashes of the deceased. It contains some ashes."
@@ -172,7 +172,7 @@
/obj/item/material/urn/attack_self(mob/user)
if(!contents.len)
to_chat(user, span("warning", "\The [src] is empty!"))
to_chat(user, SPAN_WARNING("\The [src] is empty!"))
return
else
for(var/obj/effect/decal/cleanable/ash/A in contents)
code/game/objects/items/weapons/chewables.dm
+3 -3
View File
@@ -15,7 +15,7 @@
/obj/item/clothing/mask/chewable/attack_self(mob/user)
if(wrapped)
wrapped = FALSE
to_chat(user, span("notice", "You unwrap \the [name]."))
to_chat(user, SPAN_NOTICE("You unwrap \the [name]."))
playsound(src.loc, 'sound/items/drop/wrapper.ogg', 50, 1)
slot_flags = SLOT_EARS | SLOT_MASK
update_icon()
@@ -42,7 +42,7 @@ obj/item/clothing/mask/chewable/Initialize()
if(C.check_has_mouth())
START_PROCESSING(SSprocessing, src)
else
to_chat(user, span("notice", "You don't have a mouth, and can't make much use of \the [src]."))
to_chat(user, SPAN_NOTICE("You don't have a mouth, and can't make much use of \the [src]."))
/obj/item/clothing/mask/chewable/dropped()
STOP_PROCESSING(SSprocessing, src)
@@ -96,7 +96,7 @@ obj/item/clothing/mask/chewable/Destroy()
if(ismob(loc))
var/mob/living/M = loc
if (!no_message)
to_chat(M, span("notice", "You spit out the [name]."))
to_chat(M, SPAN_NOTICE("You spit out the [name]."))
qdel(src)
/obj/item/clothing/mask/chewable/tobacco/bad
code/game/objects/items/weapons/cigs_lighters.dm
+33 -33
View File
@@ -235,7 +235,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(ismob(loc))
var/mob/living/M = loc
if (!nomessage)
to_chat(M, span("notice", "Your [name] goes out."))
to_chat(M, SPAN_NOTICE("Your [name] goes out."))
M.remove_from_mob(src) //un-equip it so the overlays can update
M.update_inv_wear_mask(0)
M.update_inv_l_hand(0)
@@ -247,7 +247,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(ismob(loc))
var/mob/living/M = loc
if (!nomessage)
to_chat(M, span("notice", "Your [name] goes out, and you empty the ash."))
to_chat(M, SPAN_NOTICE("Your [name] goes out, and you empty the ash."))
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
lit = 0
icon_state = icon_off
@@ -313,7 +313,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(istype(W, /obj/item/melee/energy/sword))
var/obj/item/melee/energy/sword/S = W
if(S.active)
light(span("warning", "[user] swings their [W], barely missing themselves. They light their [name] in the process."))
light(SPAN_WARNING("[user] swings their [W], barely missing themselves. They light their [name] in the process."))
return
@@ -321,7 +321,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(lit && H == user && istype(H))
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
to_chat(H, span("warning", "\The [blocked] is in the way!"))
to_chat(H, SPAN_WARNING("\The [blocked] is in the way!"))
return 1
if(last_drag <= world.time - 30) //Spam limiter. Only for messages/sound.
last_drag = world.time
@@ -338,17 +338,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(istype(glass)) //you can dip cigarettes into beakers
var/transfered = glass.reagents.trans_to_obj(src, chem_volume)
if(transfered) //if reagents were transfered, show the message
to_chat(user, span("warning", "You dip \the [src] into \the [glass]."))
to_chat(user, SPAN_WARNING("You dip \the [src] into \the [glass]."))
playsound(src.loc, 'sound/effects/footstep/water1.ogg', 50, 1)
else //if not, either the beaker was empty, or the cigarette was full
if(!glass.reagents.total_volume)
to_chat(user, span("notice", "[glass] is empty."))
to_chat(user, SPAN_NOTICE("[glass] is empty."))
else
to_chat(user, span("notice", "[src] is full."))
to_chat(user, SPAN_NOTICE("[src] is full."))
/obj/item/clothing/mask/smokable/cigarette/attack_self(mob/user as mob)
if(lit == TRUE)
user.visible_message(span("notice", "[user] calmly drops and treads on the lit [src], putting it out instantly."))
user.visible_message(SPAN_NOTICE("[user] calmly drops and treads on the lit [src], putting it out instantly."))
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
die(TRUE)
return ..()
@@ -567,7 +567,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/pipe/attack_self(mob/user as mob)
if(lit == TRUE)
user.visible_message(span("notice", "[user] puts out [src]."), span("notice", "You put out [src]."))
user.visible_message(SPAN_NOTICE("[user] puts out [src]."), SPAN_NOTICE("You put out [src]."))
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
lit = 0
icon_state = icon_off
@@ -575,7 +575,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
STOP_PROCESSING(SSprocessing, src)
else if (burn_rate)
var/turf/location = get_turf(user)
user.visible_message(span("notice", "[user] empties out [src]."), span("notice", "You empty out [src]."))
user.visible_message(SPAN_NOTICE("[user] empties out [src]."), SPAN_NOTICE("You empty out [src]."))
new /obj/effect/decal/cleanable/ash(location)
burn_rate = 0
reagents.clear_reagents()
@@ -590,10 +590,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if (istype(W, /obj/item/reagent_containers/food/snacks))
var/obj/item/reagent_containers/food/snacks/grown/G = W
if (!G.dry)
to_chat(user, span("notice", "[G] must be dried before you stuff it into [src]."))
to_chat(user, SPAN_NOTICE("[G] must be dried before you stuff it into [src]."))
return
if (burn_rate)
to_chat(user, span("notice", "[src] is already packed."))
to_chat(user, SPAN_NOTICE("[src] is already packed."))
return
if(G.reagents)
initial_volume = G.reagents.total_volume
@@ -605,15 +605,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else if(istype(W, /obj/item/flame/lighter))
var/obj/item/flame/lighter/L = W
if(L.lit)
light(span("notice", "[user] manages to light their [name] with [W]."))
light(SPAN_NOTICE("[user] manages to light their [name] with [W]."))
else if(istype(W, /obj/item/flame/match))
var/obj/item/flame/match/M = W
if(M.lit)
light(span("notice", "[user] lights their [name] with their [W]."))
light(SPAN_NOTICE("[user] lights their [name] with their [W]."))
else if(istype(W, /obj/item/device/assembly/igniter))
light(span("notice", "[user] fiddles with [W], and manages to light their [name] with the power of science."))
light(SPAN_NOTICE("[user] fiddles with [W], and manages to light their [name] with the power of science."))
user.update_inv_wear_mask(0)
user.update_inv_l_hand(0)
@@ -690,20 +690,20 @@ CIGARETTE PACKETS ARE IN FANCY.DM
update_icon()
playsound(src.loc, pick(activation_sound), 75, 1)
if(istype(src, /obj/item/flame/lighter/zippo) )
user.visible_message(span("notice", "Without even breaking stride, [user] flips open and lights [src] in one smooth movement."))
user.visible_message(SPAN_NOTICE("Without even breaking stride, [user] flips open and lights [src] in one smooth movement."))
else
if(prob(95))
user.visible_message(span("notice", "After a few attempts, [user] manages to light the [src]."))
user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light the [src]."))
else
to_chat(user, span("warning", "You burn yourself while lighting the lighter."))
to_chat(user, SPAN_WARNING("You burn yourself while lighting the lighter."))
if(user.IgniteMob())
user.visible_message(span("danger","\The [user] accidentally sets themselves on fire!"))
user.visible_message(SPAN_DANGER("\The [user] accidentally sets themselves on fire!"))
if (user.l_hand == src)
user.apply_damage(2,BURN,BP_L_HAND)
else
user.apply_damage(2,BURN,BP_R_HAND)
user.visible_message(span("notice", "After a few attempts, [user] manages to light the [src], they however burn their finger in the process."))
user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light the [src], they however burn their finger in the process."))
set_light(2, 1, l_color = LIGHT_COLOR_LAVA)
START_PROCESSING(SSprocessing, src)
@@ -712,9 +712,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
update_icon()
playsound(src.loc, deactivation_sound, 75, 1)
if(istype(src, /obj/item/flame/lighter/zippo) )
user.visible_message(span("notice", "You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing."))
user.visible_message(SPAN_NOTICE("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing."))
else
user.visible_message(span("notice", "[user] quietly shuts off the [src]."))
user.visible_message(SPAN_NOTICE("[user] quietly shuts off the [src]."))
set_light(0)
STOP_PROCESSING(SSprocessing, src)
@@ -728,7 +728,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
return
if(lit && M.IgniteMob())
M.visible_message(span("danger","\The [user] ignites \the [M] with \the [src]!"))
M.visible_message(SPAN_DANGER("\The [user] ignites \the [M] with \the [src]!"))
if(istype(M.wear_mask, /obj/item/clothing/mask/smokable/cigarette) && user.zone_sel.selecting == BP_MOUTH && lit)
var/obj/item/clothing/mask/smokable/cigarette/cig = M.wear_mask
@@ -736,16 +736,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM
cig.attackby(src, user)
else
if(istype(src, /obj/item/flame/lighter/zippo))
cig.light(span("notice", "[user] whips the [name] out and holds it for [M]."))
cig.light(SPAN_NOTICE("[user] whips the [name] out and holds it for [M]."))
else
cig.light(span("notice", "[user] holds the [name] out for [M], and lights the [cig.name]."))
cig.light(SPAN_NOTICE("[user] holds the [name] out for [M], and lights the [cig.name]."))
else
..()
/obj/item/flame/lighter/throw_impact(mob/living/carbon/M as mob)
. = ..()
if(istype(M) && lit && M.IgniteMob())
M.visible_message(span("danger","\The [M] is ignited by \the [src]!"))
M.visible_message(SPAN_DANGER("\The [M] is ignited by \the [src]!"))
/obj/item/flame/lighter/process()
var/turf/location = get_turf(src)
@@ -755,7 +755,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(lit && prob(10) && isliving(src.loc))
var/mob/living/M = src.loc
if(M.IgniteMob())
M.visible_message(span("danger","\The [M] is ignited by \the [src]!"))
M.visible_message(SPAN_DANGER("\The [M] is ignited by \the [src]!"))
if (istype(loc, /obj/item/storage))//A lighter shouldn't stay lit inside a closed container
lit = 0
@@ -834,7 +834,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
..()
return
if (user.a_intent == I_GRAB && icon_state != "scrap" && !istype(src, /obj/item/paper/carbon))
user.show_message(span("alert", "The cigarette paper is too small to fold into a plane."))
user.show_message(SPAN_ALERT("The cigarette paper is too small to fold into a plane."))
return
//tobacco sold seperately if you're too snobby to grow it yourself.
@@ -860,13 +860,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/cigarette/rolled/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/paper/cig/filter))
if(filter)
to_chat(user, span("warning", "[src] already has a filter!"))
to_chat(user, SPAN_WARNING("[src] already has a filter!"))
return
if(lit)
to_chat(user, span("warning", "[src] is lit already!"))
to_chat(user, SPAN_WARNING("[src] is lit already!"))
return
if(user.unEquip(I))
to_chat(user, span("notice", "You stick [I] into \the [src]"))
to_chat(user, SPAN_NOTICE("You stick [I] into \the [src]"))
playsound(src, 'sound/items/drop/gloves.ogg', 25, 1)
filter = 1
name = "filtered [name]"
@@ -878,13 +878,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/I, mob/user)
if(is_type_in_list(I, list(/obj/item/paper/cig/, /obj/item/paper/, /obj/item/teleportation_scroll)))
if(!dry)
to_chat(user, span("warning", "You need to dry [src] first!"))
to_chat(user, SPAN_WARNING("You need to dry [src] first!"))
return
if(user.unEquip(I))
var/obj/item/clothing/mask/smokable/cigarette/rolled/R = new(get_turf(src))
R.chem_volume = reagents.total_volume
reagents.trans_to_holder(R.reagents, R.chem_volume)
to_chat(user, span("notice", "You roll \the [src] into \the [I]"))
to_chat(user, SPAN_NOTICE("You roll \the [src] into \the [I]"))
playsound(src, 'sound/bureaucracy/paperfold.ogg', 25, 1)
user.put_in_active_hand(R)
qdel(I)
code/game/objects/items/weapons/gift_wrappaper.dm
+3 -3
View File
@@ -224,7 +224,7 @@
var/atom/movable/I = new gift_type(get_turf(user))
user.remove_from_mob(src)
user.put_in_hands(I)
to_chat(user, span("notice", "You open the gift, revealing your new [I.name]! Just what you always wanted!"))
to_chat(user, SPAN_NOTICE("You open the gift, revealing your new [I.name]! Just what you always wanted!"))
qdel(src)
return
@@ -294,7 +294,7 @@
user.remove_from_mob(src)
if (!user.put_in_hands(I))
user.forceMove(get_turf(src))
to_chat(user, span("notice", "You open the gift, revealing your new [I.name]! Just what you always wanted!"))
to_chat(user, SPAN_NOTICE("You open the gift, revealing your new [I.name]! Just what you always wanted!"))
qdel(src)
return
@@ -338,6 +338,6 @@
var/atom/movable/I = new gift_type(get_turf(user))
user.remove_from_mob(src)
user.put_in_hands(I)
to_chat(user, span("notice", "You open the gift, revealing your new [I.name]! Just what you always wanted!"))
to_chat(user, SPAN_NOTICE("You open the gift, revealing your new [I.name]! Just what you always wanted!"))
qdel(src)
return
code/game/objects/items/weapons/implants/implant.dm
+3 -3
View File
@@ -612,7 +612,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
for(var/obj/item/implant/mindshield/I in H)
if(I.implanted)
to_chat(H, span("danger", "Rage surges through your body, but the nanobots from your mind shield implant stop it soon after it starts!"))
to_chat(H, SPAN_DANGER("Rage surges through your body, but the nanobots from your mind shield implant stop it soon after it starts!"))
return TRUE
var/datum/antagonist/antag_data = get_antag_data(H.mind.special_role)
@@ -621,10 +621,10 @@ the implant may become unstable and either pre-maturely inject the subject or si
log_and_message_admins("[key_name(H)] was implanted by an aggression implant, but was not effected.", H)
else if(antag_data?.id == MODE_LOYALIST)
clear_antag_roles(H.mind, 1)
to_chat(H, span("danger", "You feel a surge of rage override your loyalty!"))
to_chat(H, SPAN_DANGER("You feel a surge of rage override your loyalty!"))
log_and_message_admins("[key_name(H)] was implanted by an aggression implant, clearing their loyalist status!", H)
else
to_chat(H, span("danger", "You feel a surge of rage course through your body and very soul!"))
to_chat(H, SPAN_DANGER("You feel a surge of rage course through your body and very soul!"))
log_and_message_admins("[key_name(H)] was implanted by an aggression implant!", H)
return TRUE
code/game/objects/items/weapons/material/kitchen.dm
+6 -6
View File
@@ -49,15 +49,15 @@
if (fullness > (550 * (1 + M.overeatduration / 2000)))
to_chat(M, "You cannot force anymore food down!")
return
M.visible_message(span("notice", "\The [user] [is_liquid ? "drinks" : "eats"] some [loaded] from \the [src]."))
M.visible_message(SPAN_NOTICE("\The [user] [is_liquid ? "drinks" : "eats"] some [loaded] from \the [src]."))
else
if (fullness > (550 * (1 + M.overeatduration / 2000)))
to_chat(M, "You cannot force anymore food down their throat!")
return
user.visible_message(span("warning", "\The [user] begins to feed \the [M]!"))
user.visible_message(SPAN_WARNING("\The [user] begins to feed \the [M]!"))
if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS)))
return
M.visible_message(span("notice", "\The [user] feeds some [loaded] to \the [M] with \the [src]."))
M.visible_message(SPAN_NOTICE("\The [user] feeds some [loaded] to \the [M] with \the [src]."))
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
if(is_liquid)
playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)
@@ -67,7 +67,7 @@
cut_overlays()
return
else
to_chat(user, span("warning", "You don't have anything on \the [src].")) //if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK)
to_chat(user, SPAN_WARNING("You don't have anything on \the [src].")) //if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK)
return
/obj/item/material/kitchen/utensil/fork
@@ -114,7 +114,7 @@
/obj/item/material/kitchen/utensil/knife/attack(mob/target, mob/living/user, var/target_zone)
if ((user.is_clumsy()) && prob(50))
to_chat(user, span("warning", "You accidentally cut yourself with \the [src]."))
to_chat(user, SPAN_WARNING("You accidentally cut yourself with \the [src]."))
user.take_organ_damage(20)
return
return ..()
@@ -139,7 +139,7 @@
/obj/item/material/kitchen/rollingpin/attack(mob/living/M, mob/living/user, var/target_zone)
if ((user.is_clumsy()) && prob(50))
to_chat(user, span("warning", "\The [src] slips out of your hand and hits your head."))
to_chat(user, SPAN_WARNING("\The [src] slips out of your hand and hits your head."))
user.drop_from_inventory(src)
user.take_organ_damage(10)
user.Paralyse(2)
code/game/objects/items/weapons/material/shards.dm
+1 -1
View File
@@ -64,7 +64,7 @@
if(M.buckled) //wheelchairs, office chairs, rollerbeds
return
to_chat(M, span("danger", "You step on \the [src]!"))
to_chat(M, SPAN_DANGER("You step on \the [src]!"))
playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
if(ishuman(M))
var/mob/living/carbon/human/H = M
code/game/objects/items/weapons/material/twohanded.dm
+2 -2
View File
@@ -375,7 +375,7 @@
/obj/item/material/twohanded/chainsaw/proc/PowerUp()
var/turf/T = get_turf(src)
T.audible_message(span("notice", "\The [src] rumbles to life."))
T.audible_message(SPAN_NOTICE("\The [src] rumbles to life."))
playsound(src, "sound/weapons/chainsawstart.ogg", 25, 0, 30)
force = 15
force_unwielded = 30
@@ -390,7 +390,7 @@
/obj/item/material/twohanded/chainsaw/proc/PowerDown()
var/turf/T = get_turf(src)
T.audible_message(span("notice", "\The [src] slowly powers down."))
T.audible_message(SPAN_NOTICE("\The [src] slowly powers down."))
force = initial(force)
force_wielded = initial(force_wielded)
throwforce = initial(throwforce)
code/game/objects/items/weapons/melee/energy.dm
+2 -2
View File
@@ -286,12 +286,12 @@
/obj/item/melee/energy/sword/hegemony/activate(mob/living/user)
..()
icon_state = "kataphract-esword1"
to_chat(user, span("notice", "\The [src] is now energised."))
to_chat(user, SPAN_NOTICE("\The [src] is now energised."))
/obj/item/melee/energy/sword/hegemony/deactivate(mob/living/user)
..()
icon_state = initial(icon_state)
to_chat(user, span("notice", "\The [src] is de-energised."))
to_chat(user, SPAN_NOTICE("\The [src] is de-energised."))
/obj/item/melee/energy/sword/knife
name = "energy utility knife"
code/game/objects/items/weapons/melee/misc.dm
+2 -2
View File
@@ -42,13 +42,13 @@
active= !active
if(active)
playsound(user, 'sound/weapons/saw/chainsawstart.ogg', 50, 1)
to_chat(user, span("notice", "\The [src] rumbles to life."))
to_chat(user, SPAN_NOTICE("\The [src] rumbles to life."))
force = 35
hitsound = 'sound/weapons/saw/chainsword.ogg'
icon_state = "chainswordon"
slot_flags = null
else
to_chat(user, span("notice", "\The [src] slowly powers down."))
to_chat(user, SPAN_NOTICE("\The [src] slowly powers down."))
force = initial(force)
hitsound = initial(hitsound)
icon_state = initial(icon_state)
code/game/objects/items/weapons/mop.dm
+5 -5
View File
@@ -34,10 +34,10 @@
if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
if(reagents.total_volume < 1)
if(clean_msg)
to_chat(user, span("notice", "Your mop is dry!"))
to_chat(user, SPAN_NOTICE("Your mop is dry!"))
return
if (!(last_clean && world.time < last_clean + 120)) //spam is bad
user.visible_message(span("warning", "[user] begins to mop \the [get_turf(A)]."))
user.visible_message(SPAN_WARNING("[user] begins to mop \the [get_turf(A)]."))
clean_msg = TRUE
last_clean = world.time
else
@@ -49,7 +49,7 @@
if(T)
T.clean(src, user)
if(clean_msg)
to_chat(user, span("notice", "You have finished mopping!"))
to_chat(user, SPAN_NOTICE("You have finished mopping!"))
update_icon()
@@ -93,7 +93,7 @@
START_PROCESSING(SSprocessing, src)
else
STOP_PROCESSING(SSprocessing,src)
to_chat(user, span("notice", "You set the condenser switch to the <b>'[refill_enabled ? "ON" : "OFF"]'</b> position."))
to_chat(user, SPAN_NOTICE("You set the condenser switch to the <b>'[refill_enabled ? "ON" : "OFF"]'</b> position."))
playsound(user, 'sound/machines/click.ogg', 25, 1)
/obj/item/mop/advanced/process()
@@ -102,7 +102,7 @@
/obj/item/mop/advanced/examine(mob/user)
..()
to_chat(user, span("notice", "\The condenser switch is set to <b>[refill_enabled ? "ON" : "OFF"]</b>."))
to_chat(user, SPAN_NOTICE("\The condenser switch is set to <b>[refill_enabled ? "ON" : "OFF"]</b>."))
/obj/item/mop/advanced/Destroy()
if(refill_enabled)
code/game/objects/items/weapons/policetape.dm
+7 -7
View File
@@ -58,13 +58,13 @@ var/list/tape_roll_applications = list()
/obj/item/taperoll/attack_self(mob/user as mob)
if(icon_state == "[icon_base]_start")
start = get_turf(src)
to_chat(usr, span("notice", "You place the first end of the [src]."))
to_chat(usr, SPAN_NOTICE("You place the first end of the [src]."))
icon_state = "[icon_base]_stop"
else
icon_state = "[icon_base]_start"
end = get_turf(src)
if(start.y != end.y && start.x != end.x || start.z != end.z)
to_chat(usr, span("notice", "[src] can only be laid horizontally or vertically."))
to_chat(usr, SPAN_NOTICE("[src] can only be laid horizontally or vertically."))
return
var/turf/cur = start
@@ -93,7 +93,7 @@ var/list/tape_roll_applications = list()
break
cur = get_step_towards(cur,end)
if (!can_place)
to_chat(usr, span("notice", "You can't run \the [src] through that!"))
to_chat(usr, SPAN_NOTICE("You can't run \the [src] through that!"))
return
cur = start
@@ -106,7 +106,7 @@ var/list/tape_roll_applications = list()
var/obj/item/tape/P = new tape_type(cur)
P.icon_state = "[P.icon_base]_[dir]"
cur = get_step_towards(cur,end)
to_chat(usr, span("notice", "You finish placing the [src].")) //Git Test)
to_chat(usr, SPAN_NOTICE("You finish placing the [src].")) //Git Test)
/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity)
if(!proximity)
@@ -118,7 +118,7 @@ var/list/tape_roll_applications = list()
P.forceMove(locate(T.x,T.y,T.z))
P.icon_state = "[src.icon_base]_door"
P.layer = 3.2
to_chat(user, span("notice", "You finish placing the [src]."))
to_chat(user, SPAN_NOTICE("You finish placing the [src]."))
if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor))
var/turf/F = A
@@ -157,7 +157,7 @@ var/list/tape_roll_applications = list()
/obj/item/tape/attack_hand(mob/user as mob)
if (user.a_intent == I_HELP && src.allowed(user))
user.show_viewers(span("notice", "[user] lifts [src], allowing passage."))
user.show_viewers(SPAN_NOTICE("[user] lifts [src], allowing passage."))
crumple()
lifted = 1
spawn(200)
@@ -171,7 +171,7 @@ var/list/tape_roll_applications = list()
if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user))))
to_chat(user, "You can't break the [src] with that!")
return
user.show_viewers(span("notice", "[user] breaks the [src]!"))
user.show_viewers(SPAN_NOTICE("[user] breaks the [src]!"))
var/dir[2]
var/icon_dir = src.icon_state
code/game/objects/items/weapons/scrolls.dm
+2 -2
View File
@@ -21,9 +21,9 @@
var/mob/living/carbon/human/H = user
var/obj/item/organ/O = H.internal_organs_by_name[pick(BP_EYES, BP_APPENDIX, BP_KIDNEYS, BP_LIVER, BP_HEART, BP_LUNGS, BP_BRAIN)]
if(O == null)
to_chat(user, span("notice", "You can't make any sense of the arcane glyphs. . . maybe you should try again."))
to_chat(user, SPAN_NOTICE("You can't make any sense of the arcane glyphs. . . maybe you should try again."))
else
to_chat(user, span("alert", "As you stumble over the arcane glyphs, you feel a twisting sensation in [O]!"))
to_chat(user, SPAN_ALERT("As you stumble over the arcane glyphs, you feel a twisting sensation in [O]!"))
user.visible_message("<span class='danger'>A flash of smoke pours out of [user]'s orifices!</span>")
playsound(user, 'sound/magic/lightningshock.ogg', 40, 1)
var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
code/game/objects/items/weapons/shields.dm
+2 -2
View File
@@ -299,7 +299,7 @@
throw_speed = 2
w_class = 4
slot_flags = SLOT_BACK
to_chat(user, span("notice","You extend \the [src] downward with a sharp snap of your wrist."))
to_chat(user, SPAN_NOTICE("You extend \the [src] downward with a sharp snap of your wrist."))
else
icon_state = "[initial(icon_state)]"
item_state = "[initial(item_state)]"
@@ -308,7 +308,7 @@
throw_speed = 3
w_class = 3
slot_flags = 0
to_chat(user, span("notice","\The [src] folds inwards neatly as you snap your wrist upwards and push it back into the frame."))
to_chat(user, SPAN_NOTICE("\The [src] folds inwards neatly as you snap your wrist upwards and push it back into the frame."))
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
code/game/objects/items/weapons/soap.dm
+6 -6
View File
@@ -34,7 +34,7 @@
/obj/item/soap/attackby(var/obj/item/I, var/mob/user)
if(istype(I, /obj/item/key))
if(!key_data)
to_chat(user, span("notice", "You imprint \the [I] into \the [src]."))
to_chat(user, SPAN_NOTICE("You imprint \the [I] into \the [src]."))
var/obj/item/key/K = I
key_data = K.key_data
update_icon()
@@ -56,13 +56,13 @@
//I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing.
//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
if(user.client && (target in user.client.screen))
to_chat(user, span("notice", "You need to take that [target.name] off before cleaning it."))
to_chat(user, SPAN_NOTICE("You need to take that [target.name] off before cleaning it."))
else if(istype(target,/obj/structure/sink) || istype(target,/obj/structure/sink))
to_chat(user, span("notice", "You wet \the [src] in the sink."))
to_chat(user, SPAN_NOTICE("You wet \the [src] in the sink."))
wet()
else if (istype(target, /obj/structure/mopbucket) || istype(target, /obj/item/reagent_containers/glass) || istype(target, /obj/structure/reagent_dispensers/watertank))
if (target.reagents && target.reagents.total_volume)
to_chat(user, span("notice", "You wet \the [src] in the [target]."))
to_chat(user, SPAN_NOTICE("You wet \the [src] in the [target]."))
wet()
else
to_chat(user, "\The [target] is empty!")
@@ -77,7 +77,7 @@
if (do_after(user, 25, needhand = 0))
target.clean_blood()
if(clean_msg)
to_chat(user, span("notice", "You scrub \the [target.name] out."))
to_chat(user, SPAN_NOTICE("You scrub \the [target.name] out."))
if(istype(target, /turf) || istype(target, /obj/effect/decal/cleanable) || istype(target, /obj/effect/overlay))
var/turf/T = get_turf(target)
if(T)
@@ -87,7 +87,7 @@
//attack_as_weapon
/obj/item/soap/attack(mob/living/target, mob/living/user, var/target_zone)
if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == BP_MOUTH )
user.visible_message(span("danger", "\The [user] washes \the [target]'s mouth out with soap!"))
user.visible_message(SPAN_DANGER("\The [user] washes \the [target]'s mouth out with soap!"))
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //prevent spam
return
..()
code/game/objects/items/weapons/storage/bible.dm
+2 -2
View File
@@ -30,9 +30,9 @@
if(user.mind && (user.mind.assigned_role == "Chaplain"))
if(A.reagents && A.reagents.has_reagent(/datum/reagent/water)) //blesses all the water in the holder
if(A.reagents.get_reagent_amount(/datum/reagent/water) > 60)
to_chat(user, span("notice", "There's too much water for you to bless at once!"))
to_chat(user, SPAN_NOTICE("There's too much water for you to bless at once!"))
else
to_chat(user, span("notice", "You bless the water in [A], turning it into holy water."))
to_chat(user, SPAN_NOTICE("You bless the water in [A], turning it into holy water."))
var/water2holy = A.reagents.get_reagent_amount(/datum/reagent/water)
A.reagents.del_reagent(/datum/reagent/water)
A.reagents.add_reagent(/datum/reagent/water/holywater, water2holy)
code/game/objects/items/weapons/storage/boxes.dm
+3 -3
View File
@@ -54,7 +54,7 @@
if (istype(L, /mob/living/carbon/alien/diona) || istype(L, /mob/living/simple_animal) || istype(L, /mob/living/carbon/human))//Monkey-like things do attack_generic, not crew
if(contents.len && !locate(/obj/item/reagent_containers/food) in src) // you can tear open empty boxes for nesting material, or for food
to_chat(user, span("warning", "There's no food in that box!"))
to_chat(user, SPAN_WARNING("There's no food in that box!"))
return
var/damage
if (!L.mob_size)
@@ -80,9 +80,9 @@
..()
if (health < maxHealth)
if (health >= (maxHealth * 0.5))
to_chat(user, span("warning", "It is slightly torn."))
to_chat(user, SPAN_WARNING("It is slightly torn."))
else
to_chat(user, span("danger", "It is full of tears and holes."))
to_chat(user, SPAN_DANGER("It is full of tears and holes."))
// BubbleWrap - A box can be folded up to make card
/obj/item/storage/box/attack_self(mob/user as mob)
code/game/objects/items/weapons/storage/firstaid.dm
+4 -4
View File
@@ -164,22 +164,22 @@
/obj/item/storage/pill_bottle/attack_self(mob/living/user)
if(user.get_inactive_hand())
to_chat(user, span("notice","You need an empty hand to take something out."))
to_chat(user, SPAN_NOTICE("You need an empty hand to take something out."))
return
if(contents.len)
var/obj/item/I = contents[1]
if(!remove_from_storage(I,user))
return
if(user.put_in_inactive_hand(I))
to_chat(user, span("notice","You take \the [I] out of \the [src]."))
to_chat(user, SPAN_NOTICE("You take \the [I] out of \the [src]."))
if(iscarbon(user))
var/mob/living/carbon/C = user
C.swap_hand()
else
I.dropInto(loc)
to_chat(user, span("notice","You fumble around with \the [src] and drop \the [I] on the floor."))
to_chat(user, SPAN_NOTICE("You fumble around with \the [src] and drop \the [I] on the floor."))
else
to_chat(user, span("warning","\The [src] is empty."))
to_chat(user, SPAN_WARNING("\The [src] is empty."))
/obj/item/storage/pill_bottle/antitox
code/game/objects/items/weapons/storage/toolbox.dm
+1 -1
View File
@@ -143,7 +143,7 @@
spill(3, get_turf(M))
playsound(M, 'sound/items/trayhit2.ogg', 100, 1) //sound playin' again
update_force()
user.visible_message(span("danger", "[user] smashes the [src] into [M], causing it to break open and strew its contents across the area"))
user.visible_message(SPAN_DANGER("[user] smashes the [src] into [M], causing it to break open and strew its contents across the area"))
/obj/item/storage/toolbox/lunchbox
code/game/objects/items/weapons/surgery_tools.dm
+1 -1
View File
@@ -283,7 +283,7 @@
if(..() && contents.len)
spill(3, get_turf(M))
playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again
user.visible_message(span("danger", "[user] smashes \the [src] into [M], causing it to spill its contents across the area!"))
user.visible_message(SPAN_DANGER("[user] smashes \the [src] into [M], causing it to spill its contents across the area!"))
/obj/item/storage/fancy/tray/throw_impact(atom/hit_atom)
..()
code/game/objects/items/weapons/tanks/jetpack.dm
+2 -2
View File
@@ -82,8 +82,8 @@
M.update_inv_back()
M.update_action_buttons()
to_chat(usr, span("notice", "You toggle the thrusters [on? "on":"off"]."))
to_chat(usr, span("notice", "You toggle the stabilization [stabilization_on? "on":"off"]."))
to_chat(usr, SPAN_NOTICE("You toggle the thrusters [on? "on":"off"]."))
to_chat(usr, SPAN_NOTICE("You toggle the stabilization [stabilization_on? "on":"off"]."))
/obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user as mob)
if(!(src.on))
code/game/objects/items/weapons/tools.dm
+13 -13
View File
@@ -295,16 +295,16 @@
/obj/item/weldingtool/attackby(obj/item/W, mob/user)
if(W.isscrewdriver())
if(isrobot(loc))
to_chat(user, span("alert", "You cannot modify your own welder!"))
to_chat(user, SPAN_ALERT("You cannot modify your own welder!"))
return
if(welding)
to_chat(user, span("danger", "Stop welding first!"))
to_chat(user, SPAN_DANGER("Stop welding first!"))
return
status = !status
if(status)
to_chat(user, span("notice", "You secure the welder."))
to_chat(user, SPAN_NOTICE("You secure the welder."))
else
to_chat(user, span("notice", "The welder can now be attached and modified."))
to_chat(user, SPAN_NOTICE("The welder can now be attached and modified."))
add_fingerprint(user)
return
@@ -352,28 +352,28 @@
return ..()
if(H.isSynthetic() && H == user && !(H.get_species() == "Military Frame"))
to_chat(user, span("warning", "You can't repair damage to your own body - it's against OH&S."))
to_chat(user, SPAN_WARNING("You can't repair damage to your own body - it's against OH&S."))
return
if (!welding)
to_chat(user, span("warning", "You need to light the welding tool first!"))
to_chat(user, SPAN_WARNING("You need to light the welding tool first!"))
return
if(S.brute_dam)
if(S.brute_dam > ROBOLIMB_SELF_REPAIR_CAP)
to_chat(user, span("warning", "The damage is far too severe to patch over externally!"))
to_chat(user, SPAN_WARNING("The damage is far too severe to patch over externally!"))
return
else
repair_organ(user, H, S)
else if(S.open != 2)
to_chat(user, span("notice", "You can't see any external damage to repair."))
to_chat(user, SPAN_NOTICE("You can't see any external damage to repair."))
else
return ..()
/obj/item/weldingtool/proc/repair_organ(var/mob/living/user, var/mob/living/carbon/human/target, var/obj/item/organ/external/affecting)
if(!affecting.brute_dam)
user.visible_message(span("notice", "\The [user] finishes repairing the physical damage on \the [target]'s [affecting.name]."))
user.visible_message(SPAN_NOTICE("\The [user] finishes repairing the physical damage on \the [target]'s [affecting.name]."))
return
if(do_mob(user, target, 30))
@@ -384,7 +384,7 @@
"repairs some joints"
)
affecting.heal_damage(brute = 15, robo_repair = TRUE)
user.visible_message(span("warning", "\The [user] [pick(repair_messages)] on [target]'s [affecting.name] with \the [src]."))
user.visible_message(SPAN_WARNING("\The [user] [pick(repair_messages)] on [target]'s [affecting.name] with \the [src]."))
playsound(target, 'sound/items/Welder2.ogg', 15)
repair_organ(user, target, affecting)
@@ -405,7 +405,7 @@
switch(alert("Are you sure you want to do this? It is quite dangerous and could get you in trouble.", "Heat up fuel tank", "No", "Yes"))
if("Yes")
log_and_message_admins("is attempting to welderbomb", user)
to_chat(user, span("alert", "You start heating the fueltank..."))
to_chat(user, SPAN_ALERT("You start heating the fueltank..."))
tank.armed = 1
if(do_after(user, 100))
if(tank.defuse)
@@ -414,7 +414,7 @@
tank.armed = 0
return
log_and_message_admins("triggered a fuel tank explosion", user)
to_chat(user, span("alert", "That was stupid of you."))
to_chat(user, SPAN_ALERT("That was stupid of you."))
tank.ex_act(3.0)
return
else
@@ -457,7 +457,7 @@
return 1
else
if(M)
to_chat(M, span("notice", "You need more welding fuel to complete this task."))
to_chat(M, SPAN_NOTICE("You need more welding fuel to complete this task."))
return 0
//Returns whether or not the welding tool is currently on.
code/game/objects/items/weapons/traps.dm
+10 -10
View File
@@ -190,7 +190,7 @@
if(!captured)
if(!is_type_in_list(M, allowed_mobs))
to_chat(user, span("warning", "[M] won't fit in there!"))
to_chat(user, SPAN_WARNING("[M] won't fit in there!"))
else if(do_after(user, 5 SECONDS))
capture(M)
else
@@ -208,7 +208,7 @@
to_chat(user, "<span class='warning'>[L] is trapped inside!</span>")
return
else if(deployed)
to_chat(user, span("warning", "It's set up and ready to capture something."))
to_chat(user, SPAN_WARNING("It's set up and ready to capture something."))
else
to_chat(user, "<span class='notice'>\The [src] is empty and un-deployed.</span>")
@@ -382,13 +382,13 @@
var/mob/living/M = G.affecting
if (G.state == GRAB_PASSIVE || G.state == GRAB_UPGRADING)
to_chat(user, span("notice", "You need a better grip on \the [M]!"))
to_chat(user, SPAN_NOTICE("You need a better grip on \the [M]!"))
return
user.visible_message("<span class='notice'>[user] starts putting [M] into \the [src].</span>", "<span class='notice'>You start putting [M] into \the [src].</span>")
if (!is_type_in_list(M, allowed_mobs))
to_chat(user, span("warning", "[M] won't fit in there!"))
to_chat(user, SPAN_WARNING("[M] won't fit in there!"))
return
if (do_mob(user, M, 3 SECONDS, needhand = 0))
@@ -399,7 +399,7 @@
else if(W.iswelder())
var/obj/item/weldingtool/WT = W
if(!WT.welding)
to_chat(user, span("warning", "Your \the [W] is off!"))
to_chat(user, SPAN_WARNING("Your \the [W] is off!"))
return
user.visible_message("<span class='notice'>[user] is trying to slice \the [src] open!</span>",
"<span class='notice'>You are trying to slice \the [src] open!</span>")
@@ -450,7 +450,7 @@
return
if(anchored && deployed)
to_chat(user, span("notice", "\The [src] is already anchored and set!"))
to_chat(user, SPAN_NOTICE("\The [src] is already anchored and set!"))
else if(anchored)
deploy(user)
else
@@ -573,9 +573,9 @@
if(user == buckled_mob)
return
else if(!anchored)
to_chat(user, span("warning", "You need to anchor \the [src] first!"))
to_chat(user, SPAN_WARNING("You need to anchor \the [src] first!"))
else if(captured)
to_chat(user, span("warning", "You can't deploy \the [src] with something caught!"))
to_chat(user, SPAN_WARNING("You can't deploy \the [src] with something caught!"))
else
..()
@@ -587,7 +587,7 @@
return
if(anchored && deployed)
to_chat(user, span("warning", "You can't do that while \the [src] is deployed! Undeploy it first."))
to_chat(user, SPAN_WARNING("You can't do that while \the [src] is deployed! Undeploy it first."))
return
user.visible_message("<span class='notice'>[user] begins [anchored ? "un" : "" ]securing \the [src]!</span>",
@@ -607,7 +607,7 @@
/obj/item/trap/animal/large/MouseDrop(over_object, src_location, over_location)
if(captured)
to_chat(usr, span("warning", "The trap door's down, you can't get through there!"))
to_chat(usr, SPAN_WARNING("The trap door's down, you can't get through there!"))
return
if(!src.Adjacent(usr))