rid of old span macros

This commit is contained in:
Kashargul
2024-10-01 23:51:48 +02:00
parent ded60639bc
commit e0d694e8ac
205 changed files with 862 additions and 868 deletions
-18
View File
@@ -415,24 +415,6 @@ var/global/list/##LIST_NAME = list();\
#define send_link(target, url) target << link(url)
#define SPAN_NOTICE(X) "<span class='notice'>[X]</span>"
#define SPAN_WARNING(X) "<span class='warning'>[X]</span>"
#define SPAN_DANGER(X) "<span class='danger'>[X]</span>"
#define SPAN_OCCULT(X) "<span class='cult'>[X]</span>"
#define FONT_SMALL(X) "<font size='1'>[X]</font>"
#define FONT_NORMAL(X) "<font size='2'>[X]</font>"
#define FONT_LARGE(X) "<font size='3'>[X]</font>"
#define FONT_HUGE(X) "<font size='4'>[X]</font>"
#define FONT_GIANT(X) "<font size='5'>[X]</font>"
// Volume Channel Defines
#define VOLUME_CHANNEL_MASTER "Master"
+19
View File
@@ -43,6 +43,7 @@
#define span_critical(str) ("<span class='critical'>" + str + "</span>")
#define span_danger(str) ("<span class='danger'>" + str + "</span>")
#define span_userdanger(str) ("<span class='userdanger'>" + str + "</span>")
#define span_warning(str) ("<span class='warning'>" + str + "</span>")
#define span_rose(str) ("<span class='rose'>" + str + "</span>")
#define span_info(str) ("<span class='info'>" + str + "</span>")
@@ -109,3 +110,21 @@
#define span_brown(str) ("<span class='brown'>" + str + "</span>")
#define span_lightpurple(str) ("<span class='lightpurple'>" + str + "</span>")
#define span_darkpink(str) ("<span class='lightpurple'>" + str + "</span>")
/* System and Debug */
#define span_linkOn(str) ("<span class='linkOn'>" + str + "</span>")
#define span_filter_system(str) ("<span class='filter_system'>" + str + "</span>")
#define span_filter_debuglogs(str) ("<span class='filter_debuglogs'>" + str + "</span>")
/* Byond Sizes */
#define span_small(X) "<font size='1'>[X]</font>"
#define span_normal(X) "<font size='2'>[X]</font>"
#define span_large(X) "<font size='3'>[X]</font>"
#define span_huge(X) "<font size='4'>[X]</font>"
#define span_giant(X) "<font size='5'>[X]</font>"
+6 -6
View File
@@ -1328,32 +1328,32 @@ var/mob/dview/dview_mob = new
if (NOT_FLAG(USE_ALLOW_NON_ADJACENT) && !Adjacent(user))
if (show_messages)
to_chat(user, span("notice","You're too far away from [src] to do that."))
to_chat(user, span_notice("You're too far away from [src] to do that."))
return USE_FAIL_NON_ADJACENT
if (NOT_FLAG(USE_ALLOW_DEAD) && user.stat == DEAD)
if (show_messages)
to_chat(user, span("notice","You can't do that when you're dead."))
to_chat(user, span_notice("You can't do that when you're dead."))
return USE_FAIL_DEAD
if (NOT_FLAG(USE_ALLOW_INCAPACITATED) && (user.incapacitated()))
if (show_messages)
to_chat(user, span("notice","You cannot do that in your current state."))
to_chat(user, span_notice("You cannot do that in your current state."))
return USE_FAIL_INCAPACITATED
if (NOT_FLAG(USE_ALLOW_NON_ADV_TOOL_USR) && !user.IsAdvancedToolUser())
if (show_messages)
to_chat(user, span("notice","You don't know how to operate [src]."))
to_chat(user, span_notice("You don't know how to operate [src]."))
return USE_FAIL_NON_ADV_TOOL_USR
if (HAS_FLAG(USE_DISALLOW_SILICONS) && issilicon(user))
if (show_messages)
to_chat(user, span("notice","You need hands for that."))
to_chat(user, span_notice("You need hands for that."))
return USE_FAIL_IS_SILICON
if (HAS_FLAG(USE_FORCE_SRC_IN_USER) && !(src in user))
if (show_messages)
to_chat(user, span("notice","You need to be holding [src] to do that."))
to_chat(user, span_notice("You need to be holding [src] to do that."))
return USE_FAIL_NOT_IN_USER
#undef NOT_FLAG
-2
View File
@@ -1,5 +1,3 @@
#define span(class, text) ("<span class='[class]'>[text]</span>")
#define get_turf(A) get_step(A,0)
#define get_x(A) (get_step(A, 0)?.x || 0)
+1 -1
View File
@@ -156,7 +156,7 @@ SUBSYSTEM_DEF(game_master)
if(check_rights(R_ADMIN|R_EVENT|R_DEBUG))
SSgame_master.interact(usr)
else
to_chat(usr, span("warning", "You do not have sufficient rights to view the GM panel, sorry."))
to_chat(usr, span_warning("You do not have sufficient rights to view the GM panel, sorry."))
/datum/controller/subsystem/game_master/proc/interact(var/client/user)
if(!user)
+1 -1
View File
@@ -22,7 +22,7 @@ SUBSYSTEM_DEF(job)
occupations = list()
var/list/all_jobs = subtypesof(/datum/job)
if(!all_jobs.len)
to_chat(world, span("warning", "Error setting up jobs, no job datums found"))
to_chat(world, span_warning("Error setting up jobs, no job datums found"))
return FALSE
for(var/J in all_jobs)
+2 -2
View File
@@ -64,7 +64,7 @@ SUBSYSTEM_DEF(webhooks)
return
if(!SSwebhooks.subsystem_initialized)
to_chat(usr, SPAN_WARNING("Let the webhook subsystem initialize before trying to reload it."))
to_chat(usr, span_warning("Let the webhook subsystem initialize before trying to reload it."))
return
to_world_log("[usr.key] has reloaded webhooks.")
@@ -79,7 +79,7 @@ SUBSYSTEM_DEF(webhooks)
return
if(!length(SSwebhooks.webhook_decls))
to_chat(usr, SPAN_WARNING("Webhook list is empty; either webhooks are disabled, webhooks aren't configured, or the subsystem hasn't initialized."))
to_chat(usr, span_warning("Webhook list is empty; either webhooks are disabled, webhooks aren't configured, or the subsystem hasn't initialized."))
return
var/choice = tgui_input_list(usr, "Select a webhook to ping.", "Ping Webhook", SSwebhooks.webhook_decls)
+1 -1
View File
@@ -152,7 +152,7 @@
color_to_use = color_matrix_hsv(build_hue, build_sat, build_val)
color_matrix_last = color_to_use
if(!color_to_use || !check_valid_color(color_to_use, user))
to_chat(user, SPAN_NOTICE("Invalid color."))
to_chat(user, span_notice("Invalid color."))
return FALSE
inserted.add_atom_colour(color_to_use, FIXED_COLOUR_PRIORITY)
playsound(src, 'sound/effects/spray3.ogg', 50, 1)
@@ -58,14 +58,14 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form)
if(can_be_private())
if(!feedback_hide_author)
dat += "[my_client.ckey] "
dat += span("linkOn", "<b>Visible</b>")
dat += span_linkOn("<b>Visible</b>")
dat += " | "
dat += href(src, list("feedback_hide_author" = 1), "Hashed")
else
dat += "[md5(ckey(lowertext(my_client.ckey + SSsqlite.get_feedback_pepper())))] "
dat += href(src, list("feedback_hide_author" = 0), "Visible")
dat += " | "
dat += span("linkOn", "<b>Hashed</b>")
dat += span_linkOn("<b>Hashed</b>")
else
dat += my_client.ckey
dat += "<br>"
@@ -120,13 +120,13 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form)
// Do some last minute validation, and tell the user if something goes wrong,
// so we don't wipe out their ten thousand page essay due to having a few too many characters.
if(length(feedback_body) > MAX_FEEDBACK_LENGTH)
to_chat(my_client, span("warning", "Your feedback is too long, at [length(feedback_body)] characters, where as the \
to_chat(my_client, span_warning("Your feedback is too long, at [length(feedback_body)] characters, where as the \
limit is [MAX_FEEDBACK_LENGTH]. Please shorten it and try again."))
return
var/text = sanitize(feedback_body, max_length = 0, encode = TRUE, trim = FALSE, extra = FALSE)
if(!text) // No text, or it was super invalid.
to_chat(my_client, span("warning", "It appears you didn't write anything, or it was invalid."))
to_chat(my_client, span_warning("It appears you didn't write anything, or it was invalid."))
return
if(tgui_alert(my_client, "Are you sure you want to submit your feedback?", "Confirm Submission", list("No", "Yes")) == "Yes")
@@ -136,7 +136,7 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form)
var/success = SSsqlite.insert_feedback(author = author_text, topic = feedback_topic, content = feedback_body, sqlite_object = SSsqlite.sqlite_db)
if(!success)
to_chat(my_client, span("warning", "Something went wrong while inserting your feedback into the database. Please try again. \
to_chat(my_client, span_warning("Something went wrong while inserting your feedback into the database. Please try again. \
If this happens again, you should contact a developer."))
return
@@ -144,4 +144,4 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form)
if(istype(my_client.mob, /mob/new_player))
var/mob/new_player/NP = my_client.mob
NP.new_player_panel_proc() // So the feedback button goes away, if the user gets put on cooldown.
qdel(src)
qdel(src)
@@ -30,7 +30,7 @@ var/datum/antagonist/shipwreck_survivor/survivors
can_hear_aooc = FALSE
/datum/antagonist/SURVIVOR/greet(var/datum/mind/player)
to_chat(player.current, SPAN_WARNING("You are a <b>NOT</b> an antagonist! All rules apply to you as well. Your job is to help make the world seem more alive. \n \
to_chat(player.current, span_warning("You are a <b>NOT</b> an antagonist! All rules apply to you as well. Your job is to help make the world seem more alive. \n \
You are not an existing station character, but some average person who has suffered a terrible accident. \
Feel free to make up what happened to the ship you awakened on as you please, \
but listening to your rescuers for context might help improve your mutual immersion! \n \
@@ -109,7 +109,7 @@
to_chat(user, "<span class='danger'>\The [L] seems to resist you!</span>")
return 0
if(!L.has_AI())
to_chat(user, span("warning", "\The [L] seems too dim for this to work on them."))
to_chat(user, span_warning("\The [L] seems too dim for this to work on them."))
return FALSE
if(pay_energy(500))
select(L)
@@ -141,4 +141,3 @@
adjust_instability(controlled_mobs.len)
to_chat(user, "<span class='notice'>You command your [controlled_mobs.len > 1 ? "entities" : "[controlled_mobs[1]]"] to move \
towards \the [T].</span>")
+2 -2
View File
@@ -48,7 +48,7 @@
to_chat(user, "<span class='notice'>\The [src] is already occupied!</span>")
return
if(H.affecting.has_buckled_mobs())
to_chat(user, span("warning", "\The [H.affecting] has other entities attached to it. Remove them first."))
to_chat(user, span_warning("\The [H.affecting] has other entities attached to it. Remove them first."))
return
var/mob/M = H.affecting
if(M.abiotic())
@@ -91,7 +91,7 @@
to_chat(user, "<span class='notice'>Subject cannot have abiotic items on.</span>")
return 0
if(O.has_buckled_mobs())
to_chat(user, span("warning", "\The [O] has other entities attached to it. Remove them first."))
to_chat(user, span_warning("\The [O] has other entities attached to it. Remove them first."))
return
if(O == user)
+20 -20
View File
@@ -277,7 +277,7 @@
/obj/machinery/computer/arcade/battle/emag_act(var/charges, var/mob/user)
if(!emagged)
to_chat(user, span("notice","You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Hyper-Lethal Mode."))
to_chat(user, span_notice("You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Hyper-Lethal Mode."))
temp = "If you die in the game, you die for real!"
player_hp = 30
@@ -409,18 +409,18 @@
dat += "<br>You ran out of food and starved."
if(emagged)
user.nutrition = 0 //yeah you pretty hongry
to_chat(user, span("danger", "<font size=3>Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.</font>"))
to_chat(user, span_danger("<font size=3>Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.</font>"))
if(fuel <= 0)
dat += "<br>You ran out of fuel, and drift, slowly, into a star."
if(emagged)
var/mob/living/M = user
M.adjust_fire_stacks(5)
M.IgniteMob() //flew into a star, so you're on fire
to_chat(user,span("danger", "<font size=3>You feel an immense wave of heat emanate from \the [src]. Your skin bursts into flames.</font>"))
to_chat(user,span_danger("<font size=3>You feel an immense wave of heat emanate from \the [src]. Your skin bursts into flames.</font>"))
dat += "<br><P ALIGN=Right><a href='byond://?src=\ref[src];menu=1'>OK...</a></P>"
if(emagged)
to_chat(user, span("danger", "<font size=3>You're never going to make it to Orion...</font>"))
to_chat(user, span_danger("<font size=3>You're never going to make it to Orion...</font>"))
user.death()
emagged = 0 //removes the emagged status after you lose
gameStatus = ORION_STATUS_START
@@ -485,20 +485,20 @@
switch(event)
if(ORION_TRAIL_RAIDERS)
if(prob(50))
to_chat(usr, span("warning", "You hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?"))
to_chat(usr, span_warning("You hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?"))
M.hallucination += 30
else
to_chat(usr, span("danger", "Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there..."))
to_chat(usr, span_danger("Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there..."))
M.take_organ_damage(25)
if(ORION_TRAIL_ILLNESS)
var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS
if(severity == 1)
to_chat(M, span("warning", "You suddenly feel slightly nauseous.")) //got off lucky
to_chat(M, span_warning("You suddenly feel slightly nauseous.")) //got off lucky
if(severity == 2)
to_chat(usr, span("warning", "You suddenly feel extremely nauseous and hunch over until it passes."))
to_chat(usr, span_warning("You suddenly feel extremely nauseous and hunch over until it passes."))
M.Stun(3)
if(severity >= 3) //you didn't pray hard enough
to_chat(M, span("warning", "An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit."))
to_chat(M, span_warning("An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit."))
spawn(30)
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
@@ -509,12 +509,12 @@
src.visible_message("A sudden gust of powerful wind slams \the [M] into the floor!", "You hear a large fwooshing sound, followed by a bang.")
M.take_organ_damage(15)
else
to_chat(M, span("warning", "A violent gale blows past you, and you barely manage to stay standing!"))
to_chat(M, span_warning("A violent gale blows past you, and you barely manage to stay standing!"))
if(ORION_TRAIL_COLLISION) //by far the most damaging event
if(prob(90) && !hull)
var/turf/simulated/floor/F = src.loc
F.ChangeTurf(/turf/space)
src.visible_message(span("danger", "Something slams into the floor around \the [src], exposing it to space!"), "You hear something crack and break.")
src.visible_message(span_danger("Something slams into the floor around \the [src], exposing it to space!"), "You hear something crack and break.")
else
src.visible_message("Something slams into the floor around \the [src] - luckily, it didn't get through!", "You hear something crack.")
if(ORION_TRAIL_MALFUNCTION)
@@ -584,9 +584,9 @@
event()
if(emagged) //has to be here because otherwise it doesn't work
src.show_message("\The [src] states, 'YOU ARE EXPERIENCING A BLACKHOLE. BE TERRIFIED.","You hear something say, 'YOU ARE EXPERIENCING A BLACKHOLE. BE TERRFIED'")
to_chat(usr, span("warning", "Something draws you closer and closer to the machine."))
to_chat(usr, span_warning("Something draws you closer and closer to the machine."))
sleep(10)
to_chat(usr, span("danger", "This is really starting to hurt!"))
to_chat(usr, span_danger("This is really starting to hurt!"))
var i; //spawning a literal blackhole would be fun, but a bit disruptive.
for(i=0;i<4;i++)
var/mob/living/L = usr
@@ -1022,7 +1022,7 @@
/obj/machinery/computer/arcade/orion_trail/emag_act(mob/user)
if(!emagged)
to_chat(user, span("notice", "You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode."))
to_chat(user, span_notice("You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode."))
name = "The Orion Trail: Realism Edition"
desc = "Learn how our ancestors got to Orion, and try not to die in the process!"
newgame()
@@ -1041,9 +1041,9 @@
. = ..()
if(in_range(user, src))
if(!active)
. += span("notice", "There's a little switch on the bottom. It's flipped down.")
. += span_notice("There's a little switch on the bottom. It's flipped down.")
else
. += span("notice", "There's a little switch on the bottom. It's flipped up.")
. += span_notice("There's a little switch on the bottom. It's flipped up.")
/obj/item/orion_ship/attack_self(mob/user)
if(active)
@@ -1052,17 +1052,17 @@
message_admins("[key_name_admin(usr)] primed an explosive Orion ship for detonation.")
log_game("[key_name(usr)] primed an explosive Orion ship for detonation.")
to_chat(user, span("warning", "You flip the switch on the underside of [src]."))
to_chat(user, span_warning("You flip the switch on the underside of [src]."))
active = 1
src.visible_message(span("notice", "[src] softly beeps and whirs to life!"))
src.visible_message(span_notice("[src] softly beeps and whirs to life!"))
src.audible_message("<b>\The [src]</b> says, 'This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.'")
sleep(20)
src.visible_message(span("warning", "[src] begins to vibrate..."))
src.visible_message(span_warning("[src] begins to vibrate..."))
src.audible_message("<b>\The [src]</b> says, 'Uh, Port? Having some issues with our reactor, could you check it out? Over.'")
sleep(30)
src.audible_message("<b>\The [src]</b> says, 'Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-'")
sleep(3.6)
src.visible_message(span("danger", "[src] explodes!"))
src.visible_message(span_danger("[src] explodes!"))
explosion(src.loc, 1,2,4)
qdel(src)
+3 -3
View File
@@ -112,7 +112,7 @@
return
if(istype(I, /obj/item/card/id))
if(stat & NOPOWER) //checking for power in here so crowbar and screwdriver and stuff still works.
to_chat(user, SPAN_WARNING("The terminal refuses your I.D as it is unpowered!"))
to_chat(user, span_warning("The terminal refuses your I.D as it is unpowered!"))
return
if(!giver && user.unEquip(I))
I.forceMove(src)
@@ -134,7 +134,7 @@
if(!usr || usr.stat || usr.lying) return
if(giver)
to_chat(usr, SPAN_NOTICE("You remove \the [giver] from \the [src]."))
to_chat(usr, span_notice("You remove \the [giver] from \the [src]."))
giver.loc = get_turf(src)
if(!usr.get_active_hand() && istype(usr,/mob/living/carbon/human))
usr.put_in_hands(giver)
@@ -143,7 +143,7 @@
giver = null
accesses.Cut()
else
to_chat(usr, SPAN_WARNING("There is nothing to remove from the console."))
to_chat(usr, span_warning("There is nothing to remove from the console."))
return
/obj/machinery/computer/guestpass/attack_hand(var/mob/user as mob)
+2 -2
View File
@@ -184,7 +184,7 @@
if(occupant)
to_chat(user,"<span class='warning'>\The [src] is already occupied by [occupant].</span>")
if(grab.affecting.has_buckled_mobs())
to_chat(user, span("warning", "\The [grab.affecting] has other entities attached to it. Remove them first."))
to_chat(user, span_warning("\The [grab.affecting] has other entities attached to it. Remove them first."))
return
var/mob/M = grab.affecting
qdel(grab)
@@ -341,7 +341,7 @@
if(isliving(usr))
var/mob/living/L = usr
if(L.has_buckled_mobs())
to_chat(L, span("warning", "You have other entities attached to yourself. Remove them first."))
to_chat(L, span_warning("You have other entities attached to yourself. Remove them first."))
return
if(L.stat != CONSCIOUS)
return
+1 -1
View File
@@ -612,7 +612,7 @@
if(isliving(usr))
var/mob/living/L = usr
if(L.has_buckled_mobs())
to_chat(L, span("warning", "You have other entities attached to yourself. Remove them first."))
to_chat(L, span_warning("You have other entities attached to yourself. Remove them first."))
return
visible_message("[usr] [on_enter_visible_message] [src].", 3)
+1 -1
View File
@@ -1587,7 +1587,7 @@ About the new airlock wires panel:
/obj/machinery/door/airlock/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_DECONSTRUCT)
to_chat(user, span("notice", "You deconstruct \the [src]."))
to_chat(user, span_notice("You deconstruct \the [src]."))
qdel(src)
return TRUE
return FALSE
+4 -4
View File
@@ -58,7 +58,7 @@
/obj/machinery/gear_painter/attackby(obj/item/I, mob/living/user)
if(inserted)
to_chat(user, SPAN_WARNING("The machine is already loaded."))
to_chat(user, span_warning("The machine is already loaded."))
return
if(default_deconstruction_screwdriver(user, I))
return
@@ -92,7 +92,7 @@
if(inserted)
return
if(user)
visible_message(SPAN_WARNING("[user] stuffs [victim] into [src]!"))
visible_message(span_warning("[user] stuffs [victim] into [src]!"))
inserted = victim
inserted.forceMove(src)
@@ -113,7 +113,7 @@
return
if(!inserted)
return
to_chat(usr, SPAN_NOTICE("You remove [inserted] from [src]"))
to_chat(usr, span_notice("You remove [inserted] from [src]"))
inserted.forceMove(drop_location())
var/mob/living/user = usr
if(istype(user))
@@ -234,7 +234,7 @@
color_to_use = color_matrix_hsv(build_hue, build_sat, build_val)
color_matrix_last = color_to_use
if(!color_to_use || !check_valid_color(color_to_use, user))
to_chat(user, SPAN_NOTICE("Invalid color."))
to_chat(user, span_notice("Invalid color."))
return FALSE
inserted.add_atom_colour(color_to_use, FIXED_COLOUR_PRIORITY)
playsound(src, 'sound/effects/spray3.ogg', 50, 1)
+1 -1
View File
@@ -111,7 +111,7 @@
/obj/machinery/porta_turret/can_catalogue(mob/user) // Dead turrets can't be scanned.
if(stat & BROKEN)
to_chat(user, span("warning", "\The [src] was destroyed, so it cannot be scanned."))
to_chat(user, span_warning("\The [src] was destroyed, so it cannot be scanned."))
return FALSE
return ..()
+1 -1
View File
@@ -262,7 +262,7 @@
return
if(istype(R, /mob/living/silicon/robot/platform))
to_chat(R, SPAN_WARNING("You are too large to fit into \the [src]."))
to_chat(R, span_warning("You are too large to fit into \the [src]."))
return
add_fingerprint(R)
+2 -2
View File
@@ -119,7 +119,7 @@
if(isliving(usr))
var/mob/living/L = usr
if(L.has_buckled_mobs())
to_chat(L, span("warning", "You have other entities attached to yourself. Remove them first."))
to_chat(L, span_warning("You have other entities attached to yourself. Remove them first."))
return
//search for a valid passenger compartment
@@ -148,4 +148,4 @@
to_chat(usr, "<span class='warning'>\The [src] doesn't have a passenger compartment.</span>")
#undef LOCKED
#undef OCCUPIED
#undef OCCUPIED
+1 -1
View File
@@ -34,7 +34,7 @@
occupant_message("The sleeper is already occupied")
return
if(target.has_buckled_mobs())
occupant_message(span("warning", "\The [target] has other entities attached to it. Remove them first."))
occupant_message(span_warning("\The [target] has other entities attached to it. Remove them first."))
return
occupant_message("You start putting [target] into [src].")
chassis.visible_message("[chassis] starts putting [target] into the [src].")
+7 -7
View File
@@ -58,7 +58,7 @@
var/done = FALSE
var/obj/mecha/mech = charging
var/obj/item/cell/cell = charging.get_cell()
if(cell)
if(cell)
var/t = min(charge, cell.maxcharge - cell.charge)
if(t > 0)
if(istype(mech))
@@ -68,13 +68,13 @@
use_power(t * 150)
else
if(istype(mech))
mech.occupant_message(SPAN_NOTICE("Fully charged."))
mech.occupant_message(span_notice("Fully charged."))
done = TRUE
if(repair && istype(mech) && mech.health < initial(mech.health))
mech.health = min(mech.health + repair, initial(mech.health))
if(mech.health == initial(mech.health))
mech.occupant_message(SPAN_NOTICE("Fully repaired."))
mech.occupant_message(span_notice("Fully repaired."))
else
done = FALSE
if(done)
@@ -93,14 +93,14 @@
var/obj/mecha/mech = M
if(stat & (NOPOWER | BROKEN))
if(istype(mech))
mech.occupant_message(SPAN_WARNING("Power port not responding. Terminating."))
mech.occupant_message(span_warning("Power port not responding. Terminating."))
else
to_chat(M, SPAN_WARNING("Power port not responding. Terminating."))
to_chat(M, span_warning("Power port not responding. Terminating."))
return
if(M.get_cell())
if(istype(mech))
mech.occupant_message(SPAN_NOTICE("Now charging..."))
mech.occupant_message(span_notice("Now charging..."))
else
to_chat(M, SPAN_NOTICE("Now charging..."))
to_chat(M, span_notice("Now charging..."))
charging = M
return
+1 -1
View File
@@ -467,7 +467,7 @@
if(..())
return
if(!allowed(user))
to_chat(user, SPAN_WARNING("\The [src] rejects your use due to lack of access!"))
to_chat(user, span_warning("\The [src] rejects your use due to lack of access!"))
return
tgui_interact(user)
+1 -1
View File
@@ -1936,7 +1936,7 @@
if(isliving(usr))
var/mob/living/L = usr
if(L.has_buckled_mobs())
to_chat(L, span("warning", "You have other entities attached to yourself. Remove them first."))
to_chat(L, span_warning("You have other entities attached to yourself. Remove them first."))
return
// to_chat(usr, "You start climbing into [src.name]")
@@ -70,7 +70,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
else
if(isLoud)
creator_reference << 'sound/effects/adminhelp.ogg'
to_chat(creator_reference, SPAN_WARNING("Player [L.name] ([L.ckey]) has triggered event \
to_chat(creator_reference, span_warning("Player [L.name] ([L.ckey]) has triggered event \
narrate landmark [name] of type [isNarrate ? "Narration" : "Notification"]. \n \
It [isRepeating ? "will be possible to trigger after [cooldown / (1 SECOND)] seconds" : "has self-deleted"] \n \
COORDINATES: [coordinates]"))
@@ -118,7 +118,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
switch(isPersonal_orVis_orAud)
if(0)
if(isWarning)
to_chat(L, SPAN_DANGER(message))
to_chat(L, span_danger(message))
else
to_chat(L, message)
if(1)
+1 -1
View File
@@ -82,7 +82,7 @@
return TRUE
else if(istype(mover, /mob/living))
if(prob(50))
to_chat(mover, span("warning", "You get stuck in \the [src] for a moment."))
to_chat(mover, span_warning("You get stuck in \the [src] for a moment."))
return FALSE
else if(istype(mover, /obj/item/projectile))
return prob(30)
+2 -2
View File
@@ -228,7 +228,7 @@
if (!user) return
..()
if(anchored)
to_chat(user, span("notice", "\The [src] won't budge, you can't pick it up!"))
to_chat(user, span_notice("\The [src] won't budge, you can't pick it up!"))
return
if (hasorgans(user))
var/mob/living/carbon/human/H = user
@@ -574,7 +574,7 @@ var/list/global/slot_flags_enumeration = list(
if(!hit_zone)
U.do_attack_animation(M)
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message(SPAN_DANGER("\The [U] attempts to stab \the [M] in the eyes, but misses!"))
visible_message(span_danger("\The [U] attempts to stab \the [M] in the eyes, but misses!"))
return
add_attack_logs(user,M,"Attack eyes with [name]")
+1 -1
View File
@@ -113,7 +113,7 @@
return 0
user.visible_message("\The [user] starts transferring \the [ai] into \the [src]...", "You start transferring \the [ai] into \the [src]...")
show_message(span("critical", "\The [user] is transferring you into \the [src]!"))
show_message(span_critical("\The [user] is transferring you into \the [src]!"))
if(do_after(user, 100))
if(carded_ai)
+5 -5
View File
@@ -229,7 +229,7 @@ var/list/GPS_list = list()
/obj/item/gps/proc/display(mob/user)
if(emped)
to_chat(user, SPAN_WARNING("It's busted!"))
to_chat(user, span_warning("It's busted!"))
return
var/list/dat = list()
@@ -290,7 +290,7 @@ var/list/GPS_list = list()
LAZYSET(showing_tracked_names, gps_ref, TRUE)
else
LAZYREMOVE(showing_tracked_names, gps_ref)
to_chat(usr, SPAN_NOTICE("\The [src] is [LAZYACCESS(showing_tracked_names, gps_ref) ? "now showing" : "no longer showing"] labels for [gps.gps_tag]."))
to_chat(usr, span_notice("\The [src] is [LAZYACCESS(showing_tracked_names, gps_ref) ? "now showing" : "no longer showing"] labels for [gps.gps_tag]."))
if(href_list["stop_track"])
var/gps_ref = href_list["stop_track"]
@@ -299,7 +299,7 @@ var/list/GPS_list = list()
LAZYREMOVE(tracking_devices, gps_ref)
LAZYREMOVE(showing_tracked_names, gps_ref)
if(istype(gps) && !QDELETED(gps))
to_chat(usr, SPAN_NOTICE("\The [src] is no longer tracking [gps.gps_tag]."))
to_chat(usr, span_notice("\The [src] is no longer tracking [gps.gps_tag]."))
update_compass()
. = TRUE
@@ -309,7 +309,7 @@ var/list/GPS_list = list()
if(istype(gps) && !QDELETED(gps))
LAZYSET(tracking_devices, gps_ref, "#00ffff")
LAZYSET(showing_tracked_names, gps_ref, TRUE)
to_chat(usr, SPAN_NOTICE("\The [src] is now tracking [gps.gps_tag]."))
to_chat(usr, span_notice("\The [src] is now tracking [gps.gps_tag]."))
update_compass()
. = TRUE
@@ -318,7 +318,7 @@ var/list/GPS_list = list()
if(istype(gps) && !QDELETED(gps))
var/new_colour = input(usr, "Enter a new tracking color.", "GPS Waypoint Color") as color|null
if(new_colour && istype(gps) && !QDELETED(gps) && holder == usr && !usr.incapacitated())
to_chat(usr, SPAN_NOTICE("You adjust the colour \the [src] is using to highlight [gps.gps_tag]."))
to_chat(usr, span_notice("You adjust the colour \the [src] is using to highlight [gps.gps_tag]."))
LAZYSET(tracking_devices, href_list["track_color"], new_colour)
update_compass()
. = TRUE
@@ -23,20 +23,20 @@
if(!isnull(O.reagents))
if(!(O.flags & OPENCONTAINER)) // The idea is that the scanner has to touch the reagents somehow. This is done to prevent cheesing unidentified autoinjectors.
to_chat(user, span("warning", "\The [O] is sealed, and cannot be scanned by \the [src] until unsealed."))
to_chat(user, span_warning("\The [O] is sealed, and cannot be scanned by \the [src] until unsealed."))
return
var/dat = ""
if(O.reagents.reagent_list.len > 0)
var/one_percent = O.reagents.total_volume / 100
for (var/datum/reagent/R in O.reagents.reagent_list)
dat += "\n \t " + span("notice", "[R][details ? ": [R.volume / one_percent]%" : ""]")
dat += "\n \t " + span_notice("[R][details ? ": [R.volume / one_percent]%" : ""]")
if(dat)
to_chat(user, span("notice", "Chemicals found: [dat]"))
to_chat(user, span_notice("Chemicals found: [dat]"))
else
to_chat(user, span("notice", "No active chemical agents found in [O]."))
to_chat(user, span_notice("No active chemical agents found in [O]."))
else
to_chat(user, span("notice", "No significant chemical agents found in [O]."))
to_chat(user, span_notice("No significant chemical agents found in [O]."))
return
+1 -1
View File
@@ -86,7 +86,7 @@
to_chat(user, "The headline screams, \"[headline]\"")
/obj/item/tabloid/attack_self(mob/user)
user.visible_message(SPAN_NOTICE("\The [user] leafs idly through \the [src]."))
user.visible_message(span_notice("\The [user] leafs idly through \the [src]."))
if(headline)
to_chat(user, "Most of it is the usual tabloid garbage, but the headline story, \"[headline]\", holds your attention for awhile.")
if(tabloid_headlines[headline])
+9 -9
View File
@@ -31,7 +31,7 @@
var/make_rwalls = FALSE // If true, when building walls, they will be reinforced.
/* VOREStation Removal - Unused
/obj/item/rcd/Initialize()
src.spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -56,13 +56,13 @@
if(istype(W, /obj/item/rcd_ammo))
var/obj/item/rcd_ammo/cartridge = W
if((stored_matter + cartridge.remaining) > max_stored_matter)
to_chat(user, span("warning", "The RCD can't hold that many additional matter-units."))
to_chat(user, span_warning("The RCD can't hold that many additional matter-units."))
return FALSE
stored_matter += cartridge.remaining
user.drop_from_inventory(W)
qdel(W)
playsound(src, 'sound/machines/click.ogg', 50, 1)
to_chat(user, span("notice", "The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
to_chat(user, span_notice("The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
return TRUE
return ..()
*/
@@ -74,7 +74,7 @@
else
mode_index++
to_chat(user, span("notice", "Changed mode to '[modes[mode_index]]'."))
to_chat(user, span_notice("Changed mode to '[modes[mode_index]]'."))
playsound(src, 'sound/effects/pop.ogg', 50, 0)
if(prob(20))
@@ -99,16 +99,16 @@
// Used to call rcd_act() on the atom hit.
/obj/item/rcd/proc/use_rcd(atom/A, mob/living/user)
if(busy && !allow_concurrent_building)
to_chat(user, span("warning", "\The [src] is busy finishing its current operation, be patient."))
to_chat(user, span_warning("\The [src] is busy finishing its current operation, be patient."))
return FALSE
var/list/rcd_results = A.rcd_values(user, src, modes[mode_index])
if(!rcd_results)
to_chat(user, span("warning", "\The [src] blinks a red light as you point it towards \the [A], indicating \
to_chat(user, span_warning("\The [src] blinks a red light as you point it towards \the [A], indicating \
that it won't work. Try changing the mode, or use it on something else."))
return FALSE
if(!can_afford(rcd_results[RCD_VALUE_COST]))
to_chat(user, span("warning", "\The [src] lacks the required material to start."))
to_chat(user, span_warning("\The [src] lacks the required material to start."))
return FALSE
playsound(src, 'sound/machines/click.ogg', 50, 1)
@@ -128,7 +128,7 @@
busy = FALSE
// Doing another check in case we lost matter during the delay for whatever reason.
if(!can_afford(rcd_results[RCD_VALUE_COST]))
to_chat(user, span("warning", "\The [src] lacks the required material to finish the operation."))
to_chat(user, span_warning("\The [src] lacks the required material to finish the operation."))
return FALSE
if(A.rcd_act(user, src, rcd_results[RCD_VALUE_MODE]))
consume_resources(rcd_results[RCD_VALUE_COST])
@@ -289,7 +289,7 @@
/obj/item/rcd/debug/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/rcd_ammo))
to_chat(user, span("notice", "\The [src] makes its own material, no need to add more."))
to_chat(user, span_notice("\The [src] makes its own material, no need to add more."))
return FALSE
return ..()
+3 -3
View File
@@ -69,16 +69,16 @@
var/obj/item/rcd_ammo/cartridge = W
var/can_store = min(max_stored_matter - stored_matter, cartridge.remaining)
if(can_store <= 0)
to_chat(user, span("warning", "There's either no space or \the [cartridge] is empty!"))
to_chat(user, span_warning("There's either no space or \the [cartridge] is empty!"))
return FALSE
stored_matter += can_store
cartridge.remaining -= can_store
if(!cartridge.remaining)
to_chat(user, span("warning", "\The [cartridge] dissolves as it empties of compressed matter."))
to_chat(user, span_warning("\The [cartridge] dissolves as it empties of compressed matter."))
user.drop_from_inventory(W)
qdel(W)
playsound(src, 'sound/machines/click.ogg', 50, 1)
to_chat(user, span("notice", "The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
to_chat(user, span_notice("The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
update_icon()
return TRUE
return ..()
+1 -1
View File
@@ -238,7 +238,7 @@
else
return
to_chat(user, span("notice", "Changed mode to '[choice]'."))
to_chat(user, span_notice("Changed mode to '[choice]'."))
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
return ..()
@@ -64,7 +64,7 @@
AI.hostile = !AI.hostile
if(!AI.hostile)
AI.set_stance(STANCE_IDLE)
to_chat(M, span("notice", "\The [bound_mob] is now [AI.hostile ? "hostile" : "passive"]."))
to_chat(M, span_notice("\The [bound_mob] is now [AI.hostile ? "hostile" : "passive"]."))
log_admin("[key_name_admin(M)] set [bound_mob] to [AI.hostile].")
else if(bound_mob.client)
var/transmit_msg = tgui_input_text(usr, "What is your command?", "Command")
+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()
@@ -41,7 +41,7 @@
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)
@@ -90,7 +90,7 @@
if(ismob(loc))
var/mob/living/M = loc
if(!no_message)
to_chat(M, SPAN_NOTICE("The [name] runs out of flavor."))
to_chat(M, span_notice("The [name] runs out of flavor."))
if(M.wear_mask)
M.remove_from_mob(src) //un-equip it so the overlays can update
M.update_inv_wear_mask(0)
@@ -73,7 +73,7 @@
if(!ismob(grab.affecting))
return
if(grab.affecting.has_buckled_mobs())
to_chat(user, span("warning", "\The [grab.affecting] has other entities attached to them. Remove them first."))
to_chat(user, span_warning("\The [grab.affecting] has other entities attached to them. Remove them first."))
return
var/mob/M = grab.affecting
if(put_mob(M))
@@ -46,16 +46,16 @@
/obj/item/material/kitchen/utensil/proc/load_food(var/mob/user, var/obj/item/reagent_containers/food/snacks/loading)
if (reagents.total_volume > 0)
to_chat(user, SPAN_DANGER("There is already something on \the [src]."))
to_chat(user, span_danger("There is already something on \the [src]."))
return
if (!loading?.reagents?.total_volume)
to_chat(user, SPAN_NOTICE("Nothing to scoop up in \the [loading]!"))
to_chat(user, span_notice("Nothing to scoop up in \the [loading]!"))
loaded = "\the [loading]"
user.visible_message( \
"<b>\The [user]</b> scoops up some of [loaded] with \the [src]!",
SPAN_NOTICE("You scoop up some of [loaded] with \the [src]!")
span_notice("You scoop up some of [loaded] with \the [src]!")
)
loading.bitecount++
loading.reagents.trans_to_obj(src, min(loading.reagents.total_volume, scoop_volume))
@@ -110,7 +110,7 @@
return
M.visible_message("<b>\The [user]</b> eats some of [loaded] with \the [src].")
else
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("<b>\The [user]</b> feeds some of [loaded] to \the [M] with \the [src].")
@@ -119,7 +119,7 @@
update_icon()
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/on_rag_wipe()
@@ -87,12 +87,12 @@
/obj/item/material/snow/snowball/attack_self(mob/user as mob)
if(user.a_intent == I_HURT)
to_chat(user, SPAN_NOTICE("You smash the snowball in your hand."))
to_chat(user, span_notice("You smash the snowball in your hand."))
var/atom/S = new /obj/item/stack/material/snow(user.loc)
qdel(src)
user.put_in_hands(S)
else
to_chat(user, SPAN_NOTICE("You start compacting the snowball."))
to_chat(user, span_notice("You start compacting the snowball."))
if(do_after(user, 2 SECONDS))
var/atom/S = new /obj/item/material/snow/snowball/reinforced(user.loc)
qdel(src)
@@ -66,7 +66,7 @@
continue
if(LAZYLEN(T.contents) > 20) //Avoiding potential perf issues by not iterating over large piles of objs
if(!anti_spam)
to_chat(usr, SPAN_NOTICE("Too many items! Couldn't fully unfold the blanket!"))
to_chat(usr, span_notice("Too many items! Couldn't fully unfold the blanket!"))
anti_spam = TRUE
continue
for(var/obj/O in T)
@@ -101,9 +101,9 @@
/obj/structure/picnic_blanket_deployed/examine(mob/user)
. = ..()
if(blanket_type == CENTER)
. += SPAN_NOTICE("This is the center of a folded out picnic blanket. You can use this to start packing it up!")
. += span_notice("This is the center of a folded out picnic blanket. You can use this to start packing it up!")
if(blanket_type == SIDE)
. += SPAN_NOTICE("This is one of the edges. Look for the center to start packing!")
. += span_notice("This is one of the edges. Look for the center to start packing!")
//For Mapping use only.
//If player folds it back up, it reverts to normal type so the Initialize() won't cause issues
@@ -322,7 +322,7 @@ var/list/tape_roll_applications = list()
var/mob/M = mover
add_fingerprint(M)
if(!allowed(M)) //only select few learn art of not crumpling the tape
to_chat(M, span("warning", "You are not supposed to go past \the [src]..."))
to_chat(M, span_warning("You are not supposed to go past \the [src]..."))
if(M.a_intent == I_HELP && !(istype(M, /mob/living/simple_mob)))
return FALSE
crumple()
@@ -60,10 +60,10 @@
//try to crush it
if(ispath(trash))
if(contents.len && user.a_intent == I_HURT) // only crumple with things inside on harmintent.
user.visible_message(SPAN_DANGER("[user] crushes \the [src], spilling its contents everywhere!"), SPAN_DANGER("You crush \the [src], spilling its contents everywhere!"))
user.visible_message(span_danger("[user] crushes \the [src], spilling its contents everywhere!"), span_danger("You crush \the [src], spilling its contents everywhere!"))
spill()
else
to_chat(user, SPAN_NOTICE("You crumple up \the [src].")) //make trash
to_chat(user, span_notice("You crumple up \the [src].")) //make trash
playsound(src.loc, 'sound/items/drop/wrapper.ogg', 30, 1)
var/obj/item/trash = new src.trash()
qdel(src)
+7 -7
View File
@@ -204,9 +204,9 @@ two tiles on initialization, and which way a cliff is facing may change during m
safe_fall = H.species.handle_falling(H, T, silent = TRUE, planetary = FALSE)
if(safe_fall)
visible_message(span("notice", "\The [L] glides down from \the [src]."))
visible_message(span_notice("\The [L] glides down from \the [src]."))
else
visible_message(span("danger", "\The [L] falls off \the [src]!"))
visible_message(span_danger("\The [L] falls off \the [src]!"))
L.forceMove(T)
var/harm = !is_double_cliff ? 1 : 0.5
@@ -215,7 +215,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
if(istype(L.buckled, /obj/vehicle)) // People falling off in vehicles will take less damage, but will damage the vehicle severely.
var/obj/vehicle/vehicle = L.buckled
vehicle.adjust_health(40 * harm)
to_chat(L, span("warning", "\The [vehicle] absorbs some of the impact, damaging it."))
to_chat(L, span_warning("\The [vehicle] absorbs some of the impact, damaging it."))
harm /= 2
playsound(L, 'sound/effects/break_stone.ogg', 70, 1)
@@ -228,14 +228,14 @@ two tiles on initialization, and which way a cliff is facing may change during m
sleep(fall_time) // A brief delay inbetween the two sounds helps sell the 'ouch' effect.
if(safe_fall)
visible_message(span("notice", "\The [L] lands on \the [T]."))
visible_message(span_notice("\The [L] lands on \the [T]."))
playsound(L, "rustle", 25, 1)
return
playsound(L, "punch", 70, 1)
shake_camera(L, 1, 1)
visible_message(span("danger", "\The [L] hits \the [T]!"))
visible_message(span_danger("\The [L] hits \the [T]!"))
// The bigger they are, the harder they fall.
// They will take at least 20 damage at the minimum, and tries to scale up to 40% of their max health.
@@ -250,7 +250,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
// Now fall off more cliffs below this one if they exist.
var/obj/structure/cliff/bottom_cliff = locate() in T
if(bottom_cliff)
visible_message(span("danger", "\The [L] rolls down towards \the [bottom_cliff]!"))
visible_message(span_danger("\The [L] rolls down towards \the [bottom_cliff]!"))
sleep(5)
bottom_cliff.fall_off_cliff(L)
@@ -262,7 +262,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
if(shoes && shoes.rock_climbing)
return ..() // Do the other checks too.
to_chat(user, span("warning", "\The [src] is too steep to climb unassisted."))
to_chat(user, span_warning("\The [src] is too steep to climb unassisted."))
return FALSE
// This tells AI mobs to not be dumb and step off cliffs willingly.
+13 -13
View File
@@ -71,30 +71,30 @@
/obj/structure/fence/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_WIRECUTTER))
if(!cuttable)
to_chat(user, span("warning", "This section of the fence can't be cut."))
to_chat(user, span_warning("This section of the fence can't be cut."))
return
if(invulnerable)
to_chat(user, span("warning", "This fence is too strong to cut through."))
to_chat(user, span_warning("This fence is too strong to cut through."))
return
var/current_stage = hole_size
if(current_stage >= MAX_HOLE_SIZE)
to_chat(user, span("notice", "This fence has too much cut out of it already."))
to_chat(user, span_notice("This fence has too much cut out of it already."))
return
user.visible_message(span("danger", "\The [user] starts cutting through \the [src] with \the [W]."),\
span("danger", "You start cutting through \the [src] with \the [W]."))
user.visible_message(span_danger("\The [user] starts cutting through \the [src] with \the [W]."),\
span_danger("You start cutting through \the [src] with \the [W]."))
playsound(src, W.usesound, 50, 1)
if(do_after(user, CUT_TIME * W.toolspeed, target = src))
if(current_stage == hole_size)
switch(++hole_size)
if(MEDIUM_HOLE)
visible_message(span("notice", "\The [user] cuts into \the [src] some more."))
to_chat(user, span("notice", "You could probably fit yourself through that hole now. Although climbing through would be much faster if you made it even bigger."))
visible_message(span_notice("\The [user] cuts into \the [src] some more."))
to_chat(user, span_notice("You could probably fit yourself through that hole now. Although climbing through would be much faster if you made it even bigger."))
climbable = TRUE
if(LARGE_HOLE)
visible_message(span("notice", "\The [user] completely cuts through \the [src]."))
to_chat(user, span("notice", "The hole in \the [src] is now big enough to walk through."))
visible_message(span_notice("\The [user] completely cuts through \the [src]."))
to_chat(user, span_notice("The hole in \the [src] is now big enough to walk through."))
climbable = FALSE
update_cut_status()
return TRUE
@@ -140,17 +140,17 @@
if(can_open(user))
toggle(user)
else
to_chat(user, span("warning", "\The [src] is [!open ? "locked" : "stuck open"]."))
to_chat(user, span_warning("\The [src] is [!open ? "locked" : "stuck open"]."))
return TRUE
/obj/structure/fence/door/proc/toggle(mob/user)
switch(open)
if(FALSE)
visible_message(span("notice", "\The [user] opens \the [src]."))
visible_message(span_notice("\The [user] opens \the [src]."))
open = TRUE
if(TRUE)
visible_message(span("notice", "\The [user] closes \the [src]."))
visible_message(span_notice("\The [user] closes \the [src]."))
open = FALSE
update_door_status()
@@ -211,4 +211,4 @@
#undef NO_HOLE
#undef MEDIUM_HOLE
#undef LARGE_HOLE
#undef MAX_HOLE_SIZE
#undef MAX_HOLE_SIZE
+6 -6
View File
@@ -43,11 +43,11 @@
. += get_harvestable_desc()
if(harvest_tool)
var/obj/item/tool = harvest_tool
. += SPAN_NOTICE("\The [src] can be harvested with \a [initial(tool.name)].")
. += span_notice("\The [src] can be harvested with \a [initial(tool.name)].")
if(removal_tool)
var/obj/item/tool = removal_tool
. += SPAN_NOTICE("\The [src] can be removed with \a [initial(tool.name)].")
. += span_notice("\The [src] can be removed with \a [initial(tool.name)].")
/obj/structure/flora/proc/get_harvestable_desc()
return "<span class='notice'>\The [src] seems to have something hanging from it.</span>"
@@ -58,15 +58,15 @@
var/harvest_spawn = pickweight(harvest_loot)
var/atom/movable/AM = spawn_harvest(harvest_spawn, user)
if(AM)
to_chat(user, SPAN_NOTICE("You harvest \the [AM] from \the [src]."))
to_chat(user, span_notice("You harvest \the [AM] from \the [src]."))
else
to_chat(user, SPAN_NOTICE("You fail to harvest anything from \the [src]."))
to_chat(user, span_notice("You fail to harvest anything from \the [src]."))
return
if(removal_tool && istype(W, removal_tool))
to_chat(user, SPAN_WARNING("You start uprooting \the [src]..."))
to_chat(user, span_warning("You start uprooting \the [src]..."))
if(do_after(user, 30))
visible_message(SPAN_NOTICE("\The [user] uproots and discards \the [src]!"))
visible_message(span_notice("\The [user] uproots and discards \the [src]!"))
qdel(src)
return
+2 -3
View File
@@ -177,9 +177,9 @@
return
if(ckeys_that_took[user.ckey])
to_chat(user, span("warning", "There are no presents with your name on."))
to_chat(user, span_warning("There are no presents with your name on."))
return
to_chat(user, span("notice", "After a bit of rummaging, you locate a gift with your name on it!"))
to_chat(user, span_notice("After a bit of rummaging, you locate a gift with your name on it!"))
ckeys_that_took[user.ckey] = TRUE
var/obj/item/G = new gift_type(src)
user.put_in_hands(G)
@@ -295,4 +295,3 @@
set_light(bulbs, 1, "#33ccff") // 5 variants, missing bulbs. 5th has no bulbs, so no glow.
add_overlay(mutable_appearance(icon, "[base_state][bulbs]_glow"))
add_overlay(emissive_appearance(icon, "[base_state][bulbs]_glow"))
@@ -44,9 +44,9 @@
/obj/structure/ghost_pod/manual/survivor/trigger()
. = ..()
desc += "\n The Pod's stasis is broken!"
visible_message(message = SPAN_WARNING("\The [src] hisses and blinks in a myriad of lights as its stasis ceases! \n \
visible_message(message = span_warning("\The [src] hisses and blinks in a myriad of lights as its stasis ceases! \n \
What or whoever lays beneath may yet stir once more, but their wounds may be too grevious... "),
blind_message = SPAN_WARNING("You hear hissing from [src]!"),
blind_message = span_warning("You hear hissing from [src]!"),
runemessage = "HISS")
+2 -2
View File
@@ -397,7 +397,7 @@
switch(passed_mode)
if(RCD_FLOORWALL)
to_chat(user, span("notice", "You finish a wall."))
to_chat(user, span_notice("You finish a wall."))
// This is mostly the same as using on a floor. The girder's material is preserved, however.
T.ChangeTurf(wall_type)
var/turf/simulated/wall/new_T = get_turf(src) // Ref to the wall we just built.
@@ -410,7 +410,7 @@
return TRUE
if(RCD_DECONSTRUCT)
to_chat(user, span("notice", "You deconstruct \the [src]."))
to_chat(user, span_notice("You deconstruct \the [src]."))
qdel(src)
return TRUE
+2 -3
View File
@@ -270,13 +270,13 @@
/obj/structure/grille/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_DECONSTRUCT)
to_chat(user, span("notice", "You deconstruct \the [src]."))
to_chat(user, span_notice("You deconstruct \the [src]."))
qdel(src)
return TRUE
if(RCD_WINDOWGRILLE)
if(locate(/obj/structure/window) in loc)
return FALSE
to_chat(user, span("notice", "You construct a window."))
to_chat(user, span_notice("You construct a window."))
var/obj/structure/window/WD = new the_rcd.window_type(loc)
WD.anchored = TRUE
return TRUE
@@ -286,4 +286,3 @@
health -= damage
spawn(1) healthcheck()
return 1
+1 -1
View File
@@ -158,7 +158,7 @@
O.forceMove(loc)
auto_align(I, params, TRUE)
else
to_chat(user, SPAN_WARNING("\The [I] is too big for you to move!"))
to_chat(user, span_warning("\The [I] is too big for you to move!"))
return
/obj/structure/low_wall/proc/handle_rod_use(mob/user, obj/item/stack/rods/R)
@@ -8,7 +8,7 @@
/obj/structure/prop/fake_ai/attackby(obj/O, mob/user)
if(istype(O, /obj/item/aicard)) // People trying to card the fake AI will get told its impossible.
to_chat(user, span("warning", "This core does not appear to have a suitable port to use \the [O] on..."))
to_chat(user, span_warning("This core does not appear to have a suitable port to use \the [O] on..."))
return TRUE
return ..()
@@ -17,4 +17,4 @@
/obj/structure/prop/fake_ai/dead/crashed_med_shuttle
name = "V.I.T.A."
icon_state = "ai-heartline-crash"
icon_state = "ai-heartline-crash"
+8 -8
View File
@@ -17,7 +17,7 @@
else ..()
/obj/structure/sign/proc/unfasten(mob/user)
user.visible_message(SPAN_NOTICE("\The [user] unfastens \the [src]."), SPAN_NOTICE("You unfasten \the [src]."))
user.visible_message(span_notice("\The [user] unfastens \the [src]."), span_notice("You unfasten \the [src]."))
var/obj/item/sign/S = new(src.loc)
S.name = name
S.desc = desc
@@ -1539,12 +1539,12 @@
return
if((!iswall(A) && !istype(A, /obj/structure/window)) || !isturf(user.loc))
to_chat(user, SPAN_WARNING("You can't place this here!"))
to_chat(user, span_warning("You can't place this here!"))
return
var/placement_dir = get_dir(user, A)
if (!(placement_dir in cardinal))
to_chat(user, SPAN_WARNING("You must stand directly in front of the location you wish to place that on."))
to_chat(user, span_warning("You must stand directly in front of the location you wish to place that on."))
return
var/obj/structure/sign/flag/P = new(user.loc)
@@ -1613,11 +1613,11 @@
/obj/structure/sign/flag/unfasten(mob/user)
if(!ripped)
user.visible_message(SPAN_NOTICE("\The [user] unfastens \the [src] and folds it back up."), SPAN_NOTICE("You unfasten \the [src] and fold it back up."))
user.visible_message(span_notice("\The [user] unfastens \the [src] and folds it back up."), span_notice("You unfasten \the [src] and fold it back up."))
var/obj/item/flag/F = new flagtype(get_turf(user))
user.put_in_hands(F)
else
user.visible_message(SPAN_NOTICE("\The [user] unfastens the tattered remnants of \the [src]."), SPAN_NOTICE("You unfasten the tattered remains of \the [src]."))
user.visible_message(span_notice("\The [user] unfastens the tattered remnants of \the [src]."), span_notice("You unfasten the tattered remains of \the [src]."))
if(linked_flag)
qdel(linked_flag) //otherwise you're going to get weird duping nonsense
qdel(src)
@@ -1626,7 +1626,7 @@
if(alert("Do you want to rip \the [src] from its place?","You think...","Yes","No") == "Yes")
if(!Adjacent(user)) //Cannot bring up dialogue and walk away
return FALSE
visible_message(SPAN_WARNING("\The [user] rips \the [src] in a single, decisive motion!" ))
visible_message(span_warning("\The [user] rips \the [src] in a single, decisive motion!" ))
playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1)
add_fingerprint(user)
rip()
@@ -1645,10 +1645,10 @@
/obj/structure/sign/flag/attackby(obj/item/W, mob/user)
..()
if(istype(W, /obj/item/flame/lighter) || istype(W, /obj/item/weldingtool))
visible_message(SPAN_WARNING("\The [user] starts to burn \the [src] down!"))
visible_message(span_warning("\The [user] starts to burn \the [src] down!"))
if(!do_after(user, 2 SECONDS))
return FALSE
visible_message(SPAN_WARNING("\The [user] burns \the [src] down!"))
visible_message(span_warning("\The [user] burns \the [src] down!"))
playsound(src.loc, 'sound/items/cigs_lighters/cig_light.ogg', 100, 1)
new /obj/effect/decal/cleanable/ash(src.loc)
if(linked_flag)
@@ -35,10 +35,10 @@
. = ..()
if(.)
if(M.mob_size < min_mob_buckle_size)
to_chat(M, SPAN_WARNING("You are too small to use \the [src]."))
to_chat(M, span_warning("You are too small to use \the [src]."))
. = FALSE
else if(M.mob_size >= max_mob_buckle_size)
to_chat(M, SPAN_WARNING("You are too large to use \the [src]."))
to_chat(M, span_warning("You are too large to use \the [src]."))
. = FALSE
/obj/structure/bed/chair/wheelchair/update_icon()
+1 -1
View File
@@ -698,7 +698,7 @@
/obj/structure/window/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_DECONSTRUCT)
to_chat(user, span("notice", "You deconstruct \the [src]."))
to_chat(user, span_notice("You deconstruct \the [src]."))
qdel(src)
return TRUE
return FALSE
+4 -4
View File
@@ -150,7 +150,7 @@
/turf/simulated/floor/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_FLOORWALL)
to_chat(user, span("notice", "You build a wall."))
to_chat(user, span_notice("You build a wall."))
ChangeTurf(/turf/simulated/wall)
var/turf/simulated/wall/T = get_turf(src) // Ref to the wall we just built.
// Apparently set_material(...) for walls requires refs to the material singletons and not strings.
@@ -162,18 +162,18 @@
if(RCD_AIRLOCK)
if(locate(/obj/machinery/door/airlock) in src)
return FALSE // No more airlock stacking.
to_chat(user, span("notice", "You build an airlock."))
to_chat(user, span_notice("You build an airlock."))
new the_rcd.airlock_type(src)
return TRUE
if(RCD_WINDOWGRILLE)
if(locate(/obj/structure/grille) in src)
return FALSE
to_chat(user, span("notice", "You construct the grille."))
to_chat(user, span_notice("You construct the grille."))
var/obj/structure/grille/G = new(src)
G.anchored = TRUE
return TRUE
if(RCD_DECONSTRUCT)
to_chat(user, span("notice", "You deconstruct \the [src]."))
to_chat(user, span_notice("You deconstruct \the [src]."))
ChangeTurf(get_base_turf_by_area(src), preserve_outdoors = TRUE)
return TRUE
@@ -45,31 +45,31 @@ var/list/turf_edge_cache = list()
var/obj/item/shovel/our_shovel = C
if(our_shovel.grave_mode)
if(contents.len > 0)
to_chat(user, SPAN_WARNING("You can't dig here!"))
to_chat(user, span_warning("You can't dig here!"))
return
to_chat(user, SPAN_NOTICE("\The [user] begins digging into \the [src] with \the [C]."))
to_chat(user, span_notice("\The [user] begins digging into \the [src] with \the [C]."))
var/delay = (5 SECONDS * C.toolspeed)
user.setClickCooldown(delay)
if(do_after(user, delay, src))
new/obj/structure/closet/grave/dirthole(src)
to_chat(user, SPAN_NOTICE("You dug up \a hole!"))
to_chat(user, span_notice("You dug up \a hole!"))
return
else
to_chat(user, SPAN_NOTICE("\The [user] begins digging into \the [src] with \the [C]."))
to_chat(user, span_notice("\The [user] begins digging into \the [src] with \the [C]."))
var/delay = (3 SECONDS * C.toolspeed)
user.setClickCooldown(delay)
if(do_after(user, delay, src))
if(!(locate(/obj/machinery/portable_atmospherics/hydroponics/soil) in contents))
var/obj/machinery/portable_atmospherics/hydroponics/soil/soil = new(src)
user.visible_message(SPAN_NOTICE("\The [src] digs \a [soil] into \the [src]."))
user.visible_message(span_notice("\The [src] digs \a [soil] into \the [src]."))
else
var/loot_type = get_loot_type()
if(loot_type)
loot_count--
var/obj/item/loot = new loot_type(src)
to_chat(user, SPAN_NOTICE("You dug up \a [loot]!"))
to_chat(user, span_notice("You dug up \a [loot]!"))
else
to_chat(user, SPAN_NOTICE("You didn't find anything of note in \the [src]."))
to_chat(user, span_notice("You didn't find anything of note in \the [src]."))
return
. = ..()
+1 -1
View File
@@ -329,7 +329,7 @@
/turf/simulated/wall/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
if(passed_mode == RCD_DECONSTRUCT)
to_chat(user, span("notice", "You deconstruct \the [src]."))
to_chat(user, span_notice("You deconstruct \the [src]."))
ChangeTurf(/turf/simulated/floor/airless, preserve_outdoors = TRUE)
return TRUE
return FALSE
+2 -2
View File
@@ -321,7 +321,7 @@
return FALSE
if(jobban_isbanned(vandal, JOB_GRAFFITI))
to_chat(vandal, SPAN_WARNING("You are banned from leaving persistent information across rounds."))
to_chat(vandal, span_warning("You are banned from leaving persistent information across rounds."))
return
var/too_much_graffiti = 0
@@ -397,7 +397,7 @@
/turf/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
if(passed_mode == RCD_FLOORWALL)
to_chat(user, span("notice", "You build a floor."))
to_chat(user, span_notice("You build a floor."))
ChangeTurf(/turf/simulated/floor/airless, preserve_outdoors = TRUE)
return TRUE
return FALSE
+1 -1
View File
@@ -877,7 +877,7 @@
if(!reason)
return
to_chat(M, span("filter_system critical", "You have been kicked from the server: [reason]"))
to_chat(M, span_filter_system(span_critical("You have been kicked from the server: [reason]")))
log_admin("[key_name(usr)] booted [key_name(M)] for reason: '[reason]'.")
message_admins(span_blue("[key_name_admin(usr)] booted [key_name_admin(M)] for reason '[reason]'."), 1)
//M.client = null
+18 -18
View File
@@ -521,13 +521,13 @@
var/datum/ai_holder/AI = L.ai_holder
if(stance == STANCE_SLEEP)
AI.go_wake()
to_chat(user, span("notice", "\The [L]'s AI has been enabled."))
to_chat(user, span_notice("\The [L]'s AI has been enabled."))
else
AI.go_sleep()
to_chat(user, span("notice", "\The [L]'s AI has been disabled."))
to_chat(user, span_notice("\The [L]'s AI has been disabled."))
return
else
to_chat(user, span("warning", "\The [L] is not AI controlled."))
to_chat(user, span_warning("\The [L] is not AI controlled."))
return
// Toggle hostility
@@ -535,28 +535,28 @@
if(!isnull(L.get_AI_stance()))
var/datum/ai_holder/AI = L.ai_holder
AI.hostile = !AI.hostile
to_chat(user, span("notice", "\The [L] is now [AI.hostile ? "hostile" : "passive"]."))
to_chat(user, span_notice("\The [L] is now [AI.hostile ? "hostile" : "passive"]."))
else
to_chat(user, span("warning", "\The [L] is not AI controlled."))
to_chat(user, span_warning("\The [L] is not AI controlled."))
return
// Copy faction
if(pa.Find("ctrl"))
holder.copied_faction = L.faction
to_chat(user, span("notice", "Copied faction '[holder.copied_faction]'."))
to_chat(user, span_notice("Copied faction '[holder.copied_faction]'."))
return
// Select/Deselect
if(!isnull(L.get_AI_stance()))
if(L in holder.selected_mobs)
holder.deselect_AI_mob(user.client, L)
to_chat(user, span("notice", "Deselected \the [L]."))
to_chat(user, span_notice("Deselected \the [L]."))
else
holder.select_AI_mob(user.client, L)
to_chat(user, span("notice", "Selected \the [L]."))
to_chat(user, span_notice("Selected \the [L]."))
return
else
to_chat(user, span("warning", "\The [L] is not AI controlled."))
to_chat(user, span_warning("\The [L] is not AI controlled."))
return
else //Not living
for(var/mob/living/unit in holder.selected_mobs)
@@ -564,17 +564,17 @@
if(pa.Find("middle"))
if(pa.Find("shift"))
to_chat(user, SPAN_NOTICE("All selected mobs set to wander"))
to_chat(user, span_notice("All selected mobs set to wander"))
for(var/mob/living/unit in holder.selected_mobs)
var/datum/ai_holder/AI = unit.ai_holder
AI.wander = TRUE
if(pa.Find("ctrl"))
to_chat(user, SPAN_NOTICE("Setting mobs set to NOT wander"))
to_chat(user, span_notice("Setting mobs set to NOT wander"))
for(var/mob/living/unit in holder.selected_mobs)
var/datum/ai_holder/AI = unit.ai_holder
AI.wander = FALSE
if(pa.Find("alt") && isatom(object))
to_chat(user, SPAN_NOTICE("Adding [object] to Entity Narrate List!"))
to_chat(user, span_notice("Adding [object] to Entity Narrate List!"))
user.client.add_mob_for_narration(object)
@@ -582,12 +582,12 @@
// Paste faction
if(pa.Find("ctrl") && isliving(object))
if(!holder.copied_faction)
to_chat(user, span("warning", "LMB+Shift a mob to copy their faction before pasting."))
to_chat(user, span_warning("LMB+Shift a mob to copy their faction before pasting."))
return
else
var/mob/living/L = object
L.faction = holder.copied_faction
to_chat(user, span("notice", "Pasted faction '[holder.copied_faction]'."))
to_chat(user, span_notice("Pasted faction '[holder.copied_faction]'."))
return
if(istype(object, /atom)) // Force attack.
@@ -599,7 +599,7 @@
var/datum/ai_holder/AI = unit.ai_holder
AI.give_target(A)
i++
to_chat(user, span("notice", "Commanded [i] mob\s to attack \the [A]."))
to_chat(user, span_notice("Commanded [i] mob\s to attack \the [A]."))
var/image/orderimage = image(buildmode_hud,A,"ai_targetorder")
orderimage.plane = PLANE_BUILDMODE
flick_overlay(orderimage, list(user.client), 8, TRUE)
@@ -626,7 +626,7 @@
message += "."
if(j)
message += "[j] mob\s to follow \the [L]."
to_chat(user, span("notice", message))
to_chat(user, span_notice(message))
var/image/orderimage = image(buildmode_hud,L,"ai_targetorder")
orderimage.plane = PLANE_BUILDMODE
flick_overlay(orderimage, list(user.client), 8, TRUE)
@@ -645,7 +645,7 @@
else
AI.give_destination(T, 1, pa.Find("shift")) // If shift is held, the mobs will not stop moving to attack a visible enemy.
told++
to_chat(user, span("notice", "Commanded [told] mob\s to move to \the [T], and manually placed [forced] of them."))
to_chat(user, span_notice("Commanded [told] mob\s to move to \the [T], and manually placed [forced] of them."))
var/image/orderimage = image(buildmode_hud,T,"ai_turforder")
orderimage.plane = PLANE_BUILDMODE
flick_overlay(orderimage, list(user.client), 8, TRUE)
@@ -708,7 +708,7 @@
holder.select_AI_mob(user, L)
i++
to_chat(user, span("notice", "Band-selected [i] mobs."))
to_chat(user, span_notice("Band-selected [i] mobs."))
return
/obj/effect/bmode/buildmode/proc/get_path_from_partial_text(default_path)
+6 -6
View File
@@ -587,17 +587,17 @@
switch(tgui_input_list(usr, "Which list?", "List Choice", list("Players","Admins","Mobs","Living Mobs","Dead Mobs", "Clients")))
if("Players")
to_chat(usr, span("filter_debuglogs", jointext(player_list,",")))
to_chat(usr, span_filter_debuglogs(jointext(player_list,",")))
if("Admins")
to_chat(usr, span("filter_debuglogs", jointext(GLOB.admins,",")))
to_chat(usr, span_filter_debuglogs(jointext(GLOB.admins,",")))
if("Mobs")
to_chat(usr, span("filter_debuglogs", jointext(mob_list,",")))
to_chat(usr, span_filter_debuglogs(jointext(mob_list,",")))
if("Living Mobs")
to_chat(usr, span("filter_debuglogs", jointext(living_mob_list,",")))
to_chat(usr, span_filter_debuglogs(jointext(living_mob_list,",")))
if("Dead Mobs")
to_chat(usr, span("filter_debuglogs", jointext(dead_mob_list,",")))
to_chat(usr, span_filter_debuglogs(jointext(dead_mob_list,",")))
if("Clients")
to_chat(usr, span("filter_debuglogs", jointext(GLOB.clients,",")))
to_chat(usr, span_filter_debuglogs(jointext(GLOB.clients,",")))
/client/proc/cmd_debug_using_map()
set category = "Debug"
+12 -12
View File
@@ -40,20 +40,20 @@
//Since we extended to include all atoms, we're shutting things down with a guard clause for ghosts
if(istype(E, /mob/observer))
to_chat(usr, SPAN_NOTICE("Ghosts shouldn't be narrated! If you want a ghost, make it a subtype of mob/living!"))
to_chat(usr, span_notice("Ghosts shouldn't be narrated! If you want a ghost, make it a subtype of mob/living!"))
return
//We require a static mob/living type to check for .client and also later on, to use the unique .say mechanics for stuttering and language
if(istype(E, /mob/living))
var/mob/living/L = E
if(L.client)
to_chat(usr, SPAN_NOTICE("[L.name] is a player. All attempts to speak through them \
to_chat(usr, span_notice("[L.name] is a player. All attempts to speak through them \
gets logged in case of abuse."))
log_and_message_admins("has added [L.ckey]'s mob to their entity narrate list", usr)
return
var/unique_name = sanitize(tgui_input_text(usr, "Please give the entity a unique name to track internally. \
This doesn't override how it appears in game", "tracker", L.name))
if(unique_name in holder.entity_names)
to_chat(usr, SPAN_NOTICE("[unique_name] is not unique! Pick another!"))
to_chat(usr, span_notice("[unique_name] is not unique! Pick another!"))
add_mob_for_narration(L) //Recursively calling ourselves until cancelled or a unique name is given.
return
holder.entity_names += unique_name
@@ -66,7 +66,7 @@
var/unique_name = sanitize(tgui_input_text(usr, "Please give the entity a unique name to track internally. \
This doesn't override how it appears in game", "tracker", A.name))
if(unique_name in holder.entity_names)
to_chat(usr, SPAN_NOTICE("[unique_name] is not unique! Pick another!"))
to_chat(usr, span_notice("[unique_name] is not unique! Pick another!"))
add_mob_for_narration(A)
return
holder.entity_names += unique_name
@@ -157,17 +157,17 @@
mode = sanitize(mode)
if(!(mode in list("Speak", "Emote")))
to_chat(usr, SPAN_NOTICE("Valid modes are 'Speak' and 'Emote'."))
to_chat(usr, span_notice("Valid modes are 'Speak' and 'Emote'."))
return
if(!holder.entity_refs[name])
to_chat(usr, SPAN_NOTICE("[name] not in saved references!"))
to_chat(usr, span_notice("[name] not in saved references!"))
//Separate definition for mob/living and /obj due to .say() code allowing us to engage with languages, stuttering etc
//We also need this so we can check for .client
var/datum/weakref/wref = holder.entity_refs[name]
var/selection = wref.resolve()
if(!selection)
to_chat(usr, SPAN_NOTICE("[name] has invalid reference, deleting"))
to_chat(usr, span_notice("[name] has invalid reference, deleting"))
holder.entity_names -= name
holder.entity_refs -= name
if(istype(selection, /mob/living))
@@ -260,7 +260,7 @@
var/datum/weakref/wref = entity_refs[tgui_selected_id]
tgui_selected_refs = wref.resolve()
if(!tgui_selected_refs)
to_chat(usr, SPAN_NOTICE("[tgui_selected_id] has invalid reference, deleting"))
to_chat(usr, span_notice("[tgui_selected_id] has invalid reference, deleting"))
entity_names -= tgui_selected_id
entity_refs -= tgui_selected_id
tgui_selected_id = ""
@@ -281,9 +281,9 @@
tgui_selected_name = A.name
if("narrate")
if(world.time < (tgui_last_message + 0.5 SECONDS))
to_chat(usr, SPAN_NOTICE("You can't messages that quickly! Wait at least half a second"))
to_chat(usr, span_notice("You can't messages that quickly! Wait at least half a second"))
else
to_chat(usr, SPAN_NOTICE("Message successfully sent!"))
to_chat(usr, span_notice("Message successfully sent!"))
tgui_last_message = world.time
var/message = params["message"] //Sanitizing before speaking it
if(tgui_selection_mode)
@@ -291,7 +291,7 @@
var/datum/weakref/wref = entity_refs[entity]
var/ref = wref.resolve()
if(!ref)
to_chat(usr, SPAN_NOTICE("[entity] has invalid reference, deleting"))
to_chat(usr, span_notice("[entity] has invalid reference, deleting"))
entity_names -= entity
entity_refs -= entity
tgui_selected_id_multi -= entity
@@ -308,7 +308,7 @@
var/datum/weakref/wref = entity_refs[tgui_selected_id]
var/ref = wref.resolve()
if(!ref)
to_chat(usr, SPAN_NOTICE("[tgui_selected_id] has invalid reference, deleting"))
to_chat(usr, span_notice("[tgui_selected_id] has invalid reference, deleting"))
entity_names -= tgui_selected_id
entity_refs -= tgui_selected_id
tgui_selected_id = ""
+2 -2
View File
@@ -35,7 +35,7 @@ Eventkit verb to be used to spawn the obj/effect/landmarks defined under code\ga
if("Manage Personal Triggers")
var/personal_list = event_triggers[src.ckey]
if(!LAZYLEN(personal_list))
to_chat(src, SPAN_NOTICE("You don't have any landmarks to manage!"))
to_chat(src, span_notice("You don't have any landmarks to manage!"))
return
personal_list |= list("Cancel", "Delete All")
var/choice = tgui_input_list(src, "Select a landmark to choose between teleporting to it or deleting it, select delete all to clear them.", \
@@ -70,7 +70,7 @@ Eventkit verb to be used to spawn the obj/effect/landmarks defined under code\ga
var/other_ckey = sanitize(tgui_input_text(src, "input trigger owner's ckey", "CKEY", ""))
var/others_list = event_triggers[other_ckey]
if(!LAZYLEN(others_list))
to_chat(src, SPAN_NOTICE("[other_ckey] doesn't have any landmarks to manage!"))
to_chat(src, span_notice("[other_ckey] doesn't have any landmarks to manage!"))
return
others_list |= list("Cancel", "Delete All")
var/choice = tgui_input_list(src, "Select a landmark to choose between teleporting to it or deleting it, select delete all to clear them.", \
@@ -41,6 +41,6 @@
message += "#### Over all, there are [players] eligible players, of which [inactives] were hidden due to inactivity. ####"
to_chat(usr, SPAN_NOTICE(message))
to_chat(usr, span_notice(message))
#undef INACTIVITY_CAP
+1 -1
View File
@@ -93,7 +93,7 @@
if(iscarbon(L))
var/mob/living/carbon/C = L
C.ear_deaf += 10
to_chat(L, span("danger", "Lightning struck nearby, and the thunderclap is deafening!"))
to_chat(L, span_danger("Lightning struck nearby, and the thunderclap is deafening!"))
#undef LIGHTNING_REDIRECT_RANGE
#undef LIGHTNING_ZAP_RANGE
@@ -147,7 +147,7 @@
return
rabid = TRUE
my_slime.update_mood()
my_slime.visible_message(span("danger", "\The [my_slime] enrages!"))
my_slime.visible_message(span_danger("\The [my_slime] enrages!"))
// Called to relax from being rabid (when blue slime core was used).
/datum/ai_holder/simple_mob/xenobio_slime/proc/relax()
@@ -157,7 +157,7 @@
if(rabid)
rabid = FALSE
my_slime.update_mood()
my_slime.visible_message(span("danger", "\The [my_slime] calms down."))
my_slime.visible_message(span_danger("\The [my_slime] calms down."))
// Called when using a pacification agent (or it's Kendrick being initalized).
/datum/ai_holder/simple_mob/xenobio_slime/proc/pacify()
+1 -1
View File
@@ -23,7 +23,7 @@
return
if(B.overmind != src)
to_chat(src, span("warning", "This blob isn't controlled by you."))
to_chat(src, span_warning("This blob isn't controlled by you."))
if(!istype(B, /obj/structure/blob/normal))
to_chat(src, "<span class='warning'>Unable to use this blob, find a normal one.</span>")
+5 -5
View File
@@ -14,7 +14,7 @@
// First check if anything is even on here.
var/list/data = get_catalogue_data()
if(!LAZYLEN(data))
to_chat(user, span("warning", "\The [src] is not interesting enough to catalogue."))
to_chat(user, span_warning("\The [src] is not interesting enough to catalogue."))
return FALSE
else
// Check if this has nothing new on it.
@@ -26,20 +26,20 @@
break
if(!has_new_data)
to_chat(user, span("warning", "Scanning \the [src] would provide no new information."))
to_chat(user, span_warning("Scanning \the [src] would provide no new information."))
return FALSE
return TRUE
/mob/living/can_catalogue(mob/user) // Dead mobs can't be scanned.
if(stat >= DEAD)
to_chat(user, span("warning", "Entities must be alive for a comprehensive scan."))
to_chat(user, span_warning("Entities must be alive for a comprehensive scan."))
return FALSE
return ..()
/obj/item/can_catalogue(mob/user) // Items must be identified to be scanned.
if(!is_identified())
to_chat(user, span("warning", "The properties of this object has not been determined. Identify it first."))
to_chat(user, span_warning("The properties of this object has not been determined. Identify it first."))
return FALSE
return ..()
@@ -78,4 +78,4 @@
data += /datum/category_item/catalogue/technology/positronics
if(BORG_BRAINTYPE_DRONE)
data += /datum/category_item/catalogue/technology/drone/drones
return data
return data
+4 -4
View File
@@ -104,7 +104,7 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)
/datum/category_item/catalogue/proc/display_in_chatlog(mob/user)
to_chat(user, "<br>")
to_chat(user, span("notice", "<b>[uppertext(name)]</b>"))
to_chat(user, span_notice("<b>[uppertext(name)]</b>"))
// Some entries get very long so lets not totally flood the chatlog.
var/desc_length_limit = 750
@@ -113,9 +113,9 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)
displayed_desc = copytext(displayed_desc, 1, desc_length_limit + 1)
displayed_desc += "... (View databanks for full data)"
to_chat(user, span("notice", "<i>[displayed_desc]</i>"))
to_chat(user, span("notice", "Cataloguers : <b>[english_list(cataloguers)]</b>."))
to_chat(user, span("notice", "Contributes <b>[value]</b> points to personal exploration fund."))
to_chat(user, span_notice("<i>[displayed_desc]</i>"))
to_chat(user, span_notice("Cataloguers : <b>[english_list(cataloguers)]</b>."))
to_chat(user, span_notice("Contributes <b>[value]</b> points to personal exploration fund."))
/*
// Truncates text to limit if necessary.
+18 -18
View File
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
/obj/item/cataloguer/afterattack(atom/target, mob/user, proximity_flag)
// Things that invalidate the scan immediately.
if(busy)
to_chat(user, span("warning", "\The [src] is already scanning something."))
to_chat(user, span_warning("\The [src] is already scanning something."))
return
if(isturf(target) && (!target.can_catalogue()))
@@ -89,7 +89,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
return
if(get_dist(target, user) > scan_range)
to_chat(user, span("warning", "You are too far away from \the [target] to catalogue it. Get closer."))
to_chat(user, span_warning("You are too far away from \the [target] to catalogue it. Get closer."))
return
// Get how long the delay will be.
@@ -97,9 +97,9 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
if(partial_scanned)
if(partial_scanned.resolve() == target)
scan_delay -= partial_scan_time
to_chat(user, span("notice", "Resuming previous scan."))
to_chat(user, span_notice("Resuming previous scan."))
else
to_chat(user, span("warning", "Scanning new target. Previous scan buffer cleared."))
to_chat(user, span_warning("Scanning new target. Previous scan buffer cleared."))
// Start the special effects.
busy = TRUE
@@ -118,18 +118,18 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
var/scan_start_time = world.time
if(do_after(user, scan_delay, target, ignore_movement = TRUE, max_distance = scan_range))
if(target.can_catalogue(user))
to_chat(user, span("notice", "You successfully scan \the [target] with \the [src]."))
to_chat(user, span_notice("You successfully scan \the [target] with \the [src]."))
playsound(src, 'sound/machines/ping.ogg', 50)
catalogue_object(target, user)
else
// In case someone else scans it first, or it died, etc.
to_chat(user, span("warning", "\The [target] is no longer valid to scan with \the [src]."))
to_chat(user, span_warning("\The [target] is no longer valid to scan with \the [src]."))
playsound(src, 'sound/machines/buzz-two.ogg', 50)
partial_scanned = null
partial_scan_time = 0
else
to_chat(user, span("warning", "You failed to finish scanning \the [target] with \the [src]."))
to_chat(user, span_warning("You failed to finish scanning \the [target] with \the [src]."))
playsound(src, 'sound/machines/buzz-two.ogg', 50)
color_box(box_segments, "#FF0000", 3)
partial_scanned = WEAKREF(target)
@@ -175,7 +175,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
// Give out points.
if(points_gained)
// First, to us.
to_chat(user, span("notice", "Gained [points_gained] points from this scan."))
to_chat(user, span_notice("Gained [points_gained] points from this scan."))
adjust_points(points_gained)
// Now to our friends, if any.
@@ -184,9 +184,9 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
var/list/things = M.GetAllContents(3) // Depth of two should reach into bags but just in case lets make it three.
var/obj/item/cataloguer/other_cataloguer = locate() in things // If someone has two or more scanners this only adds points to one.
if(other_cataloguer)
to_chat(M, span("notice", "Gained [points_gained] points from \the [user]'s scan of \the [target]."))
to_chat(M, span_notice("Gained [points_gained] points from \the [user]'s scan of \the [target]."))
other_cataloguer.adjust_points(points_gained)
to_chat(user, span("notice", "Shared discovery with [contributers.len] other contributer\s."))
to_chat(user, span_notice("Shared discovery with [contributers.len] other contributer\s."))
@@ -198,7 +198,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
// Helps to avoid having to click a hundred things in a room for things that have an entry.
/obj/item/cataloguer/proc/pulse_scan(mob/user)
if(busy)
to_chat(user, span("warning", "\The [src] is busy doing something else."))
to_chat(user, span_warning("\The [src] is busy doing something else."))
return
busy = TRUE
@@ -215,7 +215,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
var/filter = filter(type = "outline", size = 1, color = "#00FF00")
for(var/atom/A as anything in scannable_atoms)
A.filters += filter
to_chat(user, span("notice", "\The [src] is highlighting scannable objects in green, if any exist."))
to_chat(user, span_notice("\The [src] is highlighting scannable objects in green, if any exist."))
sleep(2 SECONDS)
@@ -231,7 +231,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
playsound(src, 'sound/machines/ping.ogg', 50)
else
playsound(src, 'sound/machines/buzz-two.ogg', 50)
to_chat(user, span("notice", "\The [src] found [scannable_atoms.len] object\s that can be scanned."))
to_chat(user, span_notice("\The [src] found [scannable_atoms.len] object\s that can be scanned."))
// Negative points are bad.
@@ -354,17 +354,17 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
set category = "Object"
if(busy)
to_chat(usr, span("warning", "\The [src] is currently scanning something."))
to_chat(usr, span_warning("\The [src] is currently scanning something."))
return
deployed = !(deployed)
if(deployed)
w_class = ITEMSIZE_NORMAL
icon_state = "[initial(icon_state)]"
to_chat(usr, span("notice", "You flick open \the [src]."))
to_chat(usr, span_notice("You flick open \the [src]."))
else
w_class = ITEMSIZE_SMALL
icon_state = "[initial(icon_state)]_closed"
to_chat(usr, span("notice", "You close \the [src]."))
to_chat(usr, span_notice("You close \the [src]."))
if (ismob(usr))
var/mob/M = usr
@@ -372,12 +372,12 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
/obj/item/cataloguer/compact/afterattack(atom/target, mob/user, proximity_flag)
if(!deployed)
to_chat(user, span("warning", "\The [src] is closed."))
to_chat(user, span_warning("\The [src] is closed."))
return
return ..()
/obj/item/cataloguer/compact/pulse_scan(mob/user)
if(!deployed)
to_chat(user, span("warning", "\The [src] is closed."))
to_chat(user, span_warning("\The [src] is closed."))
return
return ..()
@@ -214,7 +214,7 @@ var/datum/gear_tweak/custom_name/gear_tweak_free_name = new()
/datum/gear_tweak/custom_name/get_metadata(var/user, var/metadata)
if(jobban_isbanned(user, LOADOUT_BAN_STRING))
to_chat(user, SPAN_WARNING("You are banned from using custom loadout names/descriptions."))
to_chat(user, span_warning("You are banned from using custom loadout names/descriptions."))
return
if(valid_custom_names)
return tgui_input_list(user, "Choose an item name.", "Character Preference", valid_custom_names, metadata)
@@ -246,7 +246,7 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
/datum/gear_tweak/custom_desc/get_metadata(var/user, var/metadata)
if(jobban_isbanned(user, LOADOUT_BAN_STRING))
to_chat(user, SPAN_WARNING("You are banned from using custom loadout names/descriptions."))
to_chat(user, span_warning("You are banned from using custom loadout names/descriptions."))
return
if(valid_custom_desc)
return tgui_input_list(user, "Choose an item description.", "Character Preference",valid_custom_desc, metadata)
+3 -3
View File
@@ -77,13 +77,13 @@ BLIND // can't see anything
/obj/item/clothing/glasses/attack_self(mob/user)
if(toggleable)
if(!can_toggle(user))
to_chat(user, span("warning", "You don't seem to be able to toggle \the [src] here."))
to_chat(user, span_warning("You don't seem to be able to toggle \the [src] here."))
else
toggle_active(user)
if(active)
to_chat(user, span("notice", "You activate the optical matrix on the [src]."))
to_chat(user, span_notice("You activate the optical matrix on the [src]."))
else
to_chat(user, span("notice", "You deactivate the optical matrix on the [src]."))
to_chat(user, span_notice("You deactivate the optical matrix on the [src]."))
..()
/obj/item/clothing/glasses/meson
+2 -2
View File
@@ -135,11 +135,11 @@
if(ar_toggled)
away_planes = enables_planes
enables_planes = null
to_chat(usr, SPAN_NOTICE("You disabled the Augmented Reality HUD of your [src.name]."))
to_chat(usr, span_notice("You disabled the Augmented Reality HUD of your [src.name]."))
else
enables_planes = away_planes
away_planes = null
to_chat(usr, SPAN_NOTICE("You enabled the Augmented Reality HUD of your [src.name]."))
to_chat(usr, span_notice("You enabled the Augmented Reality HUD of your [src.name]."))
ar_toggled = !ar_toggled
usr.update_action_buttons()
usr.recalculate_vis()
@@ -180,18 +180,18 @@
if(H.wear_suit != src) return
if(helmet.light_on)
to_chat(H, SPAN_NOTICE("The helmet light shuts off as it retracts."))
to_chat(H, span_notice("The helmet light shuts off as it retracts."))
helmet.update_flashlight(H)
if(H.head == helmet)
to_chat(H, SPAN_NOTICE("You retract your suit helmet."))
to_chat(H, span_notice("You retract your suit helmet."))
helmet.canremove = TRUE
H.drop_from_inventory(helmet)
helmet.forceMove(src)
playsound(src.loc, 'sound/machines/click2.ogg', 75, 1)
else
if(H.head)
to_chat(H, SPAN_DANGER("You cannot deploy your helmet while wearing \the [H.head]."))
to_chat(H, span_danger("You cannot deploy your helmet while wearing \the [H.head]."))
return
if(H.equip_to_slot_if_possible(helmet, slot_head))
helmet.canremove = FALSE
@@ -211,7 +211,7 @@
var/mob/living/carbon/human/H = usr
if(!tank && !cooler)
to_chat(H, SPAN_NOTICE("There is no tank or cooling unit inserted."))
to_chat(H, span_notice("There is no tank or cooling unit inserted."))
return
if(!istype(H)) return
@@ -225,7 +225,7 @@
else
removing = cooler
cooler = null
to_chat(H, SPAN_DANGER("You press the emergency release, ejecting \the [removing] from your suit."))
to_chat(H, span_danger("You press the emergency release, ejecting \the [removing] from your suit."))
playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
removing.canremove = TRUE
H.drop_from_inventory(removing)
@@ -567,7 +567,7 @@
/obj/item/clothing/accessory/gaiter/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/clothing/mask/breath))
to_chat(user, SPAN_NOTICE("You tuck [I] behind [src]."))
to_chat(user, span_notice("You tuck [I] behind [src]."))
breathmask = I
breath_masked = TRUE
user.drop_from_inventory(I, drop_location())
@@ -578,7 +578,7 @@
/obj/item/clothing/accessory/gaiter/AltClick(mob/user)
. = ..()
if(breath_masked && breathmask)
to_chat(user, SPAN_NOTICE("You pull [breathmask] out from behind [src], and it drops to your feet."))
to_chat(user, span_notice("You pull [breathmask] out from behind [src], and it drops to your feet."))
breathmask.forceMove(drop_location())
breathmask = null
breath_masked = FALSE
@@ -598,7 +598,7 @@
body_parts_covered &= ~FACE
if(breath_masked)
item_flags &= ~AIRTIGHT
to_chat(user, SPAN_NOTICE(gaiterstring))
to_chat(user, span_notice(gaiterstring))
qdel(mob_overlay) // we're gonna need to refresh these
update_clothing_icon() //so our mob-overlays update
@@ -10,10 +10,10 @@
/decl/emote/audible/slap/New()
..()
emote_message_1p_target = SPAN_DANGER(emote_message_1p_target)
emote_message_1p = SPAN_DANGER(emote_message_1p)
emote_message_3p_target = SPAN_DANGER(emote_message_3p_target)
emote_message_3p = SPAN_DANGER(emote_message_3p)
emote_message_1p_target = span_danger(emote_message_1p_target)
emote_message_1p = span_danger(emote_message_1p)
emote_message_3p_target = span_danger(emote_message_3p_target)
emote_message_3p = span_danger(emote_message_3p)
/decl/emote/audible/slap/do_extra(var/atom/user, var/atom/target)
. = ..()
@@ -24,6 +24,6 @@
/decl/emote/audible/snap/do_emote(var/atom/user, var/extra_params)
if(!can_snap(user))
to_chat(user, SPAN_WARNING("You need at least one working hand to snap your fingers."))
to_chat(user, span_warning("You need at least one working hand to snap your fingers."))
return FALSE
. = ..()
+3 -3
View File
@@ -6,10 +6,10 @@
/decl/emote/human/deathgasp/do_emote(mob/living/carbon/human/user)
if(istype(user) && user.species.get_death_message(user) == DEATHGASP_NO_MESSAGE)
to_chat(user, SPAN_WARNING("Your species has no deathgasp."))
to_chat(user, span_warning("Your species has no deathgasp."))
return
. = ..()
. = ..()
/decl/emote/human/deathgasp/get_emote_message_3p(var/mob/living/carbon/human/user)
return "[user.species.get_death_message(user)]"
@@ -7,4 +7,4 @@
if(!M.isSynthetic())
M.vomit()
return
to_chat(src, SPAN_WARNING("You are unable to vomit."))
to_chat(src, span_warning("You are unable to vomit."))
+2 -2
View File
@@ -85,7 +85,7 @@ var/global/list/emotes_by_key
if(ismob(user) && check_restraints)
var/mob/M = user
if(M.restrained())
to_chat(user, SPAN_WARNING("You are restrained and cannot do that."))
to_chat(user, span_warning("You are restrained and cannot do that."))
return
var/atom/target
@@ -106,7 +106,7 @@ var/global/list/emotes_by_key
target = thing
if(!target)
to_chat(user, SPAN_WARNING("You cannot see a '[extra_params]' within range."))
to_chat(user, span_warning("You cannot see a '[extra_params]' within range."))
return
var/use_1p = get_emote_message_1p(user, target, extra_params)
+6 -6
View File
@@ -25,7 +25,7 @@
return
if(world.time < next_emote)
to_chat(src, SPAN_WARNING("You cannot use another emote yet."))
to_chat(src, span_warning("You cannot use another emote yet."))
return
//VOREStation Addition Start
if(forced_psay)
@@ -49,7 +49,7 @@
return
if(!can_emote(m_type))
to_chat(src, SPAN_WARNING("You cannot currently [m_type == AUDIBLE_MESSAGE ? "audibly" : "visually"] emote!"))
to_chat(src, span_warning("You cannot currently [m_type == AUDIBLE_MESSAGE ? "audibly" : "visually"] emote!"))
return
if(act == "me")
@@ -83,11 +83,11 @@
var/decl/emote/use_emote = get_emote_by_key(act)
if(!istype(use_emote))
to_chat(src, SPAN_WARNING("Unknown emote '[act]'. Type <b>say *help</b> for a list of usable emotes."))
to_chat(src, span_warning("Unknown emote '[act]'. Type <b>say *help</b> for a list of usable emotes."))
return
if(!use_emote.mob_can_use(src))
to_chat(src, SPAN_WARNING("You cannot use the emote '[act]'. Type <b>say *help</b> for a list of usable emotes."))
to_chat(src, span_warning("You cannot use the emote '[act]'. Type <b>say *help</b> for a list of usable emotes."))
return
if(m_type != use_emote.message_type && use_emote.conscious && stat != CONSCIOUS)
@@ -130,8 +130,8 @@
// Oh shit, we got this far! Let's see... did the user attempt to use more than one token?
if(findtext(subtext, "*"))
// abort abort!
to_chat(emoter, SPAN_WARNING("You may use only one \"["*"]\" symbol in your emote."))
to_chat(emoter, SPAN_WARNING(message))
to_chat(emoter, span_warning("You may use only one \"["*"]\" symbol in your emote."))
to_chat(emoter, span_warning(message))
return
if(pretext)
+1 -1
View File
@@ -181,7 +181,7 @@
keepgoing = FALSE
if(E.len == 0)
to_chat(src, SPAN_NOTICE("There are no mobs to examine."))
to_chat(src, span_notice("There are no mobs to examine."))
return
var/atom/B = null
if(E.len == 1)
+1 -1
View File
@@ -47,7 +47,7 @@
if(istype(O, /obj/item/firework_star))
if(loaded_star)
to_chat(user, SPAN_NOTICE("\The [src] already has \a [loaded_star] inside, unload it first!"))
to_chat(user, span_notice("\The [src] already has \a [loaded_star] inside, unload it first!"))
return
if(user.unEquip(O, 0, src))
loaded_star = O
+2 -2
View File
@@ -9,7 +9,7 @@
var/turf/T = get_turf(usr)
if(!T) // In null space.
to_chat(usr, span("warning", "You appear to be in a place without any sort of concept of direction. You have bigger problems to worry about."))
to_chat(usr, span_warning("You appear to be in a place without any sort of concept of direction. You have bigger problems to worry about."))
return
if(!T.is_outdoors()) // They're inside.
@@ -18,7 +18,7 @@
else // They're outside and hopefully on a planet.
if(T.z <= 0 || SSplanets.z_to_planet.len < T.z || !(SSplanets.z_to_planet[T.z])) //VOREstation edit - removed broken in list check; use length limit instead.
to_chat(usr, span("warning", "You appear to be outside, but not on a planet... Something is wrong."))
to_chat(usr, span_warning("You appear to be outside, but not on a planet... Something is wrong."))
return
var/datum/planet/P = SSplanets.z_to_planet[T.z]
+1 -1
View File
@@ -24,7 +24,7 @@
/obj/item/reagent_containers/food/proc/handle_name_change(var/mob/living/user)
if(user.stat == DEAD || !(ishuman(user) || isrobot(user)))
to_chat(user, SPAN_WARNING("You can't cook!"))
to_chat(user, span_warning("You can't cook!"))
return
var/n_name = sanitizeSafe(input(user, "What would you like to name \the [src]? Leave blank to reset.", "Food Naming", null) as text, MAX_NAME_LEN)
if(!n_name)
+1 -1
View File
@@ -4799,7 +4799,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
@@ -247,7 +247,7 @@
if (I.reagents.total_volume <= 0 && oil)
//Its empty, handle scooping some hot oil out of the fryer
oil.trans_to(I, I.reagents.maximum_volume)
user.visible_message("<span class='filter_notice'>[user] scoops some oil out of \the [src].</span>", span("notice","You scoop some oil out of \the [src]."))
user.visible_message("<span class='filter_notice'>[user] scoops some oil out of \the [src].</span>", span_notice("You scoop some oil out of \the [src]."))
return 1
else
//It contains stuff, handle pouring any oil into the fryer
+1 -1
View File
@@ -191,7 +191,7 @@
var/obj/item/reagent_containers/cooking_container/CC = container
CC.clear()
container.visible_message(SPAN_WARNING("[container] inexplicably spills, and its contents are lost!"))
container.visible_message(span_warning("[container] inexplicably spills, and its contents are lost!"))
return
@@ -92,5 +92,5 @@
/datum/event2/event/raise_funds/proc/send_command_report(title, message)
post_comm_message(title, message)
to_world(span("danger", "New [using_map.company_name] Update available at all communication consoles."))
to_world(span_danger("New [using_map.company_name] Update available at all communication consoles."))
SEND_SOUND(world, 'sound/AI/commandreport.ogg')
@@ -71,7 +71,7 @@
for(var/obj/machinery/door/airlock/door in area.contents)
if(can_break_door(door))
addtimer(CALLBACK(src, PROC_REF(break_door), door), 1) // Emagging proc is actually a blocking proc and that's bad for the ticker.
door.visible_message(span("danger", "\The [door]'s panel sparks!"))
door.visible_message(span_danger("\The [door]'s panel sparks!"))
playsound(door, "sparks", 50, 1)
log_debug("Airlock Failure event has broken \the [door] airlock in [area].")
affected_areas |= area
@@ -70,7 +70,7 @@
return
// Otherwise Vender Zero was taken out in some form.
if(vender_zero)
vender_zero.visible_message(span("notice", "\The [vender_zero]'s network activity light flickers wildly \
vender_zero.visible_message(span_notice("\The [vender_zero]'s network activity light flickers wildly \
for a few seconds as a small screen reads: 'Rolling out firmware reset to networked machines'."))
for(var/obj/machinery/vending/vender in infected_vending_machines)
cure_vender(vender)
@@ -78,7 +78,7 @@
chosen_window.take_damage(chosen_window.maxhealth * 0.8)
playsound(chosen_window, 'sound/effects/Glasshit.ogg', 100, 1)
chosen_window.visible_message(span("danger", "\The [chosen_window] suddenly begins to crack!"))
chosen_window.visible_message(span_danger("\The [chosen_window] suddenly begins to crack!"))
/datum/event2/event/window_break/should_end()
. = ..()
@@ -201,7 +201,7 @@
global_announcer.autosay(message, my_department, DEPARTMENT_ENGINEERING)
for(var/mob/living/silicon/ai/A in player_list)
to_chat(A, span("danger", "Malicious program detected in the [area_display_name] lighting and airlock control systems by [my_department]. \
to_chat(A, span_danger("Malicious program detected in the [area_display_name] lighting and airlock control systems by [my_department]. \
Disabling the main breaker in the APCs will protect the APC's room from being compromised."))
var/time_to_flicker = start_delay - 10 SECONDS
@@ -53,7 +53,7 @@
pod.make_antag = antag_type
pod.occupant_type = "[pod.make_antag] [pod.occupant_type]"
say_dead_object("[span("notice", pod.occupant_type)] pod is now available in \the [get_area(pod)].", pod)
say_dead_object("[span_notice(pod.occupant_type)] pod is now available in \the [get_area(pod)].", pod)
/datum/event2/event/ghost_pod_spawner/stowaway/announce()
if(prob(announce_odds))
+2 -2
View File
@@ -403,9 +403,9 @@
return TRUE
if(prob(50))
I.forceMove(loc)
visible_message(span("notice", "Swish! \the [I] lands in \the [src]."), 3)
visible_message(span_notice("Swish! \the [I] lands in \the [src]."), 3)
else
visible_message(span("warning", "\The [I] bounces off of \the [src]'s rim!"), 3)
visible_message(span_warning("\The [I] bounces off of \the [src]'s rim!"), 3)
return FALSE
return ..()
+16 -16
View File
@@ -69,7 +69,7 @@
"/obj/item/clothing/head/helmet/ert/engineer" = "erte",
"/obj/item/clothing/head/helmet/ert/medical" = "ertm",
)
prefix_update_rig = list(
"/obj/item/rig/ert" = "ertc",
"/obj/item/rig/ert/security" = "erts",
@@ -83,9 +83,9 @@
if(!mask_icon)
mask_icon = icon('icons/effects/64x64.dmi', "mapper_mask")
extras_holder = new()
var/obj/screen/mapper/marker/mark = new()
mark.icon = 'icons/effects/64x64.dmi'
mark.icon_state = "mapper_none"
@@ -109,7 +109,7 @@
mapping_units -= src
last_run()
map_image_cache.Cut()
icon_image_cache.Cut()
qdel_null(extras_holder)
@@ -132,7 +132,7 @@
if(!ishuman(loc) || user != loc)
to_chat(H, "<span class='warning'>This device needs to be on your person.</span>")
if(hud_datum?.main_hud)
hide_device()
to_chat(H, "<span class='notice'>You put \the [src] away.</span>")
@@ -199,7 +199,7 @@
if(!updating || (uses_power && !cell))
stop_updates()
return
if(uses_power)
var/power_to_use = pinging ? power_usage*2 : power_usage
if(cell.use(power_to_use) != power_to_use) // we weren't able to use our full power_usage amount!
@@ -288,11 +288,11 @@
// Mapper not on a turf or elsewhere
if(!TU || (TU.z != T_z))
continue
// We're the marker
if(HC == src)
mob_indicator = HOLOMAP_YOU
// The marker is held by a borg
else if(isrobot(HC.loc))
var/mob/living/silicon/robot/R = HC.loc
@@ -300,7 +300,7 @@
mob_indicator = HOLOMAP_DEAD
else
mob_indicator = HOLOMAP_OTHER
// The marker is worn by a human
else if(ishuman(loc))
var/mob/living/carbon/human/H = loc
@@ -308,11 +308,11 @@
mob_indicator = HOLOMAP_DEAD
else
mob_indicator = HOLOMAP_OTHER
// It's not attached to anything useful
else
mob_indicator = HOLOMAP_DEAD
// Ask it to update it's icon based on helmet (or whatever)
HC.update_marker()
@@ -342,19 +342,19 @@
for(var/obj/item/holomap_beacon/HB as anything in mapping_beacons)
if(HB.mapper_filter != mapper_filter)
continue
var/turf/TB = get_turf(HB)
// Marker beacon not on a turf or elsewhere
if(!TB || (TB.z != T_z))
continue
var/marker_cache_key = "\ref[HB]_marker"
if(!(marker_cache_key in icon_image_cache))
var/obj/screen/mapper/marker/mark = new()
mark.icon_state = "beacon"
mark.layer = 1
icon_image_cache[marker_cache_key] = mark
var/obj/screen/mapper/marker/mark = icon_image_cache[marker_cache_key]
handle_marker(mark,TB.x,TB.y)
extras += mark
@@ -369,7 +369,7 @@
extras_holder.vis_contents = extras
hud_item.update(bgmap, extras_holder, badmap ? FALSE : pinging)
/obj/item/mapping_unit/proc/update_marker()
marker_prefix = base_prefix
if (prefix_update_head)
@@ -416,7 +416,7 @@
in_list = FALSE
mapping_beacons -= src
icon_state = "[initial(icon_state)][in_list ? "_on" : ""]"
to_chat(user,SPAN_NOTICE("The [src] is now [in_list ? "broadcasting" : "disabled"]."))
to_chat(user,span_notice("The [src] is now [in_list ? "broadcasting" : "disabled"]."))
/obj/item/holomap_beacon/Destroy()
if(in_list)
+29 -29
View File
@@ -38,34 +38,34 @@
/obj/machinery/beehive/attackby(var/obj/item/I, var/mob/user)
if(I.has_tool_quality(TOOL_CROWBAR))
closed = !closed
user.visible_message(SPAN_NOTICE("[user] [closed ? "closes" : "opens"] \the [src]."), SPAN_NOTICE("You [closed ? "close" : "open"] \the [src]."))
user.visible_message(span_notice("[user] [closed ? "closes" : "opens"] \the [src]."), span_notice("You [closed ? "close" : "open"] \the [src]."))
update_icon()
return
else if(I.has_tool_quality(TOOL_WRENCH))
anchored = !anchored
playsound(src, I.usesound, 50, 1)
user.visible_message(SPAN_NOTICE("[user] [anchored ? "wrenches" : "unwrenches"] \the [src]."), SPAN_NOTICE("You [anchored ? "wrench" : "unwrench"] \the [src]."))
user.visible_message(span_notice("[user] [anchored ? "wrenches" : "unwrenches"] \the [src]."), span_notice("You [anchored ? "wrench" : "unwrench"] \the [src]."))
return
else if(istype(I, /obj/item/bee_smoker))
if(closed)
to_chat(user, SPAN_NOTICE("You need to open \the [src] with a crowbar before smoking the bees."))
to_chat(user, span_notice("You need to open \the [src] with a crowbar before smoking the bees."))
return
user.visible_message(SPAN_NOTICE("[user] smokes the bees in \the [src]."), SPAN_NOTICE("You smoke the bees in \the [src]."))
user.visible_message(span_notice("[user] smokes the bees in \the [src]."), span_notice("You smoke the bees in \the [src]."))
smoked = 30
update_icon()
return
else if(istype(I, /obj/item/honey_frame))
if(closed)
to_chat(user, SPAN_NOTICE("You need to open \the [src] with a crowbar before inserting \the [I]."))
to_chat(user, span_notice("You need to open \the [src] with a crowbar before inserting \the [I]."))
return
if(length(frames) >= maxFrames)
to_chat(user, SPAN_NOTICE("There is no place for an another frame."))
to_chat(user, span_notice("There is no place for an another frame."))
return
var/obj/item/honey_frame/H = I
if(H.honey)
to_chat(user, SPAN_NOTICE("\The [I] is full with beeswax and honey, empty it in the extractor first."))
to_chat(user, span_notice("\The [I] is full with beeswax and honey, empty it in the extractor first."))
return
user.visible_message(SPAN_NOTICE("[user] loads \the [I] into \the [src]."), SPAN_NOTICE("You load \the [I] into \the [src]."))
user.visible_message(span_notice("[user] loads \the [I] into \the [src]."), span_notice("You load \the [I] into \the [src]."))
update_icon()
user.drop_from_inventory(H)
H.forceMove(src)
@@ -74,23 +74,23 @@
else if(istype(I, /obj/item/bee_pack))
var/obj/item/bee_pack/B = I
if(B.full && bee_count)
to_chat(user, SPAN_NOTICE("\The [src] already has bees inside."))
to_chat(user, span_notice("\The [src] already has bees inside."))
return
if(!B.full && bee_count < 90)
to_chat(user, SPAN_NOTICE("\The [src] is not ready to split."))
to_chat(user, span_notice("\The [src] is not ready to split."))
return
if(!B.full && !smoked)
to_chat(user, SPAN_NOTICE("Smoke \the [src] first!"))
to_chat(user, span_notice("Smoke \the [src] first!"))
return
if(closed)
to_chat(user, SPAN_NOTICE("You need to open \the [src] with a crowbar before moving the bees."))
to_chat(user, span_notice("You need to open \the [src] with a crowbar before moving the bees."))
return
if(B.full)
user.visible_message(SPAN_NOTICE("[user] puts the queen and the bees from \the [I] into \the [src]."), SPAN_NOTICE("You put the queen and the bees from \the [I] into \the [src]."))
user.visible_message(span_notice("[user] puts the queen and the bees from \the [I] into \the [src]."), span_notice("You put the queen and the bees from \the [I] into \the [src]."))
bee_count = 20
B.empty()
else
user.visible_message(SPAN_NOTICE("[user] puts bees and larvae from \the [src] into \the [I]."), SPAN_NOTICE("You put bees and larvae from \the [src] into \the [I]."))
user.visible_message(span_notice("[user] puts bees and larvae from \the [src] into \the [I]."), span_notice("You put bees and larvae from \the [src] into \the [I]."))
bee_count /= 2
B.fill()
update_icon()
@@ -109,15 +109,15 @@
return 1
else if(I.has_tool_quality(TOOL_SCREWDRIVER))
if(bee_count)
to_chat(user, SPAN_NOTICE("You can't dismantle \the [src] with these bees inside."))
to_chat(user, span_notice("You can't dismantle \the [src] with these bees inside."))
return
if(length(frames))
to_chat(user, SPAN_NOTICE("You can't dismantle \the [src] with [length(frames)] frames still inside!"))
to_chat(user, span_notice("You can't dismantle \the [src] with [length(frames)] frames still inside!"))
return
to_chat(user, SPAN_NOTICE("You start dismantling \the [src]..."))
to_chat(user, span_notice("You start dismantling \the [src]..."))
playsound(src, I.usesound, 50, 1)
if(do_after(user, 30))
user.visible_message(SPAN_NOTICE("[user] dismantles \the [src]."), SPAN_NOTICE("You dismantle \the [src]."))
user.visible_message(span_notice("[user] dismantles \the [src]."), span_notice("You dismantle \the [src]."))
new /obj/item/beehive_assembly(loc)
qdel(src)
return
@@ -125,12 +125,12 @@
/obj/machinery/beehive/attack_hand(var/mob/user)
if(!closed)
if(honeycombs < 100)
to_chat(user, SPAN_NOTICE("There are no filled honeycombs."))
to_chat(user, span_notice("There are no filled honeycombs."))
return
if(!smoked && bee_count)
to_chat(user, SPAN_NOTICE("The bees won't let you take the honeycombs out like this, smoke them first."))
to_chat(user, span_notice("The bees won't let you take the honeycombs out like this, smoke them first."))
return
user.visible_message(SPAN_NOTICE("[user] starts taking the honeycombs out of \the [src]."), SPAN_NOTICE("You start taking the honeycombs out of \the [src]..."))
user.visible_message(span_notice("[user] starts taking the honeycombs out of \the [src]."), span_notice("You start taking the honeycombs out of \the [src]..."))
while(honeycombs >= 100 && length(frames) && do_after(user, 30))
var/obj/item/honey_frame/H = pop(frames)
H.honey = 20
@@ -139,7 +139,7 @@
H.forceMove(get_turf(src))
update_icon()
if(honeycombs < 100)
to_chat(user, SPAN_NOTICE("You take all filled honeycombs out."))
to_chat(user, span_notice("You take all filled honeycombs out."))
return
/obj/machinery/beehive/process()
@@ -173,14 +173,14 @@
/obj/machinery/honey_extractor/attackby(var/obj/item/I, var/mob/user)
if(processing)
to_chat(user, SPAN_NOTICE("\The [src] is currently spinning, wait until it's finished."))
to_chat(user, span_notice("\The [src] is currently spinning, wait until it's finished."))
return
else if(istype(I, /obj/item/honey_frame))
var/obj/item/honey_frame/H = I
if(!H.honey)
to_chat(user, SPAN_NOTICE("\The [H] is empty, put it into a beehive."))
to_chat(user, span_notice("\The [H] is empty, put it into a beehive."))
return
user.visible_message(SPAN_NOTICE("[user] loads \the [H]'s comb into \the [src] and turns it on."), SPAN_NOTICE("You load \the [H] into \the [src] and turn it on."))
user.visible_message(span_notice("[user] loads \the [H]'s comb into \the [src] and turns it on."), span_notice("You load \the [H] into \the [src] and turn it on."))
processing = H.honey
icon_state = "[initial(icon_state)]_moving"
H.honey = 0
@@ -192,13 +192,13 @@
icon_state = "[initial(icon_state)]"
else if(istype(I, /obj/item/reagent_containers/glass))
if(!honey)
to_chat(user, SPAN_NOTICE("There is no honey in \the [src]."))
to_chat(user, span_notice("There is no honey in \the [src]."))
return
var/obj/item/reagent_containers/glass/G = I
var/transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, honey)
G.reagents.add_reagent("honey", transferred)
honey -= transferred
user.visible_message(SPAN_NOTICE("[user] collects honey from \the [src] into \the [G]."), SPAN_NOTICE("You collect [transferred] units of honey from \the [src] into \the [G]."))
user.visible_message(span_notice("[user] collects honey from \the [src] into \the [G]."), span_notice("You collect [transferred] units of honey from \the [src] into \the [G]."))
return 1
/obj/item/bee_smoker
@@ -240,9 +240,9 @@
icon_state = "apiary"
/obj/item/beehive_assembly/attack_self(var/mob/user)
to_chat(user, SPAN_NOTICE("You start assembling \the [src]..."))
to_chat(user, span_notice("You start assembling \the [src]..."))
if(do_after(user, 30))
user.visible_message(SPAN_NOTICE("[user] constructs a beehive."), SPAN_NOTICE("You construct a beehive."))
user.visible_message(span_notice("[user] constructs a beehive."), span_notice("You construct a beehive."))
new /obj/machinery/beehive(get_turf(user))
user.drop_from_inventory(src)
qdel(src)
+1 -1
View File
@@ -216,7 +216,7 @@
if(seed.kitchen_tag == "sunflower")
new /obj/item/reagent_containers/food/snacks/rawsunflower(get_turf(src))
to_chat(user, SPAN_NOTICE("You remove the seeds from the flower, slightly damaging them."))
to_chat(user, span_notice("You remove the seeds from the flower, slightly damaging them."))
qdel(src)
return
+2 -2
View File
@@ -8,13 +8,13 @@
/obj/item/reagent_containers/food/snacks/grown/sif/examine(mob/user)
. = ..()
if(seeds)
to_chat(user, SPAN_NOTICE("You can see [seeds] seed\s in \the [src]. You might be able to extract them with a sharp object."))
to_chat(user, span_notice("You can see [seeds] seed\s in \the [src]. You might be able to extract them with a sharp object."))
/obj/item/reagent_containers/food/snacks/grown/sif/attackby(var/obj/item/W, var/mob/living/user)
if(seed && W.sharp && seeds > 0)
var/take_seeds = min(seeds, rand(1,2))
seeds -= take_seeds
to_chat(user, SPAN_NOTICE("You stick \the [W] into \the [src] and lever out [take_seeds] seed\s."))
to_chat(user, span_notice("You stick \the [W] into \the [src] and lever out [take_seeds] seed\s."))
for(var/i = 1 to take_seeds)
new /obj/item/seeds(get_turf(src), seed.name)
return

Some files were not shown because too many files have changed in this diff Show More