diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 38311fa289..00429be14d 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -415,24 +415,6 @@ var/global/list/##LIST_NAME = list();\ #define send_link(target, url) target << link(url) -#define SPAN_NOTICE(X) "[X]" - -#define SPAN_WARNING(X) "[X]" - -#define SPAN_DANGER(X) "[X]" - -#define SPAN_OCCULT(X) "[X]" - -#define FONT_SMALL(X) "[X]" - -#define FONT_NORMAL(X) "[X]" - -#define FONT_LARGE(X) "[X]" - -#define FONT_HUGE(X) "[X]" - -#define FONT_GIANT(X) "[X]" - // Volume Channel Defines #define VOLUME_CHANNEL_MASTER "Master" diff --git a/code/__defines/span_vr.dm b/code/__defines/span_vr.dm index 49e4e0ef69..50b6f9786a 100644 --- a/code/__defines/span_vr.dm +++ b/code/__defines/span_vr.dm @@ -43,6 +43,7 @@ #define span_critical(str) ("" + str + "") #define span_danger(str) ("" + str + "") +#define span_userdanger(str) ("" + str + "") #define span_warning(str) ("" + str + "") #define span_rose(str) ("" + str + "") #define span_info(str) ("" + str + "") @@ -109,3 +110,21 @@ #define span_brown(str) ("" + str + "") #define span_lightpurple(str) ("" + str + "") #define span_darkpink(str) ("" + str + "") + +/* System and Debug */ + +#define span_linkOn(str) ("" + str + "") +#define span_filter_system(str) ("" + str + "") +#define span_filter_debuglogs(str) ("" + str + "") + +/* Byond Sizes */ + +#define span_small(X) "[X]" + +#define span_normal(X) "[X]" + +#define span_large(X) "[X]" + +#define span_huge(X) "[X]" + +#define span_giant(X) "[X]" diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index dea6c6c5c4..1a0d8434af 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -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 diff --git a/code/_macros.dm b/code/_macros.dm index 2ff9da5e76..8dc5bdaf74 100644 --- a/code/_macros.dm +++ b/code/_macros.dm @@ -1,5 +1,3 @@ -#define span(class, text) ("[text]") - #define get_turf(A) get_step(A,0) #define get_x(A) (get_step(A, 0)?.x || 0) diff --git a/code/controllers/subsystems/game_master.dm b/code/controllers/subsystems/game_master.dm index 4703da0bf8..11844b4f98 100644 --- a/code/controllers/subsystems/game_master.dm +++ b/code/controllers/subsystems/game_master.dm @@ -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) diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index f117284275..d2f7e72bc9 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -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) diff --git a/code/controllers/subsystems/webhooks.dm b/code/controllers/subsystems/webhooks.dm index 1e7a27924f..d9b75805af 100644 --- a/code/controllers/subsystems/webhooks.dm +++ b/code/controllers/subsystems/webhooks.dm @@ -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) diff --git a/code/datums/colormate.dm b/code/datums/colormate.dm index 06460069a0..49c7a88542 100644 --- a/code/datums/colormate.dm +++ b/code/datums/colormate.dm @@ -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) diff --git a/code/datums/managed_browsers/feedback_form.dm b/code/datums/managed_browsers/feedback_form.dm index cd7b3a8b20..ea6ef32b9f 100644 --- a/code/datums/managed_browsers/feedback_form.dm +++ b/code/datums/managed_browsers/feedback_form.dm @@ -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", "Visible") + dat += span_linkOn("Visible") 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", "Hashed") + dat += span_linkOn("Hashed") else dat += my_client.ckey dat += "
" @@ -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) \ No newline at end of file + qdel(src) diff --git a/code/game/antagonist/outsider/shipwreck_survivor.dm b/code/game/antagonist/outsider/shipwreck_survivor.dm index 6fdcc47b97..19f8e8d4cc 100644 --- a/code/game/antagonist/outsider/shipwreck_survivor.dm +++ b/code/game/antagonist/outsider/shipwreck_survivor.dm @@ -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 NOT 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 NOT 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 \ diff --git a/code/game/gamemodes/technomancer/spells/control.dm b/code/game/gamemodes/technomancer/spells/control.dm index 215d9d455c..7288de4045 100644 --- a/code/game/gamemodes/technomancer/spells/control.dm +++ b/code/game/gamemodes/technomancer/spells/control.dm @@ -109,7 +109,7 @@ to_chat(user, "\The [L] seems to resist you!") 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, "You command your [controlled_mobs.len > 1 ? "entities" : "[controlled_mobs[1]]"] to move \ towards \the [T].") - diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 4e05b3bc12..87bca28ed1 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -48,7 +48,7 @@ to_chat(user, "\The [src] is already occupied!") 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, "Subject cannot have abiotic items on.") 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) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 99d680ae74..26cc59c7c8 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -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 += "
You ran out of food and starved." if(emagged) user.nutrition = 0 //yeah you pretty hongry - to_chat(user, span("danger", "Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.")) + to_chat(user, span_danger("Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.")) if(fuel <= 0) dat += "
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", "You feel an immense wave of heat emanate from \the [src]. Your skin bursts into flames.")) + to_chat(user,span_danger("You feel an immense wave of heat emanate from \the [src]. Your skin bursts into flames.")) dat += "

OK...

" if(emagged) - to_chat(user, span("danger", "You're never going to make it to Orion...")) + to_chat(user, span_danger("You're never going to make it to Orion...")) 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("\The [src] 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("\The [src] says, 'Uh, Port? Having some issues with our reactor, could you check it out? Over.'") sleep(30) src.audible_message("\The [src] 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) diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index d1120d8424..205246628f 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -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) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index b12739e457..5c3a50c3db 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -184,7 +184,7 @@ if(occupant) to_chat(user,"\The [src] is already occupied by [occupant].") 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 diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 8714d0b24f..379011f9f4 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -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) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index fc87a0586d..93cba9bc7c 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -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 diff --git a/code/game/machinery/painter_vr.dm b/code/game/machinery/painter_vr.dm index 949f9bcf6e..00d2dec03b 100644 --- a/code/game/machinery/painter_vr.dm +++ b/code/game/machinery/painter_vr.dm @@ -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) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 6d3d0c3324..ac40987c6a 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -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 ..() diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index d7ff16e0b0..a80486dc25 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -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) diff --git a/code/game/mecha/equipment/tools/passenger.dm b/code/game/mecha/equipment/tools/passenger.dm index 8ce9d21aa9..94b4199a16 100644 --- a/code/game/mecha/equipment/tools/passenger.dm +++ b/code/game/mecha/equipment/tools/passenger.dm @@ -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, "\The [src] doesn't have a passenger compartment.") #undef LOCKED -#undef OCCUPIED \ No newline at end of file +#undef OCCUPIED diff --git a/code/game/mecha/equipment/tools/sleeper.dm b/code/game/mecha/equipment/tools/sleeper.dm index 634e1ad435..5fc2054c78 100644 --- a/code/game/mecha/equipment/tools/sleeper.dm +++ b/code/game/mecha/equipment/tools/sleeper.dm @@ -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].") diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index d0b1123cbd..c0dc029252 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -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 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index ec29552760..2674d3f679 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -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) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c480dd6e6b..7170fe2b81 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -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]") diff --git a/code/game/objects/effects/landmarks_events.dm b/code/game/objects/effects/landmarks_events.dm index d95832ee16..7253fc6e2b 100644 --- a/code/game/objects/effects/landmarks_events.dm +++ b/code/game/objects/effects/landmarks_events.dm @@ -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) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index da93166802..de067a3991 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -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) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index e503aab0d1..8dbc360f6f 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -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]") diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 7bdbbf056d..db05b23c19 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -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) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index a2b09a8de0..3f10c4e825 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -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 diff --git a/code/game/objects/items/devices/scanners/reagents.dm b/code/game/objects/items/devices/scanners/reagents.dm index d00553539b..5fe46e6f19 100644 --- a/code/game/objects/items/devices/scanners/reagents.dm +++ b/code/game/objects/items/devices/scanners/reagents.dm @@ -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 diff --git a/code/game/objects/items/magazine.dm b/code/game/objects/items/magazine.dm index 1b8d03f5da..46db4a95d8 100644 --- a/code/game/objects/items/magazine.dm +++ b/code/game/objects/items/magazine.dm @@ -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]) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index d43f9d761c..609dc7a4f2 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -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 ..() diff --git a/code/game/objects/items/weapons/RCD_vr.dm b/code/game/objects/items/weapons/RCD_vr.dm index 02d8b2a214..7e3d0ec7b1 100644 --- a/code/game/objects/items/weapons/RCD_vr.dm +++ b/code/game/objects/items/weapons/RCD_vr.dm @@ -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 ..() diff --git a/code/game/objects/items/weapons/RMS_vr.dm b/code/game/objects/items/weapons/RMS_vr.dm index d9bb74d397..d8ae6d043c 100644 --- a/code/game/objects/items/weapons/RMS_vr.dm +++ b/code/game/objects/items/weapons/RMS_vr.dm @@ -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 ..() diff --git a/code/game/objects/items/weapons/capture_crystal.dm b/code/game/objects/items/weapons/capture_crystal.dm index 291748c7e4..b8a7af88d9 100644 --- a/code/game/objects/items/weapons/capture_crystal.dm +++ b/code/game/objects/items/weapons/capture_crystal.dm @@ -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") diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index bd5336065f..e9a3375556 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -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) diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index ff79816fb2..465a913d1a 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -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)) diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index db0d2d557d..83a9f82064 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -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( \ "\The [user] 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("\The [user] 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("\The [user] 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() diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index b1b6273934..2ae6b20364 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -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) diff --git a/code/game/objects/items/weapons/picnic_blankets.dm b/code/game/objects/items/weapons/picnic_blankets.dm index 76d8f07e00..a69ed40951 100644 --- a/code/game/objects/items/weapons/picnic_blankets.dm +++ b/code/game/objects/items/weapons/picnic_blankets.dm @@ -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 diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index e2e055b6f6..3754106760 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -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() diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 46af6f6404..3cf925ae02 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -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) diff --git a/code/game/objects/structures/cliff.dm b/code/game/objects/structures/cliff.dm index 6370e64271..201aab139b 100644 --- a/code/game/objects/structures/cliff.dm +++ b/code/game/objects/structures/cliff.dm @@ -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. diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index 1bb1b4e71e..0237f0c20a 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -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 \ No newline at end of file +#undef MAX_HOLE_SIZE diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm index bcffd24dfc..7b800cdb21 100644 --- a/code/game/objects/structures/flora/flora.dm +++ b/code/game/objects/structures/flora/flora.dm @@ -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 "\The [src] seems to have something hanging from it." @@ -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 diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm index 248961138c..21f80387f2 100644 --- a/code/game/objects/structures/flora/trees.dm +++ b/code/game/objects/structures/flora/trees.dm @@ -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")) - \ No newline at end of file diff --git a/code/game/objects/structures/ghost_pods/survivor.dm b/code/game/objects/structures/ghost_pods/survivor.dm index f31b89ca8a..197693a3cd 100644 --- a/code/game/objects/structures/ghost_pods/survivor.dm +++ b/code/game/objects/structures/ghost_pods/survivor.dm @@ -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") diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 03562df4a7..170199b9d3 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -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 diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 34d80ee4ca..a3d9d0025f 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -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 - diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index 79507c6fa3..fb51c53a36 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -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) diff --git a/code/game/objects/structures/props/fake_ai.dm b/code/game/objects/structures/props/fake_ai.dm index af0885fe32..9ffb3be8f4 100644 --- a/code/game/objects/structures/props/fake_ai.dm +++ b/code/game/objects/structures/props/fake_ai.dm @@ -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" \ No newline at end of file + icon_state = "ai-heartline-crash" diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 062e4b2b60..8533cb8e87 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -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) diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index fb74bfbf77..369a0aabab 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -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() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 22c312c3fa..8c912136ba 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -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 diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 41e30d068c..ee86344966 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -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 diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 12a59de3f2..74a08a7c46 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -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 . = ..() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 4a79a588c5..f600f83c42 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -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 diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index cd66f7a421..ce9760cab5 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -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 diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 0938f68769..c6e9d3f2e3 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -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 diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index 05901040d1..0e02fad380 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -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) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 8cf3837abf..ff724ef2a6 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -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" diff --git a/code/modules/admin/verbs/entity_narrate.dm b/code/modules/admin/verbs/entity_narrate.dm index 9dca3689a4..11f512ec5d 100644 --- a/code/modules/admin/verbs/entity_narrate.dm +++ b/code/modules/admin/verbs/entity_narrate.dm @@ -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 = "" diff --git a/code/modules/admin/verbs/event_triggers.dm b/code/modules/admin/verbs/event_triggers.dm index beb144f55d..bf7596656e 100644 --- a/code/modules/admin/verbs/event_triggers.dm +++ b/code/modules/admin/verbs/event_triggers.dm @@ -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.", \ diff --git a/code/modules/admin/verbs/get_player_status.dm b/code/modules/admin/verbs/get_player_status.dm index c852c81fd3..b55f5483cf 100644 --- a/code/modules/admin/verbs/get_player_status.dm +++ b/code/modules/admin/verbs/get_player_status.dm @@ -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 diff --git a/code/modules/admin/verbs/lightning_strike.dm b/code/modules/admin/verbs/lightning_strike.dm index cf7fa6a7ed..ce500bb9d7 100644 --- a/code/modules/admin/verbs/lightning_strike.dm +++ b/code/modules/admin/verbs/lightning_strike.dm @@ -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 diff --git a/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm b/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm index af911a62c6..5d2003e47b 100644 --- a/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm +++ b/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm @@ -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() diff --git a/code/modules/blob2/overmind/powers.dm b/code/modules/blob2/overmind/powers.dm index 5c1c4e1759..fe67f80e27 100644 --- a/code/modules/blob2/overmind/powers.dm +++ b/code/modules/blob2/overmind/powers.dm @@ -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, "Unable to use this blob, find a normal one.") diff --git a/code/modules/catalogue/atoms.dm b/code/modules/catalogue/atoms.dm index 69939aeb45..d0d075f0a5 100644 --- a/code/modules/catalogue/atoms.dm +++ b/code/modules/catalogue/atoms.dm @@ -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 \ No newline at end of file + return data diff --git a/code/modules/catalogue/catalogue_data.dm b/code/modules/catalogue/catalogue_data.dm index 2329b0f3f3..0452a70880 100644 --- a/code/modules/catalogue/catalogue_data.dm +++ b/code/modules/catalogue/catalogue_data.dm @@ -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, "
") - to_chat(user, span("notice", "[uppertext(name)]")) + to_chat(user, span_notice("[uppertext(name)]")) // 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", "[displayed_desc]")) - to_chat(user, span("notice", "Cataloguers : [english_list(cataloguers)].")) - to_chat(user, span("notice", "Contributes [value] points to personal exploration fund.")) + to_chat(user, span_notice("[displayed_desc]")) + to_chat(user, span_notice("Cataloguers : [english_list(cataloguers)].")) + to_chat(user, span_notice("Contributes [value] points to personal exploration fund.")) /* // Truncates text to limit if necessary. diff --git a/code/modules/catalogue/cataloguer.dm b/code/modules/catalogue/cataloguer.dm index fa9bcee78f..322092f077 100644 --- a/code/modules/catalogue/cataloguer.dm +++ b/code/modules/catalogue/cataloguer.dm @@ -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 ..() diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks.dm b/code/modules/client/preference_setup/loadout/gear_tweaks.dm index 58111139a1..ce9a748e5c 100644 --- a/code/modules/client/preference_setup/loadout/gear_tweaks.dm +++ b/code/modules/client/preference_setup/loadout/gear_tweaks.dm @@ -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) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index e984f606cb..aa65dcdea0 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -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 diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm index 925aea0a7b..d5cb07ffee 100644 --- a/code/modules/clothing/glasses/hud_vr.dm +++ b/code/modules/clothing/glasses/hud_vr.dm @@ -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() diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 72ee5417a4..12e946aeb5 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -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) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 0b380da71e..e5edb58ef5 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -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 diff --git a/code/modules/emotes/definitions/audible_slap.dm b/code/modules/emotes/definitions/audible_slap.dm index d0b5466c30..6740ffd973 100644 --- a/code/modules/emotes/definitions/audible_slap.dm +++ b/code/modules/emotes/definitions/audible_slap.dm @@ -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) . = ..() diff --git a/code/modules/emotes/definitions/audible_snap.dm b/code/modules/emotes/definitions/audible_snap.dm index 24d78db239..4e9e314030 100644 --- a/code/modules/emotes/definitions/audible_snap.dm +++ b/code/modules/emotes/definitions/audible_snap.dm @@ -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 . = ..() diff --git a/code/modules/emotes/definitions/human.dm b/code/modules/emotes/definitions/human.dm index b8571fa164..15922ef708 100644 --- a/code/modules/emotes/definitions/human.dm +++ b/code/modules/emotes/definitions/human.dm @@ -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)]" diff --git a/code/modules/emotes/definitions/visible_vomit.dm b/code/modules/emotes/definitions/visible_vomit.dm index 1ec79dea6a..ec96de56f5 100644 --- a/code/modules/emotes/definitions/visible_vomit.dm +++ b/code/modules/emotes/definitions/visible_vomit.dm @@ -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.")) diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm index 94812dea26..ff31fd2a3a 100644 --- a/code/modules/emotes/emote_define.dm +++ b/code/modules/emotes/emote_define.dm @@ -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) diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index f6c71351e7..f93663886d 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -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 say *help for a list of usable emotes.")) + to_chat(src, span_warning("Unknown emote '[act]'. Type say *help 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 say *help for a list of usable emotes.")) + to_chat(src, span_warning("You cannot use the emote '[act]'. Type say *help 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) diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm index 2b8f3fb209..5f030d219a 100644 --- a/code/modules/examine/examine.dm +++ b/code/modules/examine/examine.dm @@ -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) diff --git a/code/modules/fireworks/firework_launcher.dm b/code/modules/fireworks/firework_launcher.dm index 3cb5aa23f2..ee5f2e033b 100644 --- a/code/modules/fireworks/firework_launcher.dm +++ b/code/modules/fireworks/firework_launcher.dm @@ -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 diff --git a/code/modules/flufftext/look_up.dm b/code/modules/flufftext/look_up.dm index 573d90defa..1bfcf6898c 100644 --- a/code/modules/flufftext/look_up.dm +++ b/code/modules/flufftext/look_up.dm @@ -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] diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 159a4d3d7a..faf2ad39e9 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -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) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 31a73694f1..1cf8005722 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -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 diff --git a/code/modules/food/kitchen/cooking_machines/fryer.dm b/code/modules/food/kitchen/cooking_machines/fryer.dm index b01ec7062f..e7ffbce2f6 100644 --- a/code/modules/food/kitchen/cooking_machines/fryer.dm +++ b/code/modules/food/kitchen/cooking_machines/fryer.dm @@ -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("[user] scoops some oil out of \the [src].", span("notice","You scoop some oil out of \the [src].")) + user.visible_message("[user] scoops some oil out of \the [src].", span_notice("You scoop some oil out of \the [src].")) return 1 else //It contains stuff, handle pouring any oil into the fryer diff --git a/code/modules/food/recipe.dm b/code/modules/food/recipe.dm index 439c74c237..2394441f14 100644 --- a/code/modules/food/recipe.dm +++ b/code/modules/food/recipe.dm @@ -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 diff --git a/code/modules/gamemaster/event2/events/command/raise_funds.dm b/code/modules/gamemaster/event2/events/command/raise_funds.dm index 1540d74e80..69c8bc6d1d 100644 --- a/code/modules/gamemaster/event2/events/command/raise_funds.dm +++ b/code/modules/gamemaster/event2/events/command/raise_funds.dm @@ -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') diff --git a/code/modules/gamemaster/event2/events/engineering/airlock_failure.dm b/code/modules/gamemaster/event2/events/engineering/airlock_failure.dm index 3966d3c478..a1795cf7bd 100644 --- a/code/modules/gamemaster/event2/events/engineering/airlock_failure.dm +++ b/code/modules/gamemaster/event2/events/engineering/airlock_failure.dm @@ -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 diff --git a/code/modules/gamemaster/event2/events/engineering/brand_intelligence.dm b/code/modules/gamemaster/event2/events/engineering/brand_intelligence.dm index b4c58fa0ac..6fed5bc637 100644 --- a/code/modules/gamemaster/event2/events/engineering/brand_intelligence.dm +++ b/code/modules/gamemaster/event2/events/engineering/brand_intelligence.dm @@ -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) diff --git a/code/modules/gamemaster/event2/events/engineering/window_break.dm b/code/modules/gamemaster/event2/events/engineering/window_break.dm index 6b9d153a1e..e50036f23d 100644 --- a/code/modules/gamemaster/event2/events/engineering/window_break.dm +++ b/code/modules/gamemaster/event2/events/engineering/window_break.dm @@ -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() . = ..() diff --git a/code/modules/gamemaster/event2/events/security/prison_break.dm b/code/modules/gamemaster/event2/events/security/prison_break.dm index 821afd7aba..2166f64779 100644 --- a/code/modules/gamemaster/event2/events/security/prison_break.dm +++ b/code/modules/gamemaster/event2/events/security/prison_break.dm @@ -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 diff --git a/code/modules/gamemaster/event2/events/security/stowaway.dm b/code/modules/gamemaster/event2/events/security/stowaway.dm index e4e41c3091..1d66e4516a 100644 --- a/code/modules/gamemaster/event2/events/security/stowaway.dm +++ b/code/modules/gamemaster/event2/events/security/stowaway.dm @@ -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)) diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index da741e1103..c34d3f05f8 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -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 ..() diff --git a/code/modules/holomap/mapper.dm b/code/modules/holomap/mapper.dm index 9411651994..3967bb861c 100644 --- a/code/modules/holomap/mapper.dm +++ b/code/modules/holomap/mapper.dm @@ -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, "This device needs to be on your person.") - + if(hud_datum?.main_hud) hide_device() to_chat(H, "You put \the [src] away.") @@ -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) diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm index 13d799158c..4c09219c9b 100644 --- a/code/modules/hydroponics/beekeeping/beehive.dm +++ b/code/modules/hydroponics/beekeeping/beehive.dm @@ -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) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index b9a9e14fc4..961563932a 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -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 diff --git a/code/modules/hydroponics/grown_sif.dm b/code/modules/hydroponics/grown_sif.dm index 288b8f874c..c55600c756 100644 --- a/code/modules/hydroponics/grown_sif.dm +++ b/code/modules/hydroponics/grown_sif.dm @@ -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 diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index c23337ab33..0cb71a0b1d 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -174,7 +174,7 @@ var/obj/item/organ/external/E = target.get_organ(target.hand ? BP_L_HAND : BP_R_HAND) if(istype(E) && E.robotic < ORGAN_ROBOT && fruit) var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/5)) - to_chat(target, SPAN_DANGER("You are stung by \the [fruit]!")) + to_chat(target, span_danger("You are stung by \the [fruit]!")) for(var/chem in chems) target.reagents.add_reagent(chem,injecting) if (fruit.reagents) diff --git a/code/modules/hydroponics/seed_gene_mut.dm b/code/modules/hydroponics/seed_gene_mut.dm index 861ad9598b..ac23bfa8d4 100644 --- a/code/modules/hydroponics/seed_gene_mut.dm +++ b/code/modules/hydroponics/seed_gene_mut.dm @@ -94,22 +94,22 @@ if(prob(50)) S.set_trait(TRAIT_BIOLUM, !S.get_trait(TRAIT_BIOLUM)) if(S.get_trait(TRAIT_BIOLUM)) - T.visible_message(SPAN_NOTICE("\The [S.display_name] begins to glow!")) + T.visible_message(span_notice("\The [S.display_name] begins to glow!")) if(prob(50)) S.set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190)) T.visible_message("\The [S.display_name]'s glow changes colour!") else - T.visible_message(SPAN_NOTICE("\The [S.display_name]'s glow dims...")) + T.visible_message(span_notice("\The [S.display_name]'s glow dims...")) if(prob(60)) S.set_trait(TRAIT_PRODUCES_POWER, !S.get_trait(TRAIT_PRODUCES_POWER)) if(prob(30)) S.set_trait(TRAIT_SPORING, !S.get_trait(TRAIT_SPORING)) if(S.get_trait(TRAIT_SPORING)) - T.visible_message(SPAN_NOTICE("\The [S.display_name] releases a cloud of spores!")) + T.visible_message(span_notice("\The [S.display_name] releases a cloud of spores!")) S.create_spores(T) else - T.visible_message(SPAN_NOTICE("\The [S.display_name]'s spores no longer fall.")) + T.visible_message(span_notice("\The [S.display_name]'s spores no longer fall.")) /decl/plantgene/atmosphere/mutate(var/datum/seed/S) if(prob(60)) diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm index 3a037fc797..1fe2f70b05 100644 --- a/code/modules/hydroponics/spreading/spreading_growth.dm +++ b/code/modules/hydroponics/spreading/spreading_growth.dm @@ -99,7 +99,7 @@ entangle(M) if(seed.get_trait(TRAIT_SPORING) && prob(1)) - visible_message(SPAN_WARNING("\The [src] hisses, releasing a cloud of spores!"), SPAN_WARNING("Something nearby hisses loudly!")) + visible_message(span_warning("\The [src] hisses, releasing a cloud of spores!"), span_warning("Something nearby hisses loudly!")) seed.create_spores(get_turf(src)) if(length(neighbors) && prob(spread_chance)) @@ -123,7 +123,7 @@ /obj/effect/plant/proc/spread_to(turf/target_turf) //VOREStation Edit Start - Vines can go up/down stairs, but don't register that they have done this, so do so infinitely, which is annoying and laggy. if(istype(target_turf, /turf/simulated/open)) - return + return //VOREStation Edit End var/obj/effect/plant/child = new(get_turf(src),seed,parent) diff --git a/code/modules/hydroponics/trays/tray_soil.dm b/code/modules/hydroponics/trays/tray_soil.dm index 13d0cc4308..d6c471b028 100644 --- a/code/modules/hydroponics/trays/tray_soil.dm +++ b/code/modules/hydroponics/trays/tray_soil.dm @@ -34,13 +34,13 @@ /obj/machinery/portable_atmospherics/hydroponics/soil/attackby(obj/item/O, mob/user) if(istype(O, /obj/item/shovel) && user.a_intent == I_HURT) - user.visible_message(SPAN_NOTICE("\The [user] begins filling in \the [src].")) + user.visible_message(span_notice("\The [user] begins filling in \the [src].")) if(do_after(user, 3 SECONDS) && !QDELETED(src)) - user.visible_message(SPAN_NOTICE("\The [user] fills in \the [src].")) + user.visible_message(span_notice("\The [user] fills in \the [src].")) qdel(src) return . = ..() - + // Holder for vine plants. // Icons for plants are generated as overlays, so setting it to invisible wouldn't work. diff --git a/code/modules/identification/identification.dm b/code/modules/identification/identification.dm index 41ac23316a..ab0d852aef 100644 --- a/code/modules/identification/identification.dm +++ b/code/modules/identification/identification.dm @@ -66,11 +66,11 @@ if(user) switch(identified) // Give a message based on what's left. if(IDENTITY_QUALITY) - to_chat(user, span("warning", "You forgot what \the [holder] actually did...")) + to_chat(user, span_warning("You forgot what \the [holder] actually did...")) if(IDENTITY_PROPERTIES) - to_chat(user, span("warning", "You forgot \the [holder]'s quality...")) + to_chat(user, span_warning("You forgot \the [holder]'s quality...")) if(IDENTITY_UNKNOWN) - to_chat(user, span("warning", "You forgot everything about \the [holder].")) + to_chat(user, span_warning("You forgot everything about \the [holder].")) // Sets the holder's name to the real name if its properties are identified, or obscures it otherwise. /datum/identification/proc/update_name() diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index bbb4e14a96..6426774085 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -270,7 +270,7 @@ /obj/item/electronic_assembly/attackby(var/obj/item/I, var/mob/user) if(can_anchor && I.has_tool_quality(TOOL_WRENCH)) anchored = !anchored - to_chat(user, span("notice", "You've [anchored ? "" : "un"]secured \the [src] to \the [get_turf(src)].")) + to_chat(user, span_notice("You've [anchored ? "" : "un"]secured \the [src] to \the [get_turf(src)].")) if(anchored) on_anchored() else diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index eb1086060d..b5c5d06fe1 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -49,20 +49,20 @@ var/obj/item/stack/material/stack = O if(stack.material.name == MAT_STEEL) if(debug) - to_chat(user, span("warning", "\The [src] does not need any material.")) + to_chat(user, span_warning("\The [src] does not need any material.")) return var/num = min((max_metal - metal) / metal_per_sheet, stack.get_amount()) if(num < 1) - to_chat(user, span("warning", "\The [src] is too full to add more metal.")) + to_chat(user, span_warning("\The [src] is too full to add more metal.")) return if(stack.use(max(1, round(num)))) // We don't want to create stacks that aren't whole numbers - to_chat(user, span("notice", "You add [num] sheet\s to \the [src].")) + to_chat(user, span_notice("You add [num] sheet\s to \the [src].")) metal += num * metal_per_sheet attack_self(user) return TRUE if(istype(O,/obj/item/integrated_circuit)) - to_chat(user, span("notice", "You insert the circuit into \the [src].")) + to_chat(user, span_notice("You insert the circuit into \the [src].")) user.unEquip(O) metal = min(metal + O.w_class, max_metal) qdel(O) @@ -71,9 +71,9 @@ if(istype(O,/obj/item/disk/integrated_circuit/upgrade/advanced)) if(upgraded) - to_chat(user, span("warning", "\The [src] already has this upgrade.")) + to_chat(user, span_warning("\The [src] already has this upgrade.")) return TRUE - to_chat(user, span("notice", "You install \the [O] into \the [src].")) + to_chat(user, span_notice("You install \the [O] into \the [src].")) upgraded = TRUE dirty_items = TRUE attack_self(user) @@ -81,9 +81,9 @@ if(istype(O,/obj/item/disk/integrated_circuit/upgrade/illegal)) if(illegal_upgraded) - to_chat(user, span("warning", "\The [src] already has this upgrade.")) + to_chat(user, span_warning("\The [src] already has this upgrade.")) return TRUE - to_chat(user, span("notice", "You install \the [O] into \the [src].")) + to_chat(user, span_notice("You install \the [O] into \the [src].")) illegal_upgraded = TRUE dirty_items = TRUE attack_self(user) @@ -91,9 +91,9 @@ if(istype(O,/obj/item/disk/integrated_circuit/upgrade/clone)) if(can_clone) - to_chat(user, span("warning", "\The [src] already has this upgrade.")) + to_chat(user, span_warning("\The [src] already has this upgrade.")) return TRUE - to_chat(user, span("notice", "You install \the [O] into \the [src].")) + to_chat(user, span_notice("You install \the [O] into \the [src].")) can_clone = TRUE attack_self(user) return TRUE @@ -138,7 +138,7 @@ for(var/path in circuit_list) var/obj/O = path var/can_build = TRUE - + if(ispath(path, /obj/item/integrated_circuit)) var/obj/item/integrated_circuit/IC = path if((initial(IC.spawn_flags) & IC_SPAWN_RESEARCH) && (!(initial(IC.spawn_flags) & IC_SPAWN_DEFAULT)) && !upgraded) @@ -159,7 +159,7 @@ "cost" = cost, "path" = path, ))) - + cat_obj["items"] = items categories.Add(list(cat_obj)) data["categories"] = categories @@ -199,7 +199,7 @@ else var/obj/item/I = build_type cost = initial(I.w_class) - + var/in_some_category = FALSE for(var/category in SScircuit.circuit_fabricator_recipe_list) if(build_type in SScircuit.circuit_fabricator_recipe_list[category]) diff --git a/code/modules/makeup/nailpolish.dm b/code/modules/makeup/nailpolish.dm index 4a61eae13e..ea91d064f8 100644 --- a/code/modules/makeup/nailpolish.dm +++ b/code/modules/makeup/nailpolish.dm @@ -26,7 +26,7 @@ /obj/item/nailpolish/attack_self(var/mob/user) open = !open - to_chat(user, SPAN_NOTICE("You [open ? "open" : "close"] \the [src].")) + to_chat(user, span_notice("You [open ? "open" : "close"] \the [src].")) update_icon() /obj/item/nailpolish/update_icon() @@ -63,18 +63,18 @@ if(!istype(target)) return - + var/bp = user.zone_sel.selecting var/obj/item/organ/external/body_part = target.get_organ(bp) if(!body_part) - to_chat(user, SPAN_WARNING("[target] is missing that limb!")) + to_chat(user, span_warning("[target] is missing that limb!")) return if(body_part.nail_polish) - to_chat(user, SPAN_NOTICE("[target]'s [body_part.name] already has nail polish on!")) + to_chat(user, span_notice("[target]'s [body_part.name] already has nail polish on!")) return var/datum/nail_polish/polish = body_part.get_polish(colour) if(!polish) - to_chat(user, SPAN_NOTICE("You can't find any nails on [body_part] to paint.")) + to_chat(user, span_notice("You can't find any nails on [body_part] to paint.")) return if(user == target) user.visible_message("\The [user] paints their nails with \the [src].", "You paint your nails with \the [src].") @@ -82,7 +82,7 @@ if(do_after(user, 2 SECONDS, target)) user.visible_message("\The [user] paints \the [target]'s nails with \the [src].", "You paint \the [target]'s nails with \the [src].") else - to_chat(user, SPAN_NOTICE("Both you and [target] must stay still!")) + to_chat(user, span_notice("Both you and [target] must stay still!")) return body_part.set_polish(polish) @@ -101,7 +101,7 @@ /obj/item/nailpolish_remover/attack_self(var/mob/user) open = !open - to_chat(user, SPAN_NOTICE("You [open ? "open" : "close"] \the [src].")) + to_chat(user, span_notice("You [open ? "open" : "close"] \the [src].")) update_icon() /obj/item/nailpolish_remover/update_icon() @@ -114,14 +114,14 @@ if(!istype(target)) return - + var/bp = user.zone_sel.selecting var/obj/item/organ/external/body_part = target.get_organ(bp) if(!body_part) - to_chat(user, SPAN_WARNING("[target] is missing that limb!")) + to_chat(user, span_warning("[target] is missing that limb!")) return if(!body_part.nail_polish) - to_chat(user, SPAN_NOTICE("[target]'s [body_part.name] has no nail polish to remove!")) + to_chat(user, span_notice("[target]'s [body_part.name] has no nail polish to remove!")) return if(user == target) user.visible_message("\The [user] removes their nail polish with \the [src].", "You remove your nail polish with \the [src].") @@ -129,7 +129,7 @@ if(do_after(user, 2 SECONDS, target)) user.visible_message("\The [user] removes \the [target]'s nail polish with \the [src].", "You remove \the [target]'s nail polish with \the [src].") else - to_chat(user, SPAN_NOTICE("Both you and [target] must stay still!")) + to_chat(user, span_notice("Both you and [target] must stay still!")) return body_part.set_polish(null) @@ -142,4 +142,3 @@ icon = _icon icon_state = _icon_state color = _color - \ No newline at end of file diff --git a/code/modules/materials/sheets/organic/tanning/hide.dm b/code/modules/materials/sheets/organic/tanning/hide.dm index a7cbf4b260..424e5941e1 100644 --- a/code/modules/materials/sheets/organic/tanning/hide.dm +++ b/code/modules/materials/sheets/organic/tanning/hide.dm @@ -40,7 +40,7 @@ scraped++ if(scraped) - to_chat(user, SPAN_NOTICE("You scrape the hair off [scraped] hide\s.")) + to_chat(user, span_notice("You scrape the hair off [scraped] hide\s.")) else ..() diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index da2bcab551..cbf9349b50 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -230,7 +230,7 @@ to_chat(user, "You changed the drill ID to: [newtag]") else name = "[initial(name)]" - to_chat(user, SPAN_NOTICE("You removed the drill's ID and any extraneous labels.")) + to_chat(user, span_notice("You removed the drill's ID and any extraneous labels.")) return if(default_deconstruction_screwdriver(user, O)) return @@ -421,7 +421,7 @@ /obj/machinery/mining/brace/examine(mob/user) . = ..() if(brace_tier >= 3) - . += SPAN_NOTICE("The internals of the brace look resilient enough to support a drill by itself.") + . += span_notice("The internals of the brace look resilient enough to support a drill by itself.") /obj/machinery/mining/brace/Initialize() . = ..() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index d0ac3e53cf..5c6d70707f 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -426,7 +426,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return ..() if(get_z(destination) in using_map?.secret_levels) - to_chat(src,SPAN_WARNING("Sorry, that z-level does not allow ghosts.")) + to_chat(src,span_warning("Sorry, that z-level does not allow ghosts.")) if(following) stop_following() return @@ -438,7 +438,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return ..() if(get_z(newloc) in using_map?.secret_levels) - to_chat(src,SPAN_WARNING("Sorry, that z-level does not allow ghosts.")) + to_chat(src,span_warning("Sorry, that z-level does not allow ghosts.")) if(following) stop_following() return diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index 3dee402b41..fa60a10498 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -15,32 +15,32 @@ if(!I) I = src.get_inactive_hand() if(!I) - to_chat(src, SPAN_WARNING("You don't have anything in your hands to give to \the [target].")) + to_chat(src, span_warning("You don't have anything in your hands to give to \the [target].")) return - usr.visible_message(SPAN_NOTICE("\The [usr] holds out \the [I] to \the [target]."), SPAN_NOTICE("You hold out \the [I] to \the [target], waiting for them to accept it.")) + usr.visible_message(span_notice("\The [usr] holds out \the [I] to \the [target]."), span_notice("You hold out \the [I] to \the [target], waiting for them to accept it.")) if(tgui_alert(target,"[src] wants to give you \a [I]. Will you accept it?","Item Offer",list("Yes","No")) != "Yes") - target.visible_message(SPAN_NOTICE("\The [src] tried to hand \the [I] to \the [target], but \the [target] didn't want it.")) + target.visible_message(span_notice("\The [src] tried to hand \the [I] to \the [target], but \the [target] didn't want it.")) return if(!I) return if(!Adjacent(target)) - to_chat(src, SPAN_WARNING("You need to stay in reaching distance while giving an object")) - to_chat(target, SPAN_WARNING("\The [src] moved too far away.")) + to_chat(src, span_warning("You need to stay in reaching distance while giving an object")) + to_chat(target, span_warning("\The [src] moved too far away.")) return if(I.loc != src || !src.item_is_in_hands(I)) - to_chat(src, SPAN_WARNING("You need to keep the item in your hands.")) - to_chat(target, SPAN_WARNING("\The [src] seems to have given up on passing \the [I] to you.")) + to_chat(src, span_warning("You need to keep the item in your hands.")) + to_chat(target, span_warning("\The [src] seems to have given up on passing \the [I] to you.")) return if(target.hands_are_full()) - to_chat(target, SPAN_WARNING("Your hands are full.")) - to_chat(src, SPAN_WARNING("Their hands are full.")) + to_chat(target, span_warning("Your hands are full.")) + to_chat(src, span_warning("Their hands are full.")) return if(src.unEquip(I)) target.put_in_hands(I) // If this fails it will just end up on the floor, but that's fitting for things like dionaea. - target.visible_message(SPAN_NOTICE("\The [src] handed \the [I] to \the [target]")) + target.visible_message(span_notice("\The [src] handed \the [I] to \the [target]")) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index bbf0a8d805..d831d730a2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1778,7 +1778,7 @@ var/obj/item/clothing/glasses/goggles = glasses if(goggles.active && (goggles.vision_flags & (SEE_TURFS|SEE_OBJS))) goggles.toggle_active(src) - to_chat(src, span("warning", "Your [goggles.name] have suddenly turned off!")) + to_chat(src, span_warning("Your [goggles.name] have suddenly turned off!")) // RIGs. var/obj/item/rig/rig = get_rig() @@ -1786,7 +1786,7 @@ var/obj/item/clothing/glasses/rig_goggles = rig.visor.vision.glasses if(rig_goggles.vision_flags & (SEE_TURFS|SEE_OBJS)) rig.visor.deactivate() - to_chat(src, span("warning", "\The [rig]'s visor has shuddenly deactivated!")) + to_chat(src, span_warning("\The [rig]'s visor has shuddenly deactivated!")) ..() diff --git a/code/modules/mob/living/carbon/human/human_modular_limbs.dm b/code/modules/mob/living/carbon/human/human_modular_limbs.dm index b9c783a8b1..c2ec856423 100644 --- a/code/modules/mob/living/carbon/human/human_modular_limbs.dm +++ b/code/modules/mob/living/carbon/human/human_modular_limbs.dm @@ -87,34 +87,34 @@ return FALSE //VOREStation Addition Start if(species.name == SPECIES_PROTEAN) - to_chat(src, SPAN_WARNING("This is not compatible with your nanomachine body!")) + to_chat(src, span_warning("This is not compatible with your nanomachine body!")) return FALSE //VOREStation Addition End if(incapacitated() || restrained()) - to_chat(src, SPAN_WARNING("You can't do that in your current state!")) + to_chat(src, span_warning("You can't do that in your current state!")) return FALSE if(QDELETED(E) || !istype(E)) - to_chat(src, SPAN_WARNING("You are not holding a compatible limb to attach.")) + to_chat(src, span_warning("You are not holding a compatible limb to attach.")) return FALSE if(!E.can_be_attached_modular_limb(src)) - to_chat(src, SPAN_WARNING("\The [E] cannot be attached to your current body.")) + to_chat(src, span_warning("\The [E] cannot be attached to your current body.")) return FALSE if(E.get_modular_limb_category() <= MODULAR_BODYPART_INVALID) - to_chat(src, SPAN_WARNING("\The [E] cannot be attached by your own hand.")) + to_chat(src, span_warning("\The [E] cannot be attached by your own hand.")) return FALSE var/install_to_zone = E.organ_tag if(!isnull(get_organ(install_to_zone))) - to_chat(src, SPAN_WARNING("There is already a limb attached at that part of your body.")) + to_chat(src, span_warning("There is already a limb attached at that part of your body.")) return FALSE if(E.check_modular_limb_damage(src)) - to_chat(src, SPAN_WARNING("\The [E] is too damaged to be attached.")) + to_chat(src, span_warning("\The [E] is too damaged to be attached.")) return FALSE var/obj/item/organ/external/parent = E.parent_organ && get_organ(E.parent_organ) if(!parent) - to_chat(src, SPAN_WARNING("\The [E] needs an existing limb to be attached to.")) + to_chat(src, span_warning("\The [E] needs an existing limb to be attached to.")) return FALSE if(parent.check_modular_limb_damage(src)) - to_chat(src, SPAN_WARNING("Your [parent.name] is too damaged to have anything attached.")) + to_chat(src, span_warning("Your [parent.name] is too damaged to have anything attached.")) return FALSE return TRUE @@ -124,22 +124,22 @@ return FALSE //VOREStation Addition Start if(species.name == SPECIES_PROTEAN) - to_chat(src, SPAN_WARNING("You can't just detach parts of your nanomachine body!")) + to_chat(src, span_warning("You can't just detach parts of your nanomachine body!")) return FALSE //VOREStation Addition End if(incapacitated() || restrained()) - to_chat(src, SPAN_WARNING("You can't do that in your current state!")) + to_chat(src, span_warning("You can't do that in your current state!")) return FALSE if(!istype(E) || QDELETED(src) || QDELETED(E) || E.owner != src || E.loc != src) return FALSE if(E.check_modular_limb_damage(src)) - to_chat(src, SPAN_WARNING("That limb is too damaged to be removed!")) + to_chat(src, span_warning("That limb is too damaged to be removed!")) return FALSE var/obj/item/organ/external/parent = E.parent_organ && get_organ(E.parent_organ) if(!parent) return FALSE if(parent.check_modular_limb_damage(src)) - to_chat(src, SPAN_WARNING("Your [parent.name] is too damaged to detach anything from it.")) + to_chat(src, span_warning("Your [parent.name] is too damaged to detach anything from it.")) return FALSE return (E in get_modular_limbs(return_first_found = FALSE, validate_proc = /obj/item/organ/external/proc/can_remove_modular_limb)) @@ -169,8 +169,8 @@ var/datum/gender/G = gender_datums[gender] visible_message( - SPAN_NOTICE("\The [src] attaches \the [E] to [G.his] body!"), - SPAN_NOTICE("You attach \the [E] to your body!")) + span_notice("\The [src] attaches \the [E] to [G.his] body!"), + span_notice("You attach \the [E] to your body!")) regenerate_icons() // Not sure why this isn't called by removed(), but without it we don't update our limb appearance. return TRUE @@ -181,7 +181,7 @@ var/list/detachable_limbs = get_modular_limbs(return_first_found = FALSE, validate_proc = /obj/item/organ/external/proc/can_remove_modular_limb) if(!length(detachable_limbs)) - to_chat(src, SPAN_WARNING("You have no detachable limbs.")) + to_chat(src, span_warning("You have no detachable limbs.")) return FALSE var/obj/item/organ/external/E = tgui_input_list(usr, "Which limb do you wish to detach?", "Limb Removal", detachable_limbs) if(!check_can_detach_modular_limb(E)) @@ -197,6 +197,6 @@ put_in_hands(E) var/datum/gender/G = gender_datums[gender] visible_message( - SPAN_NOTICE("\The [src] detaches [G.his] [E.name]!"), - SPAN_NOTICE("You detach your [E.name]!")) + span_notice("\The [src] detaches [G.his] [E.name]!"), + span_notice("You detach your [E.name]!")) return TRUE diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 281b3945c5..6adaa514af 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -575,7 +575,7 @@ return FALSE if(!silent) - to_chat(H, SPAN_NOTICE("You manage to lower impact of the fall and land safely.")) + to_chat(H, span_notice("You manage to lower impact of the fall and land safely.")) landing.visible_message("\The [H] lowers down from above, landing safely.") playsound(H, "rustle", 25, 1) return TRUE diff --git a/code/modules/mob/living/carbon/human/species/species_getters.dm b/code/modules/mob/living/carbon/human/species/species_getters.dm index fc59efd67e..efffe3d002 100644 --- a/code/modules/mob/living/carbon/human/species/species_getters.dm +++ b/code/modules/mob/living/carbon/human/species/species_getters.dm @@ -104,7 +104,7 @@ discomfort_message = pick(heat_discomfort_strings) if(discomfort_message && prob(5)) - to_chat(H, SPAN_DANGER(discomfort_message)) + to_chat(H, span_danger(discomfort_message)) return !!discomfort_message /datum/species/proc/get_random_name(var/gender) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index c600611836..2e609a780f 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -409,7 +409,7 @@ src.species.bloodsucker_controlmode = tgui_input_list(src,"Choose your preferred control of blood sucking. \ You can only cause bleeding wounds with pop up and intents modes. Choosing intents prints controls to chat.", "Configure Bloodsuck", control_options, "always loud") if(src.species.bloodsucker_controlmode == "intents") //We are printing to chat for better readability - to_chat(src, SPAN_NOTICE("You've chosen to use intents for blood draining. \n \ + to_chat(src, span_notice("You've chosen to use intents for blood draining. \n \ HELP - Loud, No Bleeding \n \ DISARM - Subtle, Causes bleeding \n \ GRAB - Subtle, No Bleeding \n \ @@ -474,8 +474,8 @@ src.visible_message(span_red("[src] moves their head next to [B]'s neck, seemingly looking for something!"), range = 1) if(bleed) //Due to possibility of missing/misclick and missing the bleeding cues, we are warning the scene members of BLEEDING being on - to_chat(src, SPAN_WARNING("This is going to cause [B] to keep bleeding!")) - to_chat(B, SPAN_DANGER("You are going to keep bleeding from this bite!")) + to_chat(src, span_warning("This is going to cause [B] to keep bleeding!")) + to_chat(B, span_danger("You are going to keep bleeding from this bite!")) if(do_after(src, 300, B)) //Thrirty seconds. if(!Adjacent(B)) return @@ -1512,8 +1512,8 @@ to_chat(src, "You need to be closer to do that.") return - visible_message(span("warning","\The [src] rears back, ready to lunge!")) - to_chat(target, span("danger","\The [src] focuses on you!")) + visible_message(span_warning("\The [src] rears back, ready to lunge!")) + to_chat(target, span_danger("\The [src] focuses on you!")) // Telegraph, since getting stunned suddenly feels bad. do_windup_animation(target, leap_warmup) sleep(leap_warmup) // For the telegraphing. @@ -1523,7 +1523,7 @@ // Do the actual leap. status_flags |= LEAPING // Lets us pass over everything. - visible_message(span("critical","\The [src] leaps at \the [target]!")) + visible_message(span_critical("\The [src] leaps at \the [target]!")) throw_at(get_step(target, get_turf(src)), 7, 1, src) playsound(src, leap_sound, 75, 1) diff --git a/code/modules/mob/living/carbon/human/species/station/teshari.dm b/code/modules/mob/living/carbon/human/species/station/teshari.dm index 50bcccf5ed..15bed54a38 100644 --- a/code/modules/mob/living/carbon/human/species/station/teshari.dm +++ b/code/modules/mob/living/carbon/human/species/station/teshari.dm @@ -181,14 +181,14 @@ if(H.buckled) if(!silent) - to_chat(H, SPAN_WARNING("You try to spread your wings to slow your fall, but \the [H.buckled] weighs you down!")) + to_chat(H, span_warning("You try to spread your wings to slow your fall, but \the [H.buckled] weighs you down!")) return ..() // Is there enough air to flap against? var/datum/gas_mixture/environment = landing.return_air() if(!environment || environment.return_pressure() < (ONE_ATMOSPHERE * 0.75)) if(!silent) - to_chat(H, SPAN_WARNING("You spread your wings to slow your fall, but the air is too thin!")) + to_chat(H, span_warning("You spread your wings to slow your fall, but the air is too thin!")) return ..() // Are we wearing a space suit? @@ -196,7 +196,7 @@ for(var/blacklisted_type in flight_suit_blacklisted_types) if(istype(H.wear_suit, blacklisted_type)) if(!silent) - to_chat(H, SPAN_WARNING("You try to spread your wings to slow your fall, but \the [H.wear_suit] is in the way!")) + to_chat(H, span_warning("You try to spread your wings to slow your fall, but \the [H.wear_suit] is in the way!")) return ..() // Do we have working wings? @@ -204,14 +204,14 @@ var/obj/item/organ/external/E = H.organs_by_name[bp] if(!istype(E) || !E.is_usable() || E.is_broken() || E.is_stump()) if(!silent) - to_chat(H, SPAN_WARNING("You try to spread your wings to slow your fall, but they won't hold your weight!")) + to_chat(H, span_warning("You try to spread your wings to slow your fall, but they won't hold your weight!")) return ..() // Handled! if(!silent) - to_chat(H, SPAN_NOTICE("You catch the air in your wings and greatly slow your fall.")) + to_chat(H, span_notice("You catch the air in your wings and greatly slow your fall.")) landing.visible_message("\The [H] glides down from above, landing safely.") H.Stun(1) playsound(H, "rustle", 25, 1) return TRUE -*/ \ No newline at end of file +*/ diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/traits_tutorial.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/traits_tutorial.dm index b00990b462..b8dd9b1239 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/traits_tutorial.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/traits_tutorial.dm @@ -36,7 +36,7 @@ TGUI frontend path: tgui\packages\tgui\interfaces\TraitTutorial.tsx var/list/list_of_traits = species.traits if(!LAZYLEN(list_of_traits)) //Although we shouldn't show up if no traits, leaving this in case someone loses theirs after (re)spawning. - to_chat(usr, SPAN_NOTICE("You do not have any custom traits!")) + to_chat(usr, span_notice("You do not have any custom traits!")) return //Dont want an empty TGUI panel and list by accident after all. @@ -66,7 +66,7 @@ TGUI frontend path: tgui\packages\tgui\interfaces\TraitTutorial.tsx if(UI_choice == "To Chat") var/to_chat_choice = tgui_input_list(usr, "Please choose the trait to be explained", "Print to Chat", trait_names, null) if(to_chat_choice) - to_chat(usr,SPAN_NOTICE("Name: [to_chat_choice] \n Category: [trait_category[to_chat_choice]] \n Description: [trait_desc[to_chat_choice]] \n \ + to_chat(usr,span_notice("Name: [to_chat_choice] \n Category: [trait_category[to_chat_choice]] \n Description: [trait_desc[to_chat_choice]] \n \ Guide: \n [trait_tutorial[to_chat_choice]]")) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 87a9d50a29..641d5cbc86 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1160,9 +1160,9 @@ var/mob/living/carbon/human/H = target if(H.in_throw_mode && H.a_intent == I_HELP && unEquip(I)) H.put_in_hands(I) // If this fails it will just end up on the floor, but that's fitting for things like dionaea. - visible_message("[src] hands \the [H] \a [I].", SPAN_NOTICE("You give \the [target] \a [I].")) + visible_message("[src] hands \the [H] \a [I].", span_notice("You give \the [target] \a [I].")) else - to_chat(src, SPAN_NOTICE("You offer \the [I] to \the [target].")) + to_chat(src, span_notice("You offer \the [I] to \the [target].")) do_give(H) return TRUE @@ -1337,6 +1337,6 @@ if(!toggled_sleeping && alert(src, "Are you sure you wish to go to sleep? You will snooze until you use the Sleep verb again.", "Sleepy Time", "No", "Yes") == "No") return toggled_sleeping = !toggled_sleeping - to_chat(src, SPAN_NOTICE("You are [toggled_sleeping ? "now sleeping. Use the Sleep verb again to wake up" : "no longer sleeping"].")) + to_chat(src, span_notice("You are [toggled_sleeping ? "now sleeping. Use the Sleep verb again to wake up" : "no longer sleeping"].")) if(toggled_sleeping) Sleeping(1) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 1e348d94ec..a3f5919e8d 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -511,7 +511,7 @@ stuttering += 20 make_jittery(150) emp_act(1) - to_chat(src, span("critical", "You've been struck by lightning!")) + to_chat(src, span_critical("You've been struck by lightning!")) // Called when touching a lava tile. // Does roughly 70 damage (30 instantly, up to ~40 over time) to unprotected mobs, and 10 to fully protected mobs. diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index 4c0bb9c34d..d8c45f3667 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -19,7 +19,7 @@ // Unless the walker is confused. if(m_intent == "walk" && confused <= 0) if(!n.is_safe_to_enter(src)) - to_chat(src, span("warning", "\The [n] is dangerous to move into.")) + to_chat(src, span_warning("\The [n] is dangerous to move into.")) return FALSE // In case any code wants to know if movement happened. return ..() // Parent call should make the mob move. diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm index 0655ed8123..53d1a3de35 100644 --- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm +++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm @@ -8,19 +8,19 @@ /mob/living/silicon/ai/proc/deploy_to_shell(var/mob/living/silicon/robot/target) if(!config.allow_ai_shells) - to_chat(src, span("warning", "AI Shells are not allowed on this server. You shouldn't have this verb because of it, so consider making a bug report.")) + to_chat(src, span_warning("AI Shells are not allowed on this server. You shouldn't have this verb because of it, so consider making a bug report.")) return if(incapacitated()) - to_chat(src, span("warning", "You are incapacitated!")) + to_chat(src, span_warning("You are incapacitated!")) return if(lacks_power()) - to_chat(src, span("warning", "Your core lacks power, wireless is disabled.")) + to_chat(src, span_warning("Your core lacks power, wireless is disabled.")) return if(control_disabled) - to_chat(src, span("warning", "Wireless networking module is offline.")) + to_chat(src, span_warning("Wireless networking module is offline.")) return var/list/possible = list() @@ -40,16 +40,16 @@ possible += R if(!LAZYLEN(possible)) - to_chat(src, span("warning", "No usable AI shell beacons detected.")) + to_chat(src, span_warning("No usable AI shell beacons detected.")) if(!target || !(target in possible)) //If the AI is looking for a new shell, or its pre-selected shell is no longer valid target = tgui_input_list(src, "Which body to control?", "Shell Choice", possible) if(!target || target.stat == DEAD || target.deployed || !(!target.connected_ai || (target.connected_ai == src) ) ) if(target) - to_chat(src, span("warning", "It is no longer possible to deploy to \the [target].")) + to_chat(src, span_warning("It is no longer possible to deploy to \the [target].")) else - to_chat(src, span("notice", "Deployment aborted.")) + to_chat(src, span_notice("Deployment aborted.")) return else if(mind) @@ -73,5 +73,5 @@ /mob/living/silicon/ai/proc/disconnect_shell(message = "Your remote connection has been reset!") if(deployed_shell) // Forcibly call back AI in event of things such as damage, EMP or power loss. - message = span("danger", message) + message = span_danger(message) deployed_shell.undeploy(message) diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index 7c883ab849..7914993447 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -83,7 +83,7 @@ last_law_notification = world.time SEND_SOUND(src, 'sound/machines/defib_success.ogg') window_flash(client) - to_chat(src, span("warning", message)) + to_chat(src, span_warning(message)) /mob/living/silicon/proc/statelaws(var/datum/ai_laws/laws) var/prefix = "" diff --git a/code/modules/mob/living/silicon/robot/robot_remote_control.dm b/code/modules/mob/living/silicon/robot/robot_remote_control.dm index f88769c5e7..a768b1f7b7 100644 --- a/code/modules/mob/living/silicon/robot/robot_remote_control.dm +++ b/code/modules/mob/living/silicon/robot/robot_remote_control.dm @@ -66,7 +66,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells) // Give button to leave. verbs += /mob/living/silicon/robot/proc/undeploy_act - to_chat(AI, span("notice", "You have connected to an AI Shell remotely, and are now in control of it.
\ + to_chat(AI, span_notice("You have connected to an AI Shell remotely, and are now in control of it.
\ To return to your core, use the Release Control verb.")) // Languages and comms. @@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells) // mainframe.redeploy_action.Grant(mainframe) // mainframe.redeploy_action.last_used_shell = src if(message) - to_chat(src, span("notice", message)) + to_chat(src, span_notice(message)) mind.transfer_to(mainframe) src.copy_vore_prefs_to_mob(mainframe) deployed = FALSE diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm index f2bce726da..21a2db794b 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm @@ -141,9 +141,9 @@ if(new_recharge_state != last_recharge_state) last_recharge_state = new_recharge_state if(last_recharge_state) - to_chat(src, SPAN_NOTICE("Your integrated solar panels begin recharging your battery.")) + to_chat(src, span_notice("Your integrated solar panels begin recharging your battery.")) else - to_chat(src, SPAN_DANGER("Your integrated solar panels cease recharging your battery.")) + to_chat(src, span_danger("Your integrated solar panels cease recharging your battery.")) if(last_recharge_state) var/charge_amt = recharger_charge_amount * CELLRATE diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm index c3caace5d2..355adb42a8 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm @@ -62,7 +62,7 @@ var/obj/item/robot_module/robot/platform/tank_module = module if(!istype(tank_module)) - to_chat(user, SPAN_WARNING("\The [src] is not paintable.")) + to_chat(user, span_warning("\The [src] is not paintable.")) return FALSE var/list/options = list("Eyes", "Armour", "Body", "Clear Colors") diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm index fe68c93bdb..a464f9c36c 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm @@ -19,7 +19,7 @@ if(istype(W, /obj/item/cell) && !opened) if(recharging) - to_chat(user, SPAN_WARNING("\The [src] already has \a [recharging.resolve()] inserted into its recharging port.")) + to_chat(user, span_warning("\The [src] already has \a [recharging.resolve()] inserted into its recharging port.")) else if(user.unEquip(W)) W.forceMove(src) recharging = WEAKREF(W) @@ -42,7 +42,7 @@ return ..() if(jobban_isbanned(user, "Robot")) - to_chat(user, SPAN_WARNING("You are banned from synthetic roles and cannot take control of \the [src].")) + to_chat(user, span_warning("You are banned from synthetic roles and cannot take control of \the [src].")) return // Boilerplate from drone fabs, unsure if there's a shared proc to use instead. @@ -70,7 +70,7 @@ /mob/living/silicon/robot/platform/proc/welcome_client() if(client) - to_chat(src, SPAN_NOTICE("You are a think-tank, a kind of flexible and adaptive drone intelligence installed into an armoured platform. Your programming compels you to be friendly and helpful wherever possible.")) + to_chat(src, span_notice("You are a think-tank, a kind of flexible and adaptive drone intelligence installed into an armoured platform. Your programming compels you to be friendly and helpful wherever possible.")) SetSleeping(0) SetWeakened(0) SetParalysis(0) diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm index 27af8c1590..c1cc9e770e 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm @@ -23,31 +23,31 @@ if(!istype(storing)) var/storing_target = (user == src) ? "yourself" : "\the [src]" - to_chat(user, SPAN_WARNING("You cannot store that inside [storing_target].")) + to_chat(user, span_warning("You cannot store that inside [storing_target].")) return FALSE if(!isturf(storing.loc)) return FALSE if(storing.anchored || !storing.simulated) - to_chat(user, SPAN_WARNING("\The [storing] won't budge!")) + to_chat(user, span_warning("\The [storing] won't budge!")) return FALSE if(storing == src) var/storing_target = (user == src) ? "yourself" : "\the [src]" - to_chat(user, SPAN_WARNING("You cannot store [storing_target] inside [storing_target]!")) + to_chat(user, span_warning("You cannot store [storing_target] inside [storing_target]!")) return FALSE if(length(stored_atoms) >= max_stored_atoms) var/storing_target = (user == src) ? "Your" : "\The [src]'s" - to_chat(user, SPAN_WARNING("[storing_target] cargo compartment is full.")) + to_chat(user, span_warning("[storing_target] cargo compartment is full.")) return FALSE if(ismob(storing)) var/mob/M = storing if(M.mob_size >= mob_size) var/storing_target = (user == src) ? "your storage compartment" : "\the [src]" - to_chat(user, SPAN_WARNING("\The [storing] is too big for [storing_target].")) + to_chat(user, span_warning("\The [storing] is too big for [storing_target].")) return FALSE for(var/store_type in can_store_types) @@ -62,7 +62,7 @@ break if(!.) var/storing_target = (user == src) ? "yourself" : "\the [src]" - to_chat(user, SPAN_WARNING("You cannot store \the [storing] inside [storing_target].")) + to_chat(user, span_warning("You cannot store \the [storing] inside [storing_target].")) /mob/living/silicon/robot/platform/proc/store_atom(var/atom/movable/storing, var/mob/user) if(istype(storing)) @@ -110,13 +110,13 @@ set desc = "Drop something from your internal storage." if(incapacitated()) - to_chat(src, SPAN_WARNING("You are not in any state to do that.")) + to_chat(src, span_warning("You are not in any state to do that.")) return if(length(stored_atoms)) drop_stored_atom(user = src) else - to_chat(src, SPAN_WARNING("You have nothing in your cargo compartment.")) + to_chat(src, span_warning("You have nothing in your cargo compartment.")) /mob/living/silicon/robot/platform/MouseDrop_T(atom/movable/dropping, mob/living/user) if(!istype(user) || !istype(dropping) || user.incapacitated()) diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm index 1ffc3df88d..7331382326 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm @@ -11,7 +11,7 @@ /mob/living/silicon/robot/platform/explorer/welcome_client() ..() if(client) // ganbatte tachikoma-san - to_chat(src, SPAN_NOTICE("You are tasked with supporting the Exploration and Science staff as they unearth the secrets of the planet. Do your best!")) + to_chat(src, span_notice("You are tasked with supporting the Exploration and Science staff as they unearth the secrets of the planet. Do your best!")) /obj/effect/landmark/robot_platform/explorer platform_type = /mob/living/silicon/robot/platform/explorer @@ -26,7 +26,7 @@ /mob/living/silicon/robot/platform/cargo/welcome_client() ..() if(client) - to_chat(src, SPAN_NOTICE("You are tasked with supporting the Cargo and Supply staff as they handle operational logistics. Do your best!")) + to_chat(src, span_notice("You are tasked with supporting the Cargo and Supply staff as they handle operational logistics. Do your best!")) /obj/effect/landmark/robot_platform/cargo platform_type = /mob/living/silicon/robot/platform/cargo diff --git a/code/modules/mob/living/simple_mob/combat.dm b/code/modules/mob/living/simple_mob/combat.dm index 7c8ccfadc5..970be8e584 100644 --- a/code/modules/mob/living/simple_mob/combat.dm +++ b/code/modules/mob/living/simple_mob/combat.dm @@ -41,7 +41,7 @@ if(missed) // Most likely we have a slow attack and they dodged it or we somehow got moved. add_attack_logs(src, A, "Animal-attacked (dodged)", admin_notify = FALSE) playsound(src, 'sound/weapons/punchmiss.ogg', 75, 1) - visible_message(span("warning", "\The [src] misses their attack.")) + visible_message(span_warning("\The [src] misses their attack.")) return FALSE var/damage_to_do = rand(melee_damage_lower, melee_damage_upper) diff --git a/code/modules/mob/living/simple_mob/defense.dm b/code/modules/mob/living/simple_mob/defense.dm index 4c0aee988f..2f68d970c2 100644 --- a/code/modules/mob/living/simple_mob/defense.dm +++ b/code/modules/mob/living/simple_mob/defense.dm @@ -291,7 +291,7 @@ inflict_shock_damage(200) // Mobs that are very beefy or resistant to shock may survive getting struck. updatehealth() if(health <= 0) - visible_message(span("critical", "\The [src] disintegrates into ash!")) + visible_message(span_critical("\The [src] disintegrates into ash!")) ash() return // No point deafening something that wont exist. @@ -303,7 +303,7 @@ if(!client) updatehealth() if(health <= 0) - visible_message(span("critical", "\The [src] flashes into ash as the lava consumes them!")) + visible_message(span_critical("\The [src] flashes into ash as the lava consumes them!")) ash() // Injections. @@ -311,4 +311,3 @@ if(ignore_thickness) return TRUE return !thick_armor - diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 02ad425bdf..a57b7aef69 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -244,18 +244,18 @@ /mob/living/simple_mob/vore/alienanimals/catslug/proc/give_hat(var/obj/item/clothing/head/new_hat, var/mob/living/user) if(!istype(new_hat)) - to_chat(user, span("warning", "\The [new_hat] isn't a hat.")) + to_chat(user, span_warning("\The [new_hat] isn't a hat.")) return if(hat) - to_chat(user, span("warning", "\The [src] is already wearing \a [hat].")) + to_chat(user, span_warning("\The [src] is already wearing \a [hat].")) return else if(!can_wear_hat) - to_chat(user, span("warning", "\The [src] is unable to wear \a [hat].")) + to_chat(user, span_warning("\The [src] is unable to wear \a [hat].")) else user.drop_item(new_hat) hat = new_hat new_hat.forceMove(src) - to_chat(user, span("notice", "You place \a [new_hat] on \the [src]. How adorable!")) + to_chat(user, span_notice("You place \a [new_hat] on \the [src]. How adorable!")) update_icon() return diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm b/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm index f1b82ba9ef..51d338364c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm @@ -37,4 +37,4 @@ var/new_flavour_text = sanitize((input("Please describe yourself.", "Flavour Text", flavor_text) as message|null), MAX_MESSAGE_LEN) if(length(new_flavour_text) && !QDELETED(src)) flavor_text = new_flavour_text - to_chat(src, SPAN_NOTICE("Your flavour text has been updated.")) + to_chat(src, span_notice("Your flavour text has been updated.")) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm index f834c6f81e..19c817dc67 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm @@ -73,13 +73,13 @@ if(host.reagents.has_reagent("sugar") && !docile) var/message = "You feel the soporific flow of sugar in your host's blood, lulling you into docility." var/target = controlling ? host : src - to_chat(target, span("warning", message)) + to_chat(target, span_warning(message)) docile = TRUE else if(docile) var/message = "You shake off your lethargy as the sugar leaves your host's blood." var/target = controlling ? host : src - to_chat(target, span("notice", message)) + to_chat(target, span_notice(message)) docile = FALSE // Chem regen. @@ -89,7 +89,7 @@ // Control stuff. if(controlling) if(docile) - to_chat(host, span("warning", "You are feeling far too docile to continue controlling your host...")) + to_chat(host, span_warning("You are feeling far too docile to continue controlling your host...")) host.release_control() return @@ -204,7 +204,7 @@ mind.assigned_role = JOB_CORTICAL_BORER mind.special_role = JOB_CORTICAL_BORER - to_chat(src, span("notice", "You are a cortical borer! You are a brain slug that worms its way \ + to_chat(src, span_notice("You are a cortical borer! You are a brain slug that worms its way \ into the head of its victim. Use stealth, persuasion and your powers of mind control to keep you, \ your host and your eventual spawn safe and warm.")) to_chat(src, "You can speak to your victim with say, to other borers with say :x, and use your Abilities tab to access powers.") @@ -226,7 +226,7 @@ return if(client && client.prefs.muted & MUTE_IC) - to_chat(src, span("danger", "You cannot speak in IC (muted).")) + to_chat(src, span_danger("You cannot speak in IC (muted).")) return if(copytext(message, 1, 2) == "*") @@ -240,7 +240,7 @@ if(!host) if(chemicals >= 30) - to_chat(src, span("alien", "..You emit a psionic pulse with an encoded message..")) + to_chat(src, span_alien("..You emit a psionic pulse with an encoded message..")) var/list/nearby_mobs = list() for(var/mob/living/LM in view(src, 1 + round(6 * (chemicals / max_chemicals)))) if(LM == src) @@ -255,9 +255,9 @@ message_admins("[src.ckey]/([src]) tried to force [speaker] to say: [message]") speaker.say("[message]") return - to_chat(src, span("alien", "..But nothing heard it..")) + to_chat(src, span_alien("..But nothing heard it..")) else - to_chat(src, span("warning", "You have no host to speak to.")) + to_chat(src, span_warning("You have no host to speak to.")) return //No host, no audible speech. to_chat(src, "You drop words into [host]'s mind: \"[message]\"") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm index cc5b5d179c..18428ab3e7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm @@ -96,7 +96,7 @@ step_away(broodling, src) count++ - visible_message(span("danger", "\The [src] releases brood from its birthing sack!")) + visible_message(span_danger("\The [src] releases brood from its birthing sack!")) /mob/living/simple_mob/animal/giant_spider/broodmother/proc/launch_brood(atom/A) set waitfor = FALSE @@ -110,7 +110,7 @@ broodling.throw_at(A, 10) count++ - visible_message(span("danger", "\The [src] launches brood from the distance!")) + visible_message(span_danger("\The [src] launches brood from the distance!")) /mob/living/simple_mob/animal/giant_spider/broodmother/proc/can_spawn_brood() var/brood_amount = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm index 1cff5b39c7..bc2cb46ab5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm @@ -45,7 +45,7 @@ return ..() /mob/living/simple_mob/animal/giant_spider/carrier/death() - visible_message(span("warning", "\The [src]'s abdomen splits as it rolls over, spiderlings crawling from the wound.") ) + visible_message(span_warning("\The [src]'s abdomen splits as it rolls over, spiderlings crawling from the wound.") ) spawn(1) var/list/new_spiders = list() for(var/i = 1 to spiderling_count) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm index 5e2567d96d..b6cfee6b3f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm @@ -68,7 +68,7 @@ // Do the actual leap. status_flags |= LEAPING // Lets us pass over everything. - visible_message(span("danger","\The [src] leaps at \the [A]!")) + visible_message(span_danger("\The [src] leaps at \the [A]!")) throw_at(get_step(get_turf(A), get_turf(src)), special_attack_max_range+1, 1, src) playsound(src, leap_sound, 75, 1) @@ -97,8 +97,8 @@ if(victim) victim.Weaken(2) - victim.visible_message(span("danger","\The [src] knocks down \the [victim]!")) - to_chat(victim, span("critical", "\The [src] jumps on you!")) + victim.visible_message(span_danger("\The [src] knocks down \the [victim]!")) + to_chat(victim, span_critical("\The [src] jumps on you!")) . = TRUE set_AI_busy(FALSE) @@ -139,7 +139,7 @@ to_world("Failed to pull.") return FALSE - holder.visible_message(span("danger","\The [holder] starts to drag \the [L] away!")) + holder.visible_message(span_danger("\The [holder] starts to drag \the [L] away!")) var/list/allies = list() var/list/enemies = list() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm index 7a8d649541..bcdeedef00 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm @@ -103,7 +103,7 @@ if(isliving(A)) var/mob/living/L = A L.Weaken(cloaked_weaken_amount) - to_chat(L, span("danger", "\The [src] ambushes you!")) + to_chat(L, span_danger("\The [src] ambushes you!")) playsound(src, 'sound/weapons/spiderlunge.ogg', 75, 1) uncloak() ..() // For the poison. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm index 0788c80000..27211f3b82 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm @@ -68,7 +68,7 @@ var/obj/effect/spider/eggcluster/eggs = new egg_type(O, src) O.implants += eggs eggs.faction = faction - to_chat(H, span("critical", "\The [src] injects something into your [O.name]!") ) // Oh god its laying eggs in me! + to_chat(H, span_critical("\The [src] injects something into your [O.name]!") ) // Oh god its laying eggs in me! // Webs target in a web if able to. /mob/living/simple_mob/animal/giant_spider/nurse/attack_target(atom/A) @@ -95,28 +95,28 @@ /mob/living/simple_mob/animal/giant_spider/nurse/proc/spin_cocoon(atom/movable/AM) if(!istype(AM)) return FALSE // We can't cocoon walls sadly. - visible_message(span("notice", "\The [src] begins to secrete a sticky substance around \the [AM].") ) + visible_message(span_notice("\The [src] begins to secrete a sticky substance around \the [AM].") ) // Get our AI to stay still. set_AI_busy(TRUE) if(!do_mob(src, AM, 5 SECONDS)) set_AI_busy(FALSE) - to_chat(src, span("warning", "You need to stay still to spin a web around \the [AM].")) + to_chat(src, span_warning("You need to stay still to spin a web around \the [AM].")) return FALSE set_AI_busy(FALSE) if(!AM) // Make sure it didn't get deleted for whatever reason. - to_chat(src, span("warning", "Whatever you were spinning a web for, its no longer there...")) + to_chat(src, span_warning("Whatever you were spinning a web for, its no longer there...")) return FALSE if(!isturf(AM.loc)) - to_chat(src, span("warning", "You can't spin \the [AM] in a web while it is inside \the [AM.loc].")) + to_chat(src, span_warning("You can't spin \the [AM] in a web while it is inside \the [AM.loc].")) return FALSE if(!Adjacent(AM)) - to_chat(src, span("warning", "You need to be next to \the [AM] to spin it into a web.")) + to_chat(src, span_warning("You need to be next to \the [AM] to spin it into a web.")) return FALSE // Finally done with the checks. @@ -126,8 +126,8 @@ if(istype(L, /mob/living/simple_mob/animal/giant_spider)) // Cannibalism is bad. continue fed++ - visible_message(span("warning","\The [src] sticks a proboscis into \the [L], and sucks a viscous substance out.")) - to_chat(src, span("notice", "You've fed upon \the [L], and can now lay [fed] cluster\s of eggs.")) + visible_message(span_warning("\The [src] sticks a proboscis into \the [L], and sucks a viscous substance out.")) + to_chat(src, span_notice("You've fed upon \the [L], and can now lay [fed] cluster\s of eggs.")) L.forceMove(C) large_cocoon = TRUE break @@ -162,13 +162,13 @@ if(W) return FALSE // Already got webs here. - visible_message(span("notice", "\The [src] begins to secrete a sticky substance.") ) + visible_message(span_notice("\The [src] begins to secrete a sticky substance.") ) // Get our AI to stay still. set_AI_busy(TRUE) if(!do_mob(src, T, 5 SECONDS)) set_AI_busy(FALSE) - to_chat(src, span("warning", "You need to stay still to spin a web on \the [T].")) + to_chat(src, span_warning("You need to stay still to spin a web on \the [T].")) return FALSE W = locate() in T @@ -194,7 +194,7 @@ if(E) return FALSE // Already got eggs here. - visible_message(span("notice", "\The [src] begins to lay a cluster of eggs.") ) + visible_message(span_notice("\The [src] begins to lay a cluster of eggs.") ) // Get our AI to stay still. set_AI_busy(TRUE) // Stop players from spamming eggs. @@ -202,7 +202,7 @@ if(!do_mob(src, T, 5 SECONDS)) set_AI_busy(FALSE) - to_chat(src, span("warning", "You need to stay still to lay eggs on \the [T].")) + to_chat(src, span_warning("You need to stay still to lay eggs on \the [T].")) return FALSE E = locate() in T diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm index dd434d4fb7..439bf98b10 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm @@ -64,7 +64,7 @@ return ..() /mob/living/simple_mob/animal/giant_spider/phorogenic/death() - visible_message(span("critical", "\The [src]'s body begins to rupture!")) + visible_message(span_critical("\The [src]'s body begins to rupture!")) var/delay = rand(explosion_delay_lower, explosion_delay_upper) spawn(0) // Flash black and red as a warning. @@ -78,7 +78,7 @@ spawn(delay) // The actual boom. if(src && !exploded) - visible_message(span("danger", "\The [src]'s body detonates!")) + visible_message(span_danger("\The [src]'s body detonates!")) exploded = TRUE explosion(src.loc, explosion_dev_range, explosion_heavy_range, explosion_light_range, explosion_flash_range) return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm index f95b705add..149c6b4c4b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm @@ -93,7 +93,7 @@ sleep(tunnel_warning) // For the telegraphing. // Do the dig! - visible_message(span("danger","\The [src] tunnels towards \the [A]!")) + visible_message(span_danger("\The [src] tunnels towards \the [A]!")) submerge() if(handle_tunnel(destination) == FALSE) @@ -114,7 +114,7 @@ if(L == src) continue - visible_message(span("danger","\The [src] erupts from underneath, and hits \the [L]!")) + visible_message(span_danger("\The [src] erupts from underneath, and hits \the [L]!")) playsound(src, 'sound/weapons/heavysmash.ogg', 75, 1) L.Weaken(3) overshoot = FALSE @@ -125,7 +125,7 @@ return TRUE // Otherwise we need to keep going. - to_chat(src, span("warning", "You overshoot your target!")) + to_chat(src, span_warning("You overshoot your target!")) playsound(src, 'sound/weapons/punchmiss.ogg', 75, 1) var/dir_to_go = get_dir(starting_turf, destination) for(var/i = 1 to rand(2, 4)) @@ -156,7 +156,7 @@ // Update T. T = get_step(src, get_dir(src, destination)) if(T.check_density(ignore_mobs = TRUE)) - to_chat(src, span("critical", "You hit something really solid!")) + to_chat(src, span_critical("You hit something really solid!")) playsound(src, "punch", 75, 1) Weaken(5) add_modifier(/datum/modifier/tunneler_vulnerable, 10 SECONDS) @@ -204,4 +204,4 @@ stacks = MODIFIER_STACK_EXTEND incoming_damage_percent = 2 - evasion = -100 \ No newline at end of file + evasion = -100 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index 5af1e127e3..176d0d0237 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -106,24 +106,24 @@ var/list/_cat_default_emotes = list( if(friend) if(friend == usr) - to_chat(L, span("notice", "\The [src] is already your friend! Meow!")) + to_chat(L, span_notice("\The [src] is already your friend! Meow!")) return else - to_chat(L, span("warning", "\The [src] ignores you.")) + to_chat(L, span_warning("\The [src] ignores you.")) return //VOREStation Edit Start - Adds friend_name var checks if(!friend_name || L.real_name == friend_name) friend = L face_atom(L) - to_chat(L, span("notice", "\The [src] is now your friend! Meow.")) + to_chat(L, span_notice("\The [src] is now your friend! Meow.")) visible_emote(pick("nuzzles [friend].", "brushes against [friend].", "rubs against [friend].", "purrs.")) if(has_AI()) var/datum/ai_holder/AI = ai_holder AI.set_follow(friend) else - to_chat(L, span("notice", "[src] ignores you.")) + to_chat(L, span_notice("[src] ignores you.")) //VOREStation Edit End diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm index 5b75e806f6..5fb9712d01 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm @@ -117,15 +117,15 @@ if(friend) if(friend == usr) - to_chat(L, span("notice", "\The [src] is already your friend!")) + to_chat(L, span_notice("\The [src] is already your friend!")) return else - to_chat(L, span("warning", "\The [src] ignores you.")) + to_chat(L, span_warning("\The [src] ignores you.")) return friend = L face_atom(L) - to_chat(L, span("notice", "\The [src] is now your friend!")) + to_chat(L, span_notice("\The [src] is now your friend!")) visible_emote(pick("nips [friend].", "brushes against [friend].", "tugs on [friend].", "chrrrrs.")) if(has_AI()) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm index 68442e5239..757bffc007 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm @@ -65,17 +65,17 @@ /mob/living/simple_mob/animal/passive/bird/parrot/proc/give_headset(obj/item/radio/headset/new_headset, mob/living/user) if(!istype(new_headset)) - to_chat(user, span("warning", "\The [new_headset] isn't a headset.")) + to_chat(user, span_warning("\The [new_headset] isn't a headset.")) return if(my_headset) - to_chat(user, span("warning", "\The [src] is already wearing \a [my_headset].")) + to_chat(user, span_warning("\The [src] is already wearing \a [my_headset].")) return else user.drop_item(new_headset) my_headset = new_headset new_headset.forceMove(src) - to_chat(user, span("warning", "You place \a [new_headset] on \the [src]. You monster.")) - to_chat(src, span("notice", "\The [user] gives you \a [new_headset]. You should put it to good use immediately.")) + to_chat(user, span_warning("You place \a [new_headset] on \the [src]. You monster.")) + to_chat(src, span_notice("\The [user] gives you \a [new_headset]. You should put it to good use immediately.")) return /mob/living/simple_mob/animal/passive/bird/parrot/proc/remove_headset(mob/living/user) @@ -85,8 +85,8 @@ ISay("BAWWWWWK LEAVE THE HEADSET BAWKKKKK!") my_headset.forceMove(get_turf(src)) user.put_in_hands(my_headset) - to_chat(user, span("notice", "You take away \the [src]'s [my_headset.name]. Finally.")) - to_chat(src, span("warning", "\The [user] takes your [my_headset.name] away! How cruel!")) + to_chat(user, span_notice("You take away \the [src]'s [my_headset.name]. Finally.")) + to_chat(src, span_warning("\The [user] takes your [my_headset.name] away! How cruel!")) my_headset = null /mob/living/simple_mob/animal/passive/bird/parrot/examine(mob/user) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm index e1b628346a..cf1ec313cd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm @@ -86,7 +86,7 @@ Field studies suggest analytical abilities on par with some species of cepholapo /decl/emote/audible/drake_howl/broadcast_emote_to(var/send_sound, var/mob/target, var/direction) if((. = ..())) - to_chat(target, SPAN_NOTICE("You hear an eerie howl from somewhere to the [dir2text(direction)].")) + to_chat(target, span_notice("You hear an eerie howl from somewhere to the [dir2text(direction)].")) /mob/living/simple_mob/animal/sif/grafadreka/get_available_emotes() . = global._default_mob_emotes.Copy() @@ -112,7 +112,7 @@ Field studies suggest analytical abilities on par with some species of cepholapo resting = TRUE sitting = TRUE - to_chat(src, SPAN_NOTICE("You are now [sitting ? "sitting" : "getting up"].")) + to_chat(src, span_notice("You are now [sitting ? "sitting" : "getting up"].")) update_canmove() update_icon() @@ -262,17 +262,17 @@ var/global/list/wounds_being_tended_by_drakes = list() if(istype(user, /mob/living/simple_mob/animal/sif/grafadreka) || isobserver(user)) var/datum/gender/G = gender_datums[get_visible_gender()] if(stored_sap >= 20) - . += SPAN_NOTICE("[G.His] sap reserves are high.") + . += span_notice("[G.His] sap reserves are high.") else if(stored_sap >= 10) - . += SPAN_WARNING("[G.His] sap reserves are running low.") + . += span_warning("[G.His] sap reserves are running low.") else - . += SPAN_DANGER("[G.His] sap reserves are depleted.") + . += span_danger("[G.His] sap reserves are depleted.") /mob/living/simple_mob/animal/sif/grafadreka/can_projectile_attack(var/atom/A) if(a_intent != I_HURT || world.time < next_spit) return FALSE if(!has_sap(2)) - to_chat(src, SPAN_WARNING("You have no sap to spit!")) + to_chat(src, span_warning("You have no sap to spit!")) return FALSE return ..() @@ -428,7 +428,7 @@ var/global/list/wounds_being_tended_by_drakes = list() var/mob/living/friend = A if(friend.stat == DEAD) if(friend == src) - to_chat(src, SPAN_WARNING("\The [friend] is dead; tending their wounds is pointless.")) + to_chat(src, span_warning("\The [friend] is dead; tending their wounds is pointless.")) else return ..() return TRUE @@ -436,33 +436,33 @@ var/global/list/wounds_being_tended_by_drakes = list() if(!can_tend_wounds(friend)) if(friend == src) if(health == maxHealth) - to_chat(src, SPAN_WARNING("You are unwounded.")) + to_chat(src, span_warning("You are unwounded.")) else - to_chat(src, SPAN_WARNING("You cannot tend any of your wounds.")) + to_chat(src, span_warning("You cannot tend any of your wounds.")) else if(friend.health == friend.maxHealth) return ..() - to_chat(src, SPAN_WARNING("You cannot tend any of \the [friend]'s wounds.")) + to_chat(src, span_warning("You cannot tend any of \the [friend]'s wounds.")) return TRUE if(friend.has_modifier_of_type(/datum/modifier/sifsap_salve)) if(friend == src) - to_chat(src, SPAN_WARNING("You have already cleaned your wounds.")) + to_chat(src, span_warning("You have already cleaned your wounds.")) else return ..() return TRUE if(!has_sap(10)) if(friend == src) - to_chat(src, SPAN_WARNING("You don't have enough sap to clean your wounds.")) + to_chat(src, span_warning("You don't have enough sap to clean your wounds.")) else return ..() return TRUE if(friend == src) - visible_message(SPAN_NOTICE("\The [src] begins to drool a blue-glowing liquid, which they start slathering over their wounds.")) + visible_message(span_notice("\The [src] begins to drool a blue-glowing liquid, which they start slathering over their wounds.")) else - visible_message(SPAN_NOTICE("\The [src] begins to drool a blue-glowing liquid, which they start slathering over \the [friend]'s wounds.")) + visible_message(span_notice("\The [src] begins to drool a blue-glowing liquid, which they start slathering over \the [friend]'s wounds.")) playsound(src, 'sound/effects/ointment.ogg', 25) @@ -479,9 +479,9 @@ var/global/list/wounds_being_tended_by_drakes = list() set_AI_busy(FALSE) if(friend == src) - visible_message(SPAN_NOTICE("\The [src] finishes licking at their wounds.")) + visible_message(span_notice("\The [src] finishes licking at their wounds.")) else - visible_message(SPAN_NOTICE("\The [src] finishes licking at \the [friend]'s wounds.")) + visible_message(span_notice("\The [src] finishes licking at \the [friend]'s wounds.")) playsound(src, 'sound/effects/ointment.ogg', 25) // Sivian animals get a heal buff from the modifier, others just @@ -568,7 +568,7 @@ var/global/list/wounds_being_tended_by_drakes = list() set category = "Abilities" if(!has_modifier_of_type(/datum/modifier/ace)) - to_chat(src, SPAN_WARNING("You aren't the pack leader! Sit down!")) + to_chat(src, span_warning("You aren't the pack leader! Sit down!")) return audible_message("\The [src] barks loudly and rattles its neck spines.") @@ -576,7 +576,7 @@ var/global/list/wounds_being_tended_by_drakes = list() if(drake == src || drake.faction != faction) continue if(drake.client) - to_chat(drake, SPAN_NOTICE("The pack leader wishes for you to follow them.")) + to_chat(drake, span_notice("The pack leader wishes for you to follow them.")) else if(drake.ai_holder) drake.ai_holder.set_follow(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm index dac2ef0ad6..c603d6b65b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm @@ -100,9 +100,9 @@ if(was_stunned) // Try to prevent chain-stuns by having them thrown. var/throwdir = get_dir(src, L) L.throw_at(get_edge_target_turf(L, throwdir), 5, 1, src) - visible_message(span("danger", "\The [src] hurls \the [L] away!")) + visible_message(span_danger("\The [src] hurls \the [L] away!")) else - visible_message(span("danger", "\The [src] crushes \the [L]!")) + visible_message(span_danger("\The [src] crushes \the [L]!")) // The AI for hooligan crabs. Follows people for awhile. /datum/ai_holder/simple_mob/melee/hooligan diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm index 858057a23d..d6acfd76d0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm @@ -148,7 +148,7 @@ set desc = "Disorient a creature within range." if(world.time < last_flash_time + special_attack_cooldown) - to_chat(src, span("warning", "You do not have the focus to do this so soon..")) + to_chat(src, span_warning("You do not have the focus to do this so soon..")) return last_flash_time = world.time @@ -158,7 +158,7 @@ set waitfor = FALSE if(stat) - to_chat(src, span("warning","You cannot move your tails in this state..")) + to_chat(src, span_warning("You cannot move your tails in this state..")) return if(!A && src.client) @@ -177,7 +177,7 @@ A = tgui_input_list(src, "What do we wish to flash?", "Target Choice", choices) - visible_message(span("alien","\The [src] flares its tails!")) + visible_message(span_alien("\The [src] flares its tails!")) if(isliving(A)) var/mob/living/L = A if(iscarbon(L)) @@ -190,7 +190,7 @@ var/mob/living/carbon/human/H = C flash_strength *= H.species.flash_mod if(flash_strength > 0) - to_chat(H, span("alien","You are disoriented by \the [src]!")) + to_chat(H, span_alien("You are disoriented by \the [src]!")) H.eye_blurry = max(H.eye_blurry, flash_strength + 5) H.flash_eyes() H.apply_damage(flash_strength * H.species.flash_burn/5, BURN, BP_HEAD, 0, 0, "Photon burns") @@ -206,7 +206,7 @@ shield.adjust_flash_count(R, 1) flashfail = TRUE if(!flashfail) - to_chat(R, span("alien","Your optics are scrambled by \the [src]!")) + to_chat(R, span_alien("Your optics are scrambled by \the [src]!")) R.Confuse(10) R.flash_eyes() @@ -234,7 +234,7 @@ set desc = "Strike viciously at an entity within range." if(world.time < last_strike_time + special_attack_cooldown) - to_chat(src, span("warning", "Your claws cannot take that much stress in so short a time..")) + to_chat(src, span_warning("Your claws cannot take that much stress in so short a time..")) return last_strike_time = world.time @@ -242,7 +242,7 @@ /mob/living/simple_mob/animal/sif/kururak/proc/rending_strike(atom/A) if(stat) - to_chat(src, span("warning","You cannot strike in this state..")) + to_chat(src, span_warning("You cannot strike in this state..")) return if(!A && src.client) @@ -256,7 +256,7 @@ choices += M if(!choices.len) - to_chat(src, span("warning","There are no viable targets within range...")) + to_chat(src, span_warning("There are no viable targets within range...")) return A = tgui_input_list(src, "What do we wish to strike?", "Target Choice", choices) @@ -267,7 +267,7 @@ var/damage_to_apply = rand(melee_damage_lower, melee_damage_upper) + 10 if(isliving(A)) - visible_message(span("danger","\The [src] rakes its claws across [A].")) + visible_message(span_danger("\The [src] rakes its claws across [A].")) var/mob/living/L = A if(ishuman(L)) var/mob/living/carbon/human/H = L @@ -279,13 +279,13 @@ L.add_modifier(/datum/modifier/grievous_wounds, 60 SECONDS) else if(istype(A, /obj/mecha)) - visible_message(span("danger","\The [src] rakes its claws against \the [A].")) + visible_message(span_danger("\The [src] rakes its claws against \the [A].")) var/obj/mecha/M = A M.take_damage(damage_to_apply) if(prob(3)) - visible_message(span("critical","\The [src] begins digging its claws into \the [M]'s hatch!")) + visible_message(span_critical("\The [src] begins digging its claws into \the [M]'s hatch!")) if(do_after(src, 1 SECOND)) - visible_message(span("critical","\The [src] rips \the [M]'s access hatch open, dragging [M.occupant] out!")) + visible_message(span_critical("\The [src] rips \the [M]'s access hatch open, dragging [M.occupant] out!")) M.go_out() else @@ -305,7 +305,7 @@ if(K.faction != src.faction) continue var/datum/ai_holder/AI = K.ai_holder - to_chat(K, span("notice","The pack leader wishes for you to follow them.")) + to_chat(K, span_notice("The pack leader wishes for you to follow them.")) AI.set_follow(src) /mob/living/simple_mob/animal/sif/kururak/proc/detect_instinct() // Will return the Kururak within 10 tiles that has the highest instinct. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm index 8319eef5c7..73403e6c76 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm @@ -167,14 +167,14 @@ alpha = 5 if(host.reagents.has_reagent("cordradaxon") && !docile) // Overwhelms the leech with food. var/message = "We feel the rush of cardiac pluripotent cells in your host's blood, lulling us into docility." - to_chat(src, span("warning", message)) + to_chat(src, span_warning(message)) docile = TRUE if(chemicals + 5 <= max_chemicals) chemicals += 5 else if(docile) var/message = "We shake off our lethargy as the pluripotent cell count declines in our host's blood." - to_chat(src, span("notice", message)) + to_chat(src, span_notice(message)) docile = FALSE if(!host.reagents.has_reagent(passive_reagent)) @@ -236,18 +236,18 @@ set desc = "Infest a suitable humanoid host." if(docile) - to_chat(src, span("alium","We are too tired to do this...")) + to_chat(src, span_alium("We are too tired to do this...")) return do_infest(usr) /mob/living/simple_mob/animal/sif/leech/proc/do_infest(var/mob/living/user, var/mob/living/target = null) if(host) - to_chat(user, span("alien", "We are already within a host.")) + to_chat(user, span_alien("We are already within a host.")) return if(stat) - to_chat(user, span("warning","We cannot infest a target in your current state.")) + to_chat(user, span_warning("We cannot infest a target in your current state.")) return var/mob/living/carbon/M = target @@ -259,7 +259,7 @@ choices += C if(!choices.len) - to_chat(user, span("warning","There are no viable hosts within range...")) + to_chat(user, span_warning("There are no viable hosts within range...")) return M = tgui_input_list(src, "Who do we wish to infest?", "Target Choice", choices) @@ -282,24 +282,24 @@ var/list/covering_clothing = E.get_covering_clothing() for(var/obj/item/clothing/C in covering_clothing) if(C.armor["melee"] >= 20 + attack_armor_pen) - to_chat(user, span("notice","We cannot get through that host's protective gear.")) + to_chat(user, span_notice("We cannot get through that host's protective gear.")) return if(!do_after(src,2)) - to_chat(user, span("notice", "As [M] moves away, we are dislodged and fall to the ground.")) + to_chat(user, span_notice("As [M] moves away, we are dislodged and fall to the ground.")) return if(!M || !src) return if(src.stat) - to_chat(user, span("warning","We cannot infest a target in your current state.")) + to_chat(user, span_warning("We cannot infest a target in your current state.")) return if(M in view(1, src)) - to_chat(user,span("alien", "We burrow into [M]'s flesh.")) + to_chat(user,span_alien("We burrow into [M]'s flesh.")) if(!M.stat) - to_chat(M, span("critical", "You feel a sharp pain as something digs into your flesh!")) + to_chat(M, span_critical("You feel a sharp pain as something digs into your flesh!")) src.host = M src.forceMove(M) @@ -314,7 +314,7 @@ return else - to_chat(user, span("notice","They are no longer in range.")) + to_chat(user, span_notice("They are no longer in range.")) return /mob/living/simple_mob/animal/sif/leech/verb/uninfest() @@ -323,7 +323,7 @@ set desc = "Leave your current host." if(docile) - to_chat(src, span("alium","We are too tired to do this...")) + to_chat(src, span_alium("We are too tired to do this...")) return leave_host() @@ -347,7 +347,7 @@ set desc = "Inject an organic host with an incredibly painful mixture of chemicals." if(docile) - to_chat(src, span("alium","We are too tired to do this...")) + to_chat(src, span_alium("We are too tired to do this...")) return var/mob/living/carbon/M @@ -358,7 +358,7 @@ choices += C if(!choices.len) - to_chat(src, span("warning","There are no viable hosts within range...")) + to_chat(src, span_warning("There are no viable hosts within range...")) return M = tgui_input_list(src, "Who do we wish to inject?", "Target Choice", choices) @@ -375,7 +375,7 @@ var/mob/living/carbon/human/H = L if(!istype(H) || H.isSynthetic()) - to_chat(user, span("warning","You cannot inject this target...")) + to_chat(user, span_warning("You cannot inject this target...")) var/obj/item/organ/external/E = H.organs_by_name[infest_target] if(!E || E.is_stump() || E.robotic >= ORGAN_ROBOT) @@ -384,7 +384,7 @@ var/list/covering_clothing = E.get_covering_clothing() for(var/obj/item/clothing/C in covering_clothing) if(C.armor["melee"] >= 40 + attack_armor_pen) - to_chat(user, span("notice","You cannot get through that host's protective gear.")) + to_chat(user, span_notice("You cannot get through that host's protective gear.")) return H.add_modifier(/datum/modifier/poisoned/paralysis, 15 SECONDS) @@ -395,11 +395,11 @@ set desc = "Inject your host with possibly beneficial chemicals, to keep the blood flowing." if(docile) - to_chat(src, span("alium","We are too tired to do this...")) + to_chat(src, span_alium("We are too tired to do this...")) return if(!host || chemicals <= 50) - to_chat(usr, span("alien","We cannot produce any chemicals right now.")) + to_chat(usr, span_alien("We cannot produce any chemicals right now.")) return if(host) @@ -410,7 +410,7 @@ if(host) chemicals = max(1, chemicals - 50) host.reagents.add_reagent(chem, 5) - to_chat(src, span("alien","We injected \the [host] with five units of [chem].")) + to_chat(src, span_alien("We injected \the [host] with five units of [chem].")) /mob/living/simple_mob/animal/sif/leech/verb/feed_on_organ() set category = "Abilities" @@ -418,7 +418,7 @@ set desc = "Extend probosci to feed on a piece of your host's organs." if(docile) - to_chat(src, span("alium","We are too tired to do this...")) + to_chat(src, span_alium("We are too tired to do this...")) return if(host && world.time >= last_feeding + feeding_delay) @@ -432,7 +432,7 @@ if(client) target = tgui_input_list(usr, "Select an organ to feed on.", "Organs", host_internal_organs) if(!target) - to_chat(src, span("alien","We decide not to feed.")) + to_chat(src, span_alien("We decide not to feed.")) return if(!target) @@ -442,13 +442,13 @@ bite_organ(target) else - to_chat(src, span("warning","We cannot feed now.")) + to_chat(src, span_warning("We cannot feed now.")) /mob/living/simple_mob/animal/sif/leech/proc/bite_organ(var/obj/item/organ/internal/O) last_feeding = world.time if(O) - to_chat(src, span("alien","We feed on [O].")) + to_chat(src, span_alien("We feed on [O].")) O.take_damage(2,silent=prob(10)) chemicals = min(max_chemicals, chemicals + 60) host.add_modifier(/datum/modifier/grievous_wounds, 60 SECONDS) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm index b0eba2bee1..6cef5c086b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm @@ -65,7 +65,7 @@ var/mob/living/L = A if(prob(knockdown_chance)) L.Weaken(3) - L.visible_message(span("danger", "\The [src] knocks down \the [L]!")) + L.visible_message(span_danger("\The [src] knocks down \the [L]!")) // Subtypes. @@ -188,7 +188,7 @@ // Called on death. /mob/living/simple_mob/animal/space/carp/holographic/proc/derez() - visible_message(span("notice", "\The [src] fades away!")) + visible_message(span_notice("\The [src] fades away!")) qdel(src) /mob/living/simple_mob/animal/space/carp/holographic/gib() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm index 873853a41c..18e03d2a88 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm @@ -70,9 +70,9 @@ var/mob/living/L = A if(prob(knockdown_chance)) L.Weaken(4) - L.visible_message(span("danger", "\The [src] buffets \the [L]!")) + L.visible_message(span_danger("\The [src] buffets \the [L]!")) src.ai_holder.remove_target() - L.visible_message(span("notice", "\The [src] seems to lose interest in \the [L]...")) + L.visible_message(span_notice("\The [src] seems to lose interest in \the [L]...")) /datum/say_list/space_ray emote_see = list("swoops","dives","drifts on a solar current","glides elegantly through the void","briefly tumbles") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm index 07df87edfb..a611bb9dec 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm @@ -50,7 +50,7 @@ var/mob/living/L = A if(prob(knockdown_chance)) L.Weaken(3) - L.visible_message(span("danger", "\The [src] knocks down \the [L]!")) + L.visible_message(span_danger("\The [src] knocks down \the [L]!")) /mob/living/simple_mob/animal/space/shark/event ai_holder_type = /datum/ai_holder/simple_mob/event diff --git a/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm b/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm index 7ac90f935f..c6cbc08840 100644 --- a/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm @@ -60,7 +60,7 @@ factory = null if(infested) infested.forceMove(get_turf(src)) - visible_message(span("warning", "\The [infested] falls to the ground as the blob spore bursts.")) + visible_message(span_warning("\The [infested] falls to the ground as the blob spore bursts.")) infested = null return ..() @@ -133,7 +133,7 @@ say_list = new /datum/say_list/infested() update_icons() - visible_message(span("warning", "The corpse of [H.name] suddenly rises!")) + visible_message(span_warning("The corpse of [H.name] suddenly rises!")) /mob/living/simple_mob/blob/spore/GetIdCard() if(infested) // If we've infested someone, use their ID. @@ -151,7 +151,7 @@ helpers++ if(helpers) - to_chat(src, span("notice", "Your attack is assisted by [helpers] other spore\s.")) + to_chat(src, span_notice("Your attack is assisted by [helpers] other spore\s.")) return damage_to_do /decl/mob_organ_names/spore diff --git a/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm b/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm index cbc9293f9e..3ee86c8d1a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm +++ b/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm @@ -57,21 +57,21 @@ /mob/living/simple_mob/illusion/attack_hand(mob/living/carbon/human/M) if(!realistic) playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message(span("warning", "\The [M]'s hand goes through \the [src]!")) + visible_message(span_warning("\The [M]'s hand goes through \the [src]!")) return else switch(M.a_intent) if(I_HELP) var/datum/gender/T = gender_datums[src.get_visible_gender()] M.visible_message( - span("notice", "\The [M] hugs [src] to make [T.him] feel better!"), \ - span("notice", "You hug [src] to make [T.him] feel better!") + span_notice("\The [M] hugs [src] to make [T.him] feel better!"), \ + span_notice("You hug [src] to make [T.him] feel better!") ) // slightly redundant as at the moment most mobs still use the normal gender var, but it works and future-proofs it playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(I_DISARM) playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message(span("danger", "\The [M] attempted to disarm [src]!")) + visible_message(span_danger("\The [M] attempted to disarm [src]!")) M.do_attack_animation(src) if(I_GRAB) @@ -79,7 +79,7 @@ if(I_HURT) adjustBruteLoss(harm_intent_damage) - M.visible_message(span("danger", "\The [M] [response_harm] \the [src]")) + M.visible_message(span_danger("\The [M] [response_harm] \the [src]")) M.do_attack_animation(src) /mob/living/simple_mob/illusion/hit_with_weapon(obj/item/I, mob/living/user, effective_force, hit_zone) @@ -87,7 +87,7 @@ return ..() playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message(span("warning", "\The [user]'s [I] goes through \the [src]!")) + visible_message(span_warning("\The [user]'s [I] goes through \the [src]!")) return FALSE /mob/living/simple_mob/illusion/ex_act() diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm index cdc57dc37c..721af03e3d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm @@ -23,7 +23,7 @@ /mob/living/simple_mob/mechanical/hivebot/death() ..() - visible_message(span("warning","\The [src] blows apart!")) + visible_message(span_warning("\The [src] blows apart!")) new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm index 17a78da625..0e37e35216 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm @@ -82,8 +82,8 @@ if(IIsAlly(SM)) // Don't resupply enemies. if(!isnull(SM.special_attack_charges) && SM.special_attack_charges < initial(SM.special_attack_charges)) SM.special_attack_charges += 1 - to_chat(SM, span("notice", "\The [src] has resupplied you, and you can use your special ability one additional time.")) - to_chat(src, span("notice", "You have resupplied \the [SM].")) + to_chat(SM, span_notice("\The [src] has resupplied you, and you can use your special ability one additional time.")) + to_chat(src, span_notice("You have resupplied \the [SM].")) last_resupply = world.time break // Only one resupply per pulse. @@ -104,7 +104,7 @@ /mob/living/simple_mob/mechanical/hivebot/support/harry/death() ..() - visible_message(span("Connection... terminated... Sweet Release... obtained.","\The [src] blows apart!")) + visible_message(span_warning("Connection... terminated... Sweet Release... obtained."),span_danger("\The [src] blows apart!")) new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm index 81e46f8d63..d5e4ebf015 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm @@ -152,8 +152,8 @@ if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) var/reflect_prob = reflect_chance - round(P.damage/3) if(prob(reflect_prob)) - visible_message(span("danger", "The [P.name] gets reflected by [src]'s armor!"), \ - span("userdanger", "The [P.name] gets reflected by [src]'s armor!")) + visible_message(span_danger("The [P.name] gets reflected by [src]'s armor!"), \ + span_userdanger("The [P.name] gets reflected by [src]'s armor!")) // Find a turf near or on the original location to bounce to if(P.starting) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm index 653abae3eb..d9e56fcca1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm @@ -150,7 +150,7 @@ energy_ball.adjust_scale(0.5) energy_ball.orbit(src, 32, TRUE, 1 SECOND) - visible_message(span("warning", "\The [src] creates \an [energy_ball] around itself!")) + visible_message(span_warning("\The [src] creates \an [energy_ball] around itself!")) playsound(src, 'sound/effects/lightning_chargeup.ogg', 100, 1, extrarange = 30) @@ -178,7 +178,7 @@ sleep(1 SECOND) // Shoot a tesla bolt, and flashes people who are looking at the mecha without sufficent eye protection. - visible_message(span("warning", "\The [energy_ball] explodes in a flash of light, sending a shock everywhere!")) + visible_message(span_warning("\The [energy_ball] explodes in a flash of light, sending a shock everywhere!")) playsound(src, 'sound/effects/lightningbolt.ogg', 100, 1, extrarange = 30) tesla_zap(src.loc, 5, ELECTRIC_ZAP_POWER, FALSE) for(var/mob/living/L in viewers(src)) @@ -186,7 +186,7 @@ continue var/dir_towards_us = get_dir(L, src) if(L.dir && L.dir & dir_towards_us) - to_chat(L, span("danger", "The flash of light blinds you briefly.")) + to_chat(L, span_danger("The flash of light blinds you briefly.")) L.flash_eyes(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = TRUE) // Get rid of our energy ball. @@ -204,7 +204,7 @@ // Telegraph our next move. Beam(target, icon_state = "sat_beam", time = 3.5 SECONDS, maxdistance = INFINITY) - visible_message(span("warning", "\The [src] deploys a missile rack!")) + visible_message(span_warning("\The [src] deploys a missile rack!")) playsound(src, 'sound/effects/turret/move1.wav', 50, 1) sleep(0.5 SECONDS) @@ -212,7 +212,7 @@ if(target) // Might get deleted in the meantime. var/turf/T = get_turf(target) if(T) - visible_message(span("warning", "\The [src] fires a rocket into the air!")) + visible_message(span_warning("\The [src] fires a rocket into the air!")) playsound(src, 'sound/weapons/rpg.ogg', 70, 1) face_atom(T) var/obj/item/projectile/arc/explosive_rocket/rocket = new(loc) @@ -220,7 +220,7 @@ rocket.fire() sleep(1 SECOND) - visible_message(span("warning", "\The [src] retracts the missile rack.")) + visible_message(span_warning("\The [src] retracts the missile rack.")) playsound(src, 'sound/effects/turret/move2.wav', 50, 1) // Arcing rocket projectile that produces a weak explosion when it lands. @@ -235,7 +235,7 @@ /mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced/proc/launch_microsingularity(atom/target) var/turf/T = get_turf(target) - visible_message(span("warning", "\The [src] fires an energetic sphere into the air!")) + visible_message(span_warning("\The [src] fires an energetic sphere into the air!")) playsound(src, 'sound/weapons/Laser.ogg', 50, 1) face_atom(T) var/obj/item/projectile/arc/microsingulo/sphere = new(loc) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/combat_mecha.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/combat_mecha.dm index ecefa62de5..ad6aec2a8f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/combat_mecha.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/combat_mecha.dm @@ -28,11 +28,11 @@ if(isliving(A)) var/mob/living/L = A if(L.mob_size <= MOB_MEDIUM) - visible_message(span("danger", "\The [src] sends \the [L] flying with their mechanized fist!")) + visible_message(span_danger("\The [src] sends \the [L] flying with their mechanized fist!")) playsound(src, "punch", 50, 1) L.Weaken(weaken_amount) var/throw_dir = get_dir(src, L) var/throw_dist = L.incapacitated(INCAPACITATION_DISABLED) ? 4 : 1 L.throw_at(get_edge_target_turf(L, throw_dir), throw_dist, 1, src) else - to_chat(L, span("warning", "\The [src] punches you with incredible force, but you remain in place.")) + to_chat(L, span_warning("\The [src] punches you with incredible force, but you remain in place.")) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm index 97d659f7e8..44a4ba3e32 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm @@ -48,11 +48,11 @@ defense_mode = new_mode deflect_chance = defense_mode ? defense_deflect : initial(deflect_chance) projectile_accuracy = defense_mode ? -10 : initial(projectile_accuracy) - to_chat(src, span("notice", "You [defense_mode ? "en" : "dis"]able defense mode.")) + to_chat(src, span_notice("You [defense_mode ? "en" : "dis"]able defense mode.")) /mob/living/simple_mob/mechanical/mecha/combat/durand/SelfMove(turf/n, direct) if(defense_mode) - to_chat(src, span("warning", "You are in defense mode, you cannot move.")) + to_chat(src, span_warning("You are in defense mode, you cannot move.")) return FALSE return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm index 96b3797891..9186660410 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm @@ -115,7 +115,7 @@ /mob/living/simple_mob/mechanical/mecha/bullet_act(obj/item/projectile/P) if(prob(deflect_chance)) - visible_message(span("warning", "\The [P] is deflected by \the [src]'s armor!")) + visible_message(span_warning("\The [P] is deflected by \the [src]'s armor!")) deflect_sprite() return 0 return ..() @@ -130,7 +130,7 @@ /mob/living/simple_mob/mechanical/mecha/attackby(obj/item/I, mob/user) if(prob(deflect_chance)) - visible_message(span("warning", "\The [user]'s [I] bounces off \the [src]'s armor!")) + visible_message(span_warning("\The [user]'s [I] bounces off \the [src]'s armor!")) deflect_sprite() user.setClickCooldown(user.get_attack_speed(I)) return diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/odysseus.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/odysseus.dm index 736bc6caf5..396df5cdc9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/odysseus.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/odysseus.dm @@ -53,7 +53,7 @@ var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD) if(L.can_inject(src, null, target_zone)) - to_chat(L, span("warning", "You feel a tiny prick.")) + to_chat(L, span_warning("You feel a tiny prick.")) if(L.get_poison_protection() < 1) L.add_modifier(/datum/modifier/poisoned, 30 SECONDS) L.inflict_poison_damage(5) @@ -71,7 +71,7 @@ var/mob/living/L = target if(!L.can_inject(null, null, def_zone, piercing)) return FALSE - to_chat(L, span("warning", "You feel a tiny prick.")) + to_chat(L, span_warning("You feel a tiny prick.")) return ..() // This will add the modifier and return the correct value. diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm index 6f6eb9abcc..c166bba7dd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm @@ -60,7 +60,7 @@ /mob/living/simple_mob/mechanical/ward/monitor/death() if(owner) - to_chat(owner, span("warning", "Your [src.name] inside [get_area(src)] was destroyed!")) + to_chat(owner, span_warning("Your [src.name] inside [get_area(src)] was destroyed!")) ..() /mob/living/simple_mob/mechanical/ward/monitor/handle_special() @@ -96,9 +96,9 @@ playsound(L, 'sound/effects/EMPulse.ogg', 75, 1) L.break_cloak() - to_chat(L, span("danger", "\The [src] disrupts your cloak!")) + to_chat(L, span_danger("\The [src] disrupts your cloak!")) if(owner) - to_chat(owner, span("notice", "Your [src.name] at [get_area(src)] uncloaked \the [L].")) + to_chat(owner, span_notice("Your [src.name] at [get_area(src)] uncloaked \the [L].")) // Warn the owner when it sees a new mob. if(!(L in seen_mobs)) @@ -106,7 +106,7 @@ newly_seen_mobs += L if(newly_seen_mobs.len && owner) // Yell at our owner if someone new shows up. - to_chat(owner, span("notice", "Your [src.name] at [get_area(src)] detected [english_list(newly_seen_mobs)].")) + to_chat(owner, span_notice("Your [src.name] at [get_area(src)] detected [english_list(newly_seen_mobs)].")) // Now get rid of old mobs that left vision. for(var/thing in seen_mobs) diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm index b258763793..2f9f459c2c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm @@ -37,7 +37,7 @@ var/mob/living/L = A if(prob(15)) L.Weaken(3) - L.visible_message(span("danger", "\The [src] knocks down \the [L]!")) + L.visible_message(span_danger("\The [src] knocks down \the [L]!")) /mob/living/simple_mob/animal/space/tree/death() ..(null,"is hacked into pieces!") diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index d821844ede..3767512c1b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -201,7 +201,7 @@ var/list/_slime_default_emotes = list( // Otherwise they're probably fighting the slime. if(prob(25) && can_miss) //VOREStation Edit - visible_message(span("warning", "\The [user]'s [I] passes right through \the [src]!")) + visible_message(span_warning("\The [user]'s [I] passes right through \the [src]!")) user.setClickCooldown(user.get_attack_speed(I)) return ..() @@ -214,16 +214,16 @@ var/list/_slime_default_emotes = list( // Hat simulator /mob/living/simple_mob/slime/proc/give_hat(var/obj/item/clothing/head/new_hat, var/mob/living/user) if(!istype(new_hat)) - to_chat(user, span("warning", "\The [new_hat] isn't a hat.")) + to_chat(user, span_warning("\The [new_hat] isn't a hat.")) return if(hat) - to_chat(user, span("warning", "\The [src] is already wearing \a [hat].")) + to_chat(user, span_warning("\The [src] is already wearing \a [hat].")) return else user.drop_item(new_hat) hat = new_hat new_hat.forceMove(src) - to_chat(user, span("notice", "You place \a [new_hat] on \the [src]. How adorable!")) + to_chat(user, span_notice("You place \a [new_hat] on \the [src]. How adorable!")) update_icon() return diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/combat.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/combat.dm index 03565489cd..ab34573601 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/combat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/combat.dm @@ -17,8 +17,8 @@ if(prob(stun_power * 10)) // Try an electric shock. power_charge = max(0, power_charge - 3) L.visible_message( - span("danger", "\The [src] has shocked \the [L]!"), - span("danger", "\The [src] has shocked you!") + span_danger("\The [src] has shocked \the [L]!"), + span_danger("\The [src] has shocked you!") ) playsound(src, 'sound/weapons/Egloves.ogg', 75, 1) L.Weaken(4) @@ -38,8 +38,8 @@ else if(prob(20)) // Try to do a regular disarm attack. L.visible_message( - span("danger", "\The [src] has pounced at \the [L]!"), - span("danger", "\The [src] has pounced at you!") + span_danger("\The [src] has pounced at \the [L]!"), + span_danger("\The [src] has pounced at you!") ) playsound(src, 'sound/weapons/thudswoosh.ogg', 75, 1) L.Weaken(2) @@ -50,8 +50,8 @@ else // Failed to do anything this time. L.visible_message( - span("warning", "\The [src] has tried to pounce at \the [L]!"), - span("warning", "\The [src] has tried to pounce at you!") + span_warning("\The [src] has tried to pounce at \the [L]!"), + span_warning("\The [src] has tried to pounce at you!") ) playsound(src, 'sound/weapons/punchmiss.ogg', 75, 1) do_attack_animation(L) @@ -80,4 +80,4 @@ if(isliving(A) && Adjacent(A)) animal_nom(A) else - ..() \ No newline at end of file + ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm index 0764c01de6..b52b89ce65 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm @@ -54,14 +54,14 @@ if(nutrition <= 0) adjustToxLoss(rand(1,3)) if(client && prob(5)) - to_chat(src, span("danger", "You are starving!")) + to_chat(src, span_danger("You are starving!")) /mob/living/simple_mob/slime/xenobio/proc/handle_consumption() if(victim && !stat) if(istype(victim) && consume(victim, 20)) if(prob(25)) - to_chat(src, span("notice", "You continue absorbing \the [victim].")) + to_chat(src, span_notice("You continue absorbing \the [victim].")) else var/list/feedback = list( @@ -73,7 +73,7 @@ "I do not feel nourished", "This subject is not food" ) - to_chat(src, span("warning", "[pick(feedback)]...")) + to_chat(src, span_warning("[pick(feedback)]...")) stop_consumption() if(victim) @@ -97,8 +97,8 @@ update_icon() set_AI_busy(TRUE) // Don't want the AI to interfere with eatting. victim.visible_message( - span("danger", "\The [src] latches onto \the [victim]!"), - span("critical", "\The [src] latches onto you!") + span_danger("\The [src] latches onto \the [victim]!"), + span_critical("\The [src] latches onto you!") ) /mob/living/simple_mob/slime/xenobio/proc/stop_consumption(mob/living/L) @@ -106,8 +106,8 @@ return victim.unbuckle_mob() victim.visible_message( - span("notice", "\The [src] slides off of [victim]!"), - span("notice", "\The [src] slides off of you!") + span_notice("\The [src] slides off of [victim]!"), + span_notice("\The [src] slides off of you!") ) victim = null update_icon() @@ -166,7 +166,7 @@ victim.adjustToxLoss(damage_done * 0.4) adjust_nutrition(damage_done * 5) Beam(victim, icon_state = "slime_consume", time = 8) - to_chat(src, span("notice", "You absorb some biomaterial from \the [victim].")) - to_chat(victim, span("danger", "\The [src] consumes some of your flesh!")) + to_chat(src, span_notice("You absorb some biomaterial from \the [victim].")) + to_chat(victim, span_danger("\The [src] consumes some of your flesh!")) return TRUE return FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm index 7e0eab5a36..4de155da2d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm @@ -9,11 +9,11 @@ fail_odds = 60 if(prob(fail_odds)) - visible_message(span("warning", "\The [L] attempts to wrestle \the [name] off!")) + visible_message(span_warning("\The [L] attempts to wrestle \the [name] off!")) playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else - visible_message(span("warning", "\The [L] manages to wrestle \the [name] off!")) + visible_message(span_warning("\The [L] manages to wrestle \the [name] off!")) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(prob(40)) @@ -46,7 +46,7 @@ // Shocked grilles don't hurt slimes, and in fact give them charge. /mob/living/simple_mob/slime/xenobio/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, def_zone = null) power_charge = between(0, power_charge + round(shock_damage / 10), 10) - to_chat(src, span("notice", "\The [source] shocks you, and it charges you.")) + to_chat(src, span_notice("\The [source] shocks you, and it charges you.")) // Getting slimebatoned/xenotased. /mob/living/simple_mob/slime/xenobio/slimebatoned(mob/living/user, amount) diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/discipline.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/discipline.dm index 0ab838f329..456cbac0ef 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/discipline.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/discipline.dm @@ -3,7 +3,7 @@ /mob/living/simple_mob/slime/xenobio/proc/adjust_discipline(amount, silent) if(amount > 0) - to_chat(src, span("warning", "You've been disciplined!")) + to_chat(src, span_warning("You've been disciplined!")) if(has_AI()) var/datum/ai_holder/simple_mob/xenobio_slime/AI = ai_holder AI.adjust_discipline(amount, silent) diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm index 256139f1c5..613cb89858 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm @@ -46,8 +46,8 @@ if(isliving(A)) var/mob/living/L = A L.inflict_heat_damage(is_adult ? 10 : 5) - to_chat(src, span("span", "You burn \the [L].")) - to_chat(L, span("danger", "You've been burned by \the [src]!")) + to_chat(src, span_danger("You burn \the [L].")) + to_chat(L, span_danger("You've been burned by \the [src]!")) L.adjust_fire_stacks(1) if(prob(12)) L.IgniteMob() @@ -154,8 +154,8 @@ if(isliving(A)) var/mob/living/L = A L.inflict_shock_damage(is_adult ? 10 : 5) - to_chat(src, span("span", "You shock \the [L].")) - to_chat(L, span("danger", "You've been shocked by \the [src]!")) + to_chat(src, span_danger("You shock \the [L].")) + to_chat(L, span_danger("You've been shocked by \the [src]!")) /mob/living/simple_mob/slime/xenobio/yellow/handle_special() if(stat == CONSCIOUS) @@ -188,7 +188,7 @@ ) /mob/living/simple_mob/slime/xenobio/dark_purple/proc/ignite() - visible_message(span("critical", "\The [src] erupts in an inferno!")) + visible_message(span_critical("\The [src] erupts in an inferno!")) for(var/turf/simulated/target_turf in view(2, src)) target_turf.assume_gas("phoron", 30, 1500+T0C) spawn(0) @@ -264,8 +264,8 @@ if(isliving(A)) var/mob/living/L = A chill(L) - to_chat(src, span("span", "You chill \the [L].")) - to_chat(L, span("danger", "You've been chilled by \the [src]!")) + to_chat(src, span_danger("You chill \the [L].")) + to_chat(L, span_danger("You've been chilled by \the [src]!")) /mob/living/simple_mob/slime/xenobio/dark_blue/proc/chill(mob/living/L) @@ -293,7 +293,7 @@ /mob/living/simple_mob/slime/xenobio/silver/bullet_act(var/obj/item/projectile/P, var/def_zone) if(istype(P,/obj/item/projectile/beam) || istype(P, /obj/item/projectile/energy)) - visible_message(span("danger", "\The [src] reflects \the [P]!")) + visible_message(span_danger("\The [src] reflects \the [P]!")) // Find a turf near or on the original location to bounce to var/new_x = P.starting.x + pick(0, 0, 0, -1, 1, -2, 2) @@ -334,7 +334,7 @@ /mob/living/simple_mob/slime/xenobio/bluespace/do_special_attack(atom/A) // Teleport attack. if(!A) - to_chat(src, span("warning", "There's nothing to teleport to.")) + to_chat(src, span_warning("There's nothing to teleport to.")) return FALSE var/list/nearby_things = range(1, A) @@ -352,7 +352,7 @@ valid_turfs.Add(potential_turf) if(!(valid_turfs.len)) - to_chat(src, span("warning", "There wasn't an unoccupied spot to teleport to.")) + to_chat(src, span_warning("There wasn't an unoccupied spot to teleport to.")) return FALSE var/turf/target_turf = pick(valid_turfs) @@ -364,14 +364,14 @@ s2.set_up(5, 1, target_turf) - T.visible_message(span("notice", "\The [src] vanishes!")) + T.visible_message(span_notice("\The [src] vanishes!")) s1.start() forceMove(target_turf) playsound(target_turf, 'sound/effects/phasein.ogg', 50, 1) - to_chat(src, span("notice", "You teleport to \the [target_turf].")) + to_chat(src, span_notice("You teleport to \the [target_turf].")) - target_turf.visible_message(span("warning", "\The [src] appears!")) + target_turf.visible_message(span_warning("\The [src] appears!")) s2.start() if(Adjacent(A)) @@ -410,13 +410,13 @@ if(isliving(A) && a_intent == I_HURT) var/mob/living/L = A if(L.mob_size <= MOB_MEDIUM) - visible_message(span("danger", "\The [src] sends \the [L] flying with the impact!")) + visible_message(span_danger("\The [src] sends \the [L] flying with the impact!")) playsound(src, "punch", 50, 1) L.Weaken(1) var/throwdir = get_dir(src, L) L.throw_at(get_edge_target_turf(L, throwdir), 3, 1, src) else - to_chat(L, span("warning", "\The [src] hits you with incredible force, but you remain in place.")) + to_chat(L, span_warning("\The [src] hits you with incredible force, but you remain in place.")) /mob/living/simple_mob/slime/xenobio/amber diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm index ce86efdc61..fc9f87aa43 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm @@ -187,20 +187,20 @@ set desc = "This will let you evolve from baby to adult slime." if(stat) - to_chat(src, span("warning", "I must be conscious to do this...")) + to_chat(src, span_warning("I must be conscious to do this...")) return if(harmless) - to_chat(src, span("warning", "I have been pacified. I cannot evolve...")) + to_chat(src, span_warning("I have been pacified. I cannot evolve...")) return if(!is_adult) if(amount_grown >= 10) make_adult() else - to_chat(src, span("warning", "I am not ready to evolve yet...")) + to_chat(src, span_warning("I am not ready to evolve yet...")) else - to_chat(src, span("warning", "I have already evolved...")) + to_chat(src, span_warning("I have already evolved...")) /mob/living/simple_mob/slime/xenobio/verb/reproduce() @@ -208,11 +208,11 @@ set desc = "This will make you split into four new slimes." if(stat) - to_chat(src, span("warning", "I must be conscious to do this...")) + to_chat(src, span_warning("I must be conscious to do this...")) return if(harmless) - to_chat(src, span("warning", "I have been pacified. I cannot reproduce...")) + to_chat(src, span_warning("I have been pacified. I cannot reproduce...")) return if(is_adult) @@ -237,7 +237,7 @@ free_tiles++ if(free_tiles < split_amount-1) // Three free tiles are needed, as four slimes are made and the 4th tile is from the center tile that the current slime occupies. - to_chat(src, span("warning", "It is too cramped here to reproduce...")) + to_chat(src, span_warning("It is too cramped here to reproduce...")) return var/list/babies = list() @@ -252,9 +252,9 @@ new_slime.key = src.key qdel(src) else - to_chat(src, span("warning", "I am not ready to reproduce yet...")) + to_chat(src, span_warning("I am not ready to reproduce yet...")) else - to_chat(src, span("warning", "I have not evolved enough to reproduce yet...")) + to_chat(src, span_warning("I have not evolved enough to reproduce yet...")) // Used when reproducing or dying. /mob/living/simple_mob/slime/xenobio/proc/make_new_slime(var/desired_type, var/no_step) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm index 9f492b9421..275a56664e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm @@ -785,7 +785,7 @@ I think I covered everything. status_flags |= LEAPING flying = 1 //So we can thunk into things hovering = 1 // So we don't hurt ourselves running off cliffs - visible_message(span("danger","\The [src] charges at \the [A]!")) + visible_message(span_danger("\The [src] charges at \the [A]!")) throw_at(A, 7, 2) playsound(src, charge_sound, 75, 1) if(status_flags & LEAPING) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm b/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm index 8299939f9a..bad9f2dde3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm @@ -105,8 +105,8 @@ return FALSE set_AI_busy(TRUE) - visible_message(span("warning","\The [src]'s eyes flash ominously!")) - to_chat(L, span("danger","\The [src] focuses on you!")) + visible_message(span_warning("\The [src]'s eyes flash ominously!")) + to_chat(L, span_danger("\The [src] focuses on you!")) // Telegraph, since getting stunned suddenly feels bad. do_windup_animation(A, leap_warmup) sleep(leap_warmup) // For the telegraphing. @@ -117,7 +117,7 @@ // Do the actual leap. status_flags |= LEAPING // Lets us pass over everything. - visible_message(span("critical","\The [src] leaps at \the [L]!")) + visible_message(span_critical("\The [src] leaps at \the [L]!")) throw_at(get_step(L, get_turf(src)), special_attack_max_range+1, 1, src) playsound(src, leap_sound, 75, 1) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm index 0b86aa2754..e583765ac0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm @@ -130,7 +130,7 @@ var/mob/living/L = A if(prob(knockdown_chance)) L.Weaken(3) - L.visible_message(span("danger", "\The [src] knocks down \the [L]!")) + L.visible_message(span_danger("\The [src] knocks down \the [L]!")) /mob/living/simple_mob/vore/aggressive/mimic/will_show_tooltip() return FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm b/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm index 1893dcfcc7..3b29caea2e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm @@ -162,8 +162,8 @@ return FALSE set_AI_busy(TRUE) - visible_message(span("warning","\The [src] rears back, ready to lunge!")) - to_chat(L, span("danger","\The [src] focuses on you!")) + visible_message(span_warning("\The [src] rears back, ready to lunge!")) + to_chat(L, span_danger("\The [src] focuses on you!")) // Telegraph, since getting stunned suddenly feels bad. do_windup_animation(A, leap_warmup) sleep(leap_warmup) // For the telegraphing. @@ -174,7 +174,7 @@ // Do the actual leap. status_flags |= LEAPING // Lets us pass over everything. - visible_message(span("critical","\The [src] leaps at \the [L]!")) + visible_message(span_critical("\The [src] leaps at \the [L]!")) throw_at(get_step(L, get_turf(src)), special_attack_max_range+1, 1, src) playsound(src, leap_sound, 75, 1) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm index b111ff283d..9eed371799 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm @@ -201,7 +201,7 @@ var/mob/living/L = A if(prob(knockdown_chance)) L.Weaken(3) - L.visible_message(span("danger", "\The [src] pounces on \the [L]!")) + L.visible_message(span_danger("\The [src] pounces on \the [L]!")) /mob/living/simple_mob/vore/woof/hostile/melee diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm index 9df4d6982f..1b56a1da37 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm @@ -214,8 +214,8 @@ return FALSE set_AI_busy(TRUE) - visible_message(span("warning","\The [src]'s eyes flash ominously!")) - to_chat(L, span("danger","\The [src] focuses on you!")) + visible_message(span_warning("\The [src]'s eyes flash ominously!")) + to_chat(L, span_danger("\The [src] focuses on you!")) // Telegraph, since getting stunned suddenly feels bad. do_windup_animation(A, leap_warmup) sleep(leap_warmup) // For the telegraphing. @@ -226,7 +226,7 @@ // Do the actual leap. status_flags |= LEAPING // Lets us pass over everything. - visible_message(span("critical","\The [src] leaps at \the [L]!")) + visible_message(span_critical("\The [src] leaps at \the [L]!")) throw_at(get_step(L, get_turf(src)), special_attack_max_range+1, 1, src) playsound(src, leap_sound, 75, 1) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index a42b9291de..42936d230e 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -549,9 +549,9 @@ if(pulling) if(ishuman(pulling)) var/mob/living/carbon/human/H = pulling - visible_message(SPAN_WARNING("\The [src] lets go of \the [H]."), SPAN_NOTICE("You let go of \the [H]."), exclude_mobs = list(H)) + visible_message(span_warning("\The [src] lets go of \the [H]."), span_notice("You let go of \the [H]."), exclude_mobs = list(H)) if(!H.stat) - to_chat(H, SPAN_WARNING("\The [src] lets go of you.")) + to_chat(H, span_warning("\The [src] lets go of you.")) pulling.pulledby = null pulling = null if(pullin) @@ -624,13 +624,13 @@ if(ishuman(AM)) var/mob/living/carbon/human/H = AM if(H.lying) // If they're on the ground we're probably dragging their arms to move them - visible_message(SPAN_WARNING("\The [src] leans down and grips \the [H]'s arms."), SPAN_NOTICE("You lean down and grip \the [H]'s arms."), exclude_mobs = list(H)) + visible_message(span_warning("\The [src] leans down and grips \the [H]'s arms."), span_notice("You lean down and grip \the [H]'s arms."), exclude_mobs = list(H)) if(!H.stat) - to_chat(H, SPAN_WARNING("\The [src] leans down and grips your arms.")) + to_chat(H, span_warning("\The [src] leans down and grips your arms.")) else //Otherwise we're probably just holding their arm to lead them somewhere - visible_message(SPAN_WARNING("\The [src] grips \the [H]'s arm."), SPAN_NOTICE("You grip \the [H]'s arm."), exclude_mobs = list(H)) + visible_message(span_warning("\The [src] grips \the [H]'s arm."), span_notice("You grip \the [H]'s arm."), exclude_mobs = list(H)) if(!H.stat) - to_chat(H, SPAN_WARNING("\The [src] grips your arm.")) + to_chat(H, span_warning("\The [src] grips your arm.")) playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25) //Quieter than hugging/grabbing but we still want some audio feedback if(H.pull_damage()) diff --git a/code/modules/multiz/hoist.dm b/code/modules/multiz/hoist.dm index d8c064f56e..2151b9e9a7 100644 --- a/code/modules/multiz/hoist.dm +++ b/code/modules/multiz/hoist.dm @@ -12,7 +12,7 @@ /obj/item/hoist_kit/attack_self(mob/user) new /obj/structure/hoist (get_turf(user), user.dir) - user.visible_message(span("warning", "[user] deploys the hoist kit!"), span("notice", "You deploy the hoist kit!"), span("notice", "You hear the sound of parts snapping into place.")) + user.visible_message(span_warning("[user] deploys the hoist kit!"), span_notice("You deploy the hoist kit!"), span_notice("You hear the sound of parts snapping into place.")) qdel(src) /obj/effect/hoist_hook @@ -33,13 +33,13 @@ return if (!AM.simulated || AM.anchored) - to_chat(user, span("notice", "You can't do that.")) + to_chat(user, span_notice("You can't do that.")) return if (source_hoist.hoistee) - to_chat(user, span("notice", "\The [source_hoist.hoistee] is already attached to \the [src]!")) + to_chat(user, span_notice("\The [source_hoist.hoistee] is already attached to \the [src]!")) return source_hoist.attach_hoistee(AM) - user.visible_message(span("danger", "[user] attaches \the [AM] to \the [src]."), span("danger", "You attach \the [AM] to \the [src]."), span("danger", "You hear something clamp into place.")) + user.visible_message(span_danger("[user] attaches \the [AM] to \the [src]."), span_danger("You attach \the [AM] to \the [src]."), span_danger("You hear something clamp into place.")) /obj/structure/hoist/proc/attach_hoistee(atom/movable/AM) if (get_turf(AM) != get_turf(source_hook)) @@ -58,11 +58,11 @@ return if (usr.incapacitated()) - to_chat(usr, span("notice", "You can't do that while incapacitated.")) + to_chat(usr, span_notice("You can't do that while incapacitated.")) return if (!usr.IsAdvancedToolUser()) - to_chat(usr, span("notice", "You stare cluelessly at \the [src].")) + to_chat(usr, span_notice("You stare cluelessly at \the [src].")) return if (!source_hoist.hoistee) @@ -76,7 +76,7 @@ var/turf/desturf = dest source_hoist.hoistee.forceMove(desturf) - usr.visible_message(span("danger", "[usr] detaches \the [source_hoist.hoistee] from the hoist clamp."), span("danger", "You detach \the [source_hoist.hoistee] from the hoist clamp."), span("danger", "You hear something unclamp.")) + usr.visible_message(span_danger("[usr] detaches \the [source_hoist.hoistee] from the hoist clamp."), span_danger("You detach \the [source_hoist.hoistee] from the hoist clamp."), span_danger("You hear something unclamp.")) source_hoist.release_hoistee() // This will handle mobs unbuckling themselves. @@ -178,25 +178,25 @@ return if (user.incapacitated()) - to_chat(user, span("notice", "You can't do that while incapacitated.")) + to_chat(user, span_notice("You can't do that while incapacitated.")) return if (!user.IsAdvancedToolUser()) - to_chat(user, span("notice", "You stare cluelessly at \the [src].")) + to_chat(user, span_notice("You stare cluelessly at \the [src].")) return if(broken) - to_chat(user, span("warning", "The hoist is broken!")) + to_chat(user, span_warning("The hoist is broken!")) return var/can = can_move_dir(movedir) var/movtext = movedir == UP ? "raise" : "lower" if (!can) // If you can't... movedir = movedir == UP ? DOWN : UP // switch directions! - to_chat(user, span("notice", "You switch the direction of the pulley.")) + to_chat(user, span_notice("You switch the direction of the pulley.")) return if (!hoistee) - user.visible_message(span("notice", "[user] begins to [movtext] the clamp."), span("notice", "You begin to [movtext] the clamp."), span("notice", "You hear the sound of a crank.")) + user.visible_message(span_notice("[user] begins to [movtext] the clamp."), span_notice("You begin to [movtext] the clamp."), span_notice("You hear the sound of a crank.")) move_dir(movedir, 0) return @@ -210,7 +210,7 @@ var/obj/O = hoistee size = O.w_class - user.visible_message(span("notice", "[user] begins to [movtext] \the [hoistee]!"), span("notice", "You begin to [movtext] \the [hoistee]!"), span("notice", "You hear the sound of a crank.")) + user.visible_message(span_notice("[user] begins to [movtext] \the [hoistee]!"), span_notice("You begin to [movtext] \the [hoistee]!"), span_notice("You hear the sound of a crank.")) if (do_after(user, (1 SECONDS) * size / 4, target = src)) move_dir(movedir, 1) @@ -229,11 +229,11 @@ if (isobserver(usr) || usr.incapacitated()) return if (!usr.IsAdvancedToolUser()) // thanks nanacode - to_chat(usr, span("notice", "You stare cluelessly at \the [src].")) + to_chat(usr, span_notice("You stare cluelessly at \the [src].")) return if (hoistee) - to_chat(usr, span("notice", "You cannot collapse the hoist with \the [hoistee] attached!")) + to_chat(usr, span_notice("You cannot collapse the hoist with \the [hoistee] attached!")) return collapse_kit() diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index 999bfdaedf..3981538079 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -99,24 +99,24 @@ //Checking if there's any point trying to climb var/turf/above_wall = GetAbove(src) if(L.nutrition <= nutrition_cost) - to_chat(L, SPAN_WARNING("You [L.isSynthetic() ? "lack the energy" : "are too hungry"] for such strenous activities!")) + to_chat(L, span_warning("You [L.isSynthetic() ? "lack the energy" : "are too hungry"] for such strenous activities!")) return if(!above_wall) //No multiZ - to_chat(L, SPAN_NOTICE("There's nothing interesting over this cliff!")) + to_chat(L, span_notice("There's nothing interesting over this cliff!")) return var/turf/above_mob = GetAbove(L) //Making sure we got headroom if(!above_mob.CanZPass(L, UP)) - to_chat(L, SPAN_WARNING("\The [above_mob] blocks your way.")) + to_chat(L, span_warning("\The [above_mob] blocks your way.")) return if(above_wall.density) //We check density rather than type since some walls dont have a floor on top. - to_chat(L, SPAN_WARNING("\The [above_wall] blocks your way.")) + to_chat(L, span_warning("\The [above_wall] blocks your way.")) return if(LAZYLEN(above_wall.contents) > 30) //We avoid checking the contents if it's too cluttered to avoid issues - to_chat(L, SPAN_WARNING("\The [above_wall] is too cluttered to climb onto!")) + to_chat(L, span_warning("\The [above_wall] is too cluttered to climb onto!")) return for(var/atom/A in above_wall.contents) if(A.density) - to_chat(L, SPAN_WARNING("\The [A.name] blocks your way!")) + to_chat(L, span_warning("\The [A.name] blocks your way!")) return //human mobs got species and can wear special equipment @@ -169,19 +169,19 @@ // Climb time is 30 for gearless untrained people var/climb_time = (5 * climbing_delay_min) SECONDS if(fall_chance) - to_chat(L, SPAN_WARNING("You begin climbing over \The [src]. Getting a grip is exceedingly difficult...")) + to_chat(L, span_warning("You begin climbing over \The [src]. Getting a grip is exceedingly difficult...")) climb_time += 20 SECONDS else - to_chat(L, SPAN_NOTICE("You begin climbing above \The [src]! ")) + to_chat(L, span_notice("You begin climbing above \The [src]! ")) if(climbing_delay_min > 1.25) climb_time += 10 SECONDS if(climbing_delay_min > 1.0) climb_time += 2.5 SECONDS if(L.nutrition >= 100 && L.nutrition <= 200) - to_chat(L, SPAN_NOTICE("Climbing while [L.isSynthetic() ? "low on power" : "hungry"] slows you down")) + to_chat(L, span_notice("Climbing while [L.isSynthetic() ? "low on power" : "hungry"] slows you down")) climb_time += 1 SECONDS else if(L.nutrition >= nutrition_cost && L.nutrition <= 100) - to_chat(L, SPAN_DANGER("You [L.isSynthetic() ? "lack enough power" : "are too hungry"] to climb safely!")) + to_chat(L, span_danger("You [L.isSynthetic() ? "lack enough power" : "are too hungry"] to climb safely!")) climb_time +=3 SECONDS if(fall_chance < 30) fall_chance = 30 @@ -189,23 +189,23 @@ blind_message = "You hear the sounds of climbing!", runemessage = "Tap Tap") var/oops_time = world.time var/grace_time = 4 SECONDS - to_chat(L, SPAN_WARNING("If you get interrupted after [(grace_time / (1 SECOND))] seconds of climbing, you will fall and hurt yourself, beware!")) + to_chat(L, span_warning("If you get interrupted after [(grace_time / (1 SECOND))] seconds of climbing, you will fall and hurt yourself, beware!")) if(do_after(L,climb_time)) if(prob(fall_chance)) L.forceMove(above_mob) - L.visible_message(message = "[L] falls off \The [src]", self_message = SPAN_DANGER("You slipped off \The [src]"), \ + L.visible_message(message = "[L] falls off \The [src]", self_message = span_danger("You slipped off \The [src]"), \ blind_message = "you hear a loud thud!", runemessage = "CRASH!") else if(drop_our_held) L.drop_item(get_turf(L)) L.forceMove(above_wall) L.visible_message(message = "[L] climbed up on \The [src]", \ - self_message = SPAN_NOTICE("You successfully scaled \The [src]"), \ + self_message = span_notice("You successfully scaled \The [src]"), \ blind_message = "The sounds of climbing cease.", runemessage = "Tap Tap") L.adjust_nutrition(-nutrition_cost) else if(world.time > (oops_time + grace_time)) L.forceMove(above_mob) - L.visible_message(message = "[L] falls off \The [src]", self_message = SPAN_DANGER("You slipped off \The [src]"), \ + L.visible_message(message = "[L] falls off \The [src]", self_message = span_danger("You slipped off \The [src]"), \ blind_message = "you hear a loud thud!", runemessage = "CRASH!") /mob/living/verb/climb_down() @@ -221,26 +221,26 @@ //Check if we can even try to climb if(nutrition <= nutrition_cost) - to_chat(src, SPAN_WARNING("You [isSynthetic() ? "lack the energy" : "are too hungry"] for such strenous activities!")) + to_chat(src, span_warning("You [isSynthetic() ? "lack the energy" : "are too hungry"] for such strenous activities!")) return var/turf/below_wall = GetBelow(our_turf) if(!below_wall) //No multiZ - to_chat(src, SPAN_NOTICE("There's nothing interesting below us!")) + to_chat(src, span_notice("There's nothing interesting below us!")) return if(!istype(below_wall,/turf/simulated)) //Our var is on simulated turfs, we must enforce this - to_chat(src, SPAN_NOTICE("There's nothing useful to grab onto!")) + to_chat(src, span_notice("There's nothing useful to grab onto!")) return var/turf/simulated/climbing_surface = below_wall if(!climbing_surface.density) //passable turfs make no sense to climb - to_chat(src, SPAN_NOTICE("There's nothing climbable below us!")) + to_chat(src, span_notice("There's nothing climbable below us!")) return var/turf/front_of_us = get_step(src, dir) //We get the spot we are facing if(!front_of_us.CanZPass(src, DOWN)) //Makes sure where we're climbing isnt blocked by a tile or there's a wall below it. - to_chat(src, SPAN_NOTICE("\The [front_of_us] blocks your way in this direction!")) + to_chat(src, span_notice("\The [front_of_us] blocks your way in this direction!")) return var/turf/destination = GetBelow(front_of_us) if(isopenspace(destination)) //We don't allow descending more than 1 Z at a time - to_chat(src, SPAN_NOTICE("You're too high up to climb down from here! Find a more gentle descent!")) + to_chat(src, span_notice("You're too high up to climb down from here! Find a more gentle descent!")) return //Determining whether we should be able to climb safely and how fast @@ -285,25 +285,25 @@ // Climb time is 30 for gearless untrained people var/climb_time = (5 * climbing_delay_min) SECONDS if(fall_chance) - to_chat(src, SPAN_WARNING("You begin climbing down along \The [below_wall]. Getting a grip is exceedingly difficult...")) + to_chat(src, span_warning("You begin climbing down along \The [below_wall]. Getting a grip is exceedingly difficult...")) climb_time += 20 SECONDS else - to_chat(src, SPAN_NOTICE("You begin climbing down \The [below_wall]! ")) + to_chat(src, span_notice("You begin climbing down \The [below_wall]! ")) if(climbing_delay_min > 1.25) climb_time += 10 SECONDS if(climbing_delay_min > 1.0) climb_time += 2.5 SECONDS if(nutrition >= 100 && nutrition <= 200) //Values are 50 lower than the warning icon appearing - to_chat(src, SPAN_NOTICE("Climbing while [isSynthetic() ? "low on power" : "hungry"] slows you down")) + to_chat(src, span_notice("Climbing while [isSynthetic() ? "low on power" : "hungry"] slows you down")) climb_time += 1 SECONDS else if(nutrition >= nutrition_cost && nutrition <= 100) - to_chat(src, SPAN_DANGER("You [isSynthetic() ? "lack enough power" : "are too hungry"] to climb safely!")) + to_chat(src, span_danger("You [isSynthetic() ? "lack enough power" : "are too hungry"] to climb safely!")) climb_time +=3 SECONDS if(fall_chance < 30) fall_chance = 30 if(!climbing_surface.climbable) - to_chat(src, SPAN_DANGER("\The [climbing_surface] is not suitable for climbing! Even for a master climber, this is risky!")) + to_chat(src, span_danger("\The [climbing_surface] is not suitable for climbing! Even for a master climber, this is risky!")) if(fall_chance < 75 ) fall_chance = 75 src.visible_message(message = "[src] climb down \The [below_wall]", \ @@ -312,21 +312,21 @@ below_wall.audible_message(message = "You hear something climbing up \The [below_wall]", runemessage= "Tap Tap") var/oops_time = world.time var/grace_time = 3 SECONDS - to_chat(src, SPAN_WARNING("If you get interrupted after [(grace_time / (1 SECOND))] seconds of climbing, you will fall and hurt yourself, beware!")) + to_chat(src, span_warning("If you get interrupted after [(grace_time / (1 SECOND))] seconds of climbing, you will fall and hurt yourself, beware!")) if(do_after(src,climb_time)) if(prob(fall_chance)) src.forceMove(front_of_us) src.visible_message(message = "[src] falls off \The [below_wall]", \ - self_message = SPAN_DANGER("You slipped off \The [below_wall]"), \ + self_message = span_danger("You slipped off \The [below_wall]"), \ blind_message = "you hear a loud thud!", runemessage = "CRASH!") else src.forceMove(destination) src.visible_message(message = "[src] climbed down on \The [below_wall]", \ - self_message = SPAN_NOTICE("You successfully descended \The [below_wall]"), \ + self_message = span_notice("You successfully descended \The [below_wall]"), \ blind_message = "The sounds of climbing cease.", runemessage = "Tap Tap") adjust_nutrition(-nutrition_cost) else if(world.time > (oops_time + grace_time)) src.forceMove(front_of_us) src.visible_message(message = "[src] falls off \The [below_wall]", \ - self_message = SPAN_DANGER("You slipped off \The [below_wall]"), \ + self_message = span_danger("You slipped off \The [below_wall]"), \ blind_message = "you hear a loud thud!", runemessage = "CRASH!") diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index a437748949..722a303bc2 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -492,21 +492,21 @@ src.nsay_act(message) /mob/proc/nsay_act(message as text) - to_chat(src, SPAN_WARNING("You must be a humanoid with a NIF implanted to use that.")) + to_chat(src, span_warning("You must be a humanoid with a NIF implanted to use that.")) /mob/living/carbon/human/nsay_act(message as text) if(stat != CONSCIOUS) - to_chat(src,SPAN_WARNING("You can't use NSay while unconscious.")) + to_chat(src,span_warning("You can't use NSay while unconscious.")) return if(!nif) - to_chat(src,SPAN_WARNING("You can't use NSay without a NIF.")) + to_chat(src,span_warning("You can't use NSay without a NIF.")) return var/datum/nifsoft/soulcatcher/SC = nif.imp_check(NIF_SOULCATCHER) if(!SC) - to_chat(src,SPAN_WARNING("You need the Soulcatcher software to use NSay.")) + to_chat(src,span_warning("You need the Soulcatcher software to use NSay.")) return if(!SC.brainmobs.len) - to_chat(src,SPAN_WARNING("You need a loaded mind to use NSay.")) + to_chat(src,span_warning("You need a loaded mind to use NSay.")) return if(!message) message = tgui_input_text(usr, "Type a message to say.","Speak into Soulcatcher") @@ -522,21 +522,21 @@ src.nme_act(message) /mob/proc/nme_act(message as message) - to_chat(src, SPAN_WARNING("You must be a humanoid with a NIF implanted to use that.")) + to_chat(src, span_warning("You must be a humanoid with a NIF implanted to use that.")) /mob/living/carbon/human/nme_act(message as message) if(stat != CONSCIOUS) - to_chat(src,SPAN_WARNING("You can't use NMe while unconscious.")) + to_chat(src,span_warning("You can't use NMe while unconscious.")) return if(!nif) - to_chat(src,SPAN_WARNING("You can't use NMe without a NIF.")) + to_chat(src,span_warning("You can't use NMe without a NIF.")) return var/datum/nifsoft/soulcatcher/SC = nif.imp_check(NIF_SOULCATCHER) if(!SC) - to_chat(src,SPAN_WARNING("You need the Soulcatcher software to use NMe.")) + to_chat(src,span_warning("You need the Soulcatcher software to use NMe.")) return if(!SC.brainmobs.len) - to_chat(src,SPAN_WARNING("You need a loaded mind to use NMe.")) + to_chat(src,span_warning("You need a loaded mind to use NMe.")) return if(!message) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index f9dcac5242..2faa8ec05e 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -21,63 +21,63 @@ return // don't set a label if(!labels_left) - to_chat(user, SPAN_WARNING("\The [src] has no labels left.")) + to_chat(user, span_warning("\The [src] has no labels left.")) return if(!label || !length(label)) - to_chat(user, SPAN_WARNING("\The [src] has no label text set.")) + to_chat(user, span_warning("\The [src] has no label text set.")) return if(length(A.name) + length(label) > 64) - to_chat(user, SPAN_WARNING("\The [src]'s label too big.")) + to_chat(user, span_warning("\The [src]'s label too big.")) return if(istype(A, /mob/living/silicon/robot/platform)) var/mob/living/silicon/robot/platform/P = A if(!P.allowed(user)) - to_chat(usr, SPAN_WARNING("Access denied.")) + to_chat(usr, span_warning("Access denied.")) else if(P.client || P.key) - to_chat(user, SPAN_NOTICE("You rename \the [P] to [label].")) - to_chat(P, SPAN_NOTICE("\The [user] renames you to [label].")) + to_chat(user, span_notice("You rename \the [P] to [label].")) + to_chat(P, span_notice("\The [user] renames you to [label].")) P.custom_name = label P.SetName(P.custom_name) else - to_chat(user, SPAN_WARNING("\The [src] is inactive and cannot be renamed.")) + to_chat(user, span_warning("\The [src] is inactive and cannot be renamed.")) return if(ishuman(A)) - to_chat(user, SPAN_WARNING("The label refuses to stick to [A.name].")) + to_chat(user, span_warning("The label refuses to stick to [A.name].")) return if(issilicon(A)) - to_chat(user, SPAN_WARNING("The label refuses to stick to [A.name].")) + to_chat(user, span_warning("The label refuses to stick to [A.name].")) return if(isobserver(A)) - to_chat(user, SPAN_WARNING("[src] passes through [A.name].")) + to_chat(user, span_warning("[src] passes through [A.name].")) return if(istype(A, /obj/item/reagent_containers/glass)) - to_chat(user, SPAN_WARNING("The label can't stick to the [A.name] (Try using a pen).")) + to_chat(user, span_warning("The label can't stick to the [A.name] (Try using a pen).")) return if(istype(A, /obj/machinery/portable_atmospherics/hydroponics)) var/obj/machinery/portable_atmospherics/hydroponics/tray = A if(!tray.mechanical) - to_chat(user, SPAN_WARNING("How are you going to label that?")) + to_chat(user, span_warning("How are you going to label that?")) return tray.labelled = label spawn(1) tray.update_icon() user.visible_message( \ - SPAN_NOTICE("\The [user] labels [A] as [label]."), \ - SPAN_NOTICE("You label [A] as [label].")) + span_notice("\The [user] labels [A] as [label]."), \ + span_notice("You label [A] as [label].")) A.name = "[A.name] ([label])" /obj/item/hand_labeler/attack_self(mob/user as mob) mode = !mode icon_state = "labeler[mode]" if(mode) - to_chat(user, SPAN_NOTICE("You turn on \the [src].")) + to_chat(user, span_notice("You turn on \the [src].")) //Now let them chose the text. var/str = sanitizeSafe(tgui_input_text(user,"Label text?","Set label","",MAX_NAME_LEN), MAX_NAME_LEN) if(!str || !length(str)) - to_chat(user, SPAN_WARNING("Invalid text.")) + to_chat(user, span_warning("Invalid text.")) return label = str - to_chat(user, SPAN_NOTICE("You set the text to '[str]'.")) + to_chat(user, span_notice("You set the text to '[str]'.")) else - to_chat(user, SPAN_NOTICE("You turn off \the [src].")) \ No newline at end of file + to_chat(user, span_notice("You turn off \the [src].")) diff --git a/code/modules/paperwork/paper_sticky.dm b/code/modules/paperwork/paper_sticky.dm index 426cf3a01c..8f88bb00b6 100644 --- a/code/modules/paperwork/paper_sticky.dm +++ b/code/modules/paperwork/paper_sticky.dm @@ -27,12 +27,12 @@ if(istype(thing, /obj/item/pen)) if(jobban_isbanned(user, JOB_GRAFFITI)) - to_chat(user, SPAN_WARNING("You are banned from leaving persistent information across rounds.")) + to_chat(user, span_warning("You are banned from leaving persistent information across rounds.")) return var/writing_space = MAX_MESSAGE_LEN - length(written_text) if(writing_space <= 0) - to_chat(user, SPAN_WARNING("There is no room left on \the [src].")) + to_chat(user, span_warning("There is no room left on \the [src].")) return var/text = sanitizeSafe(tgui_input_text(usr, "What would you like to write?", null, null, writing_space), writing_space) if(!text || thing.loc != user || (!Adjacent(user) && loc != user) || user.incapacitated()) @@ -50,7 +50,7 @@ /obj/item/sticky_pad/examine(var/mob/user) . = ..() if(.) - to_chat(user, SPAN_NOTICE("It has [papers] sticky note\s left.")) + to_chat(user, span_notice("It has [papers] sticky note\s left.")) /obj/item/sticky_pad/attack_hand(var/mob/user) var/obj/item/paper/paper = new paper_type(get_turf(src)) @@ -59,7 +59,7 @@ paper.color = color written_text = null user.put_in_hands(paper) - to_chat(user, SPAN_NOTICE("You pull \the [paper] off \the [src].")) + to_chat(user, span_notice("You pull \the [paper] off \the [src].")) papers-- if(papers <= 0) qdel(src) @@ -132,7 +132,7 @@ if(target_turf != source_turf) dir_offset = get_dir(source_turf, target_turf) if(!(dir_offset in GLOB.cardinal)) - to_chat(user, SPAN_WARNING("You cannot reach that from here.")) + to_chat(user, span_warning("You cannot reach that from here.")) return if(user.unEquip(src, source_turf)) diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index 457fd020c9..10f95d2a08 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -52,7 +52,7 @@ else if(thing.sharp) if(jobban_isbanned(user, JOB_GRAFFITI)) - to_chat(user, SPAN_WARNING("You are banned from leaving persistent information across rounds.")) + to_chat(user, span_warning("You are banned from leaving persistent information across rounds.")) return var/_message = sanitize(tgui_input_text(usr, "Enter an additional message to engrave.", "Graffiti"), trim = TRUE) diff --git a/code/modules/planet/weather.dm b/code/modules/planet/weather.dm index a2ea891028..45dd62b12e 100644 --- a/code/modules/planet/weather.dm +++ b/code/modules/planet/weather.dm @@ -151,7 +151,7 @@ wind_speed = new_wind_speed wind_dir = pick(alldirs) var/message = "You feel the wind blowing [wind_speed > 2 ? "strongly ": ""]towards the [dir2text(wind_dir)]." - message_all_outdoor_players(span("warning", message)) + message_all_outdoor_players(span_warning(message)) /datum/weather_holder/proc/message_all_outdoor_players(message) for(var/mob/M in player_list) // Don't need to care about clientless mobs. @@ -290,4 +290,4 @@ // This is for special effects for specific types of weather, such as lightning flashes in a storm. // It's a seperate object to allow the use of flick(). /atom/movable/weather_visuals/special - plane = PLANE_LIGHTING_ABOVE \ No newline at end of file + plane = PLANE_LIGHTING_ABOVE diff --git a/code/modules/player_tips_vr/player_tips_controller_vr.dm b/code/modules/player_tips_vr/player_tips_controller_vr.dm index 7854177564..fa0db859f9 100644 --- a/code/modules/player_tips_vr/player_tips_controller_vr.dm +++ b/code/modules/player_tips_vr/player_tips_controller_vr.dm @@ -29,10 +29,10 @@ Controlled by the player_tips subsystem under code/controllers/subsystems/player for(var/mob/M in player_list) if(M.client?.prefs?.read_preference(/datum/preference/toggle/player_tips)) if(!M.key && !(M.key in HasReceived)) - to_chat(M, SPAN_WARNING("You have periodic player tips enabled. You may turn them off at any time with the Toggle Receiving Player Tips verb in Preferences, or in character set up under the OOC tab!\n Player tips appear every 45-75 minutes.")) + to_chat(M, span_warning("You have periodic player tips enabled. You may turn them off at any time with the Toggle Receiving Player Tips verb in Preferences, or in character set up under the OOC tab!\n Player tips appear every 45-75 minutes.")) HasReceived.Add(M.key) tip = GLOB.is_valid_url.Replace(tip,"$1") - to_chat(M, SPAN_NOTICE("[tip]")) + to_chat(M, span_notice("[tip]")) @@ -47,4 +47,4 @@ Controlled by the player_tips subsystem under code/controllers/subsystems/player if(choice == "cancel") return var/static/datum/player_tips/player_tips = new - to_chat(src, SPAN_NOTICE("[GLOB.is_valid_url.Replace(player_tips.pick_tip(choice),"$1")]")) + to_chat(src, span_notice("[GLOB.is_valid_url.Replace(player_tips.pick_tip(choice),"$1")]")) diff --git a/code/modules/power/batteryrack_vr.dm b/code/modules/power/batteryrack_vr.dm index c1c3b7987e..c9e08741c2 100644 --- a/code/modules/power/batteryrack_vr.dm +++ b/code/modules/power/batteryrack_vr.dm @@ -12,7 +12,7 @@ /obj/item/module/power_control/attackby(var/obj/item/I, var/mob/user) if(I.has_tool_quality(TOOL_MULTITOOL)) - to_chat(user, SPAN_NOTICE("You begin tweaking the power control circuits to support a power cell rack.")) + to_chat(user, span_notice("You begin tweaking the power control circuits to support a power cell rack.")) if(do_after(user, 50 * I.toolspeed)) var/obj/item/newcircuit = new/obj/item/circuitboard/batteryrack(get_turf(user)) qdel(src) diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm index dea73eb755..ac5c5d8191 100644 --- a/code/modules/projectiles/guns/magnetic/bore.dm +++ b/code/modules/projectiles/guns/magnetic/bore.dm @@ -209,7 +209,7 @@ /obj/item/gun/magnetic/matfed/phoronbore/process() if(generator_state && !mat_storage) - audible_message(SPAN_NOTICE("\The [src] goes quiet."),SPAN_NOTICE("A motor noise cuts out."), runemessage = "goes quiet") + audible_message(span_notice("\The [src] goes quiet."),span_notice("A motor noise cuts out."), runemessage = "goes quiet") soundloop.stop() generator_state = GEN_OFF @@ -244,7 +244,7 @@ /obj/item/gun/magnetic/matfed/phoronbore/proc/toggle_generator(mob/living/user) if(!generator_state && !mat_storage) - to_chat(user, SPAN_NOTICE("\The [src] has no fuel!")) + to_chat(user, span_notice("\The [src] has no fuel!")) return else if(!generator_state) @@ -259,12 +259,12 @@ soundloop.start() time_started = world.time cell?.use(100) - audible_message(SPAN_NOTICE("\The [src] starts chugging."),SPAN_NOTICE("A motor noise starts up."), runemessage = "whirr") + audible_message(span_notice("\The [src] starts chugging."),span_notice("A motor noise starts up."), runemessage = "whirr") generator_state = GEN_IDLE else if(generator_state > GEN_OFF && time_started + 3 SECONDS < world.time) soundloop.stop() - audible_message(SPAN_NOTICE("\The [src] goes quiet."),SPAN_NOTICE("A motor noise cuts out."), runemessage = "goes quiet") + audible_message(span_notice("\The [src] goes quiet."),span_notice("A motor noise cuts out."), runemessage = "goes quiet") generator_state = GEN_OFF /obj/item/gun/magnetic/matfed/phoronbore/loaded diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index f265da5f02..b1a5f7a9fa 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -712,14 +712,14 @@ //hit messages if(silenced) playsound(target_mob, hitsound, 5, 1, -1) - to_chat(target_mob, span("critical", "You've been hit in the [impacted_organ] by \the [src]!")) + to_chat(target_mob, span_critical("You've been hit in the [impacted_organ] by \the [src]!")) else var/volume = vol_by_damage() playsound(target_mob, hitsound, volume, 1, -1) // X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter target_mob.visible_message( - span("danger", "\The [target_mob] was hit in the [impacted_organ] by \the [src]!"), - span("critical", "You've been hit in the [impacted_organ] by \the [src]!") + span_danger("\The [target_mob] was hit in the [impacted_organ] by \the [src]!"), + span_critical("You've been hit in the [impacted_organ] by \the [src]!") ) //admin logs diff --git a/code/modules/reagents/machinery/alembic.dm b/code/modules/reagents/machinery/alembic.dm index 6762927b1f..f88917dc6b 100644 --- a/code/modules/reagents/machinery/alembic.dm +++ b/code/modules/reagents/machinery/alembic.dm @@ -34,7 +34,7 @@ /obj/machinery/alembic/attackby(var/obj/item/potion_material/O as obj, var/mob/user as mob) if(istype(O,/obj/item/potion_material)) if(potion_reagent != 0 ) - to_chat(user, SPAN_WARNING("There is already a reagent in the alembic!")) + to_chat(user, span_warning("There is already a reagent in the alembic!")) return else src.potion_reagent = O @@ -43,49 +43,49 @@ user.drop_item() O.loc = src update_icon() - to_chat(user, SPAN_NOTICE("You place the [O] in the alembic.")) + to_chat(user, span_notice("You place the [O] in the alembic.")) src.updateUsrDialog() return else if(istype(O,/obj/item/potion_base)) if(base_reagent != 0 ) - to_chat(user, SPAN_WARNING("There is already a base in the alembic!")) + to_chat(user, span_warning("There is already a base in the alembic!")) return else src.base_reagent = O user.drop_item() O.loc = src update_icon() - to_chat(user, SPAN_NOTICE("You place the [O] in the alembic.")) + to_chat(user, span_notice("You place the [O] in the alembic.")) src.updateUsrDialog() return else - to_chat(user, SPAN_WARNING("This item is no use in the alembic.")) + to_chat(user, span_warning("This item is no use in the alembic.")) return /obj/machinery/alembic/attack_hand(mob/user as mob) if(potion_reagent == 0 || base_reagent == 0) //If there is nothing in there - to_chat(user, SPAN_WARNING("The alembic is not yet full!")) + to_chat(user, span_warning("The alembic is not yet full!")) return else if(potion_reagent != 0 && base_reagent != 0 && !bubbling) //if there is something in there and it's not bubbling yet bubbling = 1 update_icon() - to_chat(user, SPAN_NOTICE("The alembic begins boiling the [potion_reagent] in the [base_reagent].")) + to_chat(user, span_notice("The alembic begins boiling the [potion_reagent] in the [base_reagent].")) sleep(30) bubbling = 0 - to_chat(user, SPAN_NOTICE("The alembic finishes brewing the potion!")) + to_chat(user, span_notice("The alembic finishes brewing the potion!")) spawn_potion() potion_reagent = 0 base_reagent = 0 update_icon() return else if(bubbling) - to_chat(user, SPAN_WARNING("The alembic is already boiling!")) + to_chat(user, span_warning("The alembic is already boiling!")) return /obj/machinery/alembic/AltClick(mob/user) if(potion_reagent == 0) - to_chat(user, SPAN_WARNING("There is nothing in the alembic!")) + to_chat(user, span_warning("There is nothing in the alembic!")) return else if(potion_reagent != 0 && !bubbling) //if there is something in there and it's not bubbling yet if(!user.incapacitated() && Adjacent(user)) @@ -95,7 +95,7 @@ else return else if(bubbling) - to_chat(user, SPAN_WARNING("The alembic is already boiling, it's too late to get your reagent back!")) + to_chat(user, span_warning("The alembic is already boiling, it's too late to get your reagent back!")) return /obj/machinery/alembic/proc/spawn_potion() diff --git a/code/modules/reagents/machinery/chemalyzer.dm b/code/modules/reagents/machinery/chemalyzer.dm index de59088c51..b0433ec03d 100644 --- a/code/modules/reagents/machinery/chemalyzer.dm +++ b/code/modules/reagents/machinery/chemalyzer.dm @@ -30,10 +30,10 @@ if(istype(I,/obj/item/reagent_containers)) analyzing = TRUE update_icon() - to_chat(user, span("notice", "Analyzing \the [I], please stand by...")) + to_chat(user, span_notice("Analyzing \the [I], please stand by...")) if(!do_after(user, 2 SECONDS, src)) - to_chat(user, span("warning", "Sample moved outside of scan range, please try again and remain still.")) + to_chat(user, span_warning("Sample moved outside of scan range, please try again and remain still.")) analyzing = FALSE update_icon() return @@ -50,14 +50,14 @@ for(var/datum/reagent/R in I.reagents.reagent_list) if(!R.name) continue - to_chat(user, span("notice", "Contains [R.volume]u of [R.name].
[R.description]
")) + to_chat(user, span_notice("Contains [R.volume]u of [R.name].
[R.description]
")) // Last, unseal it if it's an autoinjector. if(istype(I,/obj/item/reagent_containers/hypospray/autoinjector/biginjector) && !(I.flags & OPENCONTAINER)) I.flags |= OPENCONTAINER - to_chat(user, span("notice", "Sample container unsealed.
")) + to_chat(user, span_notice("Sample container unsealed.
")) - to_chat(user, span("notice", "Scanning of \the [I] complete.")) + to_chat(user, span_notice("Scanning of \the [I] complete.")) analyzing = FALSE update_icon() - return \ No newline at end of file + return diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 797d02cf6d..05c752ad0f 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -522,7 +522,7 @@ /obj/structure/reagent_dispensers/cookingoil/proc/explode() reagents.splash_area(get_turf(src), 3) - visible_message(span("danger", "The [src] bursts open, spreading oil all over the area.")) + visible_message(span_danger("The [src] bursts open, spreading oil all over the area.")) qdel(src) /obj/structure/reagent_dispensers/bloodbarrel diff --git a/code/modules/reagents/machinery/injector_maker.dm b/code/modules/reagents/machinery/injector_maker.dm index 2e5f3eff83..29aad8ad34 100644 --- a/code/modules/reagents/machinery/injector_maker.dm +++ b/code/modules/reagents/machinery/injector_maker.dm @@ -76,10 +76,10 @@ if(istype(O,/obj/item/reagent_containers/hypospray/autoinjector/empty)) var/obj/item/reagent_containers/hypospray/autoinjector/empty/E = O if(src.count_small_injector >= src.capacity_small_injector) - to_chat(user, SPAN_WARNING("Storage is full! It can only hold [capacity_small_injector]")) + to_chat(user, span_warning("Storage is full! It can only hold [capacity_small_injector]")) return if(E.reagents.total_volume > 0) - to_chat(user, SPAN_WARNING("You cannot put a filled injector into the machine!")) + to_chat(user, span_warning("You cannot put a filled injector into the machine!")) return src.count_small_injector = src.count_small_injector + 1 qdel(E) @@ -87,10 +87,10 @@ if(istype(O,/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty)) var/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty/E = O if(src.count_large_injector >= src.capacity_large_injector) - to_chat(user, SPAN_WARNING("Storage is full! It can only hold [capacity_large_injector]")) + to_chat(user, span_warning("Storage is full! It can only hold [capacity_large_injector]")) return if(E.reagents.total_volume > 0) - to_chat(user, SPAN_WARNING("You cannot put a filled injector into the machine!")) + to_chat(user, span_warning("You cannot put a filled injector into the machine!")) return src.count_large_injector = src.count_large_injector + 1 qdel(E) @@ -106,7 +106,7 @@ var/plastic_input = input_amount * value_plastic var/free_space = capacity_plastic - src.count_plastic if(plastic_input > free_space) - to_chat(user, SPAN_WARNING("Storage is full! There is only [free_space] units worth of space left!")) + to_chat(user, span_warning("Storage is full! There is only [free_space] units worth of space left!")) else S.use(input_amount) src.count_plastic = src.count_plastic + plastic_input @@ -170,14 +170,14 @@ switch(material) if("mold plastic") if(src.count_plastic < cost_plastic_small) - to_chat(user, SPAN_WARNING("Not enough plastic! Need at least [cost_plastic_small] units.")) + to_chat(user, span_warning("Not enough plastic! Need at least [cost_plastic_small] units.")) return if("use injectors") if(!src.count_small_injector) - to_chat(user, SPAN_WARNING("Small injector rack is empty!")) + to_chat(user, span_warning("Small injector rack is empty!")) return if(!beaker.reagents.total_volume) - to_chat(user, SPAN_WARNING("Chemical storage is empty!")) + to_chat(user, span_warning("Chemical storage is empty!")) return var/injector_amount = tgui_input_number(user, "How many injectors would you like?", "Make small injectors", 0, 100) if(injector_amount > 0) @@ -185,11 +185,11 @@ if("mold plastic") var/plastic_cost = cost_plastic_small * injector_amount if(src.count_plastic < plastic_cost) - to_chat(user, SPAN_WARNING("Not enough plastic! Need at least [plastic_cost] units.")) + to_chat(user, span_warning("Not enough plastic! Need at least [plastic_cost] units.")) return if("use injectors") if(src.count_small_injector < injector_amount) - to_chat(user, SPAN_WARNING("Not enough autoinjectors! You only have [src.count_small_injector]")) + to_chat(user, span_warning("Not enough autoinjectors! You only have [src.count_small_injector]")) return var/name = sanitize(tgui_input_text(user, "Name Injector", "Naming", null, 32, 0, 0, 0, 0),MAX_MESSAGE_LEN,0,0,0) make_injector("small injector", injector_amount, name, material, user) @@ -201,14 +201,14 @@ switch(material) if("mold plastic") if(src.count_plastic < cost_plastic_large) - to_chat(user, SPAN_WARNING("Not enough plastic! Need at least [cost_plastic_large] units.")) + to_chat(user, span_warning("Not enough plastic! Need at least [cost_plastic_large] units.")) return if("use injectors") if(!src.count_large_injector) - to_chat(user, SPAN_WARNING("Large injector rack is empty!")) + to_chat(user, span_warning("Large injector rack is empty!")) return if(!beaker.reagents.total_volume) - to_chat(user, SPAN_WARNING("Chemical storage is empty!")) + to_chat(user, span_warning("Chemical storage is empty!")) return var/injector_amount = tgui_input_number(user, "How many injectors would you like?", "Make large injectors", 0, 100) if(injector_amount > 0) @@ -216,11 +216,11 @@ if("mold plastic") var/plastic_cost = cost_plastic_large * injector_amount if(src.count_plastic < plastic_cost) - to_chat(user, SPAN_WARNING("Not enough plastic! Need at least [plastic_cost] units.")) + to_chat(user, span_warning("Not enough plastic! Need at least [plastic_cost] units.")) return if("use injectors") if(src.count_large_injector < injector_amount) - to_chat(user, SPAN_WARNING("Not enough autoinjectors! You only have [src.count_large_injector]")) + to_chat(user, span_warning("Not enough autoinjectors! You only have [src.count_large_injector]")) return var/name = sanitize(tgui_input_text(user, "Name Injector", "Naming", null, 32, 0, 0, 0, 0),MAX_MESSAGE_LEN,0,0,0) make_injector("large injector", injector_amount, name, material,user) diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm index 238584bf04..4b50c8e153 100644 --- a/code/modules/reagents/machinery/pump.dm +++ b/code/modules/reagents/machinery/pump.dm @@ -113,9 +113,9 @@ update_icon() if(message) if(on) - message = SPAN_NOTICE("\The [src] turns on.") + message = span_notice("\The [src] turns on.") else - message = SPAN_NOTICE("\The [src] shuts down.") + message = span_notice("\The [src] shuts down.") visible_message(message) return TRUE @@ -142,7 +142,7 @@ /obj/machinery/pump/attackby(obj/item/W, mob/user) . = TRUE if(W.has_tool_quality(TOOL_SCREWDRIVER) && !open) - to_chat(user, SPAN_NOTICE("You [unlocked ? "screw" : "unscrew"] the battery panel.")) + to_chat(user, span_notice("You [unlocked ? "screw" : "unscrew"] the battery panel.")) unlocked = !unlocked else if(W.has_tool_quality(TOOL_CROWBAR) && unlocked) @@ -202,4 +202,4 @@ /turf/simulated/floor/water/contaminated/pump_reagents(var/datum/reagents/R, var/volume) . = ..() - R.add_reagent("vatstabilizer", round(volume / 2, 0.1)) \ No newline at end of file + R.add_reagent("vatstabilizer", round(volume / 2, 0.1)) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 76c089be28..1a086dee7b 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -72,8 +72,8 @@ return FALSE user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) - to_chat(user, span("notice", "You inject \the [H] with \the [src].")) - to_chat(H, span("warning", "You feel a tiny prick!")) + to_chat(user, span_notice("You inject \the [H] with \the [src].")) + to_chat(H, span_warning("You feel a tiny prick!")) if(hyposound) playsound(src, hyposound, 25) @@ -82,7 +82,7 @@ var/contained = reagentlist() var/trans = reagents.trans_to_mob(H, amount_per_transfer_from_this, CHEM_BLOOD) add_attack_logs(user,H,"Injected with [src.name] containing [contained], trasferred [trans] units") - to_chat(user, span("notice", "[trans] units injected. [reagents.total_volume] units remaining in \the [src].")) + to_chat(user, span_notice("[trans] units injected. [reagents.total_volume] units remaining in \the [src].")) return TRUE return FALSE diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index ad61abe193..38e7a56abc 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -562,7 +562,7 @@ if(O.buckled) 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(put_mob(O)) diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 74ff2d1d20..27055d72b3 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -80,7 +80,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 return ..() diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index 500815ea4e..00bde3d0f1 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -39,7 +39,7 @@ if(world.time < last_teleport + teleport_cooldown) . += "[src] is recharging power. A timer on the side reads [round((last_teleport + teleport_cooldown - world.time)/10)] seconds." if(boosted) - . += SPAN_NOTICE("There appears to be a booster haphazardly jammed into the side of [src]. That looks unsafe.") + . += span_notice("There appears to be a booster haphazardly jammed into the side of [src]. That looks unsafe.") if(!panel_open) . += "The panel is screwed in, obstructing the linking device." else @@ -82,7 +82,7 @@ to_chat(user, "You link [src] to the one in [I]'s buffer.") update_icon() return 1 - + if(istype(I, /obj/item/quantum_pad_booster)) var/obj/item/quantum_pad_booster/booster = I visible_message("[user] violently jams [booster] into the side of [src]. [src] beeps, quietly.", \ @@ -101,11 +101,11 @@ /obj/machinery/power/quantumpad/update_icon() . = ..() - + cut_overlays() if(panel_open) add_overlay("qpad-panel") - + if(inoperable() || panel_open || !powernet) icon_state = "[initial(icon_state)]-o" else if (!linked_pad) @@ -121,7 +121,7 @@ disconnect_from_network() connect_to_network() if(powernet != original_powernet) - update_icon() + update_icon() /obj/machinery/power/quantumpad/attack_hand(mob/user) . = ..() @@ -229,7 +229,7 @@ playsound(src, 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) flick("qpad-beam-in", linked_pad) playsound(linked_pad, 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) - + transport_objects(get_turf(linked_pad)) /obj/machinery/power/quantumpad/proc/initMappedLink() @@ -245,7 +245,7 @@ // Well, I guess you can do it! if(!A?.requires_power) return TRUE - + // Otherwise we'll need a powernet var/power_to_use = 10000 / power_efficiency if(boosted) @@ -277,7 +277,7 @@ // Well, if there's no gateway map we're definitely not on it if(!GLOB.gateway_away) return TRUE - + // Traverse! if(GLOB.gateway_away.calibrated) return TRUE @@ -285,7 +285,7 @@ var/list/gateway_zs = GetConnectedZlevels(GLOB.gateway_away.z) if(z in gateway_zs) return FALSE // It's not calibrated and we're in a connected z - + return TRUE /obj/machinery/power/quantumpad/proc/gateway_scatter(mob/user) @@ -311,4 +311,4 @@ force = 9 sharp = TRUE item_state = "analyzer" - icon_state = "hacktool" \ No newline at end of file + icon_state = "hacktool" diff --git a/code/modules/vore/resizing/holder_vr.dm b/code/modules/vore/resizing/holder_vr.dm index 96a286964d..f66085aeee 100644 --- a/code/modules/vore/resizing/holder_vr.dm +++ b/code/modules/vore/resizing/holder_vr.dm @@ -7,7 +7,7 @@ /obj/item/holder/attack_hand(mob/living/user as mob) //straight up just copypasted from objects/items.dm with a few things changed (doesn't called dropped unless +actually dropped+) 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 @@ -56,4 +56,4 @@ If this is fine to you, ensure that the other player is fine with you doing things to them beforehand! "},"OOC Warning") //VORESTATION EDIT END. - return \ No newline at end of file + return diff --git a/code/modules/vore/resizing/sizegun_slow_vr.dm b/code/modules/vore/resizing/sizegun_slow_vr.dm index 5fa4beda97..c9d73952f3 100644 --- a/code/modules/vore/resizing/sizegun_slow_vr.dm +++ b/code/modules/vore/resizing/sizegun_slow_vr.dm @@ -89,18 +89,18 @@ break if(busy && !(target == current_target)) - to_chat(user, span("warning", "\The [src] is already targeting something.")) + to_chat(user, span_warning("\The [src] is already targeting something.")) return if(!isliving(target)) - to_chat(user, span("warning", "\the [target] is not a valid target.")) + to_chat(user, span_warning("\the [target] is not a valid target.")) return var/mob/living/L = target var/mob/living/U = user if(get_dist(target, user) > beam_range) - to_chat(user, span("warning", "You are too far away from \the [target] to affect it. Get closer.")) + to_chat(user, span_warning("You are too far away from \the [target] to affect it. Get closer.")) return if(target == current_target && busy) @@ -121,7 +121,7 @@ unresizable = TRUE if(unresizable) - to_chat(user, span("warning", "\the [target] is immune to resizing.")) + to_chat(user, span_warning("\the [target] is immune to resizing.")) // Start the effects current_target = target @@ -175,7 +175,7 @@ else sizeshift_mode = !sizeshift_mode update_icon() - to_chat(user, span("notice", "\The [src] will now [sizeshift_mode ? "grow" : "shrink"] its targets.")) + to_chat(user, span_notice("\The [src] will now [sizeshift_mode ? "grow" : "shrink"] its targets.")) #undef SIZE_SHRINK @@ -256,7 +256,7 @@ /obj/item/slow_sizegun/AltClick(mob/user) if (trading == 0) trading = 1 - to_chat(user, span("notice", "\The [src] will now trade your targets size for your own.")) + to_chat(user, span_notice("\The [src] will now trade your targets size for your own.")) else trading = 0 - to_chat(user, span("notice", "\The [src] will no longer trade your targets size for your own.")) + to_chat(user, span_notice("\The [src] will no longer trade your targets size for your own.")) diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm index ad01c1c176..5a97010ac7 100644 --- a/code/modules/vore/smoleworld/smoleworld_vr.dm +++ b/code/modules/vore/smoleworld/smoleworld_vr.dm @@ -378,7 +378,7 @@ // if(.) // // if(M.get_effective_size(TRUE) > RESIZE_TINY) -// to_chat(M, SPAN_WARNING("You are to big to fit in \the [src].")) +// to_chat(M, span_warning("You are to big to fit in \the [src].")) // . = FALSE // // diff --git a/code/modules/xenoarcheaology/effects/cellcharge.dm b/code/modules/xenoarcheaology/effects/cellcharge.dm index b5cad20cd0..1590abeb3f 100644 --- a/code/modules/xenoarcheaology/effects/cellcharge.dm +++ b/code/modules/xenoarcheaology/effects/cellcharge.dm @@ -21,7 +21,7 @@ if(C) if(issilicon(L) && ((last_message + (1 MINUTE)) < world.time)) messaged_robots = TRUE - to_chat(L, SPAN_NOTICE("SYSTEM ALERT: Energy boost detected!")) + to_chat(L, span_notice("SYSTEM ALERT: Energy boost detected!")) C.charge = min(C.maxcharge, C.charge + amount) continue diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm index a539da1356..4831fb5797 100644 --- a/code/modules/xenoarcheaology/effects/celldrain.dm +++ b/code/modules/xenoarcheaology/effects/celldrain.dm @@ -21,7 +21,7 @@ if(C) if(issilicon(L) && ((last_message + (1 MINUTE)) < world.time)) messaged_robots = TRUE - to_chat(L, SPAN_WARNING("SYSTEM ALERT: Energy drain detected!")) + to_chat(L, span_warning("SYSTEM ALERT: Energy drain detected!")) C.charge = min(C.maxcharge, C.charge - amount) continue diff --git a/code/modules/xenobio/items/slimepotions.dm b/code/modules/xenobio/items/slimepotions.dm index 8148ef2e43..7c1e70cd89 100644 --- a/code/modules/xenobio/items/slimepotions.dm +++ b/code/modules/xenobio/items/slimepotions.dm @@ -78,10 +78,10 @@ to_chat(user, "\The [M] is dead!") return ..() if(!M.has_AI()) - to_chat(user, span("warning", "\The [M] is too strongly willed for this to affect them.")) // Most likely player controlled. + to_chat(user, span_warning("\The [M] is too strongly willed for this to affect them.")) // Most likely player controlled. return if(currently_using) - to_chat(user, span("warning", "This agent has already been used!")) // Possibly trying to cheese the dialogue box and use same potion on multiple targets. + to_chat(user, span_warning("This agent has already been used!")) // Possibly trying to cheese the dialogue box and use same potion on multiple targets. return currently_using = TRUE @@ -199,7 +199,7 @@ to_chat(user, "\The [M] is already loyal to your species!") return ..() if(!M.has_AI()) - to_chat(user, span("warning", "\The [M] is too strong-willed for this to affect them.")) + to_chat(user, span_warning("\The [M] is too strong-willed for this to affect them.")) return ..() var/datum/ai_holder/AI = M.ai_holder @@ -234,7 +234,7 @@ to_chat(user, "\The [M] is already loyal to you!") return ..() if(!M.has_AI()) - to_chat(user, span("warning", "\The [M] is too strong-willed for this to affect them.")) + to_chat(user, span_warning("\The [M] is too strong-willed for this to affect them.")) return ..() var/datum/ai_holder/AI = M.ai_holder diff --git a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm index 7d282bd082..057af91663 100644 --- a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm +++ b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm @@ -150,7 +150,7 @@ /obj/item/space_spider_egg/attack_self(mob/user as mob) var/turf/drop_loc = user.loc - to_chat(user, SPAN_WARNING("The egg cracks open, splattering disgusting goop at your feet...\n \ + to_chat(user, span_warning("The egg cracks open, splattering disgusting goop at your feet...\n \ Whatever life laid within shall never awaken, if it was even alive.")) new /obj/effect/decal/cleanable/spiderling_remains(drop_loc) qdel(src)