From 8f9de7c3e2d760eee0eb40f7f6c80b5c0e83e8b9 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Sat, 21 Sep 2024 14:46:31 +0200 Subject: [PATCH] Text() away (#19850) Refactored all the builtin text procs to use string interpolation instead. Added a linting for the above. This is based on, and should only be merged after, #19847 --- code/__DEFINES/text.dm | 4 ++ code/__HELPERS/logging/talk.dm | 2 +- code/__HELPERS/mobs.dm | 4 +- code/__HELPERS/text.dm | 41 ++++++------ code/__HELPERS/unsorted.dm | 10 +-- code/game/atoms.dm | 12 ++-- code/game/gamemodes/cult/items/tome.dm | 4 +- .../newmalf_ability_trees/HELPERS.dm | 4 +- code/game/machinery/ai_slipper.dm | 6 +- code/game/machinery/atmoalter/canister.dm | 2 +- code/game/machinery/body_scanner.dm | 52 ++++++++-------- code/game/machinery/camera/camera.dm | 2 +- code/game/machinery/camera/tracking.dm | 4 +- code/game/machinery/computer/shuttle.dm | 2 +- code/game/machinery/doors/airlock.dm | 12 ++-- .../machinery/doors/airlock_electronics.dm | 2 +- code/game/machinery/mecha_fabricator.dm | 4 +- code/game/machinery/newscaster.dm | 2 +- code/game/machinery/nuclear_bomb.dm | 2 +- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 6 +- .../telecomms/machines/message_server.dm | 4 +- code/game/objects/effects/landmarks.dm | 2 +- code/game/objects/effects/manifest.dm | 2 +- code/game/objects/items/devices/flash.dm | 4 +- .../objects/items/devices/traitordevices.dm | 2 +- code/game/objects/items/stacks/wrap.dm | 8 +-- code/game/objects/items/weapons/AI_modules.dm | 6 +- code/game/objects/items/weapons/cards_ids.dm | 20 +++--- .../objects/items/weapons/dna_injector.dm | 4 +- code/game/objects/items/weapons/handcuffs.dm | 6 +- .../items/weapons/implants/implanter.dm | 4 +- .../objects/items/weapons/storage/secure.dm | 12 ++-- code/modules/admin/NewBan.dm | 2 +- code/modules/admin/admin_attack_log.dm | 4 +- .../secrets/admin_secrets/bombing_list.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 20 +++--- .../modules/heavy_vehicle/mech_interaction.dm | 2 +- code/modules/holodeck/HolodeckObjects.dm | 2 +- .../integrated_electronics/subtypes/input.dm | 2 +- code/modules/martial_arts/martial.dm | 4 +- code/modules/martial_arts/sol_combat.dm | 8 +-- code/modules/mining/mint.dm | 62 +++++++++---------- code/modules/mob/inventory.dm | 4 +- code/modules/mob/living/carbon/human/human.dm | 10 +-- .../living/carbon/human/human_attackhand.dm | 16 ++--- .../mob/living/carbon/human/human_defense.dm | 4 +- .../mob/living/carbon/human/stripping.dm | 6 +- .../modules/mob/living/carbon/slime/powers.dm | 2 +- code/modules/mob/living/living_defense.dm | 8 +-- code/modules/mob/living/silicon/ai/ai.dm | 4 +- .../living/silicon/robot/drone/drone_items.dm | 12 ++-- .../modules/mob/living/silicon/robot/robot.dm | 14 ++--- .../simple_animal/constructs/soulstone.dm | 4 +- .../mob/living/simple_animal/parrot.dm | 2 +- code/modules/mob/mob.dm | 6 +- code/modules/mob/mob_grab_specials.dm | 4 +- code/modules/mob/mob_helpers.dm | 10 +-- .../programs/command/account_database.dm | 2 +- .../file_system/programs/command/card.dm | 2 +- code/modules/paperwork/folders.dm | 2 +- code/modules/paperwork/pen.dm | 4 +- .../projectiles/guns/projectile/dartgun.dm | 4 +- code/modules/reagents/Chemistry-Machinery.dm | 4 +- code/modules/reagents/reagent_containers.dm | 8 +-- .../reagent_containers/food/snacks.dm | 4 +- .../reagents/reagent_containers/pill.dm | 6 +- code/modules/recycling/disposal.dm | 8 +-- .../modules/spell_system/spells/spell_code.dm | 4 +- .../real_instruments.dm | 2 +- code/modules/vehicles/animal.dm | 6 +- code/modules/vehicles/bike.dm | 4 +- code/modules/vehicles/cargo_train.dm | 6 +- code/modules/vehicles/vehicle.dm | 2 +- html/changelogs/fluffyghost-notextproc.yml | 59 ++++++++++++++++++ tools/ci/check_grep.sh | 21 +++++++ 76 files changed, 351 insertions(+), 264 deletions(-) create mode 100644 html/changelogs/fluffyghost-notextproc.yml diff --git a/code/__DEFINES/text.dm b/code/__DEFINES/text.dm index 0edb451282f..088bcbffe68 100644 --- a/code/__DEFINES/text.dm +++ b/code/__DEFINES/text.dm @@ -62,3 +62,7 @@ var/regex/filename_forbidden_chars = regex(@{""|[\\\n\t/?%*:|<>]|\.\."}, "g") /// Removes everything enclose in < and > inclusive of the bracket, and limits the length of the message. #define STRIP_HTML_FULL(text, limit) (html_tags.Replace(copytext(text, 1, limit), "")) + +/// BYOND's string procs don't support being used on datum references (as in it doesn't look for a name for stringification) +/// We just use this macro to ensure that we will only pass strings to this BYOND-level function without developers needing to really worry about it. +#define LOWER_TEXT(thing) lowertext(UNLINT("[thing]")) diff --git a/code/__HELPERS/logging/talk.dm b/code/__HELPERS/logging/talk.dm index cfa7ed224f4..c4b72dcf95c 100644 --- a/code/__HELPERS/logging/talk.dm +++ b/code/__HELPERS/logging/talk.dm @@ -7,7 +7,7 @@ * Arguments: * * message - The message being logged * * message_type - the type of log the message is(ATTACK, SAY, etc) - * * tag - tag that indicates the type of text(announcement, telepathy, etc) + * * tag - tag that indicates the type of text (announcement, telepathy, etc) * * log_globally - boolean checking whether or not we write this log to the log file * * forced_by - source that forced the dialogue if any */ diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index a54e7b539d0..756e8e93b5c 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -182,9 +182,9 @@ Proc for attack log creation, because really why not /proc/add_logs(mob/user, mob/target, what_done, var/admin=1, var/object=null, var/addition=null) if(user && ismob(user)) - user.attack_log += text("\[[time_stamp()]\] Has [what_done] [target ? "[target.name][(ismob(target) && target.ckey) ? "([target.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition]") + user.attack_log += "\[[time_stamp()]\] Has [what_done] [target ? "[target.name][(ismob(target) && target.ckey) ? "([target.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition]" if(target && ismob(target)) - target.attack_log += text("\[[time_stamp()]\] Has been [what_done] by [user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition]") + target.attack_log += "\[[time_stamp()]\] Has been [what_done] by [user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition]" if(admin) log_attack(SPAN_WARNING("[user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"] [what_done] [target ? "[target.name][(ismob(target) && target.ckey)? "([target.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition]")) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index bbcb1ae92f2..ced9e2890f6 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -725,49 +725,52 @@ var/leng = length(string) - var/next_space = findtext_char(string, " ", next_backslash + 1) + var/next_space = findtext(string, " ", next_backslash + length(string[next_backslash])) if(!next_space) next_space = leng - next_backslash - if(!next_space) //trailing bs + if(!next_space) //trailing bs return string var/base = next_backslash == 1 ? "" : copytext(string, 1, next_backslash) - var/macro = lowertext(copytext(string, next_backslash + 1, next_space)) - var/rest = next_backslash > leng ? "" : copytext(string, next_space + 1) + var/macro = LOWER_TEXT(copytext(string, next_backslash + length(string[next_backslash]), next_space)) + var/rest = next_backslash > leng ? "" : copytext(string, next_space + length(string[next_space])) - //See http://www.byond.com/docs/ref/info.html#/DM/text/macros + //See https://secure.byond.com/docs/ref/info.html#/DM/text/macros switch(macro) //prefixes/agnostic if("the") - rest = text("\the []", rest) + rest = "\the [rest]" if("a") - rest = text("\a []", rest) + rest = "\a [rest]" if("an") - rest = text("\an []", rest) + rest = "\an [rest]" if("proper") - rest = text("\proper []", rest) + rest = "\proper [rest]" if("improper") - rest = text("\improper []", rest) + rest = "\improper [rest]" if("roman") - rest = text("\roman []", rest) + rest = "\roman [rest]" //postfixes if("th") - base = text("[]\th", rest) + base = "[rest]\th" if("s") - base = text("[]\s", rest) + base = "[rest]\s" if("he") - base = text("[]\he", rest) + base = "[rest]\he" if("she") - base = text("[]\she", rest) + base = "[rest]\she" if("his") - base = text("[]\his", rest) + base = "[rest]\his" if("himself") - base = text("[]\himself", rest) + base = "[rest]\himself" if("herself") - base = text("[]\herself", rest) + base = "[rest]\herself" if("hers") - base = text("[]\hers", rest) + base = "[rest]\hers" + else // Someone fucked up, if you're not a macro just go home yeah? + // This does technically break parsing, but at least it's better then what it used to do + return base . = base if(rest) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 2a6b21c0c8d..6e4638632fa 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -23,12 +23,12 @@ textg = num2hex(255 - g, 0) textb = num2hex(255 - b, 0) if (length(textr) < 2) - textr = text("0[]", textr) + textr = "0[textr]" if (length(textg) < 2) - textr = text("0[]", textg) + textr = "0[textg]" if (length(textb) < 2) - textr = text("0[]", textb) - return text("#[][][]", textr, textg, textb) + textr = "0[textb]" + return "#[textr][textg][textb]" //Returns the middle-most value /proc/dd_range(var/low, var/high, var/num) @@ -1116,7 +1116,7 @@ var/global/known_proc = /proc/get_type_ref_bytes if(ispath(V)) return details && path_names ? "path([V])" : "path" if(istext(V)) - return details && text_lengths ? "text([length(V) ])" : "text" + return details && text_lengths ? "text ([length(V) ])" : "text" if(isnum(V)) // Byond doesn't really differentiate between floats and ints, but we can sort of guess here // also technically we could also say that 0 and 1 are boolean but that'd be quite silly if(IsInteger(V) && V < 16777216 && V > -16777216) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 32a64ef16f9..f21659df7d6 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -266,17 +266,17 @@ return 0 if (H.gloves) if(src.fingerprintslast != H.key) - src.fingerprintshidden += text("\[[time_stamp()]\] (Wearing gloves). Real name: [], Key: []",H.real_name, H.key) + src.fingerprintshidden += "\[[time_stamp()]\] (Wearing gloves). Real name: [H.real_name], Key: [H.key]" src.fingerprintslast = H.key return 0 if (!( src.fingerprints )) if(src.fingerprintslast != H.key) - src.fingerprintshidden += text("\[[time_stamp()]\] Real name: [], Key: []",H.real_name, H.key) + src.fingerprintshidden += "\[[time_stamp()]\] Real name: [H.real_name], Key: [H.key]" src.fingerprintslast = H.key return 1 else if(src.fingerprintslast != M.key) - src.fingerprintshidden += text("\[[time_stamp()]\] Real name: [], Key: []",M.real_name, M.key) + src.fingerprintshidden += "\[[time_stamp()]\] Real name: [M.real_name], Key: [M.key]" src.fingerprintslast = M.key return @@ -310,7 +310,7 @@ // Now, deal with gloves. if (H.gloves && H.gloves != src) if(fingerprintslast != H.key) - fingerprintshidden += text("\[[]\](Wearing gloves). Real name: [], Key: []",time_stamp(), H.real_name, H.key) + fingerprintshidden += "\[[time_stamp()]\](Wearing gloves). Real name: [H.real_name], Key: [H.key]" fingerprintslast = H.key H.gloves.add_fingerprint(M) @@ -323,7 +323,7 @@ // Admin related. if(fingerprintslast != H.key) - fingerprintshidden += text("\[[]\]Real name: [], Key: []",time_stamp(), H.real_name, H.key) + fingerprintshidden += "\[[time_stamp()]\]Real name: [H.real_name], Key: [H.key]" fingerprintslast = H.key // Make the list if it does not exist. @@ -375,7 +375,7 @@ else // Smudge up the prints a bit. if(fingerprintslast != M.key) - fingerprintshidden += text("\[[]\]Real name: [], Key: []",time_stamp(), M.real_name, M.key) + fingerprintshidden += "\[[time_stamp()]\]Real name: [M.real_name], Key: [M.key]" fingerprintslast = M.key // Cleaning up. diff --git a/code/game/gamemodes/cult/items/tome.dm b/code/game/gamemodes/cult/items/tome.dm index 0805979990d..14fa58e2785 100644 --- a/code/game/gamemodes/cult/items/tome.dm +++ b/code/game/gamemodes/cult/items/tome.dm @@ -32,8 +32,8 @@ attack_admins(M, user) /obj/item/book/tome/proc/attack_admins(var/mob/living/M, var/mob/living/user) - M.attack_log += text("\[[time_stamp()]\] Has had the [name] used on them by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used [name] on [M.name] ([M.ckey])") + M.attack_log += "\[[time_stamp()]\] Has had the [name] used on them by [user.name] ([user.ckey])" + user.attack_log += "\[[time_stamp()]\] Used [name] on [M.name] ([M.ckey])" msg_admin_attack("[key_name_admin(user)] used [name] on [M.name] ([M.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm index e4e9137f855..ecd1ffcefd5 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm @@ -239,7 +239,7 @@ /proc/log_ability_use(var/mob/living/silicon/ai/A, var/ability_name, var/atom/target = null, var/notify_admins = 1) var/message if(target) - message = text("used malf ability/function: [ability_name] on [target] ([target.x], [target.y], [target.z])") + message = "used malf ability/function: [ability_name] on [target] ([target.x], [target.y], [target.z])" else - message = text("used malf ability/function: [ability_name].") + message = "used malf ability/function: [ability_name]." admin_attack_log(A, null, message, null, message) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index c0223bb1f11..ac3f286e735 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -62,7 +62,7 @@ return if ( (get_dist(src, user) > 1 )) if (!istype(user, /mob/living/silicon)) - to_chat(user, text("Too far away.")) + to_chat(user, "Too far away.") user.unset_machine() user << browse(null, "window=ai_slipper") return @@ -72,7 +72,7 @@ if (istype(loc, /turf)) loc = loc:loc if (!istype(loc, /area)) - to_chat(user, text("Turret badly positioned - loc.loc is [].", loc)) + to_chat(user, "Turret badly positioned - loc.loc is [loc].") return var/area/area = loc var/t = "AI Liquid Dispenser ([area.name])
" @@ -81,7 +81,7 @@ t += "(Swipe ID card to unlock control panel.)
" else t += "Dispenser [(src.disabled ? "deactivated" : "activated")] - [(src.disabled ? "Enable" : "Disable")]?
\n" - t += text("Uses Left: [uses]. Activate the dispenser?
\n") + t += "Uses Left: [uses]. Activate the dispenser?
\n" user << browse(t, "window=computer;size=575x450") onclose(user, "computer") diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 68d338ad677..d5755f82dd8 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -278,7 +278,7 @@ update_flag if (src.destroyed) ClearOverlays() set_light(FALSE) - src.icon_state = text("[]-1", src.canister_color) + src.icon_state = "[src.canister_color]-1" return if(icon_state != "[canister_color]") diff --git a/code/game/machinery/body_scanner.dm b/code/game/machinery/body_scanner.dm index 192dd6aacf8..b183c51f521 100644 --- a/code/game/machinery/body_scanner.dm +++ b/code/game/machinery/body_scanner.dm @@ -786,48 +786,48 @@ dat += "" dat += "Patient Status
" dat += "" - dat += text("Name: []
", occ["name"]) - dat += text("Status: []
", occ["stat"]) - dat += text("Species: []
", occ["species"]) - dat += text("Pulse: [] BPM
", occ["pulse"]) - dat += text("Brain Activity: []
", occ["brain_activity"]) - dat += text("Body Temperature: []°C ", (occ["bodytemp"] - T0C)) - dat += text("([]°F)
", (occ["bodytemp"]*1.8-459.67)) + dat += "Name: [occ["name"]]
" + dat += "Status: [occ["stat"]]
" + dat += "Species: [occ["species"]]
" + dat += "Pulse: [occ["pulse"]] BPM
" + dat += "Brain Activity: [occ["brain_activity"]]
" + dat += "Body Temperature: [(occ["bodytemp"] - T0C)]°C " + dat += "([(occ["bodytemp"]*1.8-459.67)]°F)
" dat += "
Blood Status
" - dat += text("Blood Pressure: []
", occ["blood_pressure"]) - dat += text("Blood Oxygenation: []%
", occ["blood_oxygenation"]) - dat += text("Blood Volume: []%
", occ["blood_volume"]) - dat += text("Blood Type: []
", occ["blood_type"]) + dat += "Blood Pressure: [occ["blood_pressure"]]
" + dat += "Blood Oxygenation: [occ["blood_oxygenation"]]%
" + dat += "Blood Volume: [occ["blood_volume"]]%
" + dat += "Blood Type: [occ["blood_type"]]
" if(occ["inaprovaline_amount"]) - dat += text("Inaprovaline: [] units
", occ["inaprovaline_amount"]) + dat += "Inaprovaline: [occ["inaprovaline_amount"]] units
" if(occ["soporific_amount"]) - dat += text("Soporific: [] units
", occ["soporific_amount"]) + dat += "Soporific: [occ["soporific_amount"]] units
" if(occ["dermaline_amount"]) - dat += text("[]\tDermaline: [] units
", (""), occ["dermaline_amount"]) + dat += "[("")]\tDermaline: [occ["dermaline_amount"]] units
" if(occ["bicaridine_amount"]) - dat += text("[]\tBicaridine: [] units
", (""), occ["bicaridine_amount"]) + dat += "[("")]\tBicaridine: [occ["bicaridine_amount"]] units
" if(occ["dexalin_amount"]) - dat += text("[]\tDexalin: [] units
", (""), occ["dexalin_amount"]) + dat += "[("")]\tDexalin: [occ["dexalin_amount"]] units
" if(occ["thetamycin_amount"]) - dat += text("[]\tThetamycin: [] units
", (""), occ["thetamycin_amount"]) + dat += "[("")]\tThetamycin: [occ["thetamycin_amount"]] units
" if(occ["other_amount"]) - dat += text("Other: [] units
", occ["other_amount"]) + dat += "Other: [occ["other_amount"]] units
" dat += "
Symptom Status
" - dat += text("Radiation Level: [] Gy
", round(occ["rads"])) - dat += text("Genetic Damage: []
", occ["cloneloss"]) + dat += "Radiation Level: [round(occ["rads"])] Gy
" + dat += "Genetic Damage: [occ["cloneloss"]]
" if(occ["paralysis"]) - dat += text("Est Paralysis Level: [] Seconds Left
", round(occ["paralysis"] / 4)) + dat += "Est Paralysis Level: [round(occ["paralysis"] / 4)] Seconds Left
" else - dat += text("Est Paralysis Level: None
") + dat += "Est Paralysis Level: None
" dat += "
Damage Status
" - dat += text("Brute Trauma: []
", occ["bruteloss"]) - dat += text("Burn Severity: []
", occ["fireloss"]) - dat += text("Oxygen Deprivation: []
", occ["oxyloss"]) - dat += text("Toxin Exposure: []
", occ["toxloss"]) + dat += "Brute Trauma: [occ["bruteloss"]]
" + dat += "Burn Severity: [occ["fireloss"]]
" + dat += "Oxygen Deprivation: [occ["oxyloss"]]
" + dat += "Toxin Exposure: [occ["toxloss"]]
" dat += "
Body Status
" diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 0034217df47..b8dc9b5dfe6 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -237,7 +237,7 @@ var/obj/machinery/computer/security/S = O.machine if (S.current_camera == src) to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...") - O << browse(text("[][]", itemname, info), text("window=[]", itemname)) //Force people watching to open the page so they can't see it again) + O << browse("[itemname][info]", "window=[itemname]") //Force people watching to open the page so they can't see it again) return TRUE else if (istype(attacking_item, /obj/item/camera_bug)) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index f1601759bde..82480afdd36 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -16,7 +16,7 @@ for (var/obj/machinery/camera/C in GLOB.cameranet.cameras) var/list/tempnetwork = C.network&src.network if (tempnetwork.len) - T[text("[][]", C.c_tag, (C.can_use() ? null : " (Deactivated)"))] = C + T["[C.c_tag][(C.can_use() ? null : " (Deactivated)")]"] = C track = new() track.cameras = T @@ -113,7 +113,7 @@ var/name = M.name if (name in TB.names) TB.namecounts[name]++ - name = text("[] ([])", name, TB.namecounts[name]) + name = "[name] ([TB.namecounts[name]])" else TB.names.Add(name) TB.namecounts[name] = 1 diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 505351cf223..adf9ebeafee 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -41,7 +41,7 @@ to_chat(user, "The access level of [id.registered_name]\'s card is not high enough. ") return 0 - var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort") + var/choice = alert(user, "Would you like to (un)authorize a shortened launch time? [(src.auth_need - src.authorized.len)] authorization\s are still needed. Use abort to cancel all authorizations.", "Shuttle Launch", "Authorize", "Repeal", "Abort") if(evacuation_controller.is_prepared() && user.get_active_hand() != id) return 0 switch(choice) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 34e0b9e576f..79f61ed2ad7 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -915,10 +915,10 @@ About the new airlock wires panel: /obj/machinery/door/airlock/proc/electrify(var/duration, var/feedback = 0) var/message = "" if(isWireCut(WIRE_SHOCK) && arePowerSystemsOn()) - message = text("The electrification wire is cut - Door permanently electrified.") + message ="The electrification wire is cut - Door permanently electrified." electrified_until = -1 else if(duration && !arePowerSystemsOn()) - message = text("The door is unpowered - Cannot electrify the door.") + message = "The door is unpowered - Cannot electrify the door." electrified_until = 0 else if(!duration && electrified_until != 0) message = "The door is now un-electrified." @@ -926,7 +926,7 @@ About the new airlock wires panel: else if(duration) //electrify door for the given duration seconds if(usr) LAZYADD(shockedby, "\[[time_stamp()]\] - [usr](ckey:[usr.ckey])") - usr.attack_log += text("\[[time_stamp()]\] Electrified the [name] at [x] [y] [z]") + usr.attack_log += "\[[time_stamp()]\] Electrified the [name] at [x] [y] [z]" else LAZYADD(shockedby, "\[[time_stamp()]\] - EMP)") message = "The door is now electrified [duration == -1 ? "permanently" : "for [duration] second\s"]." @@ -956,7 +956,7 @@ About the new airlock wires panel: var/message = "" // Safeties! We don't need no stinking safeties! if (src.isWireCut(WIRE_SAFETY)) - message = text("The safety wire is cut - Cannot enable safeties.") + message = "The safety wire is cut - Cannot enable safeties." else if (!activate && src.safe) safe = FALSE else if (activate && !src.safe) @@ -1231,7 +1231,7 @@ About the new airlock wires panel: if("timing") // Door speed control if(src.isWireCut(WIRE_TIMING)) - to_chat(usr, text("The timing wire is cut - Cannot alter timing.")) + to_chat(usr, "The timing wire is cut - Cannot alter timing.") else if (activate && src.normalspeed) normalspeed = FALSE else if (!activate && !src.normalspeed) @@ -1617,7 +1617,7 @@ About the new airlock wires panel: if("timing") // Door speed control if(src.isWireCut(WIRE_TIMING)) - to_chat(usr, text("The timing wire is cut - Cannot alter timing.")) + to_chat(usr, "The timing wire is cut - Cannot alter timing.") else if (activate && src.normalspeed) normalspeed = FALSE else if (!activate && !src.normalspeed) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index c039bb1fcea..e64c49a4745 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -20,7 +20,7 @@ if(!ishuman(user) && !istype(user,/mob/living/silicon/robot)) return ..(user) - var/t1 = text("Access Control
\n") + var/t1 = "Access Control
\n" if(last_configurator) t1 += "Operator: [last_configurator]
" diff --git a/code/game/machinery/mecha_fabricator.dm b/code/game/machinery/mecha_fabricator.dm index fc0612104a2..7754a8b08bc 100644 --- a/code/game/machinery/mecha_fabricator.dm +++ b/code/game/machinery/mecha_fabricator.dm @@ -224,8 +224,8 @@ if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) user.visible_message(SPAN_WARNING("[user] feeds the [target]'s hair into the [src] and flicks it on!"), SPAN_ALERT("You turn the [src] on!")) do_hair_pull(target) - user.attack_log += text("\[[time_stamp()]\] Has fed [target.name]'s ([target.ckey]) hair into a [src].") - target.attack_log += text("\[[time_stamp()]\] Has had their hair fed into [src] by [user.name] ([user.ckey])") + user.attack_log += "\[[time_stamp()]\] Has fed [target.name]'s ([target.ckey]) hair into a [src]." + target.attack_log += "\[[time_stamp()]\] Has had their hair fed into [src] by [user.name] ([user.ckey])" msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(target)] in a [src]. (JMP)",ckey=key_name(user),ckey_target=key_name(target)) else return diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 918dfb4fe24..e4e6439e7e2 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -295,7 +295,7 @@ var/list/obj/machinery/newscaster/allCasters = list() if(istype(user, /mob/living/carbon/human) || istype(user,/mob/living/silicon) ) var/mob/living/human_or_robot_user = user var/dat - dat = text("

Newscaster Unit #[src.unit_no]

") + dat = "

Newscaster Unit #[src.unit_no]

" src.scan_user(human_or_robot_user) //Newscaster scans you diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index aea53123609..9a0904f7571 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -247,7 +247,7 @@ var/bomb_set yes_code = 0 code = null else - lastentered = text("[]", href_list["type"]) + lastentered = "[href_list["type"]]" if (text2num(lastentered) == null) var/turf/LOC = get_turf(usr) message_admins("[key_name_admin(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered]! ([LOC ? "JMP" : "null"])", 0) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index e609a1ed3ce..cbaea8a2ad0 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -453,7 +453,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(!operable(MAINT)) return TRUE if(screen == RCS_MESSAUTH) var/obj/item/card/id/T = attacking_item - msgVerified = text("Verified by [T.registered_name], [T.assignment]") + msgVerified = "Verified by [T.registered_name], [T.assignment]" updateUsrDialog() if(screen == RCS_ANNOUNCE) var/obj/item/card/id/ID = attacking_item diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 5ccb66ba855..84bf3955c9b 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -139,13 +139,13 @@ dat+= "" dat+= "U-Stor-It Suit Storage Unit, model DS1900
" dat+= "Welcome to the Unit control panel.
" - dat+= text("Helmet storage compartment: []
",(src.HELMET ? HELMET.name : "No helmet detected.") ) + dat+= "Helmet storage compartment: [(src.HELMET ? HELMET.name : "No helmet detected.")]
" if(HELMET && src.isopen) dat += "Dispense helmet
" - dat+= text("Suit storage compartment: []
",(src.SUIT ? SUIT.name : "No exosuit detected.") ) + dat+= "Suit storage compartment: [(src.SUIT ? SUIT.name : "No exosuit detected.")]
" if(SUIT && src.isopen) dat += "Dispense suit
" - dat+= text("Breathmask storage compartment: []
",(src.MASK ? MASK.name : "No breathmask detected.") ) + dat+= "Breathmask storage compartment: [(src.MASK ? MASK.name : "No breathmask detected.")]
" if(MASK && src.isopen) dat += "Dispense mask
" if(src.OCCUPANT) diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index 94539f0f08f..164b9152c05 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -131,7 +131,7 @@ if(2) if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) - Console.audible_message(text("[icon2html(Console, viewers(get_turf(Console)))] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5) + Console.audible_message("[icon2html(Console, viewers(get_turf(Console)))] *The Requests Console beeps: 'PRIORITY Alert in [sender]'",,5) Console.message_log += "High Priority message from [sender]
[authmsg]" for(var/obj/item/modular_computer/pda in Console.alert_pdas) var/pda_message = "A high priority message has arrived!" @@ -139,7 +139,7 @@ else if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) - Console.audible_message(text("[icon2html(Console, viewers(get_turf(Console)))] *The Requests Console beeps: 'Message from [sender]'"),,4) + Console.audible_message("[icon2html(Console, viewers(get_turf(Console)))] *The Requests Console beeps: 'Message from [sender]'",,4) Console.message_log += "Message from [sender]
[authmsg]" for(var/obj/item/modular_computer/pda in Console.alert_pdas) var/pda_message = "A message has arrived!" diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 2e528b14905..4d5a2fca6b4 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -11,7 +11,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) /obj/effect/landmark/Initialize(mapload) . = ..() - tag = text("landmark*[]", name) + tag = "landmark*[name]" GLOB.landmarks_list += src /obj/effect/landmark/Destroy() diff --git a/code/game/objects/effects/manifest.dm b/code/game/objects/effects/manifest.dm index c530be8e4af..d6969045c2e 100644 --- a/code/game/objects/effects/manifest.dm +++ b/code/game/objects/effects/manifest.dm @@ -11,7 +11,7 @@ /obj/effect/manifest/proc/manifest() var/dat = "Crew Manifest:
" for(var/mob/living/carbon/human/M in GLOB.mob_list) - dat += text(" [] - []
", M.name, M.get_assignment()) + dat += " [M.name] - [M.get_assignment()]
" var/obj/item/paper/P = new /obj/item/paper( src.loc ) P.info = dat P.name = "paper- 'Crew Manifest'" diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index f44e66c636f..ad651bb6a36 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -97,8 +97,8 @@ attack_self(user) return - L.attack_log += text("\[[time_stamp()]\] Has been flashed (attempt) with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to flash [L.name] ([L.ckey])") + L.attack_log += "\[[time_stamp()]\] Has been flashed (attempt) with [src.name] by [user.name] ([user.ckey])" + user.attack_log += "\[[time_stamp()]\] Used the [src.name] to flash [L.name] ([L.ckey])" msg_admin_attack("[user.name] ([user.ckey]) Used the [src.name] to flash [L.name] ([L.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(L)) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 34a7d6c5a86..26c32d1069a 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -35,7 +35,7 @@ effective or pretty fucking useless. to_chat(user, SPAN_WARNING("The mind batterer has been burnt out!")) return - user.attack_log += text("\[[time_stamp()]\] Used [src] to knock down people in the area.") + user.attack_log += "\[[time_stamp()]\] Used [src] to knock down people in the area." for(var/mob/living/carbon/human/M in orange(10, user)) if(prob(50)) diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index fd17e7469fc..01f9d2abaac 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -44,7 +44,7 @@ var/obj/item/gift/G = new /obj/item/gift(src.loc) G.size = attacking_item.w_class G.w_class = G.size + 1 - G.icon_state = text("gift[]", G.size) + G.icon_state = "gift[G.size]" G.gift = attacking_item attacking_item.forceMove(G) G.add_fingerprint(user) @@ -82,8 +82,8 @@ H.forceMove(present) - H.attack_log += text("\[[time_stamp()]\] Has been wrapped with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to wrap [H.name] ([H.ckey])") + H.attack_log += "\[[time_stamp()]\] Has been wrapped with [src.name] by [user.name] ([user.ckey])" + user.attack_log += "\[[time_stamp()]\] Used the [src.name] to wrap [H.name] ([H.ckey])" msg_admin_attack("[key_name_admin(user)] used [src] to wrap [key_name_admin(H)] (JMP)",ckey=key_name(user),ckey_target=key_name(H)) else @@ -123,7 +123,7 @@ if(user in target) //no wrapping closets that you are inside - it's not physically possible return - user.attack_log += text("\[[time_stamp()]\] Has used [src.name] on [REF(target)]") + user.attack_log += "\[[time_stamp()]\] Has used [src.name] on [REF(target)]" if(istype(target, /obj/item) && !(istype(target, /obj/item/storage) && !istype(target,/obj/item/storage/box))) var/obj/item/O = target diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 22a69e5f883..39060a2865c 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -110,7 +110,7 @@ AI MODULES ..() var/targName = sanitize(input("Please enter the name of the person to safeguard.", "Safeguard who?", user.name)) targetName = targName - desc = text("A 'safeguard' AI module: 'Safeguard []. Anyone threatening or attempting to harm [] is no longer to be considered a crew member, and is a threat which must be neutralized.'", targetName, targetName) + desc = "A 'safeguard' AI module: 'Safeguard [targetName]. Anyone threatening or attempting to harm [targetName] is no longer to be considered a crew member, and is a threat which must be neutralized.'" /obj/item/aiModule/safeguard/install(var/obj/machinery/computer/C) if(!targetName) @@ -119,7 +119,7 @@ AI MODULES ..() /obj/item/aiModule/safeguard/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) - var/law = text("Safeguard []. Anyone threatening or attempting to harm [] is no longer to be considered a crew member, and is a threat which must be neutralized.", targetName, targetName) + var/law = "Safeguard [targetName]. Anyone threatening or attempting to harm [targetName] is no longer to be considered a crew member, and is a threat which must be neutralized." target.add_supplied_law(9, law) GLOB.lawchanges.Add("The law specified [targetName]") @@ -136,7 +136,7 @@ AI MODULES ..() var/targName = sanitize(input("Please enter the name of the person who is the only crew member.", "Who?", user.real_name)) targetName = targName - desc = text("A 'one crew member' AI module: 'Only [] is a crew member.'", targetName) + desc = "A 'one crew member' AI module: 'Only [targetName] is a crew member.'" /obj/item/aiModule/oneHuman/install(var/obj/machinery/computer/C) if(!targetName) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 9912145aaf8..3f119de1b71 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -42,7 +42,7 @@ set src in usr if (t) - src.name = text("data disk- '[]'", t) + src.name = "data disk- '[t]'" else src.name = "data disk" src.add_fingerprint(usr) @@ -185,16 +185,16 @@ var/const/NO_EMAG_ACT = -50 /obj/item/card/id/proc/dat() var/dat = ("" dat += "
") - dat += text("Name: []
", registered_name) - dat += text("Age: []
\n", age) - dat += text("Sex: []
\n", sex) - dat += text("Citizenship: []
\n", citizenship) - dat += text("Assignment and Employer: []
\n", assignment) - dat += text("Blood Type: []
\n", blood_type) - dat += text("Fingerprint Hash: []
\n", fingerprint_hash) - dat += text("DNA Hash: []\n", dna_hash) + dat += "Name: [registered_name]
" + dat += "Age: [age]
\n" + dat += "Sex: [sex]
\n" + dat += "Citizenship: [citizenship]
\n" + dat += "Assignment and Employer: [assignment]
\n" + dat += "Blood Type: [blood_type]
\n" + dat += "Fingerprint Hash: [fingerprint_hash]
\n" + dat += "DNA Hash: [dna_hash]\n" if(mining_points) - dat += text("
Ore Redemption Points: []\n", mining_points) + dat += "
Ore Redemption Points: [mining_points]\n" if(front && side) dat +="		Front and Side Photograph
" diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 35d183c73de..214e8428254 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -132,8 +132,8 @@ if((buf.types & DNA2_BUF_SE) && (block ? (GetState() && block == MONKEYBLOCK) : GetState(MONKEYBLOCK))) injected_with_monkey = SPAN_DANGER(" (MONKEY)") - M.attack_log += text("\[[time_stamp()]\] Has been injected with [name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [name] to inject [M.name] ([M.ckey])") + M.attack_log += "\[[time_stamp()]\] Has been injected with [name] by [user.name] ([user.ckey])" + user.attack_log += "\[[time_stamp()]\] Used the [name] to inject [M.name] ([M.ckey])" log_attack("[user.name] ([user.ckey]) used the [name] to inject [M.name] ([M.ckey])") message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with \the [src][injected_with_monkey]") diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index dd8b3ee8587..ab957793934 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -83,8 +83,8 @@ return if(user) - H.attack_log += text("\[[time_stamp()]\] Has been handcuffed (attempt) by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Attempted to handcuff [H.name] ([H.ckey])") + H.attack_log += "\[[time_stamp()]\] Has been handcuffed (attempt) by [user.name] ([user.ckey])" + user.attack_log += "\[[time_stamp()]\] Attempted to handcuff [H.name] ([H.ckey])" msg_admin_attack("[key_name_admin(user)] attempted to handcuff [key_name_admin(H)] (JMP)",ckey=key_name(user),ckey_target=key_name(H)) feedback_add_details("handcuffs","H") @@ -133,7 +133,7 @@ var/s = SPAN_WARNING("[H] chews on [H.get_pronoun("his")] [O.name]!") H.visible_message(s, SPAN_WARNING("You chew on your [O.name]!")) message_admins("[key_name_admin(H)] is chewing on [H.get_pronoun("his")] restrained hand - (JMP)") - H.attack_log += text("\[[time_stamp()]\] [s] ([H.ckey])") + H.attack_log += "\[[time_stamp()]\] [s] ([H.ckey])" log_attack("[s] ([H.ckey])") if(O.take_damage(3, 0, damage_flags = DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE, used_weapon = "teeth marks")) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 5afac4afa77..0d4edee4f07 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -100,8 +100,8 @@ user.visible_message(SPAN_WARNING("\The [user] tags \the [M] with \the [src]!"), SPAN_NOTICE("You tag \the [M] with \the [src]."), range = 3) - M.attack_log += text("\[[time_stamp()]\] Implanted with [name] ([ipc_tag.name]) by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [name] ([ipc_tag.name]) to implant [M.name] ([M.ckey])") + M.attack_log += "\[[time_stamp()]\] Implanted with [name] ([ipc_tag.name]) by [user.name] ([user.ckey])" + user.attack_log += "\[[time_stamp()]\] Used the [name] ([ipc_tag.name]) to implant [M.name] ([M.ckey])" msg_admin_attack("[key_name_admin(user)] implanted [key_name_admin(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) ipc_tag.replaced(H, H.organs_by_name[BP_HEAD]) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index aced1b4f442..8cce2cff7e3 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -79,15 +79,15 @@ /obj/item/storage/secure/attack_self(mob/user as mob) user.set_machine(src) - var/dat = text("[]
\n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED")) + var/dat = "[src]
\n\nLock Status: [(src.locked ? "LOCKED" : "UNLOCKED")]" var/message = "Code" if ((src.l_set == 0) && (!src.emagged) && (!src.l_setshort)) - dat += text("

\n5-DIGIT PASSCODE NOT SET.
ENTER NEW PASSCODE.") + dat += "

\n5-DIGIT PASSCODE NOT SET.
ENTER NEW PASSCODE." if (src.emagged) - dat += text("

\nLOCKING SYSTEM ERROR - 1701") + dat += "

\nLOCKING SYSTEM ERROR - 1701" if (src.l_setshort) - dat += text("

\nALERT: MEMORY SYSTEM ERROR - 6040 201") - message = text("[]", src.code) + dat += "

\nALERT: MEMORY SYSTEM ERROR - 6040 201" + message = "src.code[]" if (!src.locked) message = "*****" dat += "

\n>[message]
\n1-2-3
\n4-5-6
\n7-8-9
\nR-0-E
\n" @@ -117,7 +117,7 @@ src.code = null src.close(usr) else - src.code += text("[]", href_list["type"]) + src.code += "[href_list["type"]]" if (length(src.code) > 5) src.code = "ERROR" src.add_fingerprint(usr) diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index fea97e20776..99cb86b75f5 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -185,7 +185,7 @@ var/savefile/Banlist if(!expiry) expiry = "Removal Pending" else expiry = "Permaban" - dat += text("(U)(E) Key: [key]ComputerID: [id]IP: [ip] [expiry](By: [by])(Reason: [reason])") + dat += "(U)(E) Key: [key]ComputerID: [id]IP: [ip] [expiry](By: [by])(Reason: [reason])" dat += "" dat = "
Bans: (U) = Unban , (E) = Edit Ban - ([count] Bans)
[dat]" diff --git a/code/modules/admin/admin_attack_log.dm b/code/modules/admin/admin_attack_log.dm index f518e5ecb0c..db266c08180 100644 --- a/code/modules/admin/admin_attack_log.dm +++ b/code/modules/admin/admin_attack_log.dm @@ -24,10 +24,10 @@ /proc/admin_attack_log(var/mob/attacker, var/mob/victim, var/attacker_message, var/victim_message, var/admin_message) var/jmp_link = "" if(victim) - victim.attack_log += text("\[[time_stamp()]\] [key_name(attacker)] - [victim_message]") + victim.attack_log +="\[[time_stamp()]\] [key_name(attacker)] - [victim_message]" jmp_link = " (JMP)" if(attacker) - attacker.attack_log += text("\[[time_stamp()]\] [key_name(victim)] - [attacker_message]") + attacker.attack_log += "\[[time_stamp()]\] [key_name(victim)] - [attacker_message]" jmp_link = " (JMP)" msg_admin_attack("[attacker ? key_name_admin(attacker) : ""] [admin_message] [victim ? key_name_admin(victim) : ""] (INTENT: [attacker? uppertext(attacker.a_intent) : "N/A"])[jmp_link]",ckey=key_name(attacker),ckey_target=key_name(victim)) diff --git a/code/modules/admin/secrets/admin_secrets/bombing_list.dm b/code/modules/admin/secrets/admin_secrets/bombing_list.dm index 812f60ae441..54feb9ee277 100644 --- a/code/modules/admin/secrets/admin_secrets/bombing_list.dm +++ b/code/modules/admin/secrets/admin_secrets/bombing_list.dm @@ -8,5 +8,5 @@ var/dat = "Bombing List" for(var/l in GLOB.bombers) - dat += text("[l]
") + dat += "[l]
" user << browse(dat, "window=bombers") diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 937aea4857a..56280ee3868 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -26,7 +26,7 @@ to_chat(src, "Only administrators may use this command.") return - var/msg = sanitize(input("Message:", text("Subtle PM to [M.key]")) as text) + var/msg = sanitize(input("Message:", "Subtle PM to [M.key]")) if (!msg) return @@ -83,7 +83,7 @@ to_chat(src, "Only administrators may use this command.") return - var/msg = html_decode(sanitize(input("Message:", text("Enter the text you wish to appear to everyone:")) as text)) + var/msg = html_decode(sanitize(input("Message:", "Enter the text you wish to appear to everyone:"))) if (!msg) return @@ -110,7 +110,7 @@ else return - var/msg = html_decode(sanitize(input("Message:", text("Enter the text you wish to appear to everyone within seven tiles of you:")) as text)) + var/msg = html_decode(sanitize(input("Message:", "Enter the text you wish to appear to everyone within seven tiles of you:"))) if(!msg) return for(var/M in message_mobs) @@ -133,7 +133,7 @@ if(!M) return - var/msg = html_decode(sanitize(input("Message:", text("Enter the text you wish to appear to your target:")) as text)) + var/msg = html_decode(sanitize(input("Message:", "Enter the text you wish to appear to your target:"))) if( !msg ) return @@ -662,13 +662,13 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_DEBUG|R_FUN)) return - var/devastation = input("Range of total devastation. -1 to none", text("Input")) as num|null + var/devastation = input("Range of total devastation. -1 to none", "Input") as num|null if(devastation == null) return - var/heavy = input("Range of heavy impact. -1 to none", text("Input")) as num|null + var/heavy = input("Range of heavy impact. -1 to none", "Input") as num|null if(heavy == null) return - var/light = input("Range of light impact. -1 to none", text("Input")) as num|null + var/light = input("Range of light impact. -1 to none", "Input") as num|null if(light == null) return - var/flash = input("Range of flash. -1 to none", text("Input")) as num|null + var/flash = input("Range of flash. -1 to none", "Input") as num|null if(flash == null) return if ((devastation != -1) || (heavy != -1) || (light != -1) || (flash != -1)) @@ -690,9 +690,9 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_DEBUG|R_FUN)) return - var/heavy = input("Range of heavy pulse.", text("Input")) as num|null + var/heavy = input("Range of heavy pulse.", "Input") as num|null if(heavy == null) return - var/light = input("Range of light pulse.", text("Input")) as num|null + var/light = input("Range of light pulse.", "Input") as num|null if(light == null) return if (heavy || light) diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm index 7f8fdebeb74..ce6475a7284 100644 --- a/code/modules/heavy_vehicle/mech_interaction.dm +++ b/code/modules/heavy_vehicle/mech_interaction.dm @@ -559,7 +559,7 @@ var/mob/living/carbon/human/D = H if(D.lying) D.attack_log += "\[[time_stamp()]\] Was trampled by [src]" - attack_log += text("\[[time_stamp()]\] trampled [D.name] ([D.ckey]) with \the [src].") + attack_log += "\[[time_stamp()]\] trampled [D.name] ([D.ckey]) with \the [src]." msg_admin_attack("[src] trampled [key_name(D)] at (JMP)" ) src.visible_message(SPAN_DANGER("\The [src] runs over \the [D]!")) D.apply_damage(legs.trample_damage, DAMAGE_BRUTE) diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 312c5e016b2..1bf25d9cd3f 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -228,7 +228,7 @@ close() else if (src.density) - flick(text("[]deny", src.base_state), src) + flick("[src.base_state]deny", src) return diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index f65278a789a..e91ef4d66a7 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -399,7 +399,7 @@ activate_pin(3) for(var/mob/O in hearers(1, get_turf(src))) - O.show_message(text("[icon2html(src, viewers(get_turf(src)))] *beep* *beep*"), 3, "*beep* *beep*", 2) + O.show_message("[icon2html(src, viewers(get_turf(src)))] *beep* *beep*", 3, "*beep* *beep*", 2) //This circuit gives information on where the machine is. /obj/item/integrated_circuit/input/gps diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 77c7b07e39c..9095933fdaa 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -88,8 +88,8 @@ D.visible_message(SPAN_DANGER("[attack_message]")) playsound(D.loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) - A.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [D.name] ([D.ckey])") - D.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Was missed by" : "Has blocked") : "Has Been [pick(attack.attack_verb)]"] by [A.name] ([A.ckey])") + A.attack_log += "\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [D.name] ([D.ckey])" + D.attack_log += "\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Was missed by" : "Has blocked") : "Has Been [pick(attack.attack_verb)]"] by [A.name] ([A.ckey])" msg_admin_attack("[key_name(A)] [miss_type ? (miss_type == 1 ? "has missed" : "was blocked by") : "has [pick(attack.attack_verb)]"] [key_name(D)] (JMP)",ckey=key_name(A),ckey_target=key_name(D)) if(miss_type) diff --git a/code/modules/martial_arts/sol_combat.dm b/code/modules/martial_arts/sol_combat.dm index acef8b010a4..078e3aaf0b4 100644 --- a/code/modules/martial_arts/sol_combat.dm +++ b/code/modules/martial_arts/sol_combat.dm @@ -88,8 +88,8 @@ playsound(get_turf(D), /singleton/sound_category/punch_sound, 50, 1, -1) A.visible_message(SPAN_DANGER("[A] [picked_hit_type] [D]!")) - A.attack_log += text("\[[time_stamp()]\] ["[picked_hit_type]"] [D.name] ([D.ckey])") - D.attack_log += text("\[[time_stamp()]\] ["Has Been [picked_hit_type]"] by [A.name] ([A.ckey])") + A.attack_log += "\[[time_stamp()]\] ["[picked_hit_type]"] [D.name] ([D.ckey])" + D.attack_log += "\[[time_stamp()]\] ["Has Been [picked_hit_type]"] by [A.name] ([A.ckey])" msg_admin_attack("[key_name(A)] ["has [picked_hit_type]"] [key_name(D)] (JMP)",ckey=key_name(A),ckey_target=key_name(D)) return 1 @@ -100,8 +100,8 @@ if(check_streak(A,D)) return 1 - A.attack_log += text("\[[time_stamp()]\] Disarmed [D.name] ([D.ckey])") - D.attack_log += text("\[[time_stamp()]\] Has been disarmed by [A.name] ([A.ckey])") + A.attack_log += "\[[time_stamp()]\] Disarmed [D.name] ([D.ckey])" + D.attack_log += "\[[time_stamp()]\] Has been disarmed by [A.name] ([A.ckey])" msg_admin_attack("[key_name(A)] disarmed [D.name] ([D.ckey]) (JMP)",ckey=key_name(D),ckey_target=key_name(A)) if(prob(60)) diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 3e1f3550179..06dcb4e0c5e 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -60,53 +60,53 @@ var/dat = "Coin Press
" if(!input) - dat += text("input connection status: ") - dat += text("NOT CONNECTED
") + dat += "input connection status: " + dat += "NOT CONNECTED
" if(!output) - dat += text("
output connection status: ") - dat += text("NOT CONNECTED
") + dat += "
output connection status: " + dat += "NOT CONNECTED
" - dat += text("
Gold inserted: [amt_gold] ") + dat += "
Gold inserted: [amt_gold] " if(chosen == "gold") - dat += text("chosen") + dat += "chosen" else - dat += text("Choose") - dat += text("
Silver inserted: [amt_silver] ") + dat += "Choose" + dat += "
Silver inserted: [amt_silver] " if(chosen == "silver") - dat += text("chosen") + dat += "chosen" else - dat += text("Choose") - dat += text("
Iron inserted: [amt_iron] ") + dat += "Choose" + dat += "
Iron inserted: [amt_iron] " if(chosen == DEFAULT_WALL_MATERIAL) - dat += text("chosen") + dat += "chosen" else - dat += text("Choose") - dat += text("
Diamond inserted: [amt_diamond] ") + dat += "Choose" + dat += "
Diamond inserted: [amt_diamond] " if(chosen == "diamond") - dat += text("chosen") + dat += "chosen" else - dat += text("Choose") - dat += text("
Phoron inserted: [amt_phoron] ") + dat += "Choose" + dat += "
Phoron inserted: [amt_phoron] " if(chosen == "phoron") - dat += text("chosen") + dat += "chosen" else - dat += text("Choose") - dat += text("
Uranium inserted: [amt_uranium] ") + dat += "Choose" + dat += "
Uranium inserted: [amt_uranium] " if(chosen == "uranium") - dat += text("chosen") + dat += "chosen" else - dat += text("Choose") + dat += "Choose" - dat += text("

Will produce [coinsToProduce] [chosen] coins if enough materials are available.
") - dat += text("-10 ") - dat += text("-5 ") - dat += text("-1 ") - dat += text("+1 ") - dat += text("+5 ") - dat += text("+10 ") + dat += "

Will produce [coinsToProduce] [chosen] coins if enough materials are available.
" + dat += "-10 " + dat += "-5 " + dat += "-1 " + dat += "+1 " + dat += "+5 " + dat += "+10 " - dat += text("

In total this machine produced [newCoins] coins.") - dat += text("
Make coins") + dat += "

In total this machine produced [newCoins] coins." + dat += "
Make coins" user << browse("[dat]", "window=mint") /obj/machinery/mineral/mint/Topic(href, href_list) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index aa4bf49bbf4..2e337b7a13d 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -431,8 +431,8 @@ var/list/slot_equipment_priority = list( \ var/start_T_descriptor = "tile at [start_T.x], [start_T.y], [start_T.z] in area [get_area(start_T)]" var/end_T_descriptor = "tile at [end_T.x], [end_T.y], [end_T.z] in area [get_area(end_T)]" - M.attack_log += text("\[[time_stamp()]\] Has been thrown by [usr.name] ([usr.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]") - usr.attack_log += text("\[[time_stamp()]\] Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]") + M.attack_log += "\[[time_stamp()]\] Has been thrown by [usr.name] ([usr.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]" + usr.attack_log += "\[[time_stamp()]\] Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]" msg_admin_attack("[usr.name] ([usr.ckey]) has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor] (JMP)",ckey=key_name(usr),ckey_target=key_name(M)) qdel(G) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 1612eb27c14..ea8f1c3c598 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -565,7 +565,7 @@ show_inv(machine) if (href_list["mach_close"]) - var/t1 = text("window=[]", href_list["mach_close"]) + var/t1 = "window=[href_list["mach_close"]]" unset_machine() src << browse(null, t1) @@ -673,10 +673,10 @@ return if(istype(usr,/mob/living/carbon/human)) var/mob/living/carbon/human/U = usr - R.security.comments += text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [GLOB.game_year]
[t1]") + R.security.comments += "Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [GLOB.game_year]
[t1]" if(istype(usr,/mob/living/silicon/robot)) var/mob/living/silicon/robot/U = usr - R.security.comments += text("Made by [U.name] ([U.mod_type] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [GLOB.game_year]
[t1]") + R.security.comments += "Made by [U.name] ([U.mod_type] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [GLOB.game_year]
[t1]" if (href_list["medical"]) if(hasHUD(usr,"medical")) @@ -774,10 +774,10 @@ return if(ishuman(usr)) var/mob/living/carbon/human/U = usr - R.medical.comments += text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [GLOB.game_year]
[t1]") + R.medical.comments += "Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [GLOB.game_year]
[t1]" if(isrobot(usr)) var/mob/living/silicon/robot/U = usr - R.medical.comments += text("Made by [U.name] ([U.mod_type] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [GLOB.game_year]
[t1]") + R.medical.comments += "Made by [U.name] ([U.mod_type] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [GLOB.game_year]
[t1]" if(href_list["triagetag"]) if(hasHUD(usr, "medical")) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 6e151980e4b..3108c6f56b4 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -47,8 +47,8 @@ if(G.cell.charge >= 2500) G.cell.use(G.cell.charge) //So it drains the cell. visible_message(SPAN_DANGER("[src] has been touched with the stun gloves by [M]!")) - M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])") - src.attack_log += text("\[[time_stamp()]\] Has been stungloved by [M.name] ([M.ckey])") + M.attack_log += "\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])" + src.attack_log += "\[[time_stamp()]\] Has been stungloved by [M.name] ([M.ckey])" msg_admin_attack("[key_name_admin(M)] stungloved [src.name] ([src.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src)) @@ -248,8 +248,8 @@ H.visible_message(SPAN_DANGER("[attack_message]")) playsound(loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) - H.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [src.name] ([src.ckey])") - src.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Was missed by" : "Has blocked") : "Has Been [pick(attack.attack_verb)]"] by [H.name] ([H.ckey])") + H.attack_log += "\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [src.name] ([src.ckey])" + src.attack_log += "\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Was missed by" : "Has blocked") : "Has Been [pick(attack.attack_verb)]"] by [H.name] ([H.ckey])" msg_admin_attack("[key_name(H)] [miss_type ? (miss_type == 1 ? "has missed" : "was blocked by") : "has [pick(attack.attack_verb)]"] [key_name(src)] (JMP)",ckey=key_name(H),ckey_target=key_name(src)) if(miss_type) @@ -335,8 +335,8 @@ return FALSE M.nutrition = Clamp(M.nutrition - disarm_cost, 0, M.max_nutrition) - M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])") - src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [M.name] ([M.ckey])") + M.attack_log += "\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])" + src.attack_log += "\[[time_stamp()]\] Has been disarmed by [M.name] ([M.ckey])" msg_admin_attack("[key_name(M)] disarmed [src.name] ([src.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src)) M.do_attack_animation(src) @@ -546,8 +546,8 @@ if(!damage) return - user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])") - src.attack_log += text("\[[time_stamp()]\] was attacked by [user.name] ([user.ckey])") + user.attack_log += "\[[time_stamp()]\] attacked [src.name] ([src.ckey])" + src.attack_log += "\[[time_stamp()]\] was attacked by [user.name] ([user.ckey])" user.do_attack_animation(src) if(damage < 15 && check_shields(damage, null, user, null, "\the [user]")) return diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 9c02464ddda..32d3301c656 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -382,8 +382,8 @@ emp_act var/mob/M = O.throwing?.thrower?.resolve() var/client/assailant = M.client if(assailant) - src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])") - M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]") + src.attack_log += "\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])" + M.attack_log += "\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]" if(!istype(src,/mob/living/simple_animal/rat)) msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src)) diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index 851456f992d..396192a9554 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -3,7 +3,7 @@ return FALSE if(user.incapacitated() || !user.Adjacent(src)) - user << browse(null, text("window=mob[src.name]")) + user << browse(null, "window=mob[src.name]") return FALSE if(ishuman(user)) @@ -134,8 +134,8 @@ if (suit.has_sensor >= 2) to_chat(user, SPAN_WARNING("\The [src]'s suit sensor controls are locked.")) return - attack_log += text("\[[time_stamp()]\] Has had their sensors toggled by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Attempted to toggle [name]'s ([ckey]) sensors") + attack_log += "\[[time_stamp()]\] Has had their sensors toggled by [user.name] ([user.ckey])" + user.attack_log += "\[[time_stamp()]\] Attempted to toggle [name]'s ([ckey]) sensors" suit.set_sensors(user) // Remove all splints. diff --git a/code/modules/mob/living/carbon/slime/powers.dm b/code/modules/mob/living/carbon/slime/powers.dm index 44fd166485f..f95384c6dcd 100644 --- a/code/modules/mob/living/carbon/slime/powers.dm +++ b/code/modules/mob/living/carbon/slime/powers.dm @@ -127,7 +127,7 @@ health = maxHealth amount_grown = 0 regenerate_icons() - name = text("[colour] [is_adult ? "adult" : "baby"] slime ([number])") + name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])" real_name = name set_content(TRUE) addtimer(CALLBACK(src, PROC_REF(set_content), FALSE), 1200) // You get two minutes of safety diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index c19ea8b6b66..e9e637a9204 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -193,8 +193,8 @@ var/mob/M = O.throwing?.thrower?.resolve() var/client/assailant = M.client if(assailant) - src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])") - M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]") + src.attack_log += "\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])" + M.attack_log += "\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]" if(!istype(src,/mob/living/simple_animal/rat)) msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src)) @@ -261,8 +261,8 @@ if(!damage) return - user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])") - src.attack_log += text("\[[time_stamp()]\] was attacked by [user.name] ([user.ckey])") + user.attack_log += "\[[time_stamp()]\] attacked [src.name] ([src.ckey])" + src.attack_log += "\[[time_stamp()]\] was attacked by [user.name] ([user.ckey])" if (attack_message) src.visible_message(SPAN_DANGER("[user] has [attack_message] [src]!")) user.do_attack_animation(src) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 856e81ec981..b6be086eb5c 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -517,7 +517,7 @@ var/list/ai_verbs_default = list( if (href_list["mach_close"]) if (href_list["mach_close"] == "aialerts") view_alerts = 0 - var/t1 = text("window=[]", href_list["mach_close"]) + var/t1 = "window=[href_list["mach_close"]]" unset_machine() src << browse(null, t1) if (href_list["switchcamera"]) @@ -546,7 +546,7 @@ var/list/ai_verbs_default = list( to_chat(src, SPAN_NOTICE("Unable to locate visual entry.")) return var/info = cameraRecords[entry] - src << browse(text("[][]", info[1], info[2]), text("window=[]", html_encode(info[1]))) + src << browse("[info[1]][info[2]]", "window=[html_encode(info[1])]") return return diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index ad2fdb28966..98b205cd672 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -197,11 +197,11 @@ for(var/O in module.modules) var/module_string = "" if(!O) - module_string += text("Resource depleted
") + module_string +="Resource depleted
" else if(activated(O)) - module_string += text("[O]: Activated
") + module_string += "[O]: Activated
" else - module_string += text("[O]: Activate
") + module_string += "[O]: Activate
" var/obj/item/I = O if((istype(I, /obj/item) || istype(I, /obj/item/device)) && !(I.iscoil())) @@ -213,11 +213,11 @@ if(emagged) if(!module.emag) - dat += text("Resource depleted
") + dat += "Resource depleted
" else if(activated(module.emag)) - dat += text("[module.emag]: Activated
") + dat += "[module.emag]: Activated
" else - dat += text("[module.emag]: Activate
") + dat += "[module.emag]: Activate
" dat += resources diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index bb8f1f9beb3..31f7fcede6a 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -878,21 +878,21 @@ for(var/obj in module.modules) if(!obj) - dat += text("Resource depleted
") + dat += "Resource depleted
" else if(activated(obj)) - dat += text("[obj]: Activated
") + dat += "[obj]: Activated
" else - dat += text("[obj]: Activate
") + dat += "[obj]: Activate
" if(emagged) if(activated(module.emag)) - dat += text("[module.emag]: Activated
") + dat += "[module.emag]: Activated
" else - dat += text("[module.emag]: Activate
") + dat += "[module.emag]: Activate
" if(malf_AI_module) if(activated(module.malf_AI_module)) - dat += text("[module.malf_AI_module]: Activated
") + dat += "[module.malf_AI_module]: Activated
" else - dat += text("[module.malf_AI_module]: Activate
") + dat += "[module.malf_AI_module]: Activate
" src << browse(dat, "window=robotmod") diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm index a10f75c6310..8df9e54e3eb 100644 --- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm +++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm @@ -26,8 +26,8 @@ to_chat(user, SPAN_WARNING("This being is corrupted by an alien intelligence and cannot be soul trapped.")) return..() - M.attack_log += text("\[[time_stamp()]\] Has had their soul captured with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to capture the soul of [M.name] ([M.ckey])") + M.attack_log += "\[[time_stamp()]\] Has had their soul captured with [src.name] by [user.name] ([user.ckey])" + user.attack_log += "\[[time_stamp()]\] Used the [src.name] to capture the soul of [M.name] ([M.ckey])" msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to capture the soul of [M.name] ([M.ckey]) (JMP)",ckey=key_name(src),ckey_target=key_name(M)) transfer_soul("VICTIM", M, user) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 394098e2c1f..c388587d01a 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -136,7 +136,7 @@ else dat += "
Headset:Nothing" - user << browse(dat, text("window=mob[];size=325x500", name)) + user << browse(dat, "window=mob[name];size=325x500") onclose(user, "mob[real_name]") return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index c2b4f072135..436446685df 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -263,7 +263,7 @@ /mob/proc/findname(msg) for(var/mob/M in GLOB.mob_list) - if (M.real_name == text("[]", msg)) + if (M.real_name == "[msg]") return M return 0 @@ -367,7 +367,7 @@
Left Hand:[(l_hand ? l_hand : "Nothing")]
Right Hand:[(r_hand ? r_hand : "Nothing")]
Back:[(back ? back : "Nothing")] [((istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/tank) && !( internal )) ? " Set Internal" : "")] -
[(internal ? text("Remove Internal") : "")] +
[(internal ? "Remove Internal" : "")]
Empty Pockets
Refresh
Close @@ -657,7 +657,7 @@ /mob/Topic(href, href_list) if(href_list["mach_close"]) - var/t1 = text("window=[href_list["mach_close"]]") + var/t1 = "window=[href_list["mach_close"]]" unset_machine() src << browse(null, t1) diff --git a/code/modules/mob/mob_grab_specials.dm b/code/modules/mob/mob_grab_specials.dm index 3b950c3cf32..6af80c5c465 100644 --- a/code/modules/mob/mob_grab_specials.dm +++ b/code/modules/mob/mob_grab_specials.dm @@ -113,8 +113,8 @@ attacker.visible_message(SPAN_DANGER("[attacker] [attacker.species.knockout_message]")) playsound(attacker.loc, /singleton/sound_category/swing_hit_sound, 25, 1, -1) - attacker.attack_log += text("\[[time_stamp()]\] Headbutted [target.name] ([target.ckey])") - target.attack_log += text("\[[time_stamp()]\] Headbutted by [attacker.name] ([attacker.ckey])") + attacker.attack_log += "\[[time_stamp()]\] Headbutted [target.name] ([target.ckey])" + target.attack_log += "\[[time_stamp()]\] Headbutted by [attacker.name] ([attacker.ckey])" msg_admin_attack("[key_name(attacker)] has headbutted [key_name(target)]",ckey=key_name(attacker),ckey_target=key_name(target)) qdel(src) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 6937602a08b..29da0e09ce8 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -442,12 +442,12 @@ It's fairly easy to fix if dealing with single letters but not so much with comp n_letter = copytext(te, p, p+n_mod) if (prob(50)) if (prob(30)) - n_letter = text("[n_letter]-[n_letter]-[n_letter]") + n_letter = "[n_letter]-[n_letter]-[n_letter]" else - n_letter = text("[n_letter]-[n_letter]") + n_letter = "[n_letter]-[n_letter]" else - n_letter = text("[n_letter]") - t = text("[t][n_letter]") + n_letter = "[n_letter]" + t = "[t][n_letter]" p=p+n_mod return sanitize(t) @@ -472,7 +472,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp /proc/findname(msg) for(var/mob/M in GLOB.mob_list) - if (M.real_name == text("[msg]")) + if (M.real_name == "[msg]") return 1 return 0 diff --git a/code/modules/modular_computers/file_system/programs/command/account_database.dm b/code/modules/modular_computers/file_system/programs/command/account_database.dm index 743f62df8de..4d5b14f4026 100644 --- a/code/modules/modular_computers/file_system/programs/command/account_database.dm +++ b/code/modules/modular_computers/file_system/programs/command/account_database.dm @@ -71,7 +71,7 @@ var/obj/item/card/id/held_card = get_held_card() data["has_printer"] = !!computer.nano_printer - data["id_card"] = held_card ? text("[held_card.registered_name], [held_card.assignment]") : null + data["id_card"] = held_card ? "[held_card.registered_name], [held_card.assignment]" : null data["access_level"] = get_access_level() data["machine_id"] = machine_id data["station_account_number"] = "[SSeconomy.station_account.account_number]" diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index ffed4c11b00..4c6aa651443 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -203,7 +203,7 @@ id_card.access += access_type . = TRUE if(id_card) - id_card.name = text("[id_card.registered_name]'s ID Card ([id_card.assignment])") + id_card.name = "[id_card.registered_name]'s ID Card ([id_card.assignment])" . = TRUE /datum/computer_file/program/card_mod/proc/remove_nt_access(var/obj/item/card/id/id_card) diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 8629ebd058b..ca3048abd3a 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -47,7 +47,7 @@ else if(attacking_item.ispen()) var/n_name = sanitizeSafe( tgui_input_text(user, "What would you like to label the folder?", "Folder Labelling", max_length = MAX_NAME_LEN), MAX_NAME_LEN ) if(Adjacent(user) && user.stat == 0) - name = "folder[(n_name ? text("- '[n_name]'") : null)]" + name = "folder[(n_name ? "- '[n_name]'" : null)]" return /obj/item/folder/attack_self(mob/user as mob) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index ab1b31d2b66..06a84e73560 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -187,8 +187,8 @@ var/trans = reagents.trans_to_mob(M, 30, CHEM_BLOOD) to_chat(user, SPAN_ALERT("You stab \the [M] with \the [src], injecting all of its contents.")) // To the stabber. to_chat(M, SPAN_WARNING("You feel a small pinch!")) // To the stabbed. - M.attack_log += text("\[[time_stamp()]\] Has been stabbed with [name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [name] to stab [M.name] ([M.ckey])") + M.attack_log += "\[[time_stamp()]\] Has been stabbed with [name] by [user.name] ([user.ckey])" + user.attack_log += "\[[time_stamp()]\] Used the [name] to stab [M.name] ([M.ckey])" msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) admin_inject_log(user, M, src, contained_reagents, reagents.get_temperature(), trans) // Admin log. diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index 09a33be1827..5fe14641488 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -141,9 +141,9 @@ var/singleton/reagent/R = GET_SINGLETON(_R) dat += "
[B.reagents.reagent_volumes[_R]] units of [R.name], " if (check_beaker_mixing(B)) - dat += text("Mixing ") + dat += "Mixing " else - dat += text("Not mixing ") + dat += "Not mixing " else dat += "nothing." dat += " \[Eject\]
" diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 87990552354..a08613b8c25 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -599,8 +599,8 @@ target.apply_damage(25, DAMAGE_PAIN) target.say("*scream") - user.attack_log += text("\[[time_stamp()]\] Has fed [target.name]'s ([target.ckey]) hair into a [src].") - target.attack_log += text("\[[time_stamp()]\] Has had their hair fed into [src] by [user.name] ([user.ckey])") + user.attack_log += "\[[time_stamp()]\] Has fed [target.name]'s ([target.ckey]) hair into a [src]." + target.attack_log += "\[[time_stamp()]\] Has had their hair fed into [src] by [user.name] ([user.ckey])" msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(target)] in a [src]. (JMP)",ckey=key_name(user),ckey_target=key_name(target)) else return diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 5a9ae0b83e2..0ab291566fe 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -190,8 +190,8 @@ var/contained = reagentlist() var/temperature = reagents.get_temperature() var/temperature_text = "Temperature: ([temperature]K/[temperature]C)" - target.attack_log += text("\[[time_stamp()]\] Has been splashed with [name] by [user.name] ([user.ckey]). Reagents: [contained] [temperature_text].") - user.attack_log += text("\[[time_stamp()]\] Used the [name] to splash [target.name] ([target.key]). Reagents: [contained] [temperature_text].") + target.attack_log += "\[[time_stamp()]\] Has been splashed with [name] by [user.name] ([user.ckey]). Reagents: [contained] [temperature_text]." + user.attack_log += "\[[time_stamp()]\] Used the [name] to splash [target.name] ([target.key]). Reagents: [contained] [temperature_text]." msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) user.visible_message(SPAN_DANGER("\The [target] has been splashed with something by \the [user]!"), @@ -274,8 +274,8 @@ other_feed_message_finish(user, target) var/contained = reagentlist() - target.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [user.name] ([user.ckey]). Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Fed [name] by [target.name] ([target.ckey]). Reagents: [contained]") + target.attack_log += "\[[time_stamp()]\] Has been fed [name] by [user.name] ([user.ckey]). Reagents: [contained]" + user.attack_log += "\[[time_stamp()]\] Fed [name] by [target.name] ([target.ckey]). Reagents: [contained]" msg_admin_attack("[key_name(user)] fed [key_name(target)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_INGEST) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index e0f232a83f4..fc6d5e4013c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -130,8 +130,8 @@ other_feed_message_finish(user,target) var/contained = reagentlist() - target.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(target)] Reagents: [contained]") + target.attack_log += "\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]" + user.attack_log += "\[[time_stamp()]\] Fed [name] to [key_name(target)] Reagents: [contained]" msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(target)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) reagents.trans_to_mob(target, min(reagents.total_volume,bitesize), CHEM_INGEST) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 2b66e1cde68..d95286d6ce0 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -49,8 +49,8 @@ user.visible_message(SPAN_WARNING("[user] forces [M] to swallow \the [src].")) var/contained = reagentlist() - M.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(M)] Reagents: [contained]") + M.attack_log +="\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]" + user.attack_log += "\[[time_stamp()]\] Fed [name] to [key_name(M)] Reagents: [contained]" msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) if(reagents.total_volume) @@ -68,7 +68,7 @@ return to_chat(user, SPAN_NOTICE("You dissolve \the [src] in [target].")) - user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagentlist()]") + user.attack_log += "\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagentlist()]" msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) reagents.trans_to(target, reagents.total_volume) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index ce547415b54..da124ec062a 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -229,8 +229,8 @@ for (var/mob/C in viewers(src)) C.show_message(SPAN_WARNING("[GM.name] has been placed in the [src] by [user]."), 3) qdel(G) - usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals.") - GM.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [usr.name] ([usr.ckey])") + usr.attack_log += "\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals." + GM.attack_log += "\[[time_stamp()]\] Has been placed in disposals by [usr.name] ([usr.ckey])" msg_admin_attack("[key_name_admin(usr)] placed [key_name_admin(GM)] in a disposals unit. (JMP)",ckey=key_name(usr),ckey_target=key_name(GM)) return TRUE if(!attacking_item.dropsafety()) @@ -287,8 +287,8 @@ msg = "[user.name] stuffs [target.name] into the [src]!" to_chat(user, "You stuff [target.name] into the [src]!") - user.attack_log += text("\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals.") - target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])") + user.attack_log += "\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals." + target.attack_log += "\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])" msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (JMP)",ckey=key_name(user),ckey_target=key_name(target)) else return diff --git a/code/modules/spell_system/spells/spell_code.dm b/code/modules/spell_system/spells/spell_code.dm index d939ebdbb3d..6094a0c79eb 100644 --- a/code/modules/spell_system/spells/spell_code.dm +++ b/code/modules/spell_system/spells/spell_code.dm @@ -103,7 +103,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now take_charge(user, skipcharge) before_cast(targets) //applies any overlays and effects - user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) cast the spell [name].") + user.attack_log += "\[[time_stamp()]\] [user.real_name] ([user.ckey]) cast the spell [name]." if(prob(critfailchance)) critfail(targets, user) else @@ -172,7 +172,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now for(var/atom/target in targets) var/location = get_turf(target) if(istype(target,/mob/living) && message) - to_chat(target, text("[message]")) + to_chat(target, "[message]") if(sparks_spread) spark(location, sparks_amt) if(smoke_spread) diff --git a/code/modules/synthesized_instruments/real_instruments.dm b/code/modules/synthesized_instruments/real_instruments.dm index 625fb3e8ebb..9beebd42987 100644 --- a/code/modules/synthesized_instruments/real_instruments.dm +++ b/code/modules/synthesized_instruments/real_instruments.dm @@ -44,7 +44,7 @@ if ("import") var/t = "" do - t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", owner.name), t) as message) + t = html_encode(input(usr, "Please paste the entire song, formatted:", "[owner.name]", t) as message) if(!CanInteractWith(usr, owner, GLOB.physical_state)) return diff --git a/code/modules/vehicles/animal.dm b/code/modules/vehicles/animal.dm index f582c9d0921..36688404d65 100644 --- a/code/modules/vehicles/animal.dm +++ b/code/modules/vehicles/animal.dm @@ -157,7 +157,7 @@ if(ishuman(AM)) var/mob/living/carbon/human/H = AM M.attack_log += "\[[time_stamp()]\] Was rammed by [src]" - M.attack_log += text("\[[time_stamp()]\] rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].") + M.attack_log += "\[[time_stamp()]\] rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src]." msg_admin_attack("[src] crashed into [key_name(H)] at (JMP)" ) src.visible_message(SPAN_DANGER("\The [src] smashes into \the [H]!")) playsound(src, /singleton/sound_category/swing_hit_sound, 50, 1) @@ -258,7 +258,7 @@ M = buckled if(M.m_intent == M_RUN) M.attack_log += "\[[time_stamp()]\] Was rammed by [src]" - M.attack_log += text("\[[time_stamp()]\] rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].") + M.attack_log += "\[[time_stamp()]\] rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src]." msg_admin_attack("[src] crashed into [key_name(H)] at (JMP)" ) src.visible_message(SPAN_DANGER("\The [src] charges into \the [H]!")) playsound(src, 'sound/weapons/pierce.ogg', 50, 1) @@ -299,7 +299,7 @@ if(ishuman(AM)) var/mob/living/carbon/human/H = AM M.attack_log += "\[[time_stamp()]\] Was rammed by [src]" - M.attack_log += text("\[[time_stamp()]\] rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].") + M.attack_log += "\[[time_stamp()]\] rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src]." msg_admin_attack("[src] crashed into [key_name(H)] at (JMP)" ) src.visible_message(SPAN_DANGER("\The [src] charges into \the [H]!")) playsound(src, 'sound/weapons/pierce.ogg', 50, 1) diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index 4dfa1ed0317..75e1b727158 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -303,7 +303,7 @@ if(ishuman(AM)) var/mob/living/carbon/human/H = AM M.attack_log += "\[[time_stamp()]\] Was rammed by [src]" - M.attack_log += text("\[[time_stamp()]\] rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].") + M.attack_log += "\[[time_stamp()]\] rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src]." msg_admin_attack("[src] crashed into [key_name(H)] at (JMP)" ) src.visible_message(SPAN_DANGER("\The [src] smashes into \the [H]!")) playsound(src, /singleton/sound_category/swing_hit_sound, 50, 1) @@ -379,7 +379,7 @@ M = buckled if(M.m_intent == M_RUN) M.attack_log += "\[[time_stamp()]\] Was rammed by [src]" - M.attack_log += text("\[[time_stamp()]\] rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].") + M.attack_log += "\[[time_stamp()]\] rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src]." msg_admin_attack("[src] crashed into [key_name(H)] at (JMP)" ) src.visible_message(SPAN_DANGER("\The [src] runs over \the [H]!")) H.apply_damage(30, DAMAGE_BRUTE) diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index fe5d7e4d80f..cd4b6c6c550 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -216,7 +216,7 @@ /obj/vehicle/train/cargo/trolley/RunOver(var/mob/living/carbon/human/H) ..() - attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") + attack_log += "\[[time_stamp()]\] ran over [H.name] ([H.ckey])" /obj/vehicle/train/cargo/engine/RunOver(var/mob/living/carbon/human/H) ..() @@ -225,10 +225,10 @@ var/mob/living/carbon/human/D = load to_chat(D, SPAN_DANGER("You ran over [H]!")) visible_message(SPAN_DANGER("\The [src] ran over [H]!")) - attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])") + attack_log += "\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])" msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (JMP)",ckey=key_name(D),ckey_target=key_name(H)) else - attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") + attack_log += "\[[time_stamp()]\] ran over [H.name] ([H.ckey])" //------------------------------------------- diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 71a97240e05..259cf60c691 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -419,7 +419,7 @@ if(!damage) return visible_message(SPAN_DANGER("[user] [attack_message] the [src]!")) - user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") + user.attack_log += "\[[time_stamp()]\] attacked [src.name]" user.do_attack_animation(src) src.health -= damage if(prob(10)) diff --git a/html/changelogs/fluffyghost-notextproc.yml b/html/changelogs/fluffyghost-notextproc.yml new file mode 100644 index 00000000000..d89ccf1d0e1 --- /dev/null +++ b/html/changelogs/fluffyghost-notextproc.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - refactor: "Refactored all the builtin text procs to use string interpolation instead." + - server: "Added a linting for the above." diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index 1876b0005b2..16c59db6299 100755 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -132,6 +132,27 @@ else echo "PASS: Only the expected number of raw ref proc calls were found" >> code_error.log fi +# Check that only the expected amount of raw ref proc calls are present +echo "Verifying no raw ref proc calls are being added" >> code_error.log +RAW_REF_BUILTIN_PROCS=`grep -r --include \*.dm -P --regexp='[^\w_]ref[\(\[]' | wc -l` +if [[ $RAW_REF_BUILTIN_PROCS -ne 3 ]]; then + ERROR_COUNT=$(($ERROR_COUNT+1)) + echo "FAIL: Found new raw ref proc calls in code" >> code_error.log +else + echo "PASS: Only the expected number of raw ref proc calls were found" >> code_error.log +fi + +# Check that the text proc is not being used +echo "Verifying no built in text proc calls are being added" >> code_error.log +BUILTIN_TEXT_PROC_CALLS=`grep -r --include \*.dm -P --regexp='[^\w_\/\.]text\('` +if [[ $BUILTIN_TEXT_PROC_CALLS != '' ]]; then + ERROR_COUNT=$(($ERROR_COUNT+1)) + echo "FAIL: Found builtin calls to the text proc, use string interpolation instead:" >> code_error.log + echo $BUILTIN_TEXT_PROC_CALLS >> code_error.log +else + echo "PASS: No builtin calls to the text proc were found" >> code_error.log +fi + echo "Found $ERROR_COUNT errors while performing code check" if [ $ERROR_COUNT -ne 0 ]; then