diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index fddb54ff01d..91bf1e1c1bc 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -111,7 +111,7 @@ GLOBAL_DATUM_INIT(vsc, /vs_control, new()) vw = vars[ch] if("[ch]_DESC" in vars) vw_desc = vars["[ch]_DESC"] if("[ch]_NAME" in vars) vw_name = vars["[ch]_NAME"] - dat += "[vw_name] = [vw] \[Change\]
" + dat += "[vw_name] = [vw] \[Change\]
" dat += "[vw_desc]

" user << browse(dat,"window=settings") diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 54eda35f475..ac6095e211e 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -56,6 +56,6 @@ #define STICKYBAN_DB_CACHE_TIME (10 SECONDS) #define STICKYBAN_ROGUE_CHECK_TIME 5 -#define ADMIN_JMP(src) "(JMP)" +#define ADMIN_JMP(src) "(JMP)" #define COORD(src) "[src ? src.Admin_Coordinates_Readable() : "nonexistent location"]" #define AREACOORD(src) "[src ? src.Admin_Coordinates_Readable(TRUE) : "nonexistent location"]" diff --git a/code/__HELPERS/logging/_logging.dm b/code/__HELPERS/logging/_logging.dm index 616b156b685..9a9711dea60 100644 --- a/code/__HELPERS/logging/_logging.dm +++ b/code/__HELPERS/logging/_logging.dm @@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global")) if(key) if(include_link && C) - . += "" + . += "" if(C && C.holder && C.holder.fakekey && !include_name) . += "Administrator" diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index c164244dafc..751bde071b8 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1136,7 +1136,7 @@ GLOBAL_LIST_INIT(wall_items, typecacheof(list( /proc/topic_link(var/datum/D, var/arglist, var/content) if(istype(arglist,/list)) arglist = list2params(arglist) - return "[content]" + return "[content]" /proc/get_random_colour(var/simple, var/lower, var/upper) var/colour diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index f0b0931e91e..212e234b4f3 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -161,7 +161,7 @@ avoid code duplication. This includes items that may sometimes act as a standard if(!no_attack_log) user.attack_log += "\[[time_stamp()]\] [hit_zone ? "Attacked" : "Missed"] [target_mob.name] ([target_mob.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" target_mob.attack_log += "\[[time_stamp()]\] [hit_zone ? "Attacked" : "Missed"] by [user.name] ([user.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" - msg_admin_attack("[key_name(user, highlight_special = 1)] [hit_zone ? "attacked" : "missed"] [key_name(target_mob, highlight_special = 1)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob) ) + msg_admin_attack("[key_name(user, highlight_special = 1)] [hit_zone ? "attacked" : "missed"] [key_name(target_mob, highlight_special = 1)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob) ) ///////////////////////// return 1 diff --git a/code/controllers/subsystems/event.dm b/code/controllers/subsystems/event.dm index 5bc1f1c103a..8065685c9cb 100644 --- a/code/controllers/subsystems/event.dm +++ b/code/controllers/subsystems/event.dm @@ -123,12 +123,12 @@ SUBSYSTEM_DEF(events) to_world(message) /datum/controller/subsystem/events/proc/GetInteractWindow() - var/html = "Refresh" - html += "Pause All - [GLOB.config.allow_random_events ? "Pause" : "Resume"]" + var/html = "Refresh" + html += "Pause All - [GLOB.config.allow_random_events ? "Pause" : "Resume"]" if(selected_event_container) var/event_time = max(0, selected_event_container.next_event_time - world.time) - html += "Back
" + html += "Back
" html += "Time till start: [round(event_time / 600, 0.1)]
" html += "
" html += "

Available [GLOB.severity_to_string[selected_event_container.severity]] Events (queued & running events will not be displayed)

" @@ -138,13 +138,13 @@ SUBSYSTEM_DEF(events) for(var/datum/event_meta/EM in selected_event_container.available_events) html += "" html += "[EM.name]" - html += "[EM.weight]" + html += "[EM.weight]" html += "[EM.min_weight]" html += "[EM.max_weight]" - html += "[EM.one_shot]" - html += "[EM.enabled]" + html += "[EM.one_shot]" + html += "[EM.enabled]" html += "[selected_event_container.get_weight(EM, active_with_role)]" - html += "Remove" + html += "Remove" html += "" html += "" html += "
" @@ -154,16 +154,16 @@ SUBSYSTEM_DEF(events) html += "" html += "NameTypeWeightOneShot" html += "" - html += "[new_event.name ? new_event.name : "Enter Event"]" - html += "[new_event.event_type ? new_event.event_type : "Select Type"]" - html += "[new_event.weight ? new_event.weight : 0]" - html += "[new_event.one_shot]" + html += "[new_event.name ? new_event.name : "Enter Event"]" + html += "[new_event.event_type ? new_event.event_type : "Select Type"]" + html += "[new_event.weight ? new_event.weight : 0]" + html += "[new_event.one_shot]" html += "" html += "" - html += "Add
" + html += "Add
" html += "" else - html += "Round End Report: [report_at_round_end ? "On": "Off"]
" + html += "Round End Report: [report_at_round_end ? "On": "Off"]
" html += "
" html += "

Event Start

" @@ -177,16 +177,16 @@ SUBSYSTEM_DEF(events) html += "[worldtime2text(max(EC.next_event_time, world.time))]" html += "[round(next_event_at / 600, 0.1)]" html += "" - html += "--" - html += "-" - html += "+" - html += "++" + html += "--" + html += "-" + html += "+" + html += "++" html += "" html += "" - html += "[EC.delayed ? "Resume" : "Pause"]" + html += "[EC.delayed ? "Resume" : "Pause"]" html += "" html += "" - html += "[EC.delay_modifier]" + html += "[EC.delay_modifier]" html += "" html += "" html += "" @@ -201,9 +201,9 @@ SUBSYSTEM_DEF(events) var/datum/event_meta/EM = EC.next_event html += "" html += "[GLOB.severity_to_string[severity]]" - html += "[EM ? EM.name : "Random"]" - html += "View" - html += "Clear" + html += "[EM ? EM.name : "Random"]" + html += "View" + html += "Clear" html += "" html += "" html += "
" @@ -224,7 +224,7 @@ SUBSYSTEM_DEF(events) html += "[EM.name]" html += "[worldtime2text(ends_at)]" html += "[ends_in]" - html += "Stop" + html += "Stop" html += "" html += "" html += "" diff --git a/code/controllers/subsystems/explosives.dm b/code/controllers/subsystems/explosives.dm index 0eb14b78c2d..92dd55727f2 100644 --- a/code/controllers/subsystems/explosives.dm +++ b/code/controllers/subsystems/explosives.dm @@ -176,7 +176,7 @@ SUBSYSTEM_DEF(explosives) //Becuse values higher than those just get really silly if(adminlog) - message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (JMP)") + message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (JMP)") log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ") if(heavy_impact_range > 1) @@ -242,7 +242,7 @@ SUBSYSTEM_DEF(explosives) if(!epicenter) return - message_admins("Explosion with size ([power]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (JMP)") + message_admins("Explosion with size ([power]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (JMP)") log_game("Explosion with size ([power]) in area [epicenter.loc.name] ") LOG_DEBUG("iexpl: Beginning discovery phase.") diff --git a/code/controllers/subsystems/garbage.dm b/code/controllers/subsystems/garbage.dm index ac95fef20da..66f391b95e3 100644 --- a/code/controllers/subsystems/garbage.dm +++ b/code/controllers/subsystems/garbage.dm @@ -234,7 +234,7 @@ SUBSYSTEM_DEF(garbage) if(!check_rights(R_ADMIN, user = admin?.mob)) continue // Used to be to_chat(admin, "## TESTING: GC: -- [ADMIN_VV(D)] | [type] was unable to be GC'd --") but we do not have that macro - to_chat(admin, "## TESTING: GC: -- VV | [type] was unable to be GC'd --") + to_chat(admin, "## TESTING: GC: -- VV | [type] was unable to be GC'd --") #endif I.failures++ diff --git a/code/controllers/subsystems/processing/psi.dm b/code/controllers/subsystems/processing/psi.dm index 6dcd0b024d8..86cc0e267ab 100644 --- a/code/controllers/subsystems/processing/psi.dm +++ b/code/controllers/subsystems/processing/psi.dm @@ -32,10 +32,10 @@ PROCESSING_SUBSYSTEM_DEF(psi) if(PC.psionic_rank >= PSI_RANK_SENSITIVE) to_chat(PC.owner, SPAN_NOTICE(FONT_HUGE("The Nlom field prompts you for your emotional state."))) to_chat(PC.owner, - "Calm | Happy | \ - Sad | Fearful | \ - Angry | Stressed | \ - ConfusedCalm | Happy | \ + Sad | Fearful | \ + Angry | Stressed | \ + Confused= complete_nlom_time) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index ad73a77b876..b0464d82373 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -491,7 +491,7 @@ var/datum/controller/subsystem/ticker/SSticker var/datum/space_sector/current_sector = SSatlas.current_sector var/html = SPAN_NOTICE("Current sector: [current_sector].") + {"\ \ - Click here \ + Click here \ to see every possible site/ship that can potentially spawn here.\ \ "} diff --git a/code/datums/components/multitool/multitool.dm b/code/datums/components/multitool/multitool.dm index ee28ef761e3..199da048322 100644 --- a/code/datums/components/multitool/multitool.dm +++ b/code/datums/components/multitool/multitool.dm @@ -28,7 +28,7 @@ . += "Buffer Memory:
" var/buffer_name = multitool.get_buffer_name() if(buffer_name) - . += "[buffer_name] Send Purge
" + . += "[buffer_name] Send Purge
" else . += "No connection stored in the buffer." diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 192cfc77e7c..93bc0d39443 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -122,7 +122,7 @@ GLOBAL_DATUM_INIT(revdata, /datum/getrev, new()) . += {"Author:[html_encode(tm.author)]"} if (GLOB.config.githuburl) - . += {"Link to GitHub"} + . += {"Link to GitHub"} . += {"Description:[html_encode(tm.body)]"} if(tm.comment) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index ef5599ebefd..7545dbe35a8 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -161,7 +161,7 @@ var/out = "[name][(current&&(current.real_name!=name))?" (as [current.real_name])":""]
" out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]
" - out += "Assigned role: [assigned_role]. Edit
" + out += "Assigned role: [assigned_role]. Edit
" out += "
" out += "Factions and special roles:
" for(var/antag_type in GLOB.all_antag_types) @@ -178,15 +178,15 @@ out += "(complete)" else out += "(incomplete)" - out += " \[toggle\]" - out += " \[remove\]
" + out += " \[toggle\]" + out += " \[remove\]
" num++ - out += "
\[announce objectives\]" + out += "
\[announce objectives\]" else out += "None." - out += "
\[add\]" - out += "Ambitions: [ambitions ? ambitions : "None"] \[edit\]
" + out += "
\[add\]" + out += "Ambitions: [ambitions ? ambitions : "None"] \[edit\]
" usr << browse(out, "window=edit_memory[src]") /datum/mind/Topic(href, href_list) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 47b6ac693d6..6777559bcb7 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -147,7 +147,7 @@ if(!no_attack_log) user.attack_log += "\[[time_stamp()]\] Attacked [target_mob.name] ([target_mob.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damagetype)])" target_mob.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damagetype)])" - msg_admin_attack("[key_name(user, highlight_special = 1)] attacked [key_name(target_mob, highlight_special = 1)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damagetype)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob) ) + msg_admin_attack("[key_name(user, highlight_special = 1)] attacked [key_name(target_mob, highlight_special = 1)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damagetype)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob) ) ///////////////////////// var/washit = 0 diff --git a/code/game/antagonist/antagonist_panel.dm b/code/game/antagonist/antagonist_panel.dm index cb50ce461df..c00e8157a43 100644 --- a/code/game/antagonist/antagonist_panel.dm +++ b/code/game/antagonist/antagonist_panel.dm @@ -3,13 +3,13 @@ var/dat = "" return dat diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm index 694fe3a00ca..385d84142f0 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -16,7 +16,7 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor) GLOB.traitors = src /datum/antagonist/traitor/get_extra_panel_options(var/datum/mind/player) - return "\[set crystals\]\[spawn uplink\]" + return "\[set crystals\]\[spawn uplink\]" /datum/antagonist/traitor/Topic(href, href_list) if (..()) diff --git a/code/game/atom/atom_examine.dm b/code/game/atom/atom_examine.dm index 7d02a024dd8..cf352b5e9a1 100644 --- a/code/game/atom/atom_examine.dm +++ b/code/game/atom/atom_examine.dm @@ -78,7 +78,7 @@ . += FONT_SMALL(SPAN_ALERT("- [desc_antag]")) else if(desc_extended || desc_info || (desc_antag && player_is_antag(user.mind))) // Checks if the object has a extended description, a mechanics description, and/or an antagonist description (and if the user is an antagonist). - . += FONT_SMALL(SPAN_NOTICE("\[?\] This object has additional examine information available. \[Show In Chat\]")) // If any of the above are true, show that the object has more information available. + . += FONT_SMALL(SPAN_NOTICE("\[?\] This object has additional examine information available. Evolve"; + body += "Evolve"; } body += "
[role_text]:" var/extra = get_extra_panel_options(player) if(is_antagonist(player)) - dat += "\[-\]" - dat += "\[equip\]" + dat += "\[-\]" + dat += "\[equip\]" if(starting_locations && starting_locations.len) - dat += "\[move to spawn\]" + dat += "\[move to spawn\]" if(extra) dat += "[extra]" else - dat += "\[+\]" + dat += "\[+\]" dat += "
"; diff --git a/code/game/gamemodes/cult/items/tome.dm b/code/game/gamemodes/cult/items/tome.dm index 1e395701234..62edde129c8 100644 --- a/code/game/gamemodes/cult/items/tome.dm +++ b/code/game/gamemodes/cult/items/tome.dm @@ -34,7 +34,7 @@ /obj/item/book/tome/proc/attack_admins(var/mob/living/target_mob, var/mob/living/user) target_mob.attack_log += "\[[time_stamp()]\] Has had the [name] used on them by [user.name] ([user.ckey])" user.attack_log += "\[[time_stamp()]\] Used [name] on [target_mob.name] ([target_mob.ckey])" - msg_admin_attack("[key_name_admin(user)] used [name] on [target_mob.name] ([target_mob.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob)) + msg_admin_attack("[key_name_admin(user)] used [name] on [target_mob.name] ([target_mob.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob)) /obj/item/book/tome/afterattack(atom/target, mob/user, proximity_flag, click_parameters) @@ -100,7 +100,7 @@ . = ..() if(iscultist(user) || isobserver(user)) . += "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of. Most of these are useless, though." - . += SPAN_WARNING("\[?\] This tome contains arcane knowledge of the Geometer's runes. \[Read Tome\]") + . += SPAN_WARNING("\[?\] This tome contains arcane knowledge of the Geometer's runes. JMP)") + msg_admin_attack("Meteor collided with shields at (JMP)") qdel(src) if(A && !QDELETED(src)) // Prevents explosions and other effects when we were deleted by whatever we Bumped() - currently used by shields. @@ -166,7 +166,7 @@ /obj/effect/meteor/medium/meteor_effect() ..() explosion(src.loc, 0, 1, 2, 3, 0) - msg_admin_attack("Meteor exploded at coords (JMP)") + msg_admin_attack("Meteor exploded at coords (JMP)") /obj/effect/meteor/big name = "large meteor" @@ -178,7 +178,7 @@ /obj/effect/meteor/big/meteor_effect() ..() explosion(src.loc, 1, 2, 3, 4, 0) - msg_admin_attack("Meteor exploded at coords (JMP)") + msg_admin_attack("Meteor exploded at coords (JMP)") /obj/effect/meteor/dust name = "space dust" @@ -199,7 +199,7 @@ /obj/effect/meteor/flaming/meteor_effect() ..() explosion(src.loc, 1, 2, 3, 4, 0, 0, 5) - msg_admin_attack("Meteor exploded at coords (JMP)") + msg_admin_attack("Meteor exploded at coords (JMP)") /obj/effect/meteor/irradiated name = "glowing meteor" @@ -255,7 +255,7 @@ explosion(src.loc, 1, 2, 3, 4, 0) for(var/obj/machinery/power/apc/A in range(rand(12, 20), src)) A.energy_fail(round(10 * rand(8, 12))) - msg_admin_attack("Meteor exploded at coords (JMP)") + msg_admin_attack("Meteor exploded at coords (JMP)") /obj/effect/meteor/meaty name = "meaty ore" diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index eb3fcf56524..3551afde9ec 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -80,8 +80,8 @@ if(src.locked && (!istype(user, /mob/living/silicon))) t += "(Swipe ID card to unlock control panel.)
" else - t += "Dispenser [(src.disabled ? "deactivated" : "activated")] - [(src.disabled ? "Enable" : "Disable")]?
\n" - t += "Uses Left: [uses]. Activate the dispenser?
\n" + t += "Dispenser [(src.disabled ? "deactivated" : "activated")] - [(src.disabled ? "Enable" : "Disable")]?
\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/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 6cf1f6996e8..7d53e8dfa25 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -209,10 +209,10 @@ user = usr log_admin("[user] ([user.ckey]) opened '[src.name]' containing [gases].") - message_admins("[key_name_admin(user)] opened '[src.name]' containing [gases]. (JMP)") + message_admins("[key_name_admin(user)] opened '[src.name]' containing [gases]. (JMP)") /obj/machinery/portable_atmospherics/proc/log_open_userless(var/cause) if(air_contents.gas.len == 0) return - message_admins("'[src.name]' was opened[cause ? " by [cause]" : ""], containing [english_list(air_contents.gas)]. (JMP)") + message_admins("'[src.name]' was opened[cause ? " by [cause]" : ""], containing [english_list(air_contents.gas)]. (JMP)") diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 0f7e88a8122..743bcf23e3f 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -400,8 +400,8 @@ SPECIAL if("menu") if (beaker) dat += "" - dat += "" - dat += "" + dat += "" + dat += "" dat += "" var/lastclass = "Commands" @@ -421,7 +421,7 @@ SPECIAL if(num*round(current_recipe.cost/build_eff) > points) dat += "
([fakenum][num])
" else - dat += "([fakenum][num])" + dat += "([fakenum][num])" dat += "" dat += "" @@ -431,13 +431,13 @@ SPECIAL dat += "
No beaker inside. Please insert a beaker.
" if("nopoints") dat += "You do not have biomass to create products.
Please put growns into the reactor and activate it.
" - dat += "Return to menu" + dat += "Return to menu" if("complete") dat += "Operation complete.
" - dat += "Return to menu" + dat += "Return to menu" if("void") dat += "Error: No growns inside.
Please put growns into the reactor.
" - dat += "Return to menu" + dat += "Return to menu" dat += "" var/datum/browser/biogen_win = new(user, "biogenerator", "Biogenerator", 450, 500) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 5ddb6e48979..c5af9c27b7e 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -232,9 +232,9 @@ var/entry = O.addCameraRecord(itemname,info) if(!O.client) continue if(U.name == "Unknown") - to_chat(O, "[U] holds \a [itemname] up to one of your cameras ...view message") + to_chat(O, "[U] holds \a [itemname] up to one of your cameras ...view message") else - to_chat(O, "[U] holds \a [itemname] up to one of your cameras ...view message") + to_chat(O, "[U] holds \a [itemname] up to one of your cameras ...view message") for(var/mob/O in GLOB.player_list) if (istype(O.machine, /obj/machinery/computer/security)) diff --git a/code/game/machinery/chem_heater.dm b/code/game/machinery/chem_heater.dm index 94fc2d7cf65..9394dcf573c 100644 --- a/code/game/machinery/chem_heater.dm +++ b/code/game/machinery/chem_heater.dm @@ -59,24 +59,24 @@ user.set_machine(src) var/dat = "" - dat += "Power: [use_power ? "On" : "Off"]" - dat += "

Slow Heating Mode: [slow_mode ? "On" : "Off"]" + dat += "Power: [use_power ? "On" : "Off"]" + dat += "

Slow Heating Mode: [slow_mode ? "On" : "Off"]" dat += "

Target Temp: [round(target_temperature)]K / [round(target_temperature - T0C,0.1)]C
" dat += "| " - dat += "----" - dat += "---" - dat += "--" - dat += "-" - dat += "+" - dat += "++" - dat += "+++" - dat += "++++" + dat += "----" + dat += "---" + dat += "--" + dat += "-" + dat += "+" + dat += "++" + dat += "+++" + dat += "++++" dat += "|

" if(container) - dat += "

Beaker Temp: [round(container.get_temperature(),0.01)]K / [round(container.get_temperature() - T0C,0.1)]C Remove

" + dat += "

Beaker Temp: [round(container.get_temperature(),0.01)]K / [round(container.get_temperature() - T0C,0.1)]C Remove

" else dat += "

No container loaded!

" diff --git a/code/game/machinery/computer/arcade_orion.dm b/code/game/machinery/computer/arcade_orion.dm index f9a0d214a19..f56289a91c2 100644 --- a/code/game/machinery/computer/arcade_orion.dm +++ b/code/game/machinery/computer/arcade_orion.dm @@ -102,7 +102,7 @@ if(world.time >= cooldown) playsound(loc, 'sound/arcade/Ori_begin.ogg', 1, 1, extrarange = -3, falloff_distance = 10, required_asfx_toggles = ASFX_ARCADE) cooldown = world.time + 300 - dat = "

Orion Trail[emagged ? ": Realism Edition" : ""]


Learn how our ancestors got to Orion, and have fun in the process!

Start New Game

" + dat = "

Orion Trail[emagged ? ": Realism Edition" : ""]


Learn how our ancestors got to Orion, and have fun in the process!

Start New Game

" var/datum/browser/arcade_win = new(user, "window=arcade", capitalize_first_letters(name)) arcade_win.set_content(dat) @@ -110,24 +110,24 @@ return else event_title = event - event_actions = "Continue your journey
" + event_actions = "Continue your journey
" switch(event) if(ORION_TRAIL_GAMEOVER) playsound(loc, 'sound/arcade/Ori_fail.ogg', 2, 1, extrarange = -3, falloff_distance = 10, required_asfx_toggles = ASFX_ARCADE) event_info = "" - event_actions = "Start New Game
" + event_actions = "Start New Game
" if(ORION_TRAIL_SPACEPORT) event_title += ": [stops[port]]" event_desc = "[stopblurbs[port]]" event_info = "" if(port == 9) - event_actions = "Return to the title screen!
" + event_actions = "Return to the title screen!
" else - event_actions = "Shove off
" - event_actions += "Raid Spaceport" + event_actions = "Shove off
" + event_actions += "Raid Spaceport" if(ORION_TRAIL_SPACEPORT_RAIDED) event_title += ": [stops[port]]" - event_actions = "Shove off" + event_actions = "Shove off" if(ORION_TRAIL_RAIDERS) event_desc = "You arm yourselves as you prepare to fight off the raiders!" if(ORION_TRAIL_DERELICT) @@ -137,32 +137,32 @@ if(ORION_TRAIL_FLUX) playsound(loc, 'sound/arcade/explo.ogg', 3, 1, extrarange = -3, falloff_distance = 10, required_asfx_toggles = ASFX_ARCADE) event_desc = "You've entered a turbulent region. Slowing down would be better for your ship but would cost more fuel." - event_actions = "Continue as normal
" - event_actions += "Take it slow
" + event_actions = "Continue as normal
" + event_actions += "Take it slow
" if(ORION_TRAIL_MALFUNCTION) event_info = "" event_desc = "The ship's computers are malfunctioning! You can choose to fix it with a part or risk something going awry." - event_actions = "Continue as normal
" + event_actions = "Continue as normal
" if(supplies["3"] != 0) - event_actions += "Fix using a part.
" + event_actions += "Fix using a part.
" if(ORION_TRAIL_COLLISION) playsound(loc, 'sound/arcade/explo.ogg', 3, 1, extrarange = -3, falloff_distance = 10, required_asfx_toggles = ASFX_ARCADE) event_info = "" event_desc = "Something has hit your ship and breached the hull! You can choose to fix it with a part or risk something going awry." - event_actions = "Continue as normal
" + event_actions = "Continue as normal
" if(supplies["2"] != 0) - event_actions += "Fix using a part.
" + event_actions += "Fix using a part.
" if(ORION_TRAIL_BREAKDOWN) playsound(loc, 'sound/arcade/explo.ogg', 3, 1, extrarange = -3, falloff_distance = 10, required_asfx_toggles = ASFX_ARCADE) event_info = "" event_desc = "The ship's engines broke down! You can choose to fix it with a part or risk something going awry." - event_actions = "Continue as normal
" + event_actions = "Continue as normal
" if(supplies["1"] != 0) - event_actions += "Fix using a part.
" + event_actions += "Fix using a part.
" if(ORION_TRAIL_STUCK) event_desc = "You've ran out of fuel. Your only hope to survive is to get refueled by a passing ship, if there are any." if(supplies["5"] == 0) - event_actions = "Wait" + event_actions = "Wait" if(ORION_TRAIL_CARP) event_desc = "You've chanced upon a large carp migration! Known both for their delicious meat as well as their bite, you and your crew arm yourselves for a small hunting trip." if(ORION_TRAIL_MUTINY) @@ -176,18 +176,18 @@ dat += "
You have [supplies["6"]] credits.
" for(var/i=1; i<6; i++) var/amm = (i>3?10:1) - dat += "[supplies["[i]"]] [supply_name["[i]"]][event==ORION_TRAIL_SPACEPORT ? ", buy [amm] for [supply_cost["[i]"]]T" : ""]
" + dat += "[supplies["[i]"]] [supply_name["[i]"]][event==ORION_TRAIL_SPACEPORT ? ", buy [amm] for [supply_cost["[i]"]]T" : ""]
" if(supplies["[i]"] >= amm && event == ORION_TRAIL_SPACEPORT) - dat += "sell [amm] for [supply_cost["[i]"]]T
" + dat += "sell [amm] for [supply_cost["[i]"]]T
" if(ORION_VIEW_CREW) dat = "

Crew

View the status of your crew.
" for(var/i=1;i<=settlers.len;i++) - dat += "[settlers[i]] Kill
" + dat += "[settlers[i]] Kill
" dat += "

View:
" - dat += "[view==ORION_VIEW_MAIN ? "" : ""]Main[view==ORION_VIEW_MAIN ? "" : ""]
" - dat += "[view==ORION_VIEW_SUPPLIES ? "" : ""]Supplies[view==ORION_VIEW_SUPPLIES ? "" : ""]
" - dat += "[view==ORION_VIEW_CREW ? "" : ""]Crew[view==ORION_VIEW_CREW ? "" : ""]

" + dat += "[view==ORION_VIEW_MAIN ? "" : ""]Main[view==ORION_VIEW_MAIN ? "" : ""]
" + dat += "[view==ORION_VIEW_SUPPLIES ? "" : ""]Supplies[view==ORION_VIEW_SUPPLIES ? "" : ""]
" + dat += "[view==ORION_VIEW_CREW ? "" : ""]Crew[view==ORION_VIEW_CREW ? "" : ""]

" var/datum/browser/arcade_win = new(user, "window=arcade", capitalize_first_letters(name)) diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index e8fc3e6553f..518c1b2cbb9 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -92,23 +92,23 @@ dat += "

Activity log


" for (var/entry in internal_log) dat += "[entry]
" - dat += "Print
" - dat += "Back
" + dat += "Print
" + dat += "Back
" else dat += "

Guest Pass Terminal #[uid]

" - dat += "Issuing ID: [giver]
" - dat += "Issued To: [giv_name]
" - dat += "Reason: [reason]
" - dat += "Duration (minutes): [duration] m
" + dat += "Issuing ID: [giver]
" + dat += "Issued To: [giv_name]
" + dat += "Reason: [reason]
" + dat += "Duration (minutes): [duration] m
" dat += "Access to Areas:
" if((giver && giver != GUEST_PASS_TERMINAL_UNSET) && giver.access) for(var/A in giver.access) var/area = get_access_desc(A) if (A in accesses) area = "[area]" - dat += "[area]
" - dat += "
Issue Pass
" - dat += "View Activity Log

" + dat += "[area]
" + dat += "
Issue Pass
" + dat += "View Activity Log

" var/datum/browser/guestpass_win = new(user, "guestpass", capitalize_first_letters(name), 400, 520) guestpass_win.set_content(dat) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 00151437b80..885a2c625a3 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -67,23 +67,23 @@ if(connected) var/d2 if(timing) //door controls do not need timers. - d2 = "Stop Time Launch" + d2 = "Stop Time Launch" else - d2 = "Initiate Time Launch" + d2 = "Initiate Time Launch" var/second = time % 60 var/minute = (time - second) / 60 - dat += "
\nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second] --++" + dat += "
\nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second] --++" var/temp = "" var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 ) for(var/t in L) if(t == connected.power) temp += "[t] " else - temp += "[t] " - dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
" + temp += "[t] " + dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
" else - dat += "
\nToggle Outer Door
" - dat += "

Close" + dat += "
\nToggle Outer Door
" + dat += "

Close" user << browse(dat, "window=computer;size=400x500") add_fingerprint(usr) onclose(user, "computer") diff --git a/code/game/machinery/computer/sentencing.dm b/code/game/machinery/computer/sentencing.dm index 03840f22435..24aa5c3af80 100644 --- a/code/game/machinery/computer/sentencing.dm +++ b/code/game/machinery/computer/sentencing.dm @@ -82,7 +82,7 @@ /obj/machinery/computer/sentencing/proc/main_menu() . = "

Welcome! Please select an option!


" - . += "Import Incident New Report
" + . += "Import IncidentNew Report" return . @@ -91,21 +91,21 @@ . += "Insert an existing Securty Incident Report paper." . += "
" - . += "Cancel" + . += "Cancel" return . /obj/machinery/computer/sentencing/proc/incident_report() . = "" if( !istype( incident )) - . += "There was an error loading the incident, please Try Again" + . += "There was an error loading the incident, please Try Again" return . // Criminal and sentence . += "

Commands

Activate Biogenerator
Detach Container
Activate Biogenerator
Detach Container
NameCostProduction Amount
" . += "" . += "" - . += "" . += "" - . += "" . += "" . += "" - . += "" @@ -162,8 +162,8 @@ . += "
" . += "
" - . += "Render Guilty" - . += "Render Guilty - Fine" + . += "Render Guilty" + . += "Render Guilty - Fine" . += "
" return . @@ -172,7 +172,7 @@ . += "
Convict:" + . += "" if( istype(incident.card) ) var/obj/item/card/id/card = incident.card.resolve() . += "[card]" @@ -116,7 +116,7 @@ . += "
Brig Sentence:" + . += "" if( incident.brig_sentence ) if( incident.brig_sentence < PERMABRIG_SENTENCE ) . += "[incident.brig_sentence] MINUTES" @@ -133,7 +133,7 @@ . += "
Fine:" + . += "" if( incident.fine ) . += "[incident.fine] Credits" // . += "
" . += "" if( buttons ) - . += "" + . += "" else . += "" . += "" @@ -181,7 +181,7 @@ . += "" . += "" if( buttons ) - . += "" + . += "" . += "" . += "
Charges AddCharges AddCharges
[L.name][L.desc]RemoveRemove
" @@ -226,7 +226,7 @@ . += "" . += "" - . += "" + . += "" . += "" for( var/witness in witnesses ) @@ -242,8 +242,8 @@ . += "[witness]" . += "" . += "
Witnesses AddWitnesses Add
" - . += "Notes
" - . += "Remove" + . += "Notes
" + . += "Remove" . += "
" @@ -257,7 +257,7 @@ . += "" . += "" - . += "" + . += "" . += "" for( var/item in evidence ) @@ -273,8 +273,8 @@ . += "[item]" . += "" . += "
EvidenceAddEvidenceAdd
" - . += "Notes
" - . += "Remove" + . += "Notes
" + . += "Remove" . += "
" @@ -287,7 +287,7 @@ // Incident notes table . += "" . += "" - . += "" + . += "" . += "" if( incident.notes ) . += "" @@ -301,11 +301,11 @@ . = "" if( !istype( incident )) - . += "There was an error loading the incident, please Try Again" + . += "There was an error loading the incident, please Try Again" return . if( !istype( SSlaw )) - . += "There was an error loading corporate regulations, please Try Again" + . += "There was an error loading corporate regulations, please Try Again" return . . += charges_header() @@ -319,7 +319,7 @@ . += get_law_table(SSlaw.high_severity, header="Capital Offences") . += "
" - . += "
Return
" + . += "
Return
" /obj/machinery/computer/sentencing/proc/charges_header() . = "
" @@ -327,23 +327,23 @@ if( menu_screen == "low_severity" ) . += "Low Severity" else - . += "Low Severity" + . += "Low Severity" . += " - " if( menu_screen == "med_severity" ) . += "Medium Severity" else - . += "Medium Severity" + . += "Medium Severity" . += " - " if( menu_screen == "high_severity" ) . += "High Severity" else - . += "High Severity" + . += "High Severity" - . += " - Return" + . += " - Return" . += "
" return . @@ -370,7 +370,7 @@ . += "" . += "" . += "" - . += "" + . += "" . += "" . += "
Incident Summary ChangeIncident Summary Change
[L.desc][L.get_brig_time_string()][L.get_fine_string()]ChargeCharge
" diff --git a/code/game/machinery/computer/slotmachine.dm b/code/game/machinery/computer/slotmachine.dm index 5b6e0c4824e..a8c5ff10ae0 100644 --- a/code/game/machinery/computer/slotmachine.dm +++ b/code/game/machinery/computer/slotmachine.dm @@ -148,11 +148,11 @@ Credit Remaining: [balance]
[plays] players have tried their luck today, and [jackpots] have won a jackpot!

- Play!
+ Play!

[reeltext]
- Refund balance
"} + Refund balance
"} var/datum/browser/popup = new(user, "slotmachine", "Slot Machine") popup.set_content(dat) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index cf3a32dada9..bcd0b74cd23 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -73,9 +73,9 @@ dat += "
[storage_name]
" dat += "Welcome, [user.real_name].

" if(allow_items) - dat += "View Objects
" - dat += "Recover Object
" - dat += "Recover All Objects
" + dat += "View Objects
" + dat += "Recover Object
" + dat += "Recover All Objects
" var/datum/browser/cryocon_win = new(user, "cryopod_console", "Cryogenic Oversight Console") cryocon_win.set_content(dat) @@ -475,7 +475,7 @@ // Book keeping! var/turf/location = get_turf(src) log_admin("[key_name_admin(M)] has entered a [initial(src.name)].") - message_admins(SPAN_NOTICE("[key_name_admin(M)] has entered a [initial(src.name)].(JMP)")) + message_admins(SPAN_NOTICE("[key_name_admin(M)] has entered a [initial(src.name)].(JMP)")) //Despawning occurs when process() is called with an occupant without a client. src.add_fingerprint(user) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 84bc07a2cb4..fe131ef57b6 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -26,25 +26,25 @@ t1 += "Operator: [last_configurator]
" if(locked) - t1 += "Swipe ID
" + t1 += "Swipe ID
" else - t1 += "Block
" + t1 += "Block
" t1 += "Unrestricted Access Settings
" for(var/direction in GLOB.cardinals) if(direction & unres_dir) - t1 += "[capitalize(dir2text(direction))]
" + t1 += "[capitalize(dir2text(direction))]
" else - t1 += "[capitalize(dir2text(direction))]
" + t1 += "[capitalize(dir2text(direction))]
" t1 += "
" t1 += "Access requirement is set to " - t1 += one_access ? "ONE
" : "ALL
" + t1 += one_access ? "ONE
" : "ALL
" - t1 += conf_access == null ? "All
" : "All
" + t1 += conf_access == null ? "All
" : "All
" t1 += "
" @@ -53,11 +53,11 @@ var/aname = get_access_desc(acc) if(!conf_access?.len || !(acc in conf_access)) - t1 += "[aname]
" + t1 += "[aname]
" else if(one_access) - t1 += "[aname]
" + t1 += "[aname]
" else - t1 += "[aname]
" + t1 += "[aname]
" var/datum/browser/electronics_win = new(user, "electronics", capitalize_first_letters(name)) electronics_win.set_content(t1) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 7d14a90a8fe..c5399bfab4a 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -244,13 +244,13 @@ // Time Left display (uses releasetime) var/obj/item/card/id/card = incident.card.resolve() . += "Detainee: [card]\t" - . += "Charges: CHARGES
" + . += "Charges: CHARGES
" . += "Sentence Length: [add_zero("[minute]", 2)]:[add_zero("[second]", 2)]\t" // Start/Stop timer if(!src.timing) - . += "ACTIVATE
" + . += "ACTIVATE
" else - . += "(!) EARLY RELEASE
" + . += "(!) EARLY RELEASE
" // Mounted Flash Controls @@ -259,10 +259,10 @@ if(F.last_flash && (F.last_flash + 150) > world.time) . += "Charging..." else - . += "(!) ACTIVATE" + . += "(!) ACTIVATE" . += "
" - . += "
CLOSE
" + . += "
CLOSE
" return . @@ -286,7 +286,7 @@ . += "
" . += "
" - . += "
RETURN
" + . += "
RETURN
" return . diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 28fc6572eb2..8aed4b5cdec 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -161,7 +161,7 @@ Possible to do for anyone motivated enough: continue if(!AreConnectedZLevels(AI.z, z)) continue - to_chat(AI, SPAN_INFO("Your presence is requested at \the [area].")) + to_chat(AI, SPAN_INFO("Your presence is requested at \the [area].")) . = TRUE if("call_holopad") diff --git a/code/game/machinery/mecha_fabricator.dm b/code/game/machinery/mecha_fabricator.dm index ac0c7dd1d71..2cbd385f545 100644 --- a/code/game/machinery/mecha_fabricator.dm +++ b/code/game/machinery/mecha_fabricator.dm @@ -240,7 +240,7 @@ do_hair_pull(target) 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)) + 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 if(!do_after(user, 3.5 SECONDS, target, DO_UNIQUE)) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 7bfb96db81f..c1f00764bc5 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -307,22 +307,22 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) dat += "Welcome to Newscasting Unit #[src.unit_no]
Interface & News Networks: Operational" dat += "
Property of NanoTrasen" if(SSnews.wanted_issue) - dat+= "
Read Wanted Issue" - dat+= "

Create Feed Channel" - dat+= "
View Feed Channels" - dat+= "
Submit new Feed story" - dat+= "
Print newspaper" - dat+= "
Re-scan User" - dat+= "

Exit" + dat+= "
Read Wanted Issue" + dat+= "

Create Feed Channel" + dat+= "
View Feed Channels" + dat+= "
Submit new Feed story" + dat+= "
Print newspaper" + dat+= "
Re-scan User" + dat+= "

Exit" if(src.securityCaster) var/wanted_already = 0 if(SSnews.wanted_issue) wanted_already = 1 dat+="
Feed Security functions:
" - dat+="
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue" - dat+="
Censor Feed Stories" - dat+="
Mark Feed Channel with [SSatlas.current_map.company_name] D-Notice" + dat+="
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue" + dat+="
Censor Feed Stories" + dat+="
Mark Feed Channel with [SSatlas.current_map.company_name] D-Notice" dat+="
The newscaster recognises you as: [src.scanned_user]" if(1) dat+= "Feed Channels
" @@ -332,31 +332,31 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) if(FC.is_admin_channel) - dat+="[FC.channel_name]
" + dat+="[FC.channel_name]
" else - dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
" - dat+="
Refresh" - dat+="
Back" + dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
" + dat+="
Refresh" + dat+="
Back" if(2) dat+="Creating new Feed Channel..." - dat+="
Channel Name: [src.channel_name]
" + dat+="
Channel Name: [src.channel_name]
" dat+="Channel Author: [src.scanned_user]
" - dat+="Will Accept Public Feeds: [(src.c_locked) ? ("NO") : ("YES")]

" - dat+="
Submit

Cancel
" + dat+="Will Accept Public Feeds: [(src.c_locked) ? ("NO") : ("YES")]

" + dat+="
Submit

Cancel
" if(3) dat+="Creating new Feed Message..." - dat+="
Receiving Channel: [src.channel_name]
" //MARK + dat+="
Receiving Channel: [src.channel_name]
" //MARK dat+="Message Author: [src.scanned_user]
" - dat+="Message Body: [src.msg]
" - dat+="Attach Photo: [(src.photo_data ? "Photo Attached" : "No Photo")]
" - dat+="Scan Paper: [((src.paper_data || src.paper_name) ? "Paper Scanned" : "No Paper")]
" - dat+="
Submit

Cancel
" + dat+="Message Body: [src.msg]
" + dat+="Attach Photo: [(src.photo_data ? "Photo Attached" : "No Photo")]
" + dat+="Scan Paper: [((src.paper_data || src.paper_name) ? "Paper Scanned" : "No Paper")]
" + dat+="
Submit

Cancel
" if(4) dat+="Feed story successfully submitted to [src.channel_name].

" - dat+="
Return
" + dat+="
Return
" if(5) dat+="Feed Channel [src.channel_name] created successfully.

" - dat+="
Return
" + dat+="
Return
" if(6) dat+="ERROR: Could not submit Feed story to Network.

" if(src.channel_name=="") @@ -366,7 +366,7 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) if(src.msg == "" || src.msg == "\[REDACTED\]") dat+="�Invalid message body.
" - dat+="
Return
" + dat+="
Return
" if(7) dat+="ERROR: Could not submit Feed Channel to Network.

" var/list/existing_authors = list() @@ -390,7 +390,7 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) dat+="�Channel name already in use.
" if(src.scanned_user=="Unknown") dat+="�Channel author unverified.
" - dat+="
Return
" + dat+="
Return
" if(8) var/total_num=length(SSnews.network_channels) var/active_num=total_num @@ -403,8 +403,8 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) active_num-- dat+="Network currently serves a total of [total_num] Feed channels, [active_num] of which are active, and a total of [message_num] Feed Stories." //TODO: CONTINUE dat+="

Liquid Paper remaining: [(src.paper_remaining) *100 ] cm^3" - dat+="

Print Paper" - dat+="
Cancel" + dat+="

Print Paper" + dat+="
Cancel" if(9) dat+="[src.viewing_channel.channel_name]: \[created by: [src.viewing_channel.author]\]
" if(src.viewing_channel.censored) @@ -424,10 +424,10 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) if(MESSAGE.caption) dat+="[MESSAGE.caption]
" dat+="
" - dat+="View Comments Add Comment Like Story Dislike Story
" + dat+="View Comments Add Comment Like Story Dislike Story
" dat+="\[Story by [MESSAGE.author] - [MESSAGE.time_stamp]\]
" - dat+="
Refresh" - dat+="
Back" + dat+="
Refresh" + dat+="
Back" if(10) dat+="[SSatlas.current_map.company_name] Feed Censorship Tool
" dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
" @@ -438,8 +438,8 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) else for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) - dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
" - dat+="
Cancel" + dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
" + dat+="
Cancel" if(11) dat+="[SSatlas.current_map.company_name] D-Notice Handler
" dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the [station_name(TRUE)]'s" @@ -450,12 +450,12 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) else for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) - dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
" + dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
" - dat+="
Back" + dat+="
Back" if(12) dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" - dat+="[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
" + dat+="[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
" if( isemptylist(src.viewing_channel.messages) ) @@ -463,11 +463,11 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) else for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) dat+="-[MESSAGE.body]
\[[MESSAGE.message_type] by [MESSAGE.author]\]
" - dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" - dat+="
Back" + dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" + dat+="
Back" if(13) dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" - dat+="Channel messages listed below. If you deem them dangerous to the [station_name(TRUE)], you can Bestow a D-Notice upon the channel.
" + dat+="Channel messages listed below. If you deem them dangerous to the [station_name(TRUE)], you can Bestow a D-Notice upon the channel.
" if(src.viewing_channel.censored) dat += SPAN_WARNING("ATTENTION: ") + "This channel has been deemed as threatening to the welfare of the [station_name(TRUE)], and marked with a [SSatlas.current_map.company_name] D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.

" @@ -477,10 +477,10 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) else for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) dat+="
[MESSAGE.body] \[Likes: [MESSAGE.likes] Dislikes: [MESSAGE.dislikes]\]
" - dat+="View Comments Add Comment Like Story Dislike Story
" + dat+="View Comments Add Comment Like Story Dislike Story
" dat+="\[Story by [MESSAGE.author] - [MESSAGE.time_stamp]\]

" - dat+="
Back" + dat+="
Back" if(14) dat+="Wanted Issue Handler:" var/wanted_already = 0 @@ -492,21 +492,21 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) if(wanted_already) dat+="
A wanted issue is already in Feed Circulation. You can edit or cancel it below." dat+="
" - dat+="Criminal Name: [src.channel_name]
" - dat+="Description: [src.msg]
" - dat+="Attach Photo: [(src.photo_data ? "Photo Attached" : "No Photo")]
" - dat+="Scan Paper: [((src.paper_data || src.paper_name) ? "Paper Scanned" : "No Paper")]
" + dat+="Criminal Name: [src.channel_name]
" + dat+="Description: [src.msg]
" + dat+="Attach Photo: [(src.photo_data ? "Photo Attached" : "No Photo")]
" + dat+="Scan Paper: [((src.paper_data || src.paper_name) ? "Paper Scanned" : "No Paper")]
" if(wanted_already) dat+="Wanted Issue created by: [SSnews.wanted_issue.backup_author]
" else dat+="Wanted Issue will be created under prosecutor: [src.scanned_user]
" - dat+="
[(wanted_already) ? ("Edit Issue") : ("Submit")]" + dat+="
[(wanted_already) ? ("Edit Issue") : ("Submit")]" if(wanted_already) - dat+="
Take down Issue" - dat+="
Cancel" + dat+="
Take down Issue" + dat+="
Cancel" if(15) dat+="Wanted issue for [src.channel_name] is now in Network Circulation.

" - dat+="
Return
" + dat+="
Return
" if(16) dat+="ERROR: Wanted Issue rejected by Network.

" if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") @@ -515,10 +515,10 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) dat+="�Issue author unverified.
" if(src.msg == "" || src.msg == "\[REDACTED\]") dat+="�Invalid description.
" - dat+="
Return
" + dat+="
Return
" if(17) dat+="Wanted Issue successfully deleted from Circulation
" - dat+="
Return
" + dat+="
Return
" if(18) dat+="-- STATIONWIDE WANTED ISSUE --
\[Submitted by: [SSnews.wanted_issue.backup_author]\]
" dat+="Criminal: [SSnews.wanted_issue.author]
" @@ -529,16 +529,16 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) dat+="
" else dat+="None" - dat+="

Back
" + dat+="

Back
" if(19) dat+="Wanted issue for [src.channel_name] successfully edited.

" - dat+="
Return
" + dat+="
Return
" if(20) dat+="Printing successful. Please receive your newspaper from the bottom of the machine.

" - dat+="Return" + dat+="Return" if(21) dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personnel to refill machine storage.

" - dat+="Return" + dat+="Return" if(22) //comments! dat+="Comments:
" if(isemptylist(src.viewing_message.comments)) @@ -546,18 +546,18 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) else for(var/datum/feed_comment/COMMENT in src.viewing_message.comments) dat+="
\[[world.time]\] [COMMENT.author]:[COMMENT.message]
" - dat+="Return" + dat+="Return" if(23) //comments but with more censorship! dat+="Comments:
" if(isemptylist(src.viewing_message.comments)) dat+="No comments on this story yet!
" else for(var/datum/feed_comment/COMMENT in src.viewing_message.comments) - dat+="
\[[world.time]\] [COMMENT.author]:[COMMENT.message]
Return" + dat+="
\[[world.time]\] [COMMENT.author]:[COMMENT.message]
Return" if(24) //newscaster is not connected to the station-z-level dat += "ERROR: Newscaster unit cannot access main news server!
" - dat += "
ATTEMPT RESET" + dat += "
ATTEMPT RESET" var/datum/browser/newscaster_main = new(user, "newscaster_main", "Newscaster", 450, 500) newscaster_main.set_content(dat) @@ -1004,7 +1004,7 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) dat+="" if(scribble_page==curr_page) dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" - dat+= "
" + dat+= "
" if(1) // X channel pages inbetween. for(var/datum/feed_channel/NP in src.news_content) src.pages++ //Let's get it right again. @@ -1028,7 +1028,7 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) dat+="" if(scribble_page==curr_page) dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" - dat+= "
" + dat+= "
" if(2) //Last page for(var/datum/feed_channel/NP in src.news_content) src.pages++ @@ -1046,7 +1046,7 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) dat+="Apart from some uninteresting Classified ads, there's nothing on this page..." if(scribble_page==curr_page) dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" - dat+= "
" + dat+= "
" else dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index 37bcee2a6aa..0cd79625117 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -250,7 +250,7 @@ GLOBAL_VAR(bomb_set) 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) + message_admins("[key_name_admin(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered]! ([LOC ? "JMP" : "null"])", 0) log_admin("EXPLOIT: [key_name(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered]!") else code += lastentered diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index bc42470c8f0..2e6feb06623 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -17,73 +17,73 @@ var/dat = {" Regular pipes:
- Pipe
- Bent Pipe
- Manifold
- Manual Valve
- Pipe Cap
- 4-Way Manifold
- Manual T-Valve
- Manual T-Valve - Mirrored
- Upward Pipe
- Downward Pipe
+ Pipe
+ Bent Pipe
+ Manifold
+ Manual Valve
+ Pipe Cap
+ 4-Way Manifold
+ Manual T-Valve
+ Manual T-Valve - Mirrored
+ Upward Pipe
+ Downward Pipe
Supply pipes:
- Pipe
- Bent Pipe
- Manifold
- Pipe Cap
- 4-Way Manifold
- Upward Pipe
- Downward Pipe
+ Pipe
+ Bent Pipe
+ Manifold
+ Pipe Cap
+ 4-Way Manifold
+ Upward Pipe
+ Downward Pipe
Scrubbers pipes:
- Pipe
- Bent Pipe
- Manifold
- Pipe Cap
- 4-Way Manifold
- Upward Pipe
- Downward Pipe
+ Pipe
+ Bent Pipe
+ Manifold
+ Pipe Cap
+ 4-Way Manifold
+ Upward Pipe
+ Downward Pipe
Fuel pipes:
- Pipe
- Bent Pipe
- Manifold
- Pipe Cap
- 4-Way Manifold
- Upward Pipe
- Downward Pipe
+ Pipe
+ Bent Pipe
+ Manifold
+ Pipe Cap
+ 4-Way Manifold
+ Upward Pipe
+ Downward Pipe
Auxiliary pipes:
- Pipe
- Bent Pipe
- Manifold
- Pipe Cap
- 4-Way Manifold
- Upward Pipe
- Downward Pipe
+ Pipe
+ Bent Pipe
+ Manifold
+ Pipe Cap
+ 4-Way Manifold
+ Upward Pipe
+ Downward Pipe
Devices:
- Universal pipe adapter
- Connector
- Fuel Connector
- Auxiliary Connector
- Unary Vent
- Auxiliary Unary Vent
- Gas Pump
- Fuel Gas Pump
- Auxiliary Gas Pump
- Pressure Regulator
- Scrubbers Pressure Regulator
- Supply Pressure Regulator
- Fuel Pressure Regulator
- Auxiliary Pressure Regulator
- High Power Gas Pump
- Scrubber
- Meter
- Omni Gas Mixer
- Omni Gas Filter
+ Universal pipe adapter
+ Connector
+ Fuel Connector
+ Auxiliary Connector
+ Unary Vent
+ Auxiliary Unary Vent
+ Gas Pump
+ Fuel Gas Pump
+ Auxiliary Gas Pump
+ Pressure Regulator
+ Scrubbers Pressure Regulator
+ Supply Pressure Regulator
+ Fuel Pressure Regulator
+ Auxiliary Pressure Regulator
+ High Power Gas Pump
+ Scrubber
+ Meter
+ Omni Gas Mixer
+ Omni Gas Filter
Heat exchange:
- Pipe
- Bent Pipe
- Junction
- Heat Exchanger
+ Pipe
+ Bent Pipe
+ Junction
+ Heat Exchanger
"} //What number the make points to is in the define # at the top of construction.dm in same folder @@ -164,22 +164,22 @@ return var/dat = {"Disposal Pipes

- Pipe
- Bent Pipe
- Junction
- Y-Junction
- Trunk
- Bin
- Bin (Small)
- Outlet
- Chute
- Upwards
- Downwards
- Sorting
- Sorting (Wildcard)
- Sorting (Untagged)
- Tagger
- Tagger (Partial)
+ Pipe
+ Bent Pipe
+ Junction
+ Y-Junction
+ Trunk
+ Bin
+ Bin (Small)
+ Outlet
+ Chute
+ Upwards
+ Downwards
+ Sorting
+ Sorting (Wildcard)
+ Sorting (Untagged)
+ Tagger
+ Tagger (Partial)
"} var/datum/browser/disposaldispenser_win = new(user, window_id, capitalize_first_letters(name), 220, 500) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 6f9969641e3..a914c61fc4c 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -113,16 +113,16 @@ dat += "Not Detected
" dat += "Power: " if(on) - dat += "On
" + dat += "On
" else - dat += "Off
" + dat += "Off
" dat += "Power Level: [cell ? round(cell.percent(),1) : 0]%

" dat += "Set Temperature: " - dat += "-" + dat += "-" dat += " [set_temperature]K ([set_temperature-T0C]°C) " - dat += "+
" + dat += "+
" user.set_machine(src) var/datum/browser/heater_win = new(user, "spaceheater", "Space Heater Control Panel") diff --git a/code/game/machinery/stargazer.dm b/code/game/machinery/stargazer.dm index c21730bc326..fdbedf43727 100644 --- a/code/game/machinery/stargazer.dm +++ b/code/game/machinery/stargazer.dm @@ -18,7 +18,7 @@ /obj/machinery/stargazer/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if(!(stat & BROKEN) && !(stat & NOPOWER)) - . += SPAN_NOTICE("\The [src] shows the current sector to be [SSatlas.current_sector.name].") + . += SPAN_NOTICE("\The [src] shows the current sector to be [SSatlas.current_sector.name].") /obj/machinery/stargazer/power_change() ..() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 84bf3955c9b..2b59349c4cf 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -122,9 +122,9 @@ dat+= "" dat+= "Maintenance panel controls
" dat+= "The panel is ridden with controls, button and meters, labeled in strange signs and symbols that
you cannot understand. Probably the manufactoring world's language.
Among other things, a few controls catch your eye.

" - dat+= "A small dial with a \"ë\" symbol embroidded on it. It's pointing towards a gauge that reads [(src.issuperUV ? "15nm" : "185nm")].
Turn towards [(src.issuperUV ? "185nm" : "15nm")]
" - dat+= "A thick old-style button, with 2 grimy LED lights next to it. The [(src.safetieson? "GREEN" : SPAN_WARNING("RED"))] LED is on.
Press button" - dat+= "

Close panel" + dat+= "A small dial with a \"ë\" symbol embroidded on it. It's pointing towards a gauge that reads [(src.issuperUV ? "15nm" : "185nm")].
Turn towards [(src.issuperUV ? "185nm" : "15nm")]
" + dat+= "A thick old-style button, with 2 grimy LED lights next to it. The [(src.safetieson? "GREEN" : SPAN_WARNING("RED"))] LED is on.
Press button" + dat+= "

Close panel" //user << browse(dat, "window=ssu_m_panel;size=400x500") //onclose(user, "ssu_m_panel") else if(src.isUV) //The thing is running its cauterisation cycle. You have to wait. @@ -141,30 +141,30 @@ dat+= "Welcome to the Unit control panel.
" dat+= "Helmet storage compartment: [(src.HELMET ? HELMET.name : "No helmet detected.")]
" if(HELMET && src.isopen) - dat += "Dispense helmet
" + dat += "Dispense helmet
" dat+= "Suit storage compartment: [(src.SUIT ? SUIT.name : "No exosuit detected.")]
" if(SUIT && src.isopen) - dat += "Dispense suit
" + dat += "Dispense suit
" dat+= "Breathmask storage compartment: [(src.MASK ? MASK.name : "No breathmask detected.")]
" if(MASK && src.isopen) - dat += "Dispense mask
" + dat += "Dispense mask
" if(src.OCCUPANT) dat+= "
WARNING: Biological entity detected inside the Unit's storage. Please remove.
" - dat+= "Eject extra load" - dat += "
Unit is: [(src.isopen ? "Open" : "Closed")] - [(src.isopen ? "Close" : "Open")] Unit " + dat+= "Eject extra load" + dat += "
Unit is: [(src.isopen ? "Open" : "Closed")] - [(src.isopen ? "Close" : "Open")] Unit " if(src.isopen) dat+="
" else - dat += " - *[(src.islocked ? "Unlock" : "Lock")] Unit*
" + dat += " - *[(src.islocked ? "Unlock" : "Lock")] Unit*
" dat+= "Unit status: [(src.islocked? "**LOCKED**
" : "**UNLOCKED**
")]" - dat+= "Start Disinfection cycle
" - dat += "

Close control panel" + dat+= "Start Disinfection cycle
" + dat += "

Close control panel" //user << browse(dat, "window=Suit Storage Unit;size=400x500") //onclose(user, "Suit Storage Unit") else //Ohhhh shit it's dirty or broken! Let's inform the guy. dat+= "" dat+= "Unit chamber is too contaminated to continue usage. Please call for a qualified individual to perform maintenance.

" - dat+= "
Close control panel" + dat+= "
Close control panel" //user << browse(dat, "window=suit_storage_unit;size=400x500") //onclose(user, "suit_storage_unit") diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 673d480f2d2..736f267b106 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -37,23 +37,23 @@ if(0) dat += "
[temp]
" - dat += "
Current Network: [network]
" + dat += "
Current Network: [network]
" if(servers.len) dat += "
Detected Telecommunication Servers:" - dat += "
\[Flush Buffer\]" + dat += "
\[Flush Buffer\]" else - dat += "
No servers detected. Scan for servers: \[Scan\]" + dat += "
No servers detected. Scan for servers: \[Scan\]" // --- Viewing Server --- if(1) dat += "
[temp]
" - dat += "
\[Main Menu\] \[Refresh\] \[Print Logs\]
" + dat += "
\[Main Menu\] \[Refresh\] \[Print Logs\]
" dat += "
Current Network: [network]" dat += "
Selected Server: [SelectedServer.id]" @@ -200,7 +200,7 @@ // If the log is a speech file if(C.input_type == "Speech File") - . += "
  • [C.name] \[X\]
    " + . += "
  • [C.name] \[X\]
    " var/datum/language/language = C.parameters["language"] var/message_out = "" @@ -226,7 +226,7 @@ else if(C.input_type == "Execution Error") - . += "
  • [C.name] \[X\]
    " + . += "
  • [C.name] \[X\]
    " . += "Output: \"[C.parameters["message"]]\"
    " . += "

    • " . += "" diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index 5436fa198c5..a571b1ad4c6 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -103,10 +103,10 @@ dat += "

    " if(auth) - dat += "

    \[Authenticated\] /" - dat += " Server Power: [src.linkedServer && src.linkedServer.use_power ? "\[On\]":SPAN_WARNING("\[Off\]")]

    " + dat += "

    \[Authenticated\] /" + dat += " Server Power: [src.linkedServer && src.linkedServer.use_power ? "\[On\]":SPAN_WARNING("\[Off\]")]

    " else - dat += "

    \[Unauthenticated\] /" + dat += "

    \[Unauthenticated\] /" dat += " Server Power: [src.linkedServer && src.linkedServer.use_power ? "\[On\]":SPAN_WARNING("\[Off\]")]

    " if(hacking || emag) @@ -120,24 +120,24 @@ if(0) // = TAB var/i = 0 - dat += "
    [++i]. Link To A Server
    " + dat += "
    [++i]. Link To A Server
    " if(auth) if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN))) dat += "
    ERROR: Server not found!
    " else - dat += "
    [++i]. View Message Logs
    " - dat += "
    [++i]. View Requests Console Logs
    " - dat += "
    [++i]. Clear Message Logs
    " - dat += "
    [++i]. Clear Requests Console Logs
    " - dat += "
    [++i]. Set Custom Key
    " - dat += "
    [++i]. Send Admin Message
    " - dat += "
    [++i]. Modify Spam Filter
    " + dat += "
    [++i]. View Message Logs
    " + dat += "
    [++i]. View Requests Console Logs
    " + dat += "
    [++i]. Clear Message Logs
    " + dat += "
    [++i]. Clear Requests Console Logs
    " + dat += "
    [++i]. Set Custom Key
    " + dat += "
    [++i]. Send Admin Message
    " + dat += "
    [++i]. Modify Spam Filter
    " else for(var/n = ++i; n <= optioncount; n++) dat += "
    [n]. ---------------
    " if((istype(user, /mob/living/silicon/ai) || istype(user, /mob/living/silicon/robot)) && (user.mind.special_role && user.mind.original == user)) //Malf/Traitor AIs can bruteforce into the system to gain the Key. - dat += "
    *&@#. Bruteforce Key
    " + dat += "
    *&@#. Bruteforce Key
    " else dat += "
    " @@ -155,7 +155,7 @@ var/index = 3000 dat += "
    " + SPAN_ALERT("Only the last [index] messages are stored!") + "" - dat += "
    Back - Refresh
    " + dat += "
    Back - Refresh
    " for(var/datum/data_pda_msg/message in src.linkedServer.pda_msgs) if(index-- <= 0) @@ -218,7 +218,7 @@ var/id_auth = "Unauthenticated" - 15% var/priority = "Normal" - 10% */ - dat += "
    Back - Refresh
    " + dat += "
    Back - Refresh
    " dat += {""} for(var/datum/data_rc_msg/rc in src.linkedServer.rc_msgs) @@ -227,22 +227,22 @@ break // Del - Sender - Recepient - Message // X - Al Green - Your Mom - WHAT UP!? - dat += {" + dat += {""} dat += "
    XSending Dep.Receiving Dep. MessageStampID Auth.Priority.
    X
    		[rc.send_dpt]
    X
    		[rc.send_dpt] [rc.rec_dpt][rc.message][rc.stamp][rc.id_auth][rc.priority]
    " //Spam filter modification if(5) - dat += "
    Back - Refresh
    " + dat += "
    Back - Refresh
    " var/index = 0 for(var/token in src.linkedServer.spamfilter) index++ if(index > 3000) break - dat += "
    [index] \[[token]\]
    " + dat += "
    [index] \[[token]\]
    " dat += "
    " if (linkedServer.spamfilter.len < linkedServer.spamfilter_limit) - dat += "Add token
    " + dat += "Add token
    " dat += "" diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index bf4cb37f1bf..c1406dd55c0 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -33,28 +33,28 @@ if(0) dat += "
    [temp]

    " - dat += "
    Current Network: [network]
    " + dat += "
    Current Network: [network]
    " if(machinelist.len) dat += "
    Detected Network Entities:" - dat += "
    \[Flush Buffer\]" + dat += "
    \[Flush Buffer\]" else - dat += "\[Probe Network\]" + dat += "\[Probe Network\]" // --- Viewing Machine --- if(1) dat += "
    [temp]
    " - dat += "
    \[Main Menu\]
    " + dat += "
    \[Main Menu\]
    " dat += "
    Current Network: [network]
    " dat += "Selected Network Entity: [SelectedMachine.name] ([SelectedMachine.id])
    " dat += "Linked Entities:
      " for(var/obj/machinery/telecomms/T in SelectedMachine.links) if(!T.hide) - dat += "
    1. [REF(T.id)] [T.name] ([T.id])
      2. " + dat += "
    2. [REF(T.id)] [T.name] ([T.id])
      3. " dat += "
    " diff --git a/code/game/machinery/telecomms/computers/traffic_control.dm b/code/game/machinery/telecomms/computers/traffic_control.dm index aa4a37ac9c9..9bcd103af33 100644 --- a/code/game/machinery/telecomms/computers/traffic_control.dm +++ b/code/game/machinery/telecomms/computers/traffic_control.dm @@ -78,31 +78,31 @@ if(0) dat += "
    [temp]
    " - dat += "
    Current Network: [network]
    " + dat += "
    Current Network: [network]
    " if(servers.len) dat += "
    Detected Telecommunication Servers:" - dat += "
    \[Flush Buffer\]" + dat += "
    \[Flush Buffer\]" else - dat += "
    No servers detected. Scan for servers: \[Scan\]" + dat += "
    No servers detected. Scan for servers: \[Scan\]" // --- Viewing Server --- if(1) dat += "
    [temp]
    " - dat += "
    \[Main Menu\] \[Refresh\]
    " + dat += "
    \[Main Menu\] \[Refresh\]
    " dat += "
    Current Network: [network]" dat += "
    Selected Server: [SelectedServer.id]

    " - dat += "
    \[Edit Code\]" + dat += "
    \[Edit Code\]" dat += "
    Signal Execution: " if(SelectedServer.autoruncode) - dat += "ALWAYS" + dat += "ALWAYS" else - dat += "NEVER" + dat += "NEVER" user << browse(dat, "window=traffic_control;size=575x400") diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 37f4989b7fa..778de2a2f3e 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -110,13 +110,13 @@ M = user.get_multitool() var/dat dat += "
    [temp]

    " - dat += "Power Status: [src.use_power ? "On" : "Off"]" + dat += "Power Status: [src.use_power ? "On" : "Off"]" if(operable() && use_power) if(id != "" && id) - dat += "
    Identification String: [id]" + dat += "
    Identification String: [id]" else - dat += "
    Identification String: NULL" - dat += "
    Network: [network]" + dat += "
    Identification String: NULL" + dat += "
    Network: [network]" dat += "
    Prefabrication: [autolinkers.len ? "TRUE" : "FALSE"]" if(hide) dat += "
    Shadow Link: ACTIVE" @@ -130,7 +130,7 @@ i++ if(T.hide && !src.hide) continue - dat += "
  • [REF(T)] [T.name] ([T.id]) \[X\]
    • " + dat += "
  • [REF(T)] [T.name] ([T.id]) \[X\]
    • " dat += "" dat += "Filtering Frequencies: " @@ -140,21 +140,21 @@ for(var/x in freq_listening) i++ if(i < length(freq_listening)) - dat += "[format_frequency(x)] GHz\[X\]; " + dat += "[format_frequency(x)] GHz\[X\]; " else - dat += "[format_frequency(x)] GHz\[X\]" + dat += "[format_frequency(x)] GHz\[X\]" else dat += "NONE" - dat += "
    \[Add Filter\]" + dat += "
    \[Add Filter\]" dat += "
    " if(M) var/obj/machinery/telecomms/device = M.get_buffer() if(istype(device)) - dat += "
    MULTITOOL BUFFER: [device] ([device.id]) \[Link\] \[Flush\]" + dat += "
    MULTITOOL BUFFER: [device] ([device.id]) \[Link\] \[Flush\]" else - dat += "
    MULTITOOL BUFFER: \[Add Machine\]" + dat += "
    MULTITOOL BUFFER: \[Add Machine\]" temp = "" @@ -172,7 +172,7 @@ /* // Add an option to the processor to switch processing mode. (COMPRESS -> UNCOMPRESS or UNCOMPRESS -> COMPRESS) /obj/machinery/telecomms/processor/Options_Menu() - var/dat = "
    Processing Mode: [process_mode ? "UNCOMPRESS" : "COMPRESS"]" + var/dat = "
    Processing Mode: [process_mode ? "UNCOMPRESS" : "COMPRESS"]" return dat */ // The topic for Additional Options. Use this for checking href links for your specific option. @@ -190,7 +190,7 @@ // BUS /obj/machinery/telecomms/bus/Options_Menu() - var/dat = "
    Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" + var/dat = "
    Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" return dat /obj/machinery/telecomms/bus/Options_Topic(href, href_list) diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index 4428ee17224..3c630642b3f 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -131,7 +131,7 @@ if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) 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]" + 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!" pda.get_notification(pda_message, 1, "[Console.department] Requests Console") @@ -139,7 +139,7 @@ if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) Console.audible_message("[icon2html(Console, viewers(get_turf(Console)))] *The Requests Console beeps: 'Message from [sender]'",,4) - Console.message_log += "Message from [sender]
    [authmsg]" + 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!" pda.get_notification(pda_message, 1, "[Console.department] Requests Console") diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm index 6405679943d..21d1af16378 100644 --- a/code/game/objects/effects/chem/chemsmoke.dm +++ b/code/game/objects/effects/chem/chemsmoke.dm @@ -136,14 +136,14 @@ var/area/A = get_area(location) var/where = "[A.name] | [location.x], [location.y]" - var/whereLink = "[where]" + var/whereLink = "[where]" if(show_log) if(carry.my_atom.fingerprintslast) var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast) var/more = "" if(M) - more = "(?)" + more = "(?)" message_admins("A chemical smoke reaction has taken place in ([whereLink])[contained]. Last associated key is [carry.my_atom.fingerprintslast][more].", 0, 1) log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].") else @@ -155,7 +155,7 @@ mobnames += "Affected players: " var/i = 1 do - mobnames += "?" + mobnames += "?" if (touched_mobs[i+1]) mobnames += ", " i++ diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c084a4941cd..3b8eeb77616 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -354,7 +354,7 @@ . = ..(user, distance, "", "It is a [size] item.", get_extended = get_extended) var/datum/component/armor/armor_component = GetComponent(/datum/component/armor) if(armor_component) - . += FONT_SMALL(SPAN_NOTICE("\[?\] This item has armor values. \[Show Armor Values\]")) + . += FONT_SMALL(SPAN_NOTICE("\[?\] This item has armor values. Take a closer look.",1) /mob/living/carbon/verb/showoff() set name = "Show Held Item" diff --git a/code/game/objects/items/devices/drop_targeter/_droptargeter.dm b/code/game/objects/items/devices/drop_targeter/_droptargeter.dm index f3676d2d4f9..99f9f4b9545 100644 --- a/code/game/objects/items/devices/drop_targeter/_droptargeter.dm +++ b/code/game/objects/items/devices/drop_targeter/_droptargeter.dm @@ -96,7 +96,7 @@ /obj/item/device/orbital_dropper/proc/orbital_drop(var/turf/target, var/user) if(!map) return - log_and_message_admins("[key_name_admin(user)] has used a [src] at JMP.") + log_and_message_admins("[key_name_admin(user)] has used a [src] at JMP.") map.load(target, TRUE) //Target must be the center! diff --git a/code/game/objects/items/devices/drop_targeter/orbital_drops.dm b/code/game/objects/items/devices/drop_targeter/orbital_drops.dm index 67452e9f913..9ddf80c161e 100644 --- a/code/game/objects/items/devices/drop_targeter/orbital_drops.dm +++ b/code/game/objects/items/devices/drop_targeter/orbital_drops.dm @@ -76,6 +76,6 @@ map = null /obj/item/device/orbital_dropper/icarus_drones/orbital_drop(var/turf/target, var/user) - log_and_message_admins("[key_name_admin(user)] has used a [src] at JMP.") + log_and_message_admins("[key_name_admin(user)] has used a [src] at JMP.") for(var/i = 1, i <= num_of_drones, i++) new /mob/living/simple_animal/hostile/icarus_drone(get_random_turf_in_range(target, 4, 2, TRUE)) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 2a6c32b66ca..1add2330f68 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -100,7 +100,7 @@ target_mob.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 [target_mob.name] ([target_mob.ckey])" - msg_admin_attack("[user.name] ([user.ckey]) Used the [src.name] to flash [target_mob.name] ([target_mob.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob)) + msg_admin_attack("[user.name] ([user.ckey]) Used the [src.name] to flash [target_mob.name] ([target_mob.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob)) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.do_attack_animation(target_mob) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 454098b7597..85657cfa34a 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -93,7 +93,7 @@ return user.set_machine(src) var/dat = {" -Turn [on ? "Off" : "On"]
    +Turn [on ? "Off" : "On"]
    Frequency/Code for electropack:
    Frequency: - diff --git a/code/game/objects/items/devices/slide_projector.dm b/code/game/objects/items/devices/slide_projector.dm index d18c6a864ab..71d5af37304 100644 --- a/code/game/objects/items/devices/slide_projector.dm +++ b/code/game/objects/items/devices/slide_projector.dm @@ -93,7 +93,7 @@ /obj/item/storage/slide_projector/interact(mob/user) var/data = list() if(projection) - data += "Disable Projector" + data += "Disable Projector" else data += "Projector Inactive" @@ -104,7 +104,7 @@ if(I == current_slide) table += "[I.name]SHOWING" else - table += "[I.name]SHOW" + table += "[I.name]SHOW" table += "" i++ table += "" diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index adf99947abe..0fa0f3cd22d 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -29,7 +29,7 @@ tank_two = attacking_item user.drop_from_inventory(attacking_item,src) to_chat(user, SPAN_NOTICE("You attach the tank to the transfer valve.")) - message_admins("[key_name_admin(user)] attached both tanks to a transfer valve. (JMP)") + message_admins("[key_name_admin(user)] attached both tanks to a transfer valve. (JMP)") log_game("[key_name_admin(user)] attached both tanks to a transfer valve.") update_icon() @@ -51,7 +51,7 @@ A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). GLOB.bombers += "[key_name(user)] attached a [attacking_item] to a transfer valve." - message_admins("[key_name_admin(user)] attached a [attacking_item] to a transfer valve. (JMP)") + message_admins("[key_name_admin(user)] attached a [attacking_item] to a transfer valve. (JMP)") log_game("[key_name_admin(user)] attached a [attacking_item] to a transfer valve.") attacher = user update_static_data_for_all_viewers() @@ -190,16 +190,16 @@ else attacher_name = "[attacher.name]([attacher.ckey])" - var/log_str = "Bomb valve opened in [A.name] " + var/log_str = "Bomb valve opened in [A.name] " log_str += "with [attached_device ? attached_device : "no device"] attacher: [attacher_name]" if(attacher) - log_str += "(?)" + log_str += "(?)" var/mob/mob = get_mob_by_key(src.fingerprintslast) var/last_touch_info = "" if(mob) - last_touch_info = "(?)" + last_touch_info = "(?)" log_str += " Last touched by: [src.fingerprintslast][last_touch_info]" GLOB.bombers += log_str diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index 3977ea6f966..cb8050bb505 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -35,9 +35,9 @@ add_fingerprint(user) user.set_machine(src) var/dat = list() - dat += "Channel name is: [channel ? channel : "unidentified broadcast"]
    " - dat += "Video streaming is: [camera.status ? "Online" : "Offline"]
    " - dat += "Microphone is: [radio.get_broadcasting() ? "Online" : "Offline"]
    " + dat += "Channel name is: [channel ? channel : "unidentified broadcast"]
    " + dat += "Video streaming is: [camera.status ? "Online" : "Offline"]
    " + dat += "Microphone is: [radio.get_broadcasting() ? "Online" : "Offline"]
    " dat += "Sound is being broadcasted on frequency: [format_frequency(radio.get_frequency())] ([get_frequency_name(radio.get_frequency())])
    " var/datum/browser/popup = new(user, "Press Camera Drone", "EyeBuddy", 300, 390, src) popup.set_content(jointext(dat,null)) diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 5322083ccfe..a7c19ca3a56 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -87,7 +87,7 @@ /obj/item/eightball/haunted/start_shaking(mob/user) for(var/mob/abstract/ghost/observer/O in GLOB.player_list) if(O.client) - to_chat(O, "[ghost_follow_link(user, O)] \The [user] is shaking \the [src], hoping to get an answer to \"[question]\".(Answer)") + to_chat(O, "[ghost_follow_link(user, O)] \The [user] is shaking \the [src], hoping to get an answer to \"[question]\".(Answer)") /obj/item/eightball/haunted/Topic(href, href_list) if(href_list["candidate"]) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index d1ad5f29aed..72d84a1e91e 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -93,11 +93,11 @@ var/t1 = "Constructions from [capitalize_first_letters(src.name)]Amount Left: [src.get_amount()]
    " if(sublist) - t1 += "Back
    " + t1 += "Back
    " if(locate(/datum/stack_recipe_list) in recipes_sublist) t1 += "

    Recipe Categories

    " for(var/datum/stack_recipe_list/srl in recipes_sublist) - t1 += "[capitalize_first_letters(srl.title)]
    " + t1 += "[capitalize_first_letters(srl.title)]
    " if(locate(/datum/stack_recipe) in recipes_sublist) var/sublist_title = sublist ? " ([capitalize_first_letters(sublist.title)])" : "" @@ -117,7 +117,7 @@ if(can_build) var/sublist_var = sublist ? "[REF(sublist)]" : "" - t1 += "[title]" + t1 += "[title]" else t1 += "
    [title]

    " continue @@ -129,10 +129,10 @@ for(var/n in multipliers) if(max_multiplier >= n) var/sublist_var = sublist ? "[REF(sublist)]" : "" - t1 += " [n * R.res_amount]x" + t1 += " [n * R.res_amount]x" if(!(max_multiplier in multipliers)) var/sublist_var = sublist ? "[REF(sublist)]" : "" - t1 += " [max_multiplier * R.res_amount]x" + t1 += " [max_multiplier * R.res_amount]x" t1 += "
    " t1 += "    " diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 98f4d417534..8ad2864f100 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -84,7 +84,7 @@ 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)) + 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 to_chat(user, SPAN_WARNING("You need more paper.")) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 81ab40167a7..50457493c44 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -39,7 +39,7 @@ if(stage > 1 && !active && clown_check(user)) to_chat(user, SPAN_WARNING("You prime \the [name]!")) - msg_admin_attack("[user.name] ([user.ckey]) primed \a [src]. (JMP)",ckey=key_name(user)) + msg_admin_attack("[user.name] ([user.ckey]) primed \a [src]. (JMP)",ckey=key_name(user)) activate() add_fingerprint(user) @@ -130,7 +130,7 @@ icon_state = initial(icon_state) + "_active" if(user) - msg_admin_attack("[user.name] ([user.ckey]) primed \a [src] (JMP)",ckey=key_name(user)) + msg_admin_attack("[user.name] ([user.ckey]) primed \a [src] (JMP)",ckey=key_name(user)) return diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index c2ba0754549..5985980cbbc 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -69,7 +69,7 @@ var/mob/M = user admin_attack_log(M, attacker_message = "primed \a [fake ? (" fake") : ("")][src]!", admin_message = "primed \a [fake ? ("fake ") : ("")][src]!") else - message_admins("[user.name] primed \a [fake ? ("fake ") : ("")][src] (JMP)") + message_admins("[user.name] primed \a [fake ? ("fake ") : ("")][src] (JMP)") icon_state = initial(icon_state) + "_active" active = TRUE diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index e2d82b21a36..f3280f415f4 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -89,7 +89,7 @@ if(user) 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)) + 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") if(user) @@ -136,7 +136,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)") + message_admins("[key_name_admin(H)] is chewing on [H.get_pronoun("his")] restrained hand - (JMP)") H.attack_log += "\[[time_stamp()]\] [s] ([H.ckey])" log_attack("[s] ([H.ckey])") diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index e83aa16223e..5b41a3fda00 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -100,7 +100,7 @@ target_mob.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 [target_mob.name] ([target_mob.ckey])" - msg_admin_attack("[key_name_admin(user)] implanted [key_name_admin(target_mob)] with [name] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob)) + msg_admin_attack("[key_name_admin(user)] implanted [key_name_admin(target_mob)] with [name] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob)) ipc_tag.replaced(H, H.organs_by_name[BP_HEAD]) ipc_tag.forceMove(target_mob) diff --git a/code/game/objects/items/weapons/implants/implants/explosive.dm b/code/game/objects/items/weapons/implants/implants/explosive.dm index a29040c7455..064bf39a174 100644 --- a/code/game/objects/items/weapons/implants/implants/explosive.dm +++ b/code/game/objects/items/weapons/implants/implants/explosive.dm @@ -140,7 +140,7 @@ small_countdown() return - message_admins("Explosive implant triggered in [imp_in] ([imp_in.key]). (JMP) ") + message_admins("Explosive implant triggered in [imp_in] ([imp_in.key]). (JMP) ") log_game("Explosive implant triggered in [imp_in] ([imp_in.key]).") if(!elevel) elevel = "Localized Limb" diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 58d7a734424..e92a50ae4eb 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -90,7 +90,7 @@ ABSTRACT_TYPE(/obj/item/storage/secure) message = "[src.code]" if (!src.locked) message = "*****" - dat += "
    \n>[message]
    \n1-2-3
    \n4-5-6
    \n7-8-9
    \nR-0-E
    \n    " + dat += "
    \n>[message]
    \n1-2-3
    \n4-5-6
    \n7-8-9
    \nR-0-E
    \n" user << browse(dat, "window=caselock;size=300x280") diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 3c2711fc06c..185fb9b51a8 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -54,7 +54,7 @@ Frequency: + +
    -Refresh"} +Refresh"} user << browse(dat, "window=radio") onclose(user, "radio") return diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 8c77aa50092..860a35e205a 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -38,7 +38,7 @@ if(is_adjacent) var/dat = "Noticeboard
    " for(var/obj/item/paper/P in src) - dat += "[P.name] Write Remove
    " + dat += "[P.name] Write Remove
    " user << browse("Notices[dat]","window=noticeboard") onclose(user, "noticeboard") return TRUE diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index c8308d28bc6..4ed6188ad65 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -145,12 +145,12 @@ FLOOR SAFES else user.set_machine(src) var/dat = "
    " - dat += "[open ? "Close" : "Open"] [src][drill || broken ? "" : " | - [dial * 5] +"]" + dat += "[open ? "Close" : "Open"] [src][drill || broken ? "" : " | - [dial * 5] +"]" if(open) dat += "" for(var/i = contents.len, i>=1, i--) var/obj/item/P = contents[i] - dat += "" + dat += "" dat += "
    [P.name]
    [P.name]
    " user << browse("[name][dat]", "window=safe;size=350x300") diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index ae95746b45f..3d3718d37d0 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -299,7 +299,7 @@ occupant.visible_message(SPAN_DANGER("[pulling] has thrusted \the [name] into \the [A], throwing \the [occupant] out of it!")) pulling.attack_log += "\[[time_stamp()]\] Crashed [occupant.name]'s ([occupant.ckey]) [name] into \a [A]" occupant.attack_log += "\[[time_stamp()]\] Thrusted into \a [A] by [pulling.name] ([pulling.ckey]) with \the [name]" - msg_admin_attack("[pulling.name] ([pulling.ckey]) has thrusted [occupant.name]'s ([occupant.ckey]) [name] into \a [A] (JMP)",ckey=key_name(pulling),ckey_target=key_name(occupant)) + msg_admin_attack("[pulling.name] ([pulling.ckey]) has thrusted [occupant.name]'s ([occupant.ckey]) [name] into \a [A] (JMP)",ckey=key_name(pulling),ckey_target=key_name(occupant)) else occupant.visible_message(SPAN_DANGER("[occupant] crashed into \the [A]!")) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index d93924d334d..1b293be2a62 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -48,8 +48,8 @@ /obj/structure/dispenser/attack_hand(mob/user) user.set_machine(src) var/dat = "
    " - dat += "Oxygen Tanks: [oxygen_tanks] - [oxygen_tanks ? "Dispense" : "empty"]
    " - dat += "Phoron Tanks: [phoron_tanks] - [phoron_tanks ? "Dispense" : "empty"]" + dat += "Oxygen Tanks: [oxygen_tanks] - [oxygen_tanks ? "Dispense" : "empty"]
    " + dat += "Phoron Tanks: [phoron_tanks] - [phoron_tanks ? "Dispense" : "empty"]" var/datum/browser/dispenser_win = new(user, "dispenser", capitalize_first_letters(name), 300, 250) dispenser_win.set_content(dat) diff --git a/code/game/objects/structures/under_wardrobe.dm b/code/game/objects/structures/under_wardrobe.dm index e9875d8c7d1..473eb4b0048 100644 --- a/code/game/objects/structures/under_wardrobe.dm +++ b/code/game/objects/structures/under_wardrobe.dm @@ -22,11 +22,11 @@ for(var/datum/category_group/underwear/UWC in GLOB.global_underwear.categories) var/datum/category_item/underwear/UWI = H.all_underwear[UWC.name] var/item_name = UWI?.name || "None" - dat += "[UWC.name]: [item_name]" + dat += "[UWC.name]: [item_name]" if(UWI) for(var/datum/gear_tweak/gt in UWI.tweaks) - dat += " [gt.get_contents(get_metadata(H, UWC.name, gt))]" - dat += " (Remove)
    " + dat += " [gt.get_contents(get_metadata(H, UWC.name, gt))]" + dat += " (Remove)
    " dat = jointext(dat, null) show_browser(H, dat, "window=wardrobe;size=400x200") diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index b5318909709..8a9344dba53 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -159,7 +159,7 @@ prefix = "(R)" admin_stuff += "/([source.key])" if(target != source.client) - admin_stuff += "(JMP)" + admin_stuff += "(JMP)" if(target.mob in messagemobs) prefix = "" if((target.mob in messagemobs) || display_remote) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 8cca18a81bd..70a32239083 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -77,7 +77,7 @@ msg += "" // more info button - msg += "?" + msg += "?" total_num++ msg += "" diff --git a/code/modules/admin/DB ban/ban_mirroring.dm b/code/modules/admin/DB ban/ban_mirroring.dm index 76fc409c3be..bc6c6ef40c4 100644 --- a/code/modules/admin/DB ban/ban_mirroring.dm +++ b/code/modules/admin/DB ban/ban_mirroring.dm @@ -175,9 +175,9 @@ output += "[details["source"]]" output += "[details["ckey"]]" output += "[details["date"]]" - output += "[details["inactive"] ? "Reactivate" : "Deactivate"]" + output += "[details["inactive"] ? "Reactivate" : "Deactivate"]" if (details["extra"]) - output += " | View Ckeys" + output += " | View Ckeys" output += "" output += "" @@ -209,7 +209,7 @@ to_chat(user, SPAN_NOTICE("No attached ckeys were found.")) return - var/output = "Back

    " + var/output = "Back

    " try var/list/ckeys = json_decode(query.item[1]) @@ -222,7 +222,7 @@ to_chat(user, SPAN_NOTICE("Maligned data found. Please alert the system administrator.")) return - output += "

    Back" + output += "

    Back" user << browse(output, "window=banmirrors") /proc/toggle_mirror_status(mob/user, mirror_id, inactive = FALSE) diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index 1c1d0a57c41..cfa00a4c981 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -449,7 +449,7 @@ var/mirror_count = 0 var/mirror_data = "
    " while (mirror_query.NextRow()) - mirror_data += "Active mirror for #[mirror_query.item[1]] (View Ban)
    " + mirror_data += "Active mirror for #[mirror_query.item[1]] (View Ban)
    " mirror_count++ if (mirror_count) diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 99cb86b75f5..4a666396fd8 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 += "(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.dm b/code/modules/admin/admin.dm index 53047a946f0..10458ce0a15 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -52,51 +52,51 @@ var/global/enabled_spooking = 0 body += "Options panel for [M]" if(M.client) body += " played by [M.client] " - body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]" + body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]" if(istype(M, /mob/abstract/new_player)) body += " Hasn't Entered Game " else - body += " \[Heal\] " + body += " \[Heal\] " body += {"

    \[ - VV - - TP - - PM - - SM - + VV - + TP - + PM - + SM - [admin_jump_link(M, src)]\]
    Mob type = [M.type]

    - Kick | - Warn | - Warnings | - Ban | - Jobban | - Notes + Kick | + Warn | + Warnings | + Ban | + Jobban | + Notes "} if(M.client) - body += "| Wind | " - body += "\ Send back to Lobby" + body += "| Wind | " + body += "\ Send back to Lobby" var/muted = M.client.prefs.muted body += {"
    Mute: - \[IC | - OOC | - PRAY | - ADMINHELP | - DEADCHAT | - AOOC\] - (toggle all) + \[IC | + OOC | + PRAY | + ADMINHELP | + DEADCHAT | + AOOC\] + (toggle all) "} body += {"

    - Jump to | - Get | - Send To + Jump to | + Get | + Send To

    - [check_rights(R_ADMIN|R_MOD,0) ? "Traitor panel | " : "" ] - Narrate to | - Subtle message + [check_rights(R_ADMIN|R_MOD,0) ? "Traitor panel | " : "" ] + Narrate to | + Subtle message "} body += "

    " @@ -104,7 +104,7 @@ var/global/enabled_spooking = 0 if(isliving(M)) var/mob/living/psyker = M if(psyker.psi) - body += "Remove psionics.

    " + body += "Remove psionics.

    " body += "
    " for(var/psi_rank in list(PSI_RANK_SENSITIVE, PSI_RANK_HARMONIOUS, PSI_RANK_APEX, PSI_RANK_LIMITLESS)) var/owner_rank = psyker.psi ? psyker.psi.get_rank() : 0 @@ -112,9 +112,9 @@ var/global/enabled_spooking = 0 if(psi_rank == owner_rank) psi_title = "[psi_title]" if(psi_rank != PSI_RANK_LIMITLESS) - body += "[psi_title]" + body += "[psi_title]" else - body += "[psi_title]" + body += "[psi_title]" body += "
    " if (M.client) @@ -127,28 +127,28 @@ var/global/enabled_spooking = 0 if(issmall(M)) body += "Monkeyized | " else - body += "Monkeyize | " + body += "Monkeyize | " //Corgi if(iscorgi(M)) body += "Corgized | " else - body += "Corgize | " + body += "Corgize | " //AI / Cyborg if(isAI(M)) body += "Is an AI " else if(ishuman(M)) - body += {"Make AI | - Make Robot | - Make slime + body += {"Make AI | + Make Robot | + Make slime "} //Simple Animals if(isanimal(M)) - body += "Re-Animalize | " + body += "Re-Animalize | " else - body += "Animalize | " + body += "Animalize | " // DNA2 - Admin Hax if(M.dna && iscarbon(M)) @@ -163,7 +163,7 @@ var/global/enabled_spooking = 0 if(bname) var/bstate=M.dna.GetSEState(block) var/bcolor="[(bstate)?"#006600":"#ff0000"]" - body += "[bname][block]" + body += "[bname][block]" else body += "[block]" body+="" @@ -171,36 +171,36 @@ var/global/enabled_spooking = 0 body += {"

    Rudimentary transformation:
    These transformations only create a new mob type and copy stuff over. They do not take into account MMIs and similar mob-specific things. The buttons in 'Transformations' are preferred, when possible.
    - Observer | - \[ Crew: Choose Species\] | \[ - Nymph\] | - \[ slime: Baby\]| - AI | - Cyborg | - Cat | - Runtime | - Corgi | - Ian | - Crab | - Coffee | - \[ Construct: Armored , - Builder , - Wraith \] - Shade - Meme + Observer | + \[ Crew: Choose Species\] | \[ + Nymph\] | + \[ slime: Baby\]| + AI | + Cyborg | + Cat | + Runtime | + Corgi | + Ian | + Crab | + Coffee | + \[ Construct: Armored , + Builder , + Wraith \] + Shade + Meme
    "} body += {"

    Other actions:
    - Forcesay + Forcesay "} if (M.client) body += {" | - Thunderdome 1 | - Thunderdome 2 | - Thunderdome Admin | - Thunderdome Observer | + Thunderdome 1 | + Thunderdome 2 | + Thunderdome Admin | + Thunderdome Observer | "} // language toggles body += "

    Languages:
    " @@ -211,9 +211,9 @@ var/global/enabled_spooking = 0 if(!f) body += " | " else f = 0 if(L in M.languages) - body += "[k]" + body += "[k]" else - body += "[k]" + body += "[k]" body += {"
    @@ -269,7 +269,7 @@ var/global/enabled_spooking = 0 upper_bound = min(upper_bound, note_keys.len) for(var/index = lower_bound, index <= upper_bound, index++) var/t = note_keys[index] - dat += "[t]" + dat += "[t]" dat += "
    " @@ -277,7 +277,7 @@ var/global/enabled_spooking = 0 for(var/index = 1, index <= number_pages, index++) if(index == page) dat += "" - dat += "[index] " + dat += "[index] " if(index == page) dat += "" @@ -330,12 +330,12 @@ var/global/enabled_spooking = 0 update_file = 1 dat += "[I.content] by [I.author] ([I.rank]) on [I.timestamp] " if(I.author == usr.key || I.author == "Adminbot") - dat += "Remove" + dat += "Remove" dat += "

    " if(update_file) info << infos dat += "
    " - dat += "Add Comment
    " + dat += "Add Comment
    " dat += "" show_browser(usr, dat, "window=adminplayerinfo;size=480x480") @@ -365,12 +365,12 @@ var/global/enabled_spooking = 0
    Note that this panel allows full freedom over the news network, there are no constrictions except the few basic ones. Don't break things! "} if(SSnews.wanted_issue) - dat+= "
    Read Wanted Issue" + dat+= "
    Read Wanted Issue" - dat+= {"

    Create Feed Channel -
    View Feed Channels -
    Submit new Feed story -

    Exit + dat+= {"

    Create Feed Channel +
    View Feed Channels +
    Submit new Feed story +

    Exit "} var/wanted_already = 0 @@ -378,10 +378,10 @@ var/global/enabled_spooking = 0 wanted_already = 1 dat+={"
    Feed Security functions:
    -
    [(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue -
    Censor Feed Stories -
    Mark Feed Channel with [SSatlas.current_map.company_name] D-Notice (disables and locks the channel. -
    The newscaster recognises you as:
    [src.admincaster_signature]     +
    [(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue +
    Censor Feed Stories +
    Mark Feed Channel with [SSatlas.current_map.company_name] D-Notice (disables and locks the channel. +
    The newscaster recognises you as:
    [src.admincaster_signature]     "} if(1) dat+= "Feed Channels
    " @@ -391,38 +391,38 @@ var/global/enabled_spooking = 0 for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) if(FC.is_admin_channel) - dat+="[FC.channel_name]
    " + dat+="[FC.channel_name]
    " else - dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
    " - dat+={"
    Refresh -
    Back + dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
    " + dat+={"
    Refresh +
    Back "} if(2) dat+={" Creating new Feed Channel... -
    Channel Name: [src.admincaster_feed_channel.channel_name]
    - Channel Author: [src.admincaster_signature]
    - Will Accept Public Feeds: [(src.admincaster_feed_channel.locked) ? ("NO") : ("YES")]

    -
    Submit

    Cancel
    +
    Channel Name: [src.admincaster_feed_channel.channel_name]
    + Channel Author: [src.admincaster_signature]
    + Will Accept Public Feeds: [(src.admincaster_feed_channel.locked) ? ("NO") : ("YES")]

    +
    Submit

    Cancel
    "} if(3) dat+={" Creating new Feed Message... -
    Receiving Channel: [src.admincaster_feed_channel.channel_name]
    " //MARK +
    Receiving Channel: [src.admincaster_feed_channel.channel_name]
    " //MARK Message Author: [src.admincaster_signature]
    - Message Body: [src.admincaster_feed_message.body]
    -
    Submit

    Cancel
    + Message Body: [src.admincaster_feed_message.body]
    +
    Submit

    Cancel
    "} if(4) dat+={" Feed story successfully submitted to [src.admincaster_feed_channel.channel_name].

    -
    Return
    +
    Return
    "} if(5) dat+={" Feed Channel [src.admincaster_feed_channel.channel_name] created successfully.

    -
    Return
    +
    Return
    "} if(6) dat+="ERROR: Could not submit Feed story to Network.

    " @@ -430,7 +430,7 @@ var/global/enabled_spooking = 0 dat+="•Invalid receiving channel name.
    " if(src.admincaster_feed_message.body == "" || src.admincaster_feed_message.body == "\[REDACTED\]") dat+="•Invalid message body.
    " - dat+="
    Return
    " + dat+="
    Return
    " if(7) dat+="ERROR: Could not submit Feed Channel to Network.

    " if(src.admincaster_feed_channel.channel_name =="" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]") @@ -443,7 +443,7 @@ var/global/enabled_spooking = 0 break if(check) dat+="•Channel name already in use.
    " - dat+="
    Return
    " + dat+="
    Return
    " if(9) dat+="[src.admincaster_feed_channel.channel_name]: \[created by: [src.admincaster_feed_channel.author]\]
    " if(src.admincaster_feed_channel.censored) @@ -458,15 +458,15 @@ var/global/enabled_spooking = 0 var/i = 0 for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) i++ - dat+="
    [MESSAGE.body] \[Likes: [MESSAGE.likes] Dislikes: [MESSAGE.dislikes]\]
    " + dat+="
    [MESSAGE.body] \[Likes: [MESSAGE.likes] Dislikes: [MESSAGE.dislikes]\]
    " if(MESSAGE.img) send_rsc(usr, MESSAGE.img, "tmp_photo[i].png") dat+="

    " - dat+="View Comments Add Comment Like Story Dislike Story
    " + dat+="View Comments Add Comment Like Story Dislike Story
    " dat+="\[Story by [MESSAGE.author] - [MESSAGE.time_stamp]\]

    " dat+={" -
    Refresh -
    Back +
    Refresh +
    Back "} if(10) dat+={" @@ -480,8 +480,8 @@ var/global/enabled_spooking = 0 else for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) - dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
    " - dat+="
    Cancel" + dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
    " + dat+="
    Cancel" if(11) dat+={" [SSatlas.current_map.company_name] D-Notice Handler
    @@ -494,13 +494,13 @@ var/global/enabled_spooking = 0 else for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) - dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
    " + dat+="[FC.channel_name] [(FC.censored) ? (SPAN_WARNING("***")) : null]
    " - dat+="
    Back" + dat+="
    Back" if(12) dat+={" [src.admincaster_feed_channel.channel_name]: \[ created by: [src.admincaster_feed_channel.author] \]
    - [(src.admincaster_feed_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
    + [(src.admincaster_feed_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
    "} if( isemptylist(src.admincaster_feed_channel.messages) ) dat+="No feed messages found in channel...
    " @@ -508,13 +508,13 @@ var/global/enabled_spooking = 0 for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) dat+={" -[MESSAGE.body]
    \[Story by [MESSAGE.author]\]
    - [(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
    + [(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
    "} - dat+="
    Back" + dat+="
    Back" if(13) dat+={" [src.admincaster_feed_channel.channel_name]: \[ created by: [src.admincaster_feed_channel.author] \]
    - Channel messages listed below. If you deem them dangerous to the [station_name(TRUE)], you can Bestow a D-Notice upon the channel.
    + Channel messages listed below. If you deem them dangerous to the [station_name(TRUE)], you can Bestow a D-Notice upon the channel.
    "} if(src.admincaster_feed_channel.censored) dat+={" @@ -528,7 +528,7 @@ var/global/enabled_spooking = 0 for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) dat+="-[MESSAGE.body]
    \[Story by [MESSAGE.author]\]
    " - dat+="
    Back" + dat+="
    Back" if(14) dat+="Wanted Issue Handler:" var/wanted_already = 0 @@ -540,21 +540,21 @@ var/global/enabled_spooking = 0 dat+="
    A wanted issue is already in Feed Circulation. You can edit or cancel it below.    " dat+={"
    - Criminal Name: [src.admincaster_feed_message.author]
    - Description: [src.admincaster_feed_message.body]
    + Criminal Name: [src.admincaster_feed_message.author]
    + Description: [src.admincaster_feed_message.body]
    "} if(wanted_already) dat+="Wanted Issue created by: [SSnews.wanted_issue.backup_author]
    " else dat+="Wanted Issue will be created under prosecutor: [src.admincaster_signature]
    " - dat+="
    [(wanted_already) ? ("Edit Issue") : ("Submit")]" + dat+="
    [(wanted_already) ? ("Edit Issue") : ("Submit")]" if(wanted_already) - dat+="
    Take down Issue" - dat+="
    Cancel" + dat+="
    Take down Issue" + dat+="
    Cancel" if(15) dat+={" Wanted issue for [src.admincaster_feed_message.author] is now in Network Circulation.

    -
    Return
    +
    Return
    "} if(16) dat+="ERROR: Wanted Issue rejected by Network.

    " @@ -562,11 +562,11 @@ var/global/enabled_spooking = 0 dat+="•Invalid name for person wanted.
    " if(src.admincaster_feed_message.body == "" || src.admincaster_feed_message.body == "\[REDACTED\]") dat+="•Invalid description.
    " - dat+="
    Return
    " + dat+="
    Return
    " if(17) dat+={" Wanted Issue successfully deleted from Circulation
    -
    Return
    +
    Return
    "} if(18) dat+={" @@ -580,11 +580,11 @@ var/global/enabled_spooking = 0 dat+="
    " else dat+="None" - dat+="
    Back
    " + dat+="
    Back
    " if(19) dat+={" Wanted issue for [src.admincaster_feed_message.author] successfully edited.

    -
    Return
    +
    Return
    "} if(20) //comments but with more censorship! dat+="Comments:
    " @@ -592,8 +592,8 @@ var/global/enabled_spooking = 0 dat+="No comments on this story yet!
    " else for(var/datum/feed_comment/COMMENT in src.admincaster_viewing_message.comments) - dat+="
    \[[world.time]\] [COMMENT.author]:[COMMENT.message]
    Return" + dat+="
    \[[world.time]\] [COMMENT.author]:[COMMENT.message]
    Return" else dat+="Please report this on GitHub, along with what you did to make this appear." @@ -609,13 +609,13 @@ var/global/enabled_spooking = 0 // RIP whoever uses this panel. It's going to be amazingly painful! var/dat = "Job Bans!
    " - dat += "Search via ckey
    " + dat += "Search via ckey
    " dat += "" for (var/ckey in GLOB.jobban_keylist) for (var/job in GLOB.jobban_keylist[ckey]) var/list/ban = GLOB.jobban_keylist[ckey][job] if (!jobban_isexpired(ban, null, job, ckey)) - dat += "" + dat += "" dat += "
    [ckey] - [ban[2]] - (unban)
    [ckey] - [ban[2]] - (unban)
    " usr << browse(dat, "window=ban;size=400x400") @@ -625,19 +625,19 @@ var/global/enabled_spooking = 0 var/dat = {"
    Game Panel
    \n - Change Game Mode
    + Change Game Mode
    "} if(GLOB.master_mode == ROUNDTYPE_STR_SECRET || GLOB.master_mode == ROUNDTYPE_STR_MIXED_SECRET) - dat += "(Force Secret Mode)
    " + dat += "(Force Secret Mode)
    " dat += {"
    - Create Object
    - Create Turf
    - Create Mob
    -
    Edit Airflow Settings
    - Edit Phoron Settings
    - Choose a default ZAS setting
    + Create Object
    + Create Turf
    + Create Mob
    +
    Edit Airflow Settings
    + Edit Phoron Settings
    + Choose a default ZAS setting
    "} usr << browse(dat, "window=admin2;size=210x280") @@ -656,7 +656,7 @@ var/global/enabled_spooking = 0 for(var/datum/admin_secret_item/item in category.items) if(!item.can_view(usr)) continue - dat += "[item.name()]
    " + dat += "[item.name()]
    " dat += "
    " usr << browse(dat, "window=secrets") return @@ -1078,66 +1078,66 @@ var/global/enabled_spooking = 0 alert("Not before roundstart!", "Alert") return - var/out = "Current mode: [SSticker.mode.name] ([SSticker.mode.config_tag])
    " + var/out = "Current mode: [SSticker.mode.name] ([SSticker.mode.config_tag])
    " out += "
    " if(SSticker.mode.ert_disabled) - out += "Emergency Response Teams: disabled" + out += "Emergency Response Teams: disabled" else - out += "Emergency Response Teams: enabled" + out += "Emergency Response Teams: enabled" out += "
    " if(SSticker.mode.deny_respawn) - out += "Respawning: disallowed" + out += "Respawning: disallowed" else - out += "Respawning: allowed" + out += "Respawning: allowed" out += "
    " - out += "Shuttle delay multiplier: [SSticker.mode.shuttle_delay]
    " + out += "Shuttle delay multiplier: [SSticker.mode.shuttle_delay]
    " if(SSticker.mode.auto_recall_shuttle) - out += "Shuttle auto-recall: enabled" + out += "Shuttle auto-recall: enabled" else - out += "Shuttle auto-recall: disabled" + out += "Shuttle auto-recall: disabled" out += "

    " if(SSticker.mode.event_delay_mod_moderate) - out += "Moderate event time modifier: [SSticker.mode.event_delay_mod_moderate]
    " + out += "Moderate event time modifier: [SSticker.mode.event_delay_mod_moderate]
    " else - out += "Moderate event time modifier: unset
    " + out += "Moderate event time modifier: unset
    " if(SSticker.mode.event_delay_mod_major) - out += "Major event time modifier: [SSticker.mode.event_delay_mod_major]
    " + out += "Major event time modifier: [SSticker.mode.event_delay_mod_major]
    " else - out += "Major event time modifier: unset
    " + out += "Major event time modifier: unset
    " out += "
    " if(LAZYLEN(SSticker.mode.antag_tags)) out += "Core antag templates:
    " for(var/antag_tag in SSticker.mode.antag_tags) - out += "[antag_tag].
    " + out += "[antag_tag].
    " if(SSticker.mode.round_autoantag) - out += "Autotraitor enabled." + out += "Autotraitor enabled." if(SSticker.mode.antag_scaling_coeff > 0) - out += " (scaling with [SSticker.mode.antag_scaling_coeff])" + out += " (scaling with [SSticker.mode.antag_scaling_coeff])" else - out += " (not currently scaling, set a coefficient)" + out += " (not currently scaling, set a coefficient)" out += "
    " else - out += "Autotraitor disabled.
    " + out += "Autotraitor disabled.
    " out += "All antag ids:" if(LAZYLEN(SSticker.mode.antag_templates)) for(var/datum/antagonist/antag in SSticker.mode.antag_templates) antag.update_current_antag_max() - out += " [antag.id]" + out += " [antag.id]" out += " ([antag.get_antag_count()]/[antag.cur_max]) " - out += " \[-\]
    " + out += " \[-\]
    " else out += " None." - out += " \[+\]
    " + out += " \[+\]
    " usr << browse(out, "window=edit_mode[src]") feedback_add_details("admin_verb","SGM") @@ -1221,19 +1221,19 @@ var/global/enabled_spooking = 0 return "[key_name(C, link, name, highlight_special, ticket)]" if(1) //Private Messages - return "[key_name(C, link, name, highlight_special, ticket)](?)" + return "[key_name(C, link, name, highlight_special, ticket)](?)" if(2) //Admins var/ref_mob = "[REF(M)]" - return "[key_name(C, link, name, highlight_special, ticket)](?) (PP) (VV) (SM) ([admin_jump_link(M)]) (CA)" + return "[key_name(C, link, name, highlight_special, ticket)](?) (PP) (VV) (SM) ([admin_jump_link(M)]) (CA)" if(3) //Devs var/ref_mob = "[REF(M)]" - return "[key_name(C, link, name, highlight_special, ticket)](VV)([admin_jump_link(M)])" + return "[key_name(C, link, name, highlight_special, ticket)](VV)([admin_jump_link(M)])" if(4) //Mentors var/ref_mob = "[REF(M)]" - return "[key_name(C, link, name, highlight_special, ticket)] (?) (PP) (VV) (SM) ([admin_jump_link(M)])" + return "[key_name(C, link, name, highlight_special, ticket)] (?) (PP) (VV) (SM) ([admin_jump_link(M)])" // //ALL DONE diff --git a/code/modules/admin/admin_attack_log.dm b/code/modules/admin/admin_attack_log.dm index db266c08180..e1c1ba975fa 100644 --- a/code/modules/admin/admin_attack_log.dm +++ b/code/modules/admin/admin_attack_log.dm @@ -5,7 +5,7 @@ /proc/log_and_message_admins(var/message as text, var/mob/user = usr, var/turf/location) var/turf/T = location ? location : (user ? get_turf(user) : null) if(T) - message = message + " (JMP)" + message = message + " (JMP)" log_admin(user ? "[key_name(user)] [message]" : "EVENT [message]") message_admins(user ? "[key_name_admin(user)] [message]" : "EVENT [message]") @@ -25,10 +25,10 @@ var/jmp_link = "" if(victim) victim.attack_log +="\[[time_stamp()]\] [key_name(attacker)] - [victim_message]" - jmp_link = " (JMP)" + jmp_link = " (JMP)" if(attacker) attacker.attack_log += "\[[time_stamp()]\] [key_name(victim)] - [attacker_message]" - jmp_link = " (JMP)" + 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/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ad0469d7c20..e4105d8f7a0 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1368,7 +1368,7 @@ GLOBAL_LIST_INIT(admin_verbs_cciaa, list( prefix = "(R)" admin_stuff += "/([source.key])" if(target != source.client) - admin_stuff += "(JMP)" + admin_stuff += "(JMP)" if(target.mob in messagemobs) prefix = "" if((target.mob in messagemobs) || display_remote) diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 16394cb4d2c..fdcbc8f48ec 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -322,7 +322,7 @@ GLOBAL_PROTECT(jobban_keylist) //Regular jobs //Command jobs += "" - jobs += "" + jobs += "" for (var/jobPos in command_positions) if (!jobPos) continue @@ -331,10 +331,10 @@ GLOBAL_PROTECT(jobban_keylist) continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 6) //So things dont get squiiiiished! @@ -344,7 +344,7 @@ GLOBAL_PROTECT(jobban_keylist) //Command Support jobs += "
    Command Positions
    Command Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for (var/jobPos in command_support_positions) if (!jobPos) continue @@ -353,10 +353,10 @@ GLOBAL_PROTECT(jobban_keylist) continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 6) //So things dont get squiiiiished! @@ -367,7 +367,7 @@ GLOBAL_PROTECT(jobban_keylist) //Security counter = 0 jobs += "
    Command Support Positions
    Command Support Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for (var/jobPos in security_positions) if (!jobPos) continue @@ -376,10 +376,10 @@ GLOBAL_PROTECT(jobban_keylist) continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -390,7 +390,7 @@ GLOBAL_PROTECT(jobban_keylist) //Engineering counter = 0 jobs += "
    Security Positions
    Security Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for (var/jobPos in engineering_positions) if (!jobPos) continue @@ -399,10 +399,10 @@ GLOBAL_PROTECT(jobban_keylist) continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -413,7 +413,7 @@ GLOBAL_PROTECT(jobban_keylist) //Medical counter = 0 jobs += "
    Engineering Positions
    Engineering Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for (var/jobPos in medical_positions) if (!jobPos) continue @@ -422,10 +422,10 @@ GLOBAL_PROTECT(jobban_keylist) continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -436,7 +436,7 @@ GLOBAL_PROTECT(jobban_keylist) //Science counter = 0 jobs += "
    Medical Positions
    Medical Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for (var/jobPos in science_positions) if (!jobPos) continue @@ -445,10 +445,10 @@ GLOBAL_PROTECT(jobban_keylist) continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -459,7 +459,7 @@ GLOBAL_PROTECT(jobban_keylist) //Cargo counter = 0 jobs += "
    Science Positions
    Science Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for (var/jobPos in cargo_positions) if (!jobPos) continue @@ -468,10 +468,10 @@ GLOBAL_PROTECT(jobban_keylist) continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) @@ -481,7 +481,7 @@ GLOBAL_PROTECT(jobban_keylist) //Service counter = 0 jobs += "
    Cargo Positions
    Cargo Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for (var/jobPos in service_positions) if (!jobPos) continue @@ -490,10 +490,10 @@ GLOBAL_PROTECT(jobban_keylist) continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -504,7 +504,7 @@ GLOBAL_PROTECT(jobban_keylist) //Civilian counter = 0 jobs += "
    Service Positions
    Service Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for (var/jobPos in civilian_positions) if (!jobPos) continue @@ -513,10 +513,10 @@ GLOBAL_PROTECT(jobban_keylist) continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -526,7 +526,7 @@ GLOBAL_PROTECT(jobban_keylist) //Non-Human (Green) counter = 0 jobs += "
    Civilian Positions
    Civilian Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for (var/jobPos in nonhuman_positions) if (!jobPos) continue @@ -535,10 +535,10 @@ GLOBAL_PROTECT(jobban_keylist) continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -549,28 +549,28 @@ GLOBAL_PROTECT(jobban_keylist) //pAI isn't technically a job, but it goes in here. if (jobban_isbanned(ckey, "pAI")) - jobs += "" + jobs += "" else - jobs += "" + jobs += "" if (jobban_isbanned(ckey, "AntagHUD")) - jobs += "" + jobs += "" else - jobs += "" + jobs += "" jobs += "
    Non-human Positions
    Non-human Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]pAIpAIpAIpAIAntagHUDAntagHUDAntagHUDAntagHUD
    " //Antagonist (Orange) counter = 0 var/isbanned_dept = jobban_isbanned(ckey, "Antagonist") jobs += "" - jobs += "" + jobs += "" for (var/antag_type in GLOB.all_antag_types) var/datum/antagonist/antag = GLOB.all_antag_types[antag_type] if (!antag || !antag.bantype) continue if (isbanned_dept || jobban_isbanned(ckey, antag.bantype)) - jobs += "" + jobs += "" else - jobs += "" + jobs += "" counter++ @@ -584,9 +584,9 @@ GLOBAL_PROTECT(jobban_keylist) jobs += "" if (jobban_isbanned(ckey, "Dionaea")) - jobs += "" + jobs += "" else - jobs += "" + jobs += "" jobs += "
    Antagonist Positions
    Antagonist Positions
    [replacetext("[antag.role_text]", " ", " ")][replacetext("[antag.role_text]", " ", " ")][replacetext("[antag.role_text]", " ", " ")][replacetext("[antag.role_text]", " ", " ")]
    Other Races
    DionaeaDionaeaDionaeaDionaea
    " body = "[jobs]" dat = "[header][body]" diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm index 82fde396205..13da213669b 100644 --- a/code/modules/admin/player_notes.dm +++ b/code/modules/admin/player_notes.dm @@ -12,19 +12,19 @@ datum/admins/proc/notes_gethtml(var/ckey) var/savefile/notesfile = new(NOTESFILE) if(!notesfile) return SPAN_WARNING("Error: Cannot access [NOTESFILE]") if(ckey) - . = "Notes for [ckey]: \[+\] \[-\]
    " + . = "Notes for [ckey]: \[+\] \[-\]
    " notesfile.cd = "/[ckey]" var/index = 1 while( !notesfile.eof ) var/note notesfile >> note - . += "[note] \[-\]
    " + . += "[note] \[-\]
    " index++ else - . = "All Notes: \[+\] \[-\]
    " + . = "All Notes: \[+\] \[-\]
    " notesfile.cd = "/" for(var/dir in notesfile.dir) - . += "[dir]
    " + . += "[dir]
    " return //handles removing entries from the buffer, or removing the entire directory if no start_index is given diff --git a/code/modules/admin/player_notes_sql.dm b/code/modules/admin/player_notes_sql.dm index 74931e911a1..602032540c6 100644 --- a/code/modules/admin/player_notes_sql.dm +++ b/code/modules/admin/player_notes_sql.dm @@ -117,7 +117,7 @@ if (player_ckey) var/list/query_details = list("player_ckey" = player_ckey) - dat += "Add Note" + dat += "Add Note" var/DBQuery/init_query = GLOB.dbcon.NewQuery("SELECT ip, computerid FROM ss13_player WHERE ckey = :player_ckey:") init_query.Execute(query_details) diff --git a/code/modules/admin/secrets/admin_secrets/move_shuttle.dm b/code/modules/admin/secrets/admin_secrets/move_shuttle.dm index 2ec24dcef9a..44c52decdae 100644 --- a/code/modules/admin/secrets/admin_secrets/move_shuttle.dm +++ b/code/modules/admin/secrets/admin_secrets/move_shuttle.dm @@ -30,4 +30,4 @@ if(!destination) return S.attempt_move(destination) - log_and_message_admins("moved the [shuttle_tag] shuttle to [destination] (JMP)", user) + log_and_message_admins("moved the [shuttle_tag] shuttle to [destination] (JMP)", user) diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 31b6d766d93..43f30b37ab6 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -323,15 +323,15 @@ return var/timeout if (establish_db_connection(GLOB.dbcon)) - timeout = "\[[(ban["timeout"] ? "untimeout" : "timeout" )]\]" + timeout = "\[[(ban["timeout"] ? "untimeout" : "timeout" )]\]" else - timeout = "\[revert\]" + timeout = "\[revert\]" . = list({" - \[-\] + \[-\] [timeout] [ckey]
    " - [ban["message"]] \[Edit\]
    + [ban["message"]] \[Edit\]
    "}) if (ban["admin"]) . += "[ban["admin"]]
    " @@ -341,12 +341,12 @@ for (var/key in ban["keys"]) if (ckey(key) == ckey) continue - . += "
  • \[-\][key]\[E\]
    • " + . += "
  • \[-\][key]\[E\]
    • " for (var/key in ban["whitelist"]) if (ckey(key) == ckey) continue - . += "
  • \[-\][key]\[UE\]
    • " + . += "
  • \[-\][key]\[UE\]
    • " . += "\n" @@ -365,7 +365,7 @@ Sticky Bans -

    All Sticky Bans:

    \[+\]
    +

    All Sticky Bans:

    \[+\]
    [banhtml.Join("")] "} diff --git a/code/modules/admin/ticket.dm b/code/modules/admin/ticket.dm index 4ba6d15ee23..593586035f7 100644 --- a/code/modules/admin/ticket.dm +++ b/code/modules/admin/ticket.dm @@ -245,7 +245,7 @@ GLOBAL_LIST_EMPTY(ticket_panels) var/ref_mob = "" if(owner_client) ref_mob = "[REF(owner_client.mob)]" - ticket_dat += " - ? - PP - VV - SM[owner_client ? "- [admin_jump_link(owner_client.mob, src)]" : ""]" + ticket_dat += " - ? - PP - VV - SM[owner_client ? "- [admin_jump_link(owner_client.mob, src)]" : ""]" if(open_ticket && open_ticket == ticket) ticket_dat += "" ticket_dat += "" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 8dca8f3cf61..5dcce167d43 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -412,9 +412,9 @@ return alert(usr, "The game has already started.", null, null, null, null) var/dat = {"What mode do you wish to play?
    "} for(var/mode in GLOB.config.modes) - dat += {"[GLOB.config.mode_names[mode]]
    "} - dat += {"Secret
    "} - dat += {"Random
    "} + dat += {"[GLOB.config.mode_names[mode]]
    "} + dat += {"Secret
    "} + dat += {"Random
    "} dat += {"Now: [GLOB.master_mode]"} usr << browse(dat, "window=c_mode") @@ -428,8 +428,8 @@ return alert(usr, "The game mode has to be secret!", null, null, null, null) var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
    "} for(var/mode in GLOB.config.modes) - dat += {"[GLOB.config.mode_names[mode]]
    "} - dat += {"Random (default)
    "} + dat += {"[GLOB.config.mode_names[mode]]
    "} + dat += {"Random (default)
    "} dat += {"Now: [GLOB.secret_force_mode]"} usr << browse(dat, "window=f_secret") @@ -831,7 +831,7 @@ dat += "Location: [location_description]
    " if(special_role_description) dat += "Special Role Desc: [special_role_description]
    " - dat += "(PM) (PP) (VV) (SM) ([admin_jump_link(M, src)]) (CA)" + dat += "(PM) (PP) (VV) (SM) ([admin_jump_link(M, src)]) (CA)" var/datum/browser/extrainfo_win = new(usr, "extrainfo", "Extra Info (M.name)", 450, 500) extrainfo_win.set_content(dat) @@ -979,7 +979,7 @@ for (var/page = 1, page <= B.pages.len, page++) var/obj/pageobj = B.pages[page] - data += "Page [page] - [pageobj.name]
    " + data += "Page [page] - [pageobj.name]
    " usr << browse(data, "window=[B.name]") else @@ -1589,11 +1589,11 @@ /mob/extra_admin_link(var/source) if(client && eyeobj) - return "|EYE" + return "|EYE" /mob/abstract/ghost/observer/extra_admin_link(var/source) if(mind && mind.current) - return "|BDY" + return "|BDY" /proc/admin_jump_link(var/atom/target, var/source) if(!target) return @@ -1603,7 +1603,7 @@ else source = "_src_=holder" - . = "JMP" + . = "JMP" . += target.extra_admin_link(source) /proc/spawn_humanoid_species_admin(var/mob/user, var/mob/M, var/delmob) diff --git a/code/modules/admin/verbs/SDQL_2.dm b/code/modules/admin/verbs/SDQL_2.dm index cb59138ccf5..b06394beb7e 100644 --- a/code/modules/admin/verbs/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL_2.dm @@ -717,18 +717,18 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null /datum/sdql2_query/proc/SDQL_print(object, list/text_list, print_nulls = TRUE) if(isdatum(object)) - text_list += "[REF(object)] : [object]" + text_list += "[REF(object)] : [object]" if(istype(object, /atom)) var/atom/A = object var/turf/T = A.loc var/area/a if(istype(T)) - text_list += " at [T] (JMP)" + text_list += " at [T] (JMP)" a = T.loc else var/turf/final = get_turf(T) //Recursive, hopefully? if(istype(final)) - text_list += " at [final] (JMP)" + text_list += " at [final] (JMP)" a = final.loc else text_list += " at nonexistent location" diff --git a/code/modules/admin/verbs/access_control.dm b/code/modules/admin/verbs/access_control.dm index 6782e1e78c1..01d88f06bfe 100644 --- a/code/modules/admin/verbs/access_control.dm +++ b/code/modules/admin/verbs/access_control.dm @@ -13,27 +13,27 @@ data += "If you do not know what these do, you shouldn't be touching them!
    " data += "

    Hub Visibility Setting:


    " - data += "Currently [world.visibility ? "VISIBLE" : SPAN_WARNING("HIDDEN")]. Toggle
    " + data += "Currently [world.visibility ? "VISIBLE" : SPAN_WARNING("HIDDEN")]. Toggle
    " data += "

    IP Intel Settings:


      " - data += "
    • Current warning level: [GLOB.config.ipintel_rating_bad ? "[GLOB.config.ipintel_rating_bad]" : SPAN_WARNING("DISABLED")]. Edit
      • " - data += "
    • Current kick level: [GLOB.config.ipintel_rating_kick ? "[GLOB.config.ipintel_rating_kick]" : SPAN_WARNING("DISABLED")]. Edit
      • " + data += "
    • Current warning level: [GLOB.config.ipintel_rating_bad ? "[GLOB.config.ipintel_rating_bad]" : SPAN_WARNING("DISABLED")]. Edit
      • " + data += "
    • Current kick level: [GLOB.config.ipintel_rating_kick ? "[GLOB.config.ipintel_rating_kick]" : SPAN_WARNING("DISABLED")]. Edit
      • " data += "
    " data += "

    Player Age Settings:


      " - data += "
    • New players: [GLOB.config.access_deny_new_players ? SPAN_WARNING("DENIED") : "ALLOWED"]. Toggle
      • " - data += "
    • Account age restriction: [GLOB.config.access_deny_new_accounts == -1 ? SPAN_WARNING("DISABLED") : "[GLOB.config.access_deny_new_accounts] DAYS"]. Edit
      • " + data += "
    • New players: [GLOB.config.access_deny_new_players ? SPAN_WARNING("DENIED") : "ALLOWED"]. Toggle
      • " + data += "
    • Account age restriction: [GLOB.config.access_deny_new_accounts == -1 ? SPAN_WARNING("DISABLED") : "[GLOB.config.access_deny_new_accounts] DAYS"]. Edit
      • " data += "
    " data += "

    VM Detection Settings:


      " - data += "
    • VM identifier count to warn on: [GLOB.config.access_warn_vms ? "[GLOB.config.access_warn_vms]" : SPAN_WARNING("DISABLED")]. Edit
      • " - data += "
    • VM identifier count to kick on: [GLOB.config.access_deny_vms ? "[GLOB.config.access_deny_vms]" : SPAN_WARNING("DISABLED")]. Edit
      • " + data += "
    • VM identifier count to warn on: [GLOB.config.access_warn_vms ? "[GLOB.config.access_warn_vms]" : SPAN_WARNING("DISABLED")]. Edit
      • " + data += "
    • VM identifier count to kick on: [GLOB.config.access_deny_vms ? "[GLOB.config.access_deny_vms]" : SPAN_WARNING("DISABLED")]. Edit
      • " data += "
    " data += "

    Guest join settings:


      " data += "
    • Guests [(GLOB.config.guests_allowed || GLOB.config.external_auth) ? "CAN" : SPAN_WARNING("CAN NOT")] join.
      • " - data += "
    • Guests [GLOB.config.guests_allowed ? "CAN" : SPAN_WARNING("CAN NOT")] play. Toggle
      • " - data += "
    • External authetification: [GLOB.config.external_auth ? "ENABLED" : SPAN_WARNING("DISABLED")]. Toggle
      • " + data += "
    • Guests [GLOB.config.guests_allowed ? "CAN" : SPAN_WARNING("CAN NOT")] play. Toggle
      • " + data += "
    • External authetification: [GLOB.config.external_auth ? "ENABLED" : SPAN_WARNING("DISABLED")]. Toggle
      • " data += "
    " config_window.set_user(src.mob) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 52ab55163d6..ddbbbeba70c 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -41,7 +41,7 @@ GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown","the","a","an","of","mo if(!(word in GLOB.adminhelp_ignored_words)) if(word == "ai" && !ai_found) ai_found = 1 - msg += "[original_word] (CL) " + msg += "[original_word] (CL) " continue else var/mob/found = ckeys[word] @@ -52,10 +52,10 @@ GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown","the","a","an","of","mo if(found) if(!(found in mobs_found)) mobs_found += found - msg += "[original_word] (?)" + msg += "[original_word] (?)" if(!ai_found && isAI(found)) ai_found = 1 - msg += " (CL)" + msg += " (CL)" msg += " " continue msg += "[original_word] " @@ -111,7 +111,7 @@ GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown","the","a","an","of","mo //Options bar: mob, details ( admin = 2, undibbsed admin = 3, mentor = 4, character name (0 = just ckey, 1 = ckey and character name), link? (0 no don't make it a link, 1 do so), // highlight special roles (0 = everyone has same looking name, 1 = antags / special roles get a golden name) - msg = SPAN_NOTICE("[create_text_tag("HELP")][get_options_bar(mob, 2, 1, 1, 1, ticket)] ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE): [msg]") + msg = SPAN_NOTICE("[create_text_tag("HELP")][get_options_bar(mob, 2, 1, 1, 1, ticket)] ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE): [msg]") var/admin_number_present = 0 var/admin_number_afk = 0 diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 6a7bff6f67d..7140a79de6e 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -128,7 +128,7 @@ var/sender_message = "" + create_text_tag("PM <-", src) + " to [get_options_bar(C, holder ? 1 : 0, holder ? 1 : 0, 1)]" if(holder) - sender_message += " ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE)" + sender_message += " ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE)" sender_message += ": [generate_ahelp_key_words(mob, msg)]" else sender_message += ": [msg]" @@ -137,7 +137,7 @@ var/receiver_message = "" + create_text_tag("PM ->", C) + " \[[receive_pm_type] PM\] [get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]" if(C.holder) - receiver_message += " ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE)" + receiver_message += " ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE)" receiver_message += ": [generate_ahelp_key_words(C.mob, msg)]" else receiver_message += ": [msg]" @@ -160,7 +160,7 @@ if(X == C || X == src) continue if(X.key != key && X.key != C.key && (X.holder.rights & (R_ADMIN|R_MOD))) - to_chat(X, "" + create_text_tag("PM <->", X) + " [key_name(src, X, 0, ticket)] to [key_name(C, X, 0, ticket)] ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE): [msg]") + to_chat(X, "" + create_text_tag("PM <->", X) + " [key_name(src, X, 0, ticket)] to [key_name(C, X, 0, ticket)] ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE): [msg]") /client/proc/cmd_admin_discord_pm(sender) if(prefs.muted & MUTE_ADMINHELP) diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index a92ea3c7c1f..e4531078984 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -36,7 +36,7 @@ for(var/s in GLOB.staff) var/client/C = s if ((R_ADMIN|R_MOD) & C.holder.rights) - to_chat(C, "" + create_text_tag("MOD", C) + " [sender_name](JMP): [msg]") + to_chat(C, "" + create_text_tag("MOD", C) + " [sender_name](JMP): [msg]") feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm index 3d4014cc581..bea9b89ceaa 100644 --- a/code/modules/admin/verbs/antag-ooc.dm +++ b/code/modules/admin/verbs/antag-ooc.dm @@ -22,7 +22,7 @@ for(var/mob/M in GLOB.mob_list) if (check_rights(R_ADMIN|R_MOD|R_CCIAA, 0, M) && M.client.aooc_mute_holder_check() == FALSE) - to_chat(M, "" + create_text_tag("A-OOC", M.client) + " [get_options_bar(src, 0, 1, 1)](JMP): [msg]") + to_chat(M, "" + create_text_tag("A-OOC", M.client) + " [get_options_bar(src, 0, 1, 1)](JMP): [msg]") else if (M.mind && M.mind.special_role && M.client && player_is_antag(M.mind)) to_chat(M, "" + create_text_tag("A-OOC", M.client) + " [display_name]: [msg]") diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index acfdf48c90e..ba75213f7e7 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -13,7 +13,7 @@ return var/image/cross = image('icons/obj/library.dmi',"bible") - msg = SPAN_NOTICE("[icon2html(cross, src)] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC): [msg]") + msg = SPAN_NOTICE("[icon2html(cross, src)] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC): [msg]") for(var/s in GLOB.staff) var/client/C = s @@ -26,8 +26,8 @@ log_admin("PRAYER: [key_name(src)]: [msg]") /proc/Centcomm_announce(var/msg, var/mob/Sender, var/iamessage) - var/msg_cciaa = SPAN_NOTICE("[uppertext(SSatlas.current_map.boss_short)][iamessage ? " IA" : ""]:[key_name(Sender, 1)] (RPLY): [msg]") - var/msg_admin = SPAN_NOTICE("[uppertext(SSatlas.current_map.boss_short)][iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender)]) (CA) (BSA) (RPLY): [msg]") + var/msg_cciaa = SPAN_NOTICE("[uppertext(SSatlas.current_map.boss_short)][iamessage ? " IA" : ""]:[key_name(Sender, 1)] (RPLY): [msg]") + var/msg_admin = SPAN_NOTICE("[uppertext(SSatlas.current_map.boss_short)][iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender)]) (CA) (BSA) (RPLY): [msg]") var/cciaa_present = 0 var/cciaa_afk = 0 @@ -56,7 +56,7 @@ SSdiscord.post_webhook_event(WEBHOOK_CCIAA_EMERGENCY_MESSAGE, list("message"=msg, "sender"="[Sender]", "cciaa_present"=cciaa_present, "cciaa_afk"=cciaa_afk)) /proc/Syndicate_announce(var/msg, var/mob/Sender) - msg = SPAN_NOTICE("ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender)]) (CA) (BSA) (RPLY): [msg]") + msg = SPAN_NOTICE("ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender)]) (CA) (BSA) (RPLY): [msg]") for(var/s in GLOB.staff) var/client/C = s if(R_ADMIN & C.holder.rights) diff --git a/code/modules/admin/verbs/warning.dm b/code/modules/admin/verbs/warning.dm index c13e2ded9c3..c1a54e63afa 100644 --- a/code/modules/admin/verbs/warning.dm +++ b/code/modules/admin/verbs/warning.dm @@ -266,7 +266,7 @@ var/list/data = list("unread" = "", "expired" = "") if (count) - data["unread"] = "You have [count] unread warning\s! Click here to review and acknowledge them!" + data["unread"] = "You have [count] unread warning\s! Click here to review and acknowledge them!" if (count_expire) data["expired"] = "[count_expire] of your warnings have expired." diff --git a/code/modules/admin/view_variables/helpers.dm b/code/modules/admin/view_variables/helpers.dm index 4df79c56d9b..537d5a9dce1 100644 --- a/code/modules/admin/view_variables/helpers.dm +++ b/code/modules/admin/view_variables/helpers.dm @@ -1,11 +1,11 @@ /atom/vv_get_header() . = ..() . += {" - [src] + [src]
    - << - [dir2text(dir)] - >> + << + [dir2text(dir)] + >> "} @@ -13,14 +13,14 @@ . = ..() . += {"
    -
    [ckey ? ckey : "No ckey"] / [real_name ? real_name : "No real name"] +
    [ckey ? ckey : "No ckey"] / [real_name ? real_name : "No real name"]
    - BRUTE:[getBruteLoss()] - FIRE:[getFireLoss()] - TOXIN:[getToxLoss()] - OXY:[getOxyLoss()] - CLONE:[getCloneLoss()] - BRAIN:[getBrainLoss()] + BRUTE:[getBruteLoss()] + FIRE:[getFireLoss()] + TOXIN:[getToxLoss()] + OXY:[getOxyLoss()] + CLONE:[getCloneLoss()] + BRAIN:[getBrainLoss()]     "} diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm index 7ae3863dbda..ee3e9d13fa6 100644 --- a/code/modules/admin/view_variables/view_variables.dm +++ b/code/modules/admin/view_variables/view_variables.dm @@ -65,7 +65,7 @@
    - Refresh + Refresh
    " . += "Refresh " - . += "Clear " + . += "Clear " . += "" . += "" . += "
    " @@ -264,7 +264,7 @@ GLOBAL_LIST_INIT(gear_datums, list()) style = "style='color: #B1B1B1;'" if(ticked) style = "style='color: #FF8000;'" - temp_html += "[G.display_name]" + temp_html += "[G.display_name]" temp_html += "[G.cost]" temp_html += "[G.description]
    " @@ -320,7 +320,7 @@ GLOBAL_LIST_INIT(gear_datums, list()) if(ticked) temp_html += "" for(var/datum/gear_tweak/tweak in G.gear_tweaks) - temp_html += " [tweak.get_contents(get_tweak_metadata(G, tweak))]" + temp_html += " [tweak.get_contents(get_tweak_metadata(G, tweak))]" temp_html += "" if(ticked) diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 672a58c1562..97ff81b0e4c 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -163,7 +163,7 @@ "", "
    Character Faction
    ", "This will influence the jobs you can select from, and the starting equipment.
    ", - "[pref.faction]

    " + "[pref.faction]
    " ) dat += list( @@ -202,7 +202,7 @@ dat += "[dispRank] \[FACTION RESTRICTED]" continue else if (ban_reason) - dat += "[dispRank] \[BANNED]" + dat += "[dispRank] \[BANNED]" continue if(job.blacklisted_species) // check for restricted species var/datum/species/S = GLOB.all_species[pref.species] @@ -218,7 +218,7 @@ dat += "[dispRank] \[BACKGROUND RESTRICTED]" continue if(job.alt_titles && (LAZYLEN(pref.GetValidTitles(job)) > 1)) - dispRank = " \[[pref.GetPlayerAltTitle(job)]\]" + dispRank = " \[[pref.GetPlayerAltTitle(job)]\]" if((pref.job_civilian_low & ASSISTANT) && (rank != "Assistant")) dat += "[dispRank]" continue @@ -229,7 +229,7 @@ dat += "" - dat += "" + dat += "" if(rank == "Assistant")//Assistant is special if(pref.job_civilian_low & ASSISTANT) @@ -255,11 +255,11 @@ switch(pref.alternate_option) if(BE_ASSISTANT) - dat += "

    Be assistant if preference unavailable

    " + dat += "

    Be assistant if preference unavailable

    " if(RETURN_TO_LOBBY) - dat += "

    Return to lobby if preference unavailable

    " + dat += "

    Return to lobby if preference unavailable

    " - dat += "
    \[Reset\]
    " + dat += "
    \[Reset\]
    " dat += "" . = dat.Join() @@ -461,7 +461,7 @@ if (faction.name == selected_faction) factions += "[faction.name]" else - factions += "[faction.name]" + factions += "[faction.name]" dat += factions.Join(" ") @@ -485,12 +485,12 @@ dat += "" dat += "
    " - dat += "You can learn more about this faction on the wiki." + dat += "You can learn more about this faction on the wiki." if (selected_faction == pref.faction) dat += "
    \[Faction selected\]" else if (faction.can_select(pref,user)) - dat += "
    \[Select faction\]" + dat += "
    \[Select faction\]" else dat += "
    [faction.get_selection_error(pref, user)]" dat += "
    " diff --git a/code/modules/client/preference_setup/origin/origin.dm b/code/modules/client/preference_setup/origin/origin.dm index 3d09c7754fa..2e31ccc9fe5 100644 --- a/code/modules/client/preference_setup/origin/origin.dm +++ b/code/modules/client/preference_setup/origin/origin.dm @@ -99,14 +99,14 @@ var/list/dat = list() var/singleton/origin_item/culture/CL = GET_SINGLETON(text2path(pref.culture)) var/singleton/origin_item/origin/OR = GET_SINGLETON(text2path(pref.origin)) - dat += "Culture: [CL.name]
    " + dat += "Culture: [CL.name]
    " dat += "- [CL.desc]

    " if(length(CL.origin_traits_descriptions)) dat += "- Characters from this culture " dat += "[english_list(CL.origin_traits_descriptions)]." if(CL.important_information) dat += "
    - [CL.important_information]" - dat += "
    Origin: [OR.name]
    " + dat += "
    Origin: [OR.name]
    " dat += "- [OR.desc]
    " if(length(OR.origin_traits_descriptions)) dat += "- Characters from this origin " @@ -114,10 +114,10 @@ if(OR.important_information) dat += "
    - [OR.important_information]" dat += "
    " - dat += "Economic Status: [pref.economic_status]
    " - dat += "Citizenship: [pref.citizenship]
    " - dat += "Religion: [pref.religion]
    " - dat += "Accent: [pref.accent]
    " + dat += "Economic Status: [pref.economic_status]
    " + dat += "Citizenship: [pref.citizenship]
    " + dat += "Religion: [pref.religion]
    " + dat += "Accent: [pref.accent]
    " . = dat.Join() /datum/category_item/player_setup_item/origin/OnTopic(href, href_list, user) @@ -213,7 +213,7 @@ dat += "
    [OI.desc]
    " if(OI.important_information) dat += "[OI.important_information]" - dat += "
    \[Select\]
    " + dat += "
    \[Select\]
    " dat += "" origin_win.set_content(dat) origin_win.open() @@ -223,9 +223,9 @@ if(citizenship) var/datum/browser/citizen_win = new(user, "citizen_win", "Citizenship") var/dat = "
    [citizenship.name]
    " - dat += "

    Read the Wiki
    " + dat += "

    Read the Wiki
    " dat += "
    [citizenship.description]" - dat += "
    \[Select\]
    " + dat += "
    \[Select\]
    " dat += "" citizen_win.set_content(dat) citizen_win.open() @@ -236,7 +236,7 @@ var/datum/browser/rel_win = new(user, "rel_win", "Religion") var/dat = "
    [religion.name]
    " dat += "
    [religion.description]" - dat += "
    \[Select\]
    " + dat += "
    \[Select\]
    " dat += "" rel_win.set_content(dat) rel_win.open() @@ -247,7 +247,7 @@ var/datum/browser/acc_win = new(user, "acc_win", "Accent") var/dat = "
    [accent.name]
    " dat += "
    [accent.description]" - dat += "
    \[Select\]
    " + dat += "
    \[Select\]
    " dat += "" acc_win.set_content(dat) acc_win.open() diff --git a/code/modules/client/preference_setup/other/01_incidents.dm b/code/modules/client/preference_setup/other/01_incidents.dm index 7e19974d31a..af4a62a892a 100644 --- a/code/modules/client/preference_setup/other/01_incidents.dm +++ b/code/modules/client/preference_setup/other/01_incidents.dm @@ -84,7 +84,7 @@ dat += nl2br(I.notes) else dat += "- No Summary Entered -" - dat += "
    Show Details
    Delete Incident" + dat += "
    Show Details
    Delete Incident" . = dat.Join() diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm index 9ee8f2aa9e2..b01bfc0fdb6 100644 --- a/code/modules/client/preference_setup/preference_setup.dm +++ b/code/modules/client/preference_setup/preference_setup.dm @@ -102,7 +102,7 @@ if(PS == selected_category) dat += "[PS.name] " // TODO: Check how to properly mark a href/button selected in a classic browser window else - dat += "[PS.name] " + dat += "[PS.name] " return dat /datum/category_collection/player_setup_collection/proc/content(var/mob/user) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 94d89b6aebd..e29923f7164 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -254,11 +254,11 @@ GLOBAL_LIST_EMPTY_TYPED(preferences_datums, /datum/preferences) var/dat = "
    " if(path) - dat += "Load slot - " - dat += "Save slot - " - dat += "Reload slot" + dat += "Load slot - " + dat += "Save slot - " + dat += "Reload slot" if (GLOB.config.sql_saves) - dat += " - Permanently delete slot" + dat += " - Permanently delete slot" else dat += "Please create an account to save your preferences." @@ -542,19 +542,19 @@ GLOBAL_LIST_EMPTY_TYPED(preferences_datums, /datum/preferences) id = text2num(query.item[1]) name = query.item[2] if (id == current_character) - dat += "[name]
    " + dat += "[name]
    " else - dat += "[name]
    " + dat += "[name]
    " dat += "
    " dat += "[query.RowCount()]/[GLOB.config.character_slots] slots used
    " if (query.RowCount() < GLOB.config.character_slots) - dat += "New Character" + dat += "New Character" else dat += "New Character" dat += "
    " - dat += "Close
    " + dat += "Close
    " dat += "
    " var/datum/browser/load_diag = new(user, "load_diag", "Character Slots") @@ -576,7 +576,7 @@ GLOBAL_LIST_EMPTY_TYPED(preferences_datums, /datum/preferences) if(!name) name = "Character[i]" if(i==default_slot) name = "[name]" - dat += "[name]
    " + dat += "[name]
    " dat += "
    " dat += "" diff --git a/code/modules/client/preferences_notification.dm b/code/modules/client/preferences_notification.dm index 9232d1c01de..2370a48a21d 100644 --- a/code/modules/client/preferences_notification.dm +++ b/code/modules/client/preferences_notification.dm @@ -203,9 +203,9 @@ "}) ackquery.Execute(list("id" = query.item[3])) if(panel_notification) - new_notification("warning","You have [notification_count] unread notifications! Click here to review and acknowledge them!") + new_notification("warning","You have [notification_count] unread notifications! Click here to review and acknowledge them!") if(chat_notification) - to_chat(user,SPAN_WARNING("You have unacknowledged notifications.
    Click here to review and acknowledge them!")) + to_chat(user,SPAN_WARNING("You have unacknowledged notifications.
    Click here to review and acknowledge them!")) /* * Helper proc for getting a count of active CCIA actions against the player's characters. diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 15a98a4c1c8..b491b30b27c 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -102,7 +102,7 @@ . = ..() if(LAZYLEN(accessories)) for(var/obj/item/clothing/accessory/A in accessories) - . += SPAN_NOTICE("\A [A] [A.gender == PLURAL ? "are" : "is"] attached to it.") + . += SPAN_NOTICE("[on ? "Disable" : "Enable"]" - dat += "
    ID: [id]" - dat += "
    Search Interval: [search_interval/10] seconds" - dat += "
    Search Distance: [distance]" + var/list/dat = "[on ? "Disable" : "Enable"]" + dat += "
    ID: [id]" + dat += "
    Search Interval: [search_interval/10] seconds" + dat += "
    Search Distance: [distance]" var/datum/browser/popup = new(user, "buddytag", "Buddy Tag", 290, 200) popup.set_content(JOINTEXT(dat)) diff --git a/code/modules/cooking/machinery/gibber.dm b/code/modules/cooking/machinery/gibber.dm index 3ed4e121513..0e4d40cd489 100644 --- a/code/modules/cooking/machinery/gibber.dm +++ b/code/modules/cooking/machinery/gibber.dm @@ -213,7 +213,7 @@ occupant.attack_log += "\[[time_stamp()]\] Was gibbed by [user]/[user.ckey]" //One shall not simply gib a mob unnoticed! user.attack_log += "\[[time_stamp()]\] Gibbed [occupant]/[occupant.ckey]" - msg_admin_attack("[key_name_admin(user)] gibbed [occupant] ([occupant.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(occupant)) + msg_admin_attack("[key_name_admin(user)] gibbed [occupant] ([occupant.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(occupant)) occupant.ghostize() diff --git a/code/modules/cooking/machinery/icecream.dm b/code/modules/cooking/machinery/icecream.dm index a9401845b29..395a6c24243 100644 --- a/code/modules/cooking/machinery/icecream.dm +++ b/code/modules/cooking/machinery/icecream.dm @@ -81,22 +81,22 @@ var/dat dat += "ICECREAM
    " dat += "Dispensing: [flavour_name] icecream

    " - dat += "Vanilla icecream: Select Make x5 [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)
    " - dat += "Strawberry icecream: Select Make x5 [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)
    " - dat += "Chocolate icecream: Select Make x5 [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)
    " - dat += "Blue icecream: Select Make x5 [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)
    " - dat += "Cherry icecream: Select Make x5 [product_types[ICECREAM_CHERRY]] dollops left. (Ingredients: milk, ice, cherry jelly)
    " - dat += "Banana icecream: Select Make x5 [product_types[ICECREAM_BANANA]] dollops left. (Ingredients: milk, ice, banana)
    " + dat += "Vanilla icecream: Select Make x5 [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)
    " + dat += "Strawberry icecream: Select Make x5 [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)
    " + dat += "Chocolate icecream: Select Make x5 [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)
    " + dat += "Blue icecream: Select Make x5 [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)
    " + dat += "Cherry icecream: Select Make x5 [product_types[ICECREAM_CHERRY]] dollops left. (Ingredients: milk, ice, cherry jelly)
    " + dat += "Banana icecream: Select Make x5 [product_types[ICECREAM_BANANA]] dollops left. (Ingredients: milk, ice, banana)
    " dat += "
    CONES
    " - dat += "Waffle cones: Dispense Make x5 [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)
    " - dat += "Chocolate cones: Dispense Make x5 [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)
    " + dat += "Waffle cones: Dispense Make x5 [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)
    " + dat += "Chocolate cones: Dispense Make x5 [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)
    " dat += "
    " dat += "VAT CONTENT
    " for(var/_R in reagents.reagent_volumes) var/singleton/reagent/R = GET_SINGLETON(_R) dat += "[R.name]: [reagents.reagent_volumes[_R]]" - dat += "Purge
    " - dat += "Refresh Close" + dat += "Purge
    " + dat += "Refresh Close" var/datum/browser/popup = new(user, "icecreamvat","Icecream Vat", 700, 500, src) popup.set_content(dat) diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 6fd0d0036f3..9fe7b5512bd 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -86,7 +86,7 @@ var/dat = "[eftpos_name]
    " dat += "This terminal is [machine_id]. Report this code when contacting IT Support
    " if(transaction_locked) - dat += "Back[transaction_paid ? "" : " (authentication required)"]

    " + dat += "Back[transaction_paid ? "" : " (authentication required)"]

    " dat += "Transaction purpose: [transaction_purpose]
    " dat += "Value: $[transaction_amount]
    " @@ -95,19 +95,19 @@ dat += "This transaction has been processed successfully.
    " else dat += "Swipe your card below the line to finish this transaction.
    " - dat += "\[------\]" + dat += "\[------\]" else - dat += "Lock in new transaction

    " + dat += "Lock in new transaction

    " - dat += "Transaction purpose: [transaction_purpose]
    " - dat += "Value: $[transaction_amount]
    " + dat += "Transaction purpose: [transaction_purpose]
    " + dat += "Value: $[transaction_amount]
    " if(!prelocked_account) - dat += "Linked account: [linked_account ? linked_account.owner_name : "None"]
    " + dat += "Linked account: [linked_account ? linked_account.owner_name : "None"]
    " else dat += "Linked account: [linked_account.owner_name]
    " - dat += "Change access code
    " - dat += "Change EFTPOS ID
    " - dat += "Scan card to reset access code \[------\]" + dat += "Change access code
    " + dat += "Change EFTPOS ID
    " + dat += "Scan card to reset access code \[------\]" user << browse(dat,"window=eftpos") else user << browse(null,"window=eftpos") diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm index f4a6fb0ef3f..1f10e79fbd1 100644 --- a/code/modules/error_handler/error_viewer.dm +++ b/code/modules/error_handler/error_viewer.dm @@ -71,7 +71,7 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache) if (linear) back_to_param += ";viewruntime_linear=1" - return "[linktext]" + return "[linktext]" /datum/error_viewer/error_cache var/list/errors = list() @@ -183,12 +183,12 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache) var/html = build_header(back_to, linear) html += "[name]
    [desc]
    " if (usr_ref) - html += "
    usr: VV" - html += " PP" - html += " Follow" + html += "
    usr: VV" + html += " PP" + html += " Follow" if (istype(usr_loc)) - html += "
    usr.loc: VV" - html += " JMP" + html += "
    usr.loc: VV" + html += " JMP" browse_to(user, html) diff --git a/code/modules/events/supply_drop.dm b/code/modules/events/supply_drop.dm index 445d2731841..b8b1ec74f1c 100644 --- a/code/modules/events/supply_drop.dm +++ b/code/modules/events/supply_drop.dm @@ -18,7 +18,7 @@ location_name = a.name new /obj/structure/closet/crate/loot(spawn_loc, rarity, quantity) - log_and_message_admins("Unusual container spawned at (JMP)") + log_and_message_admins("Unusual container spawned at (JMP)") spark(spawn_loc, 10, GLOB.alldirs) diff --git a/code/modules/heavy_vehicle/components/arms.dm b/code/modules/heavy_vehicle/components/arms.dm index 426d71c8f86..fcade95a230 100644 --- a/code/modules/heavy_vehicle/components/arms.dm +++ b/code/modules/heavy_vehicle/components/arms.dm @@ -19,7 +19,7 @@ /obj/item/mech_component/manipulators/get_missing_parts_text() . = ..() if(!motivator) - . += SPAN_WARNING("It is missing an actuator.") + . += SPAN_WARNING("It is missing an actuator.") /obj/item/mech_component/manipulators/Topic(href, href_list) . = ..() diff --git a/code/modules/heavy_vehicle/components/body.dm b/code/modules/heavy_vehicle/components/body.dm index dcfee399413..eb8e4692de8 100644 --- a/code/modules/heavy_vehicle/components/body.dm +++ b/code/modules/heavy_vehicle/components/body.dm @@ -67,11 +67,11 @@ . = ..() if(!cell) - . += SPAN_WARNING("It is missing a power core.") + . += SPAN_WARNING("It is missing a power core.") if(!diagnostics) - . += SPAN_WARNING("It is missing a diagnostics unit.") + . += SPAN_WARNING("It is missing a diagnostics unit.") if(!mech_armor) - . += SPAN_WARNING("It is missing armor plating.") + . += SPAN_WARNING("It is missing armor plating.") /obj/item/mech_component/chassis/Topic(href, href_list) . = ..() diff --git a/code/modules/heavy_vehicle/components/frame.dm b/code/modules/heavy_vehicle/components/frame.dm index 5d27e78e03f..742b1361ba1 100644 --- a/code/modules/heavy_vehicle/components/frame.dm +++ b/code/modules/heavy_vehicle/components/frame.dm @@ -42,23 +42,23 @@ /obj/structure/heavy_vehicle_frame/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if(!arms) - . += SPAN_WARNING("It is missing some manipulators.") + . += SPAN_WARNING("It is missing some manipulators.") if(!legs) - . += SPAN_WARNING("It is missing a means of propulsion.") + . += SPAN_WARNING("It is missing a means of propulsion.") if(!head) - . += SPAN_WARNING("It is missing some sensors.") + . += SPAN_WARNING("It is missing some sensors.") if(!body) - . += SPAN_WARNING("It is missing a chassis.") + . += SPAN_WARNING("It is missing a chassis.") if(is_wired == FRAME_WIRED) - . += SPAN_WARNING("Its wiring is unadjusted.") + . += SPAN_WARNING("Its wiring is unadjusted.") else if(!is_wired) - . += SPAN_WARNING("It has not yet been wired.") + . += SPAN_WARNING("It has not yet been wired.") if(is_reinforced == FRAME_REINFORCED) - . += SPAN_WARNING("It has not had its internal reinforcement secured.") + . += SPAN_WARNING("It has not had its internal reinforcement secured.") else if(is_reinforced == FRAME_REINFORCED_SECURE) - . += SPAN_WARNING("It has not had its internal reinforcement welded in.") + . += SPAN_WARNING("It has not had its internal reinforcement welded in.") else if(!is_reinforced) - . += SPAN_WARNING("It does not have any internal reinforcement.") + . += SPAN_WARNING("It does not have any internal reinforcement.") /obj/structure/heavy_vehicle_frame/Topic(href, href_list) . = ..() diff --git a/code/modules/heavy_vehicle/components/head.dm b/code/modules/heavy_vehicle/components/head.dm index 0bd33ec824e..6b7ac4aa03d 100644 --- a/code/modules/heavy_vehicle/components/head.dm +++ b/code/modules/heavy_vehicle/components/head.dm @@ -24,11 +24,11 @@ . = ..() if(!radio) - . += SPAN_WARNING("It is missing a radio.") + . += SPAN_WARNING("It is missing a radio.") if(!camera) - . += SPAN_WARNING("It is missing a camera.") + . += SPAN_WARNING("It is missing a camera.") if(!software) - . += SPAN_WARNING("It is missing an exosuit control module.") + . += SPAN_WARNING("It is missing an exosuit control module.") /obj/item/mech_component/sensors/Topic(href, href_list) . = ..() @@ -112,7 +112,7 @@ /obj/item/mech_component/control_module/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() - . += SPAN_NOTICE("It has [max_installed_software - LAZYLEN(installed_software)] empty slot\s remaining out of [max_installed_software].") + . += SPAN_NOTICE("It has [max_installed_software - LAZYLEN(installed_software)] empty slot\s remaining out of [max_installed_software].") /obj/item/mech_component/control_module/Topic(href, href_list) . = ..() diff --git a/code/modules/heavy_vehicle/components/legs.dm b/code/modules/heavy_vehicle/components/legs.dm index 230f008e0d9..6d50a561246 100644 --- a/code/modules/heavy_vehicle/components/legs.dm +++ b/code/modules/heavy_vehicle/components/legs.dm @@ -18,7 +18,7 @@ /obj/item/mech_component/propulsion/get_missing_parts_text() . = ..() if(!motivator) - . += SPAN_WARNING("It is missing an actuator.") + . += SPAN_WARNING("It is missing an actuator.") /obj/item/mech_component/propulsion/Topic(href, href_list) . = ..() diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm index 882fb4708f6..2d0711e7f2e 100644 --- a/code/modules/heavy_vehicle/mech_interaction.dm +++ b/code/modules/heavy_vehicle/mech_interaction.dm @@ -153,7 +153,7 @@ user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])" src.attack_log += "\[[time_stamp()]\] [user] ([user.ckey]) attacked [target.name] ([target.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])" target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])" - msg_admin_attack("[key_name(user, highlight_special = 1)] attacked [key_name(target, highlight_special = 1)] with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target) ) + msg_admin_attack("[key_name(user, highlight_special = 1)] attacked [key_name(target, highlight_special = 1)] with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target) ) return A.attack_generic(src, arms.melee_damage, "attacked") return @@ -562,7 +562,7 @@ GLOBAL_DATUM_INIT(mech_state, /datum/ui_state/default, new()) if(D.lying) D.attack_log += "\[[time_stamp()]\] Was trampled by [src]" attack_log += "\[[time_stamp()]\] trampled [D.name] ([D.ckey]) with \the [src]." - msg_admin_attack("[src] trampled [key_name(D)] at (JMP)" ) + 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) return TRUE diff --git a/code/modules/heavy_vehicle/mecha.dm b/code/modules/heavy_vehicle/mecha.dm index 61b9de94928..2b59098acdd 100644 --- a/code/modules/heavy_vehicle/mecha.dm +++ b/code/modules/heavy_vehicle/mecha.dm @@ -149,7 +149,7 @@ for(var/pilot in pilots) if(ismob(pilot)) var/mob/M = pilot - . += "It is being piloted by [M.name]." + . += "It is being piloted by ([prog])
    " + dat += "([prog])
    " dat += "
    " - dat += "(Turn Off)
    " + dat += "(Turn Off)
    " dat += "
    " dat += "Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded.
    " @@ -100,15 +100,15 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont if (emagged) dat += "ERROR: Cannot re-enable Safety Protocols.
    " else - dat += "(Re-Enable Safety Protocols?)
    " + dat += "(Re-Enable Safety Protocols?)
    " else - dat += "(Override Safety Protocols?)
    " + dat += "(Override Safety Protocols?)
    " dat += "
    " if(safety_disabled) for(var/prog in SSatlas.current_map.holodeck_restricted_programs) - dat += "(Begin [prog])
    " + dat += "(Begin [prog])
    " dat += "Ensure the holodeck is empty before testing.
    " dat += "
    " dat += "Safety Protocols are DISABLED
    " @@ -116,15 +116,15 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont dat += "Safety Protocols are ENABLED
    " if(linkedholodeck.has_gravity) - dat += "Gravity is (ON)
    " + dat += "Gravity is (ON)
    " else - dat += "Gravity is (OFF)
    " + dat += "Gravity is (OFF)
    " if(!locked) - dat += "Holodeck is (UNLOCKED)
    " + dat += "Holodeck is (UNLOCKED)
    " else dat = "Holodeck Control System
    " - dat += "Holodeck is (LOCKED)
    " + dat += "Holodeck is (LOCKED)
    " user << browse(dat, "window=computer;size=400x500") onclose(user, "computer") diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index d269011294c..831bd6407e1 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -224,7 +224,7 @@ if(dat) last_data = dat - dat += "

    \[print report\]" + dat += "

    \[print report\]" user << browse(dat,"window=plant_analyzer") return diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 5ea37e8fb8f..09e15e38592 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -85,12 +85,12 @@ total_complexity = total_complexity + part.complexity var/list/HTML = list() - HTML += "
    Refresh | " - HTML += "Rename
    " + HTML += "
    Refresh | " + HTML += "Rename
    " HTML += "[total_parts]/[max_components] ([round((total_parts / max_components) * 100, 0.1)]%) space taken up in the assembly.
    " HTML += "[total_complexity]/[max_complexity] ([round((total_complexity / max_complexity) * 100, 0.1)]%) maximum complexity.
    " if(battery) - HTML += "[round(battery.charge, 0.1)]/[battery.maxcharge] ([round(battery.percent(), 0.1)]%) cell charge. Remove" + HTML += "[round(battery.charge, 0.1)]/[battery.maxcharge] ([round(battery.percent(), 0.1)]%) cell charge. Remove" else HTML += SPAN_DANGER("No powercell detected!") HTML += "

    " @@ -101,10 +101,10 @@ //Put removable circuits in separate categories from non-removable for(var/obj/item/integrated_circuit/circuit in contents) if(!circuit.removable) - HTML += "[circuit.displayed_name] | " - HTML += "Rename | " - HTML += "Scan with Debugger | " - HTML += "Move to Bottom" + HTML += "Rename | " + HTML += "Move to Bottom" HTML += "
    " HTML += "
    " @@ -112,11 +112,11 @@ for(var/obj/item/integrated_circuit/circuit in contents) if(circuit.removable) - HTML += "[circuit.displayed_name] | " - HTML += "Rename | " - HTML += "Scan with Debugger | " - HTML += "Remove | " - HTML += "Move to Bottom" + HTML += "Rename | " + HTML += "Remove | " + HTML += "", "", - "
    Return to Assembly", - "
    Refresh | ", - "Rename | ", - "Scan with Device | " + "
    Return to Assembly", + "
    Refresh | ", + "Rename | ", + "Scan with Device | " ) if(src.removable) - HTML += "Remove
    " + HTML += "Remove
    " HTML += "" HTML += "" @@ -120,11 +120,11 @@ a creative player the means to solve many problems. Circuits are held inside an if(1) io = get_pin_ref(IC_INPUT, i) if(io) - words += "[io.display_pin_type()] [io.name] [io.display_data(io.data)]
    " + words += "[io.display_data(io.data)]
    " if(io.linked.len) for(var/datum/integrated_io/linked in io.linked) - words += "[linked.name] \ - @ [linked.holder.displayed_name]
    " + words += "[linked.holder.displayed_name]
    " if(outputs.len > inputs.len) height = 1 @@ -137,11 +137,11 @@ a creative player the means to solve many problems. Circuits are held inside an if(3) io = get_pin_ref(IC_OUTPUT, i) if(io) - words += "[io.display_pin_type()] [io.name] [io.display_data(io.data)]
    " + words += "[io.display_data(io.data)]
    " if(io.linked.len) for(var/datum/integrated_io/linked in io.linked) - words += "[linked.name] \ - @ [linked.holder.displayed_name]
    " + words += "[linked.holder.displayed_name]
    " if(inputs.len > outputs.len) height = 1 @@ -151,13 +151,13 @@ a creative player the means to solve many problems. Circuits are held inside an for(var/activator in activators) var/datum/integrated_io/io = activator var/words = list( - "[io.name] [io.data?"\":"\"]
    " + "[io.name] [io.data?"\":"\"]
    " ) if(io.linked.len) for(var/datum/integrated_io/linked in io.linked) - words += "[linked.name] \ - @ [linked.holder.displayed_name]
    " + words += "[linked.name] \ + @ [linked.holder.displayed_name]
    " HTML += "" HTML += "" diff --git a/code/modules/integrated_electronics/core/special_pins/list_pin.dm b/code/modules/integrated_electronics/core/special_pins/list_pin.dm index 4b34de4fb7c..b485af8e1e2 100644 --- a/code/modules/integrated_electronics/core/special_pins/list_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/list_pin.dm @@ -14,19 +14,19 @@ var/list/my_list = data var/t = "

    [src]


    " t += "List length: [my_list.len]
    " - t += "Refresh | " - t += "Add | " - t += "Remove | " - t += "Edit | " - t += "Swap | " - t += "Clear
    " + t += "Refresh | " + t += "Add | " + t += "Remove | " + t += "Edit | " + t += "Swap | " + t += "Clear
    " t += "
    " // Iterating by index simplifies editing/deletion in game, // since the href_list["pos"] var is consistent for(var/i = 1, i <= my_list.len; i++) t += "#[i] | [display_data(my_list[i])] | " - t += "Edit | " - t += "Remove
    " + t += "Edit | " + t += "Remove
    " var/datum/browser/B = new(user, "list_pin_[REF(src)]", null, 500, 400) B.set_content(t) B.open(FALSE) diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index a5b854d8ec4..b6ba998c743 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -39,10 +39,10 @@ switch(screenstate) if(0) dat += {"

    Search Settings


    - Filter by Title: [title]
    - Filter by Category: [category]
    - Filter by Author: [author]
    - \[Start Search\]
    "} + Filter by Title: [title]
    + Filter by Category: [category]
    + Filter by Author: [author]
    + \[Start Search\]
    "} if(1) if(!establish_db_connection(GLOB.dbcon)) dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance.
    " @@ -62,7 +62,7 @@ var/id = query.item[4] dat += "" dat += "
    [jointext(words, null)]
    [author][title][category][id]

    " - dat += "\[Go Back\]
    " + dat += "\[Go Back\]
    " user << browse(dat, "window=publiclibrary") onclose(user, "publiclibrary") @@ -142,15 +142,15 @@ switch(screenstate) if(0) // Main Menu - dat += "View Stock
    " - dat += "View Checked Out Books
    " - dat += "Check out a Book
    " - dat += "Order From Library Database
    " + dat += "View Stock
    " + dat += "View Checked Out Books
    " + dat += "Check out a Book
    " + dat += "Order From Library Database
    " if(!is_public) - dat += "Upload New Title to Library Database
    " - dat += "Print a Bible
    " + dat += "Upload New Title to Library Database
    " + dat += "Print a Bible
    " if(emagged) - dat += "7. Access the Forbidden Lore Vault
    " + dat += "7. Access the Forbidden Lore Vault
    " if(arcanecheckout) new /obj/item/book/tome(get_turf(src)) to_chat(user, SPAN_WARNING("Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.")) @@ -160,8 +160,8 @@ // Inventory dat += "

    Inventory


    " for(var/obj/item/book/b in inventory) - dat += "[b.name] (Delete)
    " - dat += "(<-- Return to Main Menu)
    " + dat += "[b.name] (Delete)
    " + dat += "(<-- Return to Main Menu)
    " if(2) // Checked Out dat += "

    Checked Out Books


    " @@ -178,28 +178,28 @@ else timedue = round(timedue) dat += {"\"[b.bookname]\", Checked out to: [b.mobname]
    --- Taken: [timetaken] minutes ago, Due: in [timedue] minutes
    - (Check In)

    "} - dat += "(<-- Return to Main Menu)
    " + (Check In)

    "} + dat += "(<-- Return to Main Menu)
    " if(3) // Check Out a Book dat += {"

    Check Out a Book


    Book: [src.buffer_book] - \[Edit\]
    + \[Edit\]
    Recipient: [src.buffer_mob] - \[Edit\]
    + \[Edit\]
    Checkout Date: [world.time / 600]
    Due Date: [(world.time + checkoutperiod) / 600]
    - (Checkout Period: [checkoutperiod] minutes) (+/-)
    - (Commit Entry)
    - (<-- Return to Main Menu)
    "} + (Checkout Period: [checkoutperiod] minutes) (+/-)
    + (Commit Entry)
    + (<-- Return to Main Menu)
    "} if(4) dat += "

    External Archive

    " if(!establish_db_connection(GLOB.dbcon)) dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance." else - dat += {"(Order Book by ISBN)

    + dat += {"(Order Book by ISBN)

    - "} var/DBQuery/query = GLOB.dbcon.NewQuery("SELECT id, author, title, category FROM ss13_library ORDER BY [sortby]") query.Execute() @@ -208,9 +208,9 @@ var/author = query.item[2] var/title = query.item[3] var/category = query.item[4] - dat += "" + dat += "" dat += "
    TITLEAUTHORCATEGORY
    [author][title][category]\[Order\]
    [author][title][category]\[Order\]
    " - dat += "
    (<-- Return to Main Menu)
    " + dat += "
    (<-- Return to Main Menu)
    " if(5) dat += "

    Upload a New Title

    " if(!scanner) @@ -227,17 +227,17 @@ Title: [scanner.cache.name]
    "} if(!scanner.cache.author) scanner.cache.author = "Anonymous" - dat += {"Author: [scanner.cache.author]
    - Category: [upload_category]
    - \[Upload\]
    "} - dat += "(<-- Return to Main Menu)
    " + dat += {"Author: [scanner.cache.author]
    + Category: [upload_category]
    + \[Upload\]
    "} + dat += "(<-- Return to Main Menu)
    " if(7) dat += {"

    Accessing Forbidden Lore Vault v 1.3

    Are you absolutely sure you want to proceed? EldritchTomes Inc. takes no responsibilities for loss of sanity resulting from this action.

    - Yes.
    - No.
    "} + Yes.
    + No.
    "} - //dat += "Close

    " + //dat += "Close

    " user << browse(dat, "window=library") onclose(user, "library") @@ -437,9 +437,9 @@ dat += "Data stored in memory.
    " else dat += "No data stored in memory.
    " - dat += "\[Scan\]" + dat += "\[Scan\]" if(cache) - dat += " \[Clear Memory\]

    \[Remove Book\]" + dat += " \[Clear Memory\]

    \[Remove Book\]" else dat += "
    " user << browse(dat, "window=scanner") diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 4421f4ced2a..1f0b08dd98b 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -90,7 +90,7 @@ playsound(D.loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) 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)) + 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) return 0 diff --git a/code/modules/martial_arts/sol_combat.dm b/code/modules/martial_arts/sol_combat.dm index 92cf60c88b0..788e3a8d767 100644 --- a/code/modules/martial_arts/sol_combat.dm +++ b/code/modules/martial_arts/sol_combat.dm @@ -90,7 +90,7 @@ A.visible_message(SPAN_DANGER("[A] [picked_hit_type] [D]!")) 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)) + 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 @@ -102,7 +102,7 @@ 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)) + msg_admin_attack("[key_name(A)] disarmed [D.name] ([D.ckey]) (JMP)",ckey=key_name(D),ckey_target=key_name(A)) if(prob(60)) var/obj/item/I = D.get_active_hand() diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index a199ee57d1d..6286e0fbd5c 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -70,43 +70,43 @@ if(chosen == "gold") dat += "chosen" else - dat += "Choose" + dat += "Choose" dat += "
    Silver inserted: [amt_silver] " if(chosen == "silver") dat += "chosen" else - dat += "Choose" + dat += "Choose" dat += "
    Iron inserted: [amt_iron] " if(chosen == DEFAULT_WALL_MATERIAL) dat += "chosen" else - dat += "Choose" + dat += "Choose" dat += "
    Diamond inserted: [amt_diamond] " if(chosen == "diamond") dat += "chosen" else - dat += "Choose" + dat += "Choose" dat += "
    Phoron inserted: [amt_phoron] " if(chosen == "phoron") dat += "chosen" else - dat += "Choose" + dat += "Choose" dat += "
    Uranium inserted: [amt_uranium] " if(chosen == "uranium") dat += "chosen" else - dat += "Choose" + dat += "Choose" dat += "

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

    In total this machine produced [newCoins] coins." - dat += "
    Make coins" + dat += "
    Make coins" user << browse("[dat]", "window=mint") /obj/machinery/mineral/mint/Topic(href, href_list) diff --git a/code/modules/mob/abstract/ghost/observer/observer.dm b/code/modules/mob/abstract/ghost/observer/observer.dm index 3be389b450d..4054d1bd2dc 100644 --- a/code/modules/mob/abstract/ghost/observer/observer.dm +++ b/code/modules/mob/abstract/ghost/observer/observer.dm @@ -203,7 +203,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return resting = 1 var/turf/location = get_turf(src) - message_admins("[key_name_admin(usr)] has ghosted. (JMP)") + message_admins("[key_name_admin(usr)] has ghosted. (JMP)") log_game("[key_name_admin(usr)] has ghosted.") var/mob/abstract/ghost/observer/ghost = ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly. diff --git a/code/modules/mob/abstract/ghost/storyteller/storyteller.dm b/code/modules/mob/abstract/ghost/storyteller/storyteller.dm index ca88fde8267..eab57745c6d 100644 --- a/code/modules/mob/abstract/ghost/storyteller/storyteller.dm +++ b/code/modules/mob/abstract/ghost/storyteller/storyteller.dm @@ -89,7 +89,7 @@ prefix = "(R)" admin_stuff += "/([key])" if(target != client) - admin_stuff += "(JMP)" + admin_stuff += "(JMP)" if(target.mob in messagemobs) prefix = "" if((target.mob in messagemobs) || display_remote) diff --git a/code/modules/mob/abstract/ghost/storyteller/storyteller_verbs.dm b/code/modules/mob/abstract/ghost/storyteller/storyteller_verbs.dm index 0eabee55ebc..b31d5cffc3a 100644 --- a/code/modules/mob/abstract/ghost/storyteller/storyteller_verbs.dm +++ b/code/modules/mob/abstract/ghost/storyteller/storyteller_verbs.dm @@ -13,9 +13,9 @@ "} dat += {"
    - Create Object
    - Create Turf
    - Create Mob
    + Create Object
    + Create Turf
    + Create Mob
    "} usr << browse(dat, "window=storytellerpanel;size=210x280") diff --git a/code/modules/mob/abstract/new_player/poll.dm b/code/modules/mob/abstract/new_player/poll.dm index 89b74cb6bfd..aec0f09446a 100644 --- a/code/modules/mob/abstract/new_player/poll.dm +++ b/code/modules/mob/abstract/new_player/poll.dm @@ -101,7 +101,7 @@ output += "Question: [pollquestion]
    " output += "Poll runs from [pollstarttime] until [pollendtime]" if(haslink) - output += "
    Additional information is available here" + output += "
    Additional information is available here" output += "

    " if(!voted) //Only make this a form if we have not voted yet @@ -149,7 +149,7 @@ output += "Question: [pollquestion]
    " output += "Feedback gathering runs from [pollstarttime] until [pollendtime]" if(haslink) - output += "
    Additional information is available here" + output += "
    Additional information is available here" output += "

    " if(!voted) //Only make this a form if we have not voted yet @@ -187,7 +187,7 @@ output += "Question: [pollquestion]
    " output += "Poll runs from [pollstarttime] until [pollendtime]" if(haslink) - output += "
    Additional information is available here" + output += "
    Additional information is available here" output += "

    " var/voted = 0 @@ -287,7 +287,7 @@ output += "Question: [pollquestion]
    You can select up to [multiplechoiceoptions] options. If you select more, the first [multiplechoiceoptions] will be saved.
    " output += "Poll runs from [pollstarttime] until [pollendtime]" if(haslink) - output += "
    Additional information is available here" + output += "
    Additional information is available here" output += "

    " if(!voted) //Only make this a form if we have not voted yet diff --git a/code/modules/mob/abstract/unauthed/login.dm b/code/modules/mob/abstract/unauthed/login.dm index 3a84bbb364d..e2942e7ba1e 100644 --- a/code/modules/mob/abstract/unauthed/login.dm +++ b/code/modules/mob/abstract/unauthed/login.dm @@ -18,9 +18,9 @@ GLOBAL_LIST_EMPTY(unauthed) remove_verb(client, typesof(/client/verb)) var/uihtml = "

    Please select:

    " if(GLOB.config.guests_allowed) - uihtml += "Login as guest" + uihtml += "Login as guest" if(GLOB.config.webint_url && GLOB.config.external_auth) - uihtml += "Login via forums" + uihtml += "Login via forums" if(!GLOB.config.guests_allowed && GLOB.config.webint_url && GLOB.config.external_auth) src.OpenForumAuthWindow() show_browser(src, uihtml, "window=externalauth;size=300x300;border=0;can_close=1;can_resize=0;can_minimize=0;titlebar=1") diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index ec74996e041..5f603fae34f 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -436,7 +436,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( 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)) + 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) else diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 22cfb3d339e..b3cfc70f2fe 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -49,7 +49,7 @@ return var/dat = "" - dat += "Status: [on ? "On" : "Off"]
    " + dat += "Status: [on ? "On" : "Off"]
    " dat += "Water Tank: " if (tank) dat += "[tank.reagents.total_volume]/[tank.reagents.maximum_volume]" @@ -58,16 +58,16 @@ dat += "
    Behaviour controls are [locked ? "locked" : "unlocked"]
    " if(!locked || issilicon(usr)) dat += "Watering controls:
    " - dat += "Water plants : [waters_trays ? "Yes" : "No"]
    " - dat += "Refill watertank : [refills_water ? "Yes" : "No"]
    " + dat += "Water plants : [waters_trays ? "Yes" : "No"]
    " + dat += "Refill watertank : [refills_water ? "Yes" : "No"]
    " dat += "
    Preventive measures:
    " - dat += "Weed plants: [uproots_weeds ? "Yes" : "No"]
    " - dat += "Eradicate pests: [eliminates_pests ? "Yes" : "No"]
    " + dat += "Weed plants: [uproots_weeds ? "Yes" : "No"]
    " + dat += "Eradicate pests: [eliminates_pests ? "Yes" : "No"]
    " dat += "
    Nutriment controls:
    " - dat += "Replace fertilizer: [replaces_nutriment ? "Yes" : "No"]
    " + dat += "Replace fertilizer: [replaces_nutriment ? "Yes" : "No"]
    " dat += "
    Plant controls:
    " - dat += "Collect produce: [collects_produce ? "Yes" : "No"]
    " - dat += "Remove dead plants: [removes_dead ? "Yes" : "No"]
    " + dat += "Collect produce: [collects_produce ? "Yes" : "No"]
    " + dat += "Remove dead plants: [removes_dead ? "Yes" : "No"]
    " dat += "    " var/datum/browser/bot_win = new(user, "autofarm", "Automatic Farmbot v1.2 Controls") diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index abaa6992ab9..4be7e0735ec 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -142,35 +142,35 @@ return var/dat = "" - dat += "Status: [on ? "On" : "Off"]
    " + dat += "Status: [on ? "On" : "Off"]
    " dat += "Maintenance panel is [open ? "opened" : "closed"]
    " dat += "Beaker: " if (reagent_glass) - dat += "Loaded \[[reagent_glass.reagents.total_volume]/[reagent_glass.reagents.maximum_volume]\]" + dat += "Loaded \[[reagent_glass.reagents.total_volume]/[reagent_glass.reagents.maximum_volume]\]" else dat += "None Loaded" dat += "
    Behaviour controls are [locked ? "locked" : "unlocked"]
    " if(!locked || issilicon(user)) dat += "Healing Threshold: " - dat += "-- " - dat += "- " + dat += "-- " + dat += "- " dat += "[heal_threshold] " - dat += "+ " - dat += "++" + dat += "+ " + dat += "++" dat += "
    " dat += "Injection Level: " - dat += "- " + dat += "- " dat += "[injection_amount] " - dat += "+ " + dat += "+ " dat += "
    " dat += "Reagent Source: " - dat += "[use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
    " + dat += "[use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
    " - dat += "Treatment report is [declare_treatment ? "on" : "off"]. Toggle
    " - dat += "The speaker switch is [speech ? "on" : "off"]. Toggle
    " - dat += "Message is [message ? message : "unset"]. Set
    " + dat += "Treatment report is [declare_treatment ? "on" : "off"]. Toggle
    " + dat += "The speaker switch is [speech ? "on" : "off"]. Toggle
    " + dat += "Message is [message ? message : "unset"]. Set
    " var/datum/browser/bot_win = new(user, "automed", "Automatic Medibot v1.2 Controls") bot_win.set_content(dat) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 0c14c10a334..2f8e9974196 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -42,6 +42,6 @@ HTML += TextPreview(flavor_texts["feet"]) HTML += "
    " HTML += "
    " - HTML +="\[Done\]" + HTML +="\[Done\]" HTML += "" src << browse(HTML, "window=flavor_changes;size=430x300") diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 026c32c7f7a..09e067afde2 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -77,22 +77,22 @@ if(istype(accessory, /obj/item/clothing/accessory/holster)) //so you can't see what kind of gun a holster is holding from afar accessory_descs += "\a [accessory]" else - accessory_descs += "\a [accessory]" + accessory_descs += "\a [accessory]" tie_msg += " [lowertext(english_list(accessory_descs))]" tie_msg_warn += " [lowertext(english_list(accessory_descs))]" if(w_uniform.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] [fluid_color_type_map(w_uniform.blood_color)]-stained [w_uniform.name][tie_msg_warn].\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] [fluid_color_type_map(w_uniform.blood_color)]-stained [w_uniform.name][tie_msg_warn].\n") else - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] \a [w_uniform][tie_msg].\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] \a [w_uniform][tie_msg].\n" //head if(head) if(head.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] [fluid_color_type_map(head.blood_color)]-stained [head.name] [head.get_head_examine_text(src)]!\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] [fluid_color_type_map(head.blood_color)]-stained [head.name] [head.get_head_examine_text(src)]!\n") else - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] \a [head] [head.get_head_examine_text(src)].\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] \a [head] [head.get_head_examine_text(src)].\n" //suit/armor if(wear_suit) @@ -105,109 +105,109 @@ tie_msg_warn += "! Attached to it is" var/list/accessory_descs = list() for(var/accessory in U.accessories) - accessory_descs += "\a [accessory]" + accessory_descs += "\a [accessory]" tie_msg += " [lowertext(english_list(accessory_descs))]" tie_msg_warn += " [lowertext(english_list(accessory_descs))]" if(wear_suit.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_suit.blood_color)]-stained [wear_suit.name][tie_msg_warn].\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_suit.blood_color)]-stained [wear_suit.name][tie_msg_warn].\n") else - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_suit, user)] \a [wear_suit][tie_msg].\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_suit, user)] \a [wear_suit][tie_msg].\n" //suit/armor storage if(s_store && !skipsuitstorage) if(s_store.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] [fluid_color_type_map(s_store.blood_color)]-stained [s_store.name] on [get_pronoun("his")] [wear_suit.name]!\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] [fluid_color_type_map(s_store.blood_color)]-stained [s_store.name] on [get_pronoun("his")] [wear_suit.name]!\n") else - msg += "[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] \a [s_store] on [get_pronoun("his")] [wear_suit.name].\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] \a [s_store] on [get_pronoun("his")] [wear_suit.name].\n" else if(s_store && !skipsuitstorage) if(s_store.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] [fluid_color_type_map(s_store.blood_color)]-stained [s_store.name] on [get_pronoun("his")] chest!\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] [fluid_color_type_map(s_store.blood_color)]-stained [s_store.name] on [get_pronoun("his")] chest!\n") else - msg += "[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] \a [s_store] on [get_pronoun("his")] chest.\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] \a [s_store] on [get_pronoun("his")] chest.\n" //back if(back) if(back.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(back, user)] [fluid_color_type_map(back.blood_color)]-stained [back] on [get_pronoun("his")] back.\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(back, user)] [fluid_color_type_map(back.blood_color)]-stained [back] on [get_pronoun("his")] back.\n") else - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(back, user)] \a [back] on [get_pronoun("his")] back.\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(back, user)] \a [back] on [get_pronoun("his")] back.\n" //left hand if(l_hand) if(l_hand.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(l_hand, user)] [l_hand.gender==PLURAL?"some":"a"] [fluid_color_type_map(l_hand.blood_color)]-stained [l_hand.name] in [get_pronoun("his")] left hand!\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(l_hand, user)] [l_hand.gender==PLURAL?"some":"a"] [fluid_color_type_map(l_hand.blood_color)]-stained [l_hand.name] in [get_pronoun("his")] left hand!\n") else - msg += "[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(l_hand, user)] \a [l_hand] in [get_pronoun("his")] left hand.\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(l_hand, user)] \a [l_hand] in [get_pronoun("his")] left hand.\n" //right hand if(r_hand) if(r_hand.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(r_hand, user)] [r_hand.gender==PLURAL?"some":"a"] [fluid_color_type_map(r_hand.blood_color)]-stained [r_hand.name] in [get_pronoun("his")] right hand!\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(r_hand, user)] [r_hand.gender==PLURAL?"some":"a"] [fluid_color_type_map(r_hand.blood_color)]-stained [r_hand.name] in [get_pronoun("his")] right hand!\n") else - msg += "[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(r_hand, user)] \a [r_hand] in [get_pronoun("his")] right hand.\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(r_hand, user)] \a [r_hand] in [get_pronoun("his")] right hand.\n" //gloves if(gloves && !skipgloves) var/gloves_name = gloves if(gloves.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(gloves, user)] [gloves.gender==PLURAL?"some":"a"] [fluid_color_type_map(gloves.blood_color)]-stained [gloves_name] on [get_pronoun("his")] hands!\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(gloves, user)] [gloves.gender==PLURAL?"some":"a"] [fluid_color_type_map(gloves.blood_color)]-stained [gloves_name] on [get_pronoun("his")] hands!\n") else - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(gloves, user)] \a [gloves_name] on [get_pronoun("his")] hands.\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(gloves, user)] \a [gloves_name] on [get_pronoun("his")] hands.\n" else if(blood_color) msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [fluid_color_type_map(hand_blood_color)]-stained hands!\n") //belt if(belt) if(belt.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(belt, user)] [belt.gender==PLURAL?"some":"a"] [fluid_color_type_map(belt.blood_color)]-stained [belt.name] about [get_pronoun("his")] waist!\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(belt, user)] [belt.gender==PLURAL?"some":"a"] [fluid_color_type_map(belt.blood_color)]-stained [belt.name] about [get_pronoun("his")] waist!\n") else - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(belt, user)] \a [belt] about [get_pronoun("his")] waist.\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(belt, user)] \a [belt] about [get_pronoun("his")] waist.\n" //pants if(pants && !skippants) - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(pants, user)] \a [pants] about [get_pronoun("his")] waist.\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(pants, user)] \a [pants] about [get_pronoun("his")] waist.\n" //shoes if(shoes && !skipshoes) if(shoes.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(shoes, user)] [shoes.gender==PLURAL?"some":"a"] [fluid_color_type_map(shoes.blood_color)]-stained [shoes.name] on [get_pronoun("his")] feet!\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(shoes, user)] [shoes.gender==PLURAL?"some":"a"] [fluid_color_type_map(shoes.blood_color)]-stained [shoes.name] on [get_pronoun("his")] feet!\n") else - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(shoes, user)] \a [shoes] on [get_pronoun("his")] feet.\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(shoes, user)] \a [shoes] on [get_pronoun("his")] feet.\n" else if(footprint_color) msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [fluid_color_type_map(footprint_color)]-stained feet!\n") //mask if(wear_mask && !skipmask) if(wear_mask.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] [wear_mask.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_mask.blood_color)]-stained [wear_mask.name] [wear_mask.get_mask_examine_text(src)]!\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] [wear_mask.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_mask.blood_color)]-stained [wear_mask.name] [wear_mask.get_mask_examine_text(src)]!\n") else - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] \a [wear_mask] [wear_mask.get_mask_examine_text(src)].\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] \a [wear_mask] [wear_mask.get_mask_examine_text(src)].\n" //eyes if(glasses && !skipeyes) if(glasses.blood_color) - msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(glasses, user)] [glasses.gender==PLURAL?"some":"a"] [fluid_color_type_map(glasses.blood_color)]-stained [glasses] covering [get_pronoun("his")] eyes!\n") + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(glasses, user)] [glasses.gender==PLURAL?"some":"a"] [fluid_color_type_map(glasses.blood_color)]-stained [glasses] covering [get_pronoun("his")] eyes!\n") else - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(glasses, user)] \a [glasses] covering [get_pronoun("his")] eyes.\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(glasses, user)] \a [glasses] covering [get_pronoun("his")] eyes.\n" //left ear if(l_ear && !skipears) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(l_ear, user)] \a [l_ear] [l_ear.get_ear_examine_text(src, "left")].\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(l_ear, user)] \a [l_ear] [l_ear.get_ear_examine_text(src, "left")].\n" //right ear if(r_ear && !skipears) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(r_ear, user)] \a [r_ear] [r_ear.get_ear_examine_text(src, "right")].\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(r_ear, user)] \a [r_ear] [r_ear.get_ear_examine_text(src, "right")].\n" //ID if(wear_id) var/id_name = wear_id - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_id, user)] \a [id_name].\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_id, user)] \a [id_name].\n" //wrists if(wrists && !skipwrists) - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wrists, user)] \a [wrists] [wrists.get_wrist_examine_text(src)].\n" + msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wrists, user)] \a [wrists] [wrists.get_wrist_examine_text(src)].\n" //Jitters if(is_jittery) @@ -368,8 +368,8 @@ if(istype(R) && istype(R.security)) criminal = R.security.criminal - msg += "Criminal status: \[[criminal]\]\n" - msg += "Security records: \[View\] \[Add comment\]\n" + msg += "Criminal status: \[[criminal]\]\n" + msg += "Security records: \[View\] \[Add comment\]\n" if(hasHUD(user,MED_HUDTYPE)) var/perpname = "wot" @@ -385,15 +385,15 @@ if(istype(R)) medical = R.physical_status - msg += "Physical Status: \[[medical]\]\n" - msg += "Medical Records: \[View\] \[Add Comment\]\n" - msg += "Triage Tag: \[[triage_tag]\]\n" + msg += "Physical Status: \[[medical]\]\n" + msg += "Medical Records: \[View\] \[Add Comment\]\n" + msg += "Triage Tag: \[[triage_tag]\]\n" if(print_flavor_text()) msg += "[print_flavor_text()]\n" if(GLOB.config.allow_Metadata && client?.prefs.metadata) - msg += "OOC Notes: \[View\]\n" + msg += "OOC Notes: \[View\]\n" msg += "    " diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 685b19aa54e..3b2dc5381b8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -350,13 +350,13 @@ if((slot_ref["slot"] in list(slot_l_store, slot_r_store))) continue var/obj/item/thing_in_slot = get_equipped_item(slot_ref["slot"]) - dat += "
    [slot_ref["name"]]: [istype(thing_in_slot) ? thing_in_slot : "nothing"]" + dat += "
    [slot_ref["name"]]: [istype(thing_in_slot) ? thing_in_slot : "nothing"]" dat += "
    " if(species.hud.has_hands) - dat += "
    Left hand: [istype(l_hand) ? l_hand : "nothing"]" - dat += "
    Right hand: [istype(r_hand) ? r_hand : "nothing"]" + dat += "
    Left hand: [istype(l_hand) ? l_hand : "nothing"]" + dat += "
    Right hand: [istype(r_hand) ? r_hand : "nothing"]" var/has_mask // 0, no mask | 1, mask but it's down | 2, mask and it's ready var/has_helmet @@ -373,29 +373,29 @@ has_tank = TRUE if((has_mask == 2|| has_helmet) && has_tank) - dat += "
    Toggle internals [internal ? "off" : "on"]" + dat += "
    Toggle internals [internal ? "off" : "on"]" // Other incidentals. if(istype(suit) && suit.has_sensor == 1) - dat += "
    Set sensors" + dat += "
    Set sensors" if(handcuffed) - dat += "
    Handcuffed" + dat += "
    Handcuffed" if(legcuffed) - dat += "
    Legcuffed" + dat += "
    Legcuffed" if(has_mask) var/obj/item/clothing/mask/M = wear_mask if(M.adjustable) - dat += "
    Adjust mask" + dat += "
    Adjust mask" if(has_tank && internal) - dat += "
    Check air tank" + dat += "
    Check air tank" if(suit && LAZYLEN(suit.accessories)) - dat += "
    Remove accessory" - dat += "
    Remove splints" - dat += "
    Empty pockets" + dat += "
    Remove accessory" + dat += "
    Remove splints" + dat += "
    Empty pockets" dat += species.get_strip_info("[REF(src)]") - dat += "
    Refresh" - dat += "
    Close" + dat += "
    Refresh" + dat += "
    Close" var/datum/browser/mob_win = new(user, "mob[name]", capitalize_first_letters(name), 350, 550) mob_win.set_content(dat) @@ -625,7 +625,7 @@ + "Criminal Status: [R.security.criminal]\n" \ + "Crimes: [R.security.crimes]\n" \ + "Notes: [R.security.notes]\n" \ - + "\[View Comment Log\]" + + "\[View Comment Log\]" to_chat(usr, EXAMINE_BLOCK_RED(message)) read = 1 @@ -652,7 +652,7 @@ message += comment + "\n\n" else message += "No comments found.\n" - message += "\[Add Comment\]" + message += "\[Add Comment\]" to_chat(usr, EXAMINE_BLOCK_RED(message)) if(!read) @@ -726,7 +726,7 @@ + "DNA: [R.medical.blood_dna]\n" \ + "Disabilities: [R.medical.disabilities]\n" \ + "Notes: [R.medical.notes]\n" \ - + "\[View Comment Log\]" + + "\[View Comment Log\]" to_chat(usr, EXAMINE_BLOCK_DEEP_CYAN(message)) read = 1 @@ -753,7 +753,7 @@ message += comment + "\n\n" else message += "No comments found.\n" - message += "\[Add Comment\]" + message += "\[Add Comment\]" to_chat(usr, EXAMINE_BLOCK_DEEP_CYAN(message)) if(!read) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 04dea41efe1..4f1eaca50aa 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -50,7 +50,7 @@ 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)) + msg_admin_attack("[key_name_admin(M)] stungloved [src.name] ([src.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src)) apply_effects(5,5,0,0,5,0,0,0,0) apply_damage(rand(5,25), DAMAGE_BURN, M.zone_sel.selecting) @@ -250,7 +250,7 @@ playsound(loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) 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)) + 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) return 0 @@ -338,7 +338,7 @@ 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)) + 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) if(w_uniform) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 2c8dbd88914..13805d4bd88 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -59,7 +59,7 @@ emp_act c_hand = r_hand if(c_hand && (stun_amount || agony_amount > 10)) - msg_admin_attack("[src.name] ([src.ckey]) was disarmed by a stun effect (JMP)",ckey=key_name(src)) + msg_admin_attack("[src.name] ([src.ckey]) was disarmed by a stun effect (JMP)",ckey=key_name(src)) drop_from_inventory(c_hand) if (affected.status & ORGAN_ROBOT) @@ -374,7 +374,7 @@ emp_act 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)) + 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)) //thrown weapon embedded object code. if(dtype == DAMAGE_BRUTE && istype(O,/obj/item)) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index d768b1de3a1..3ce4c999eae 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -399,14 +399,14 @@ H.apply_damage(25, DAMAGE_BRUTE, hit_zone, damage_flags = DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE) visible_message(SPAN_WARNING("[src] rips viciously at \the [G.affecting]'s [affected] with its mandibles!")) - msg_admin_attack("[key_name_admin(src)] mandible'd [key_name_admin(H)] (JMP)",ckey=key_name(src),ckey_target=key_name(H)) + msg_admin_attack("[key_name_admin(src)] mandible'd [key_name_admin(H)] (JMP)",ckey=key_name(src),ckey_target=key_name(H)) else var/mob/living/M = G.affecting if(!istype(M)) return M.apply_damage(25, DAMAGE_BRUTE, damage_flags = DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE) visible_message(SPAN_WARNING("[src] rips viciously at \the [G.affecting]'s flesh with its mandibles!")) - msg_admin_attack("[key_name_admin(src)] mandible'd [key_name_admin(M)] (JMP)",ckey=key_name(src),ckey_target=key_name(M)) + msg_admin_attack("[key_name_admin(src)] mandible'd [key_name_admin(M)] (JMP)",ckey=key_name(src),ckey_target=key_name(M)) playsound(get_turf(src), 'sound/weapons/slash.ogg', 50, TRUE) last_special = world.time + 100 @@ -610,7 +610,7 @@ playsound(src.loc, 'sound/weapons/bladeslice.ogg', 50, 1) var/obj/item/arrow/quill/A = new /obj/item/arrow/quill(usr.loc) A.throw_at(target, 10, 30, usr) - msg_admin_attack("[key_name_admin(src)] launched a quill at [key_name_admin(target)] (JMP)",ckey=key_name(src),ckey_target=key_name(target)) + msg_admin_attack("[key_name_admin(src)] launched a quill at [key_name_admin(target)] (JMP)",ckey=key_name(src),ckey_target=key_name(target)) /mob/living/carbon/human/proc/dissolve() set name = "Dissolve Self" @@ -773,7 +773,7 @@ if (brokesomething) playsound(get_turf(target), 'sound/weapons/heavysmash.ogg', 100, 1) attack_log += "\[[time_stamp()]\]crashed into [brokesomething] objects at ([target.x];[target.y];[target.z]) " - msg_admin_attack("[key_name(src)] crashed into [brokesomething] objects at (JMP)" ) + msg_admin_attack("[key_name(src)] crashed into [brokesomething] objects at (JMP)" ) if (!done && target.Enter(src, null)) if(stat || paralysis || stunned || weakened || lying || restrained() || buckled_to) @@ -799,7 +799,7 @@ var/mob/living/M = A attack_log += "\[[time_stamp()]\] Crashed into [key_name(M)]" M.attack_log += "\[[time_stamp()]\] Was rammed by [key_name(src)]" - msg_admin_attack("[key_name(src)] crashed into [key_name(M)] at (JMP)" ) + msg_admin_attack("[key_name(src)] crashed into [key_name(M)] at (JMP)" ) A.ex_act(2) @@ -1367,8 +1367,8 @@ say(",9!an enormous surge of encrypted data, surging out into the wider Hivenet.") - var/ccia_msg = SPAN_NOTICE("[uppertext(selected_hive)]: [key_name(src, 1)] (RPLY): [msg]") - var/admin_msg = SPAN_NOTICE("[uppertext(selected_hive)]: [key_name(src, 1)] (PP) (VV) (SM) ([admin_jump_link(src)]) (CA) (BSA) (RPLY): [msg]") + var/ccia_msg = SPAN_NOTICE("[uppertext(selected_hive)]: [key_name(src, 1)] (RPLY): [msg]") + var/admin_msg = SPAN_NOTICE("[uppertext(selected_hive)]: [key_name(src, 1)] (PP) (VV) (SM) ([admin_jump_link(src)]) (CA) (BSA) (RPLY): [msg]") var/cciaa_present = 0 var/cciaa_afk = 0 @@ -1530,7 +1530,7 @@ var/choice = tgui_alert(src, "Are you sure you want to void [target]? This cannot be undone!", "Void User?", list("Proceed", "Cancel")) if(choice == "Cancel") return - msg_admin_attack("[key_name_admin(src)] attempted to void [key_name_admin(target)]'s neural socket! (JMP)",ckey=key_name(src),ckey_target=key_name(target)) + msg_admin_attack("[key_name_admin(src)] attempted to void [key_name_admin(target)]'s neural socket! (JMP)",ckey=key_name(src),ckey_target=key_name(target)) var/obj/item/organ/internal/vaurca/neuralsocket/S = target.internal_organs_by_name[BP_NEURAL_SOCKET] var/list/target_fullname = splittext(target.name, " ") var/target_surname = target_fullname[target_fullname.len] @@ -2190,7 +2190,7 @@ var/obj/item/organ/internal/parasite/blackkois/infest = new() infest.replaced(H, affected) - msg_admin_attack("[key_name_admin(src)] infected [key_name_admin(H)] with black k'ois! (JMP)",ckey=key_name(src),ckey_target=key_name(H)) + msg_admin_attack("[key_name_admin(src)] infected [key_name_admin(H)] with black k'ois! (JMP)",ckey=key_name(src),ckey_target=key_name(H)) /mob/living/carbon/human/proc/phalanx_transmit() set name = "Phalanx Hivenet Transmission" diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 58aaf3dd36d..361af2b4700 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -503,7 +503,7 @@ target.IgniteMob() H.visible_message(SPAN_DANGER("[H] taps [target], setting [target.get_pronoun("his")] ablaze!"), \ SPAN_WARNING("You tap [target], setting [target.get_pronoun("him")] ablaze!")) - msg_admin_attack("[key_name(H)] spread fire to [target.name] ([target.ckey]) (JMP)",ckey=key_name(H),ckey_target=key_name(target)) + msg_admin_attack("[key_name(H)] spread fire to [target.name] ([target.ckey]) (JMP)",ckey=key_name(H),ckey_target=key_name(target)) else H.visible_message(SPAN_NOTICE("[H] taps [target] to get [target.get_pronoun("his")] attention!"), \ SPAN_NOTICE("You tap [target] to get [target.get_pronoun("his")] attention!")) diff --git a/code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm b/code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm index fc904e5d147..e86b1238d70 100644 --- a/code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm +++ b/code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm @@ -140,7 +140,7 @@ return /datum/species/skrell/get_strip_info(var/reference) - return "
    Empty Headtail Storage" + return "
    Empty Headtail Storage" /datum/species/skrell/can_breathe_water() return TRUE diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 4a401780f90..9dc0e051f31 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -287,7 +287,7 @@ 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)) + 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)) // Begin BS12 momentum-transfer code. var/mass = 1.5 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index e22f94da81a..3ad62d6ce02 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -220,7 +220,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( /mob/living/silicon/ai/proc/on_mob_init() to_chat(src, "

    You are playing the [station_name()]'s AI.

    ") - to_chat(src, "\[View help\] (or use OOC command AI-Help at any time)
    ") + to_chat(src, "\[View help\] (or use OOC command AI-Help at any time)
    ") if(GLOB.malf && !(mind in GLOB.malf.current_antagonists)) show_laws() diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index 9d8019145e9..39f50ce29d2 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -44,12 +44,12 @@ dat += "
    [D.real_name] ([D.stat == 2 ? SPAN_WARNING("INACTIVE") : "ACTIVE"])" dat += "
    Cell charge: [D.cell.charge]/[D.cell.maxcharge]." dat += "
    Currently located in: [get_area(D)]." - dat += "
    Resync | Shutdown    " + dat += "
    Resync | Shutdown    " - dat += "

    Request drone presence in area: [drone_call_area] (Send ping)" + dat += "

    Request drone presence in area: [drone_call_area] (Send ping)" dat += "

    Drone fabricator: " - dat += "[dronefab ? "[(dronefab.produce_drones && !(dronefab.stat & NOPOWER)) ? "ACTIVE" : "INACTIVE"]" : "FABRICATOR NOT DETECTED. (search)"]" + dat += "[dronefab ? "[(dronefab.produce_drones && !(dronefab.stat & NOPOWER)) ? "ACTIVE" : "INACTIVE"]" : "FABRICATOR NOT DETECTED. (search)"]" var/datum/browser/drone_win = new(user, "computer", capitalize_first_letters(name), 400, 500) drone_win.set_content(dat) 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 f17929e5d96..cf14d86c19e 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -184,9 +184,9 @@ dat += {" Activated Modules
    - Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
    - Module 2: [module_state_2 ? "    [module_state_2]" : "No Module"]
    - Module 3: [module_state_3 ? "    [module_state_3]" : "No Module"]
    + Module 1: [module_state_1 ? "    [module_state_2]" : "No Module"]
    + Module 3: [module_state_3 ? "    Activate
    " var/obj/item/I = O if((istype(I, /obj/item) || istype(I, /obj/item/device)) && !(I.iscoil())) @@ -217,7 +217,7 @@ else if(activated(module.emag)) dat += "[module.emag]: Activated
    " else - dat += "[module.emag]: Activate
    " + dat += "[module.emag]: [module_state_1]" : "No Module"]
    + Module 2: [module_state_2 ? "    [module_state_3]" : "No Module"]

    Installed Modules

    "} @@ -887,17 +887,17 @@ else if(activated(obj)) dat += "[obj]: Activated
    " else - dat += "[obj]:     Activate
    " + dat += "[obj]: Activate
    " if(malf_AI_module) if(activated(module.malf_AI_module)) dat += "[module.malf_AI_module]: Activated
    " else - dat += "[module.malf_AI_module]: Activate
    " + dat += "[module.malf_AI_module]: [C.c_tag]" to_chat(src, "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])") diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm index 78326b14343..5b98c197e6a 100644 --- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm +++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm @@ -31,7 +31,7 @@ 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)) + 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) return diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 5feda553fa8..3dc1aa6737b 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -132,9 +132,9 @@ var/dat = "
    Inventory of [name]

    " if(ears) - dat += "
    Headset: [ears] (Remove)" + dat += "
    Headset: [ears] (Remove)" else - dat += "
    Headset: Nothing" + dat += "
    Headset: Nothing" user << browse(dat, "window=mob[name];size=325x500") onclose(user, "mob[real_name]") diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index cc3f36d3095..68e268d81a8 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -19,10 +19,10 @@ spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!") if(matches) if(M.client) - message_admins(SPAN_WARNING("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)]."), 1) + message_admins(SPAN_WARNING("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)]."), 1) log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)].") else - message_admins(SPAN_WARNING("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). "), 1) + message_admins(SPAN_WARNING("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). "), 1) log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).") /mob diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index bc121e9c426..97d32cadd0a 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -369,14 +369,14 @@ /mob/proc/show_inv(mob/user) user.set_machine(src) var/dat = {" -
    Head(Mask): [(wear_mask ? wear_mask : "Nothing")] -
    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 ? "Remove Internal" : "")] -
    Empty Pockets -
    Refresh -
    Close +
    Head(Mask): [(wear_mask ? wear_mask : "Nothing")] +
    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 ? "Remove Internal" : "")] +
    Empty Pockets +
    Refresh +
    Close
    "} var/datum/browser/mob_win = new(user, "mob[name]", capitalize_first_letters(name)) diff --git a/code/modules/modular_computers/file_system/programs/security/implant_tracker.dm b/code/modules/modular_computers/file_system/programs/security/implant_tracker.dm index b7b08e4897d..6bb36c4b173 100644 --- a/code/modules/modular_computers/file_system/programs/security/implant_tracker.dm +++ b/code/modules/modular_computers/file_system/programs/security/implant_tracker.dm @@ -101,4 +101,4 @@ if(istype(I) && I.imp_in) var/mob/living/carbon/R = I.imp_in to_chat(R, SPAN_NOTICE("You hear a voice in your head saying: '[warning]'.")) - message_admins("[key_name_admin(usr)] messaged [key_name_admin(I.imp_in)]: '[warning]' via \the [computer]. (JMP)") + message_admins("[key_name_admin(usr)] messaged [key_name_admin(I.imp_in)]: '[warning]' via \the [computer]. (JMP)") diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 7cc80ec1294..e2f2c3b4286 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -450,7 +450,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) if(user) user.attack_log += "\[[time_stamp()]\] removed a vital organ ([src]) from [owner.name] ([owner.ckey]) [user ? "(INTENT: [uppertext(user.a_intent)])" : ""]" owner.attack_log += "\[[time_stamp()]\] had a vital organ ([src]) removed by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])" - msg_admin_attack("[user.name] ([user.ckey]) removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(owner)) + msg_admin_attack("[user.name] ([user.ckey]) removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(owner)) owner.death() owner.update_action_buttons() diff --git a/code/modules/overmap/ship_weaponry/_ship_ammunition.dm b/code/modules/overmap/ship_weaponry/_ship_ammunition.dm index d81fa1511c5..68c7b256e13 100644 --- a/code/modules/overmap/ship_weaponry/_ship_ammunition.dm +++ b/code/modules/overmap/ship_weaponry/_ship_ammunition.dm @@ -196,7 +196,7 @@ P.speed = get_speed() P.entry_target = entry_point forceMove(P) - log_and_message_admins("A projectile ([name]) has entered the Overmap! (JMP)") + log_and_message_admins("A projectile ([name]) has entered the Overmap! (JMP)") return TRUE //SNOWFLAKE CODE: ACTIVATE diff --git a/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm b/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm index 42da78e7394..6bbde991481 100644 --- a/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm +++ b/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm @@ -99,7 +99,7 @@ widowmaker.primed = TRUE widowmaker.forceMove(entry_target) widowmaker.on_hit(laze, is_landmark_hit = TRUE) - log_and_message_admins("A projectile ([name]) has entered a z-level at [entry_target.name]! (JMP)") + log_and_message_admins("A projectile ([name]) has entered a z-level at [entry_target.name]! (JMP)") say_dead_direct("A projectile ([name]) has entered a z-level at [entry_target.name]!") qdel(widowmaker) qdel(src) @@ -126,7 +126,7 @@ widowmaker.dir = ammunition.heading var/turf/target_turf = get_step(widowmaker, widowmaker.dir) widowmaker.on_translate(entry_turf, target_turf) - log_and_message_admins("A projectile ([widowmaker.name]) has entered a z-level at [entry_target.name], with direction [dir2text(widowmaker.dir)]! (JMP)") + log_and_message_admins("A projectile ([widowmaker.name]) has entered a z-level at [entry_target.name], with direction [dir2text(widowmaker.dir)]! (JMP)") say_dead_direct("A projectile ([widowmaker.name]) has entered a z-level at [entry_target.name], with direction [dir2text(widowmaker.dir)]!") widowmaker.preparePixelProjectile(target_turf, entry_turf) widowmaker.fired_from = src diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index b02839136af..59e2d26c6f7 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -22,7 +22,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov /obj/machinery/computer/ship/proc/display_reconnect_dialog(var/mob/user, var/flavor) var/datum/browser/popup = new (user, "[src]", "[src]") - popup.set_content("

    Error
    Unable to connect to [flavor].
    Reconnect
    ") + popup.set_content("
    Error
    Unable to connect to [flavor].
    Reconnect
    ") popup.open() /obj/machinery/computer/ship/attackby(obj/item/attacking_item, mob/user) diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 62d3b5f2cdc..2b301fad411 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -75,23 +75,23 @@ /obj/item/clipboard/attack_self(mob/user as mob) var/dat = "Clipboard" if(haspen) - dat += "Remove Pen
    " + dat += "Remove Pen
    " else - dat += "Add Pen
    " + dat += "Add Pen
    " //The topmost paper. I don't think there's any way to organise contents in byond, so this is what we're stuck with. -Pete //i'm leaving this here because it's funny - wildkins if(toppaper) var/obj/item/paper/P = toppaper - dat += "Write Remove Rename - [P.name]
    " + dat += "Write Remove Rename - [P.name]
    " for(var/obj/item/paper/P in r_contents) // now this is podracing if(P==toppaper) continue - dat += "Write Remove Rename - [P.name]
    " + dat += "Write Remove Rename - [P.name]
    " for(var/obj/item/photo/Ph in r_contents) - dat += "Remove Rename - [Ph.name]
    " + dat += "Remove Rename - [Ph.name]
    " user << browse(dat, "window=clipboard") if(!ui_open) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index ee9602bb3d6..f75eec13bb3 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -300,7 +300,7 @@ GLOBAL_LIST_EMPTY(admin_departments) /obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/obj/item/sent, var/reply_type, font_colour="#006100") - var/msg = SPAN_NOTICE(" [faxname]: [key_name(sender, 1)] (PP) (VV) (SM) (JMP) (CA) (REPLY): Receiving '[sent.name]' via secure connection ... view message") + var/msg = SPAN_NOTICE(" [faxname]: [key_name(sender, 1)] (PP) (VV) (SM) (JMP) (CA) (REPLY): Receiving '[sent.name]' via secure connection ... view message") var/cciaa_present = 0 var/cciaa_afk = 0 diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index eec8e9cfa27..a132618946e 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -79,7 +79,7 @@ user.set_machine(src) var/dat = "
    " for(var/obj/item/P in src) - dat += "" + dat += "" dat += "
    [P.name]
    [P.name]
    " user << browse("[name][dat]", "window=filingcabinet;size=350x300") diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index ca3048abd3a..5754fd1b0fb 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -54,13 +54,13 @@ var/dat = "[name]" for(var/obj/item/paper/P in src) - dat += "[can_write ? "Write " : ""]Remove Rename - [P.name]
    " + dat += "[can_write ? "Write " : ""]Remove Rename - [P.name]
    " for(var/obj/item/photo/Ph in src) - dat += "Remove Rename - [Ph.name]
    " + dat += "Remove Rename - [Ph.name]
    " for(var/obj/item/paper_bundle/Pb in src) - dat += "Remove Rename - [Pb.name]
    " + dat += "Remove Rename - [Pb.name]
    " for(var/obj/item/sample/Pf in src) - dat += "Remove - [Pf.name]
    " + dat += "Remove - [Pf.name]
    " user << browse(dat, "window=folder") onclose(user, "folder") add_fingerprint(usr) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 09dd4aa8140..fd11647c9a3 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -299,8 +299,8 @@ /obj/item/paper/proc/updateinfolinks() info_links = info for (var/i = 1, i <= min(fields, 35), i++) - addtofield(i, "write", 1) - info_links = info_links + "write" + addtofield(i, "write", 1) + info_links = info_links + "write" /obj/item/paper/proc/clearpaper() diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index cfa64f1455c..9371a43e5df 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -112,18 +112,18 @@ // first if(page == 1) dat+= "
    Front
    " - dat+= "" - dat+= "
    " + dat+= "" + dat+= "
    " // last else if(page == pages.len) - dat+= "" - dat+= "" + dat+= "" + dat+= "" dat+= "
    Back

    " // middle pages else - dat+= "" - dat+= "" - dat+= "
    " + dat+= "" + dat+= "" + dat+= "
    " if(istype(pages[page], /obj/item/paper)) var/obj/item/paper/P = W diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index fb732c3b885..d25990a2254 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -189,7 +189,7 @@ to_chat(target_mob, SPAN_WARNING("You feel a small pinch!")) // To the stabbed. target_mob.attack_log += "\[[time_stamp()]\] Has been stabbed with [name] by [user.name] ([user.ckey])" user.attack_log += "\[[time_stamp()]\] Used the [name] to stab [target_mob.name] ([target_mob.ckey])" - msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [target_mob.name] ([target_mob.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob)) + msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [target_mob.name] ([target_mob.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob)) admin_inject_log(user, target_mob, src, contained_reagents, reagents.get_temperature(), trans) // Admin log. /* diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 120fb552393..a1a0974c582 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -45,7 +45,7 @@ /obj/machinery/power/am_control_unit/process() if(exploding && !exploded) - message_admins("AME explosion at ([x],[y],[z] - JMP) - Last touched by [fingerprintslast]",0,1) + message_admins("AME explosion at ([x],[y],[z] - JMP) - Last touched by [fingerprintslast]",0,1) exploded=1 explosion(get_turf(src),8,10,12,15) if(src) @@ -160,7 +160,7 @@ return fueljar = attacking_item user.drop_from_inventory(attacking_item, src) - message_admins("AME loaded with fuel by [user.real_name] ([user.key]) at ([x],[y],[z] - JMP)",0,1) + message_admins("AME loaded with fuel by [user.real_name] ([user.key]) at ([x],[y],[z] - JMP)",0,1) user.visible_message("[user] loads \the [attacking_item] into \the [src].", SPAN_NOTICE("You load \the [attacking_item] into \the [src]."), SPAN_NOTICE("You hear a thunk.")) @@ -322,7 +322,7 @@ if(href_list["togglestatus"]) toggle_power() - message_admins("AME toggled [active?"on":"off"] by [usr.real_name] ([usr.key]) at ([x],[y],[z] - JMP)",0,1) + message_admins("AME toggled [active?"on":"off"] by [usr.real_name] ([usr.key]) at ([x],[y],[z] - JMP)",0,1) return TRUE if(href_list["refreshicons"]) @@ -331,7 +331,7 @@ if(href_list["ejectjar"]) if(fueljar) - message_admins("AME fuel jar ejected by [usr.real_name] ([usr.key]) at ([x],[y],[z] - JMP)",0,1) + message_admins("AME fuel jar ejected by [usr.real_name] ([usr.key]) at ([x],[y],[z] - JMP)",0,1) fueljar.forceMove(src.loc) fueljar = null //fueljar.control_unit = null currently it does not care where it is @@ -344,7 +344,7 @@ return fuel_injection = newval fuel_injection = max(1, fuel_injection) - message_admins("AME injection strength set to [fuel_injection] by [usr.real_name] ([usr.key]) at ([x],[y],[z] - JMP)",0,1) + message_admins("AME injection strength set to [fuel_injection] by [usr.real_name] ([usr.key]) at ([x],[y],[z] - JMP)",0,1) return TRUE if(href_list["refreshstability"]) diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index e020cf77d4f..ee40aa220c4 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -254,12 +254,12 @@ var/dat = "Gravity Generator Breaker: " if(!eventon) if(breaker) - dat += "ON OFF" + dat += "ON OFF" else - dat += "ON OFF " + dat += "ON OFF " if(backpanelopen) dat += "
    Emergency shutoff:
    " - dat += "Red Button" + dat += "Red Button" dat += "
    Generator Status:
    " if(charging_state != POWER_IDLE) @@ -353,14 +353,14 @@ GLOB.gravity_is_on = 1 soundloop.start(src) investigate_log("was brought online and is now producing gravity for this level.", "gravity") - message_admins("The gravity generator was brought online. ([area.name])") + message_admins("The gravity generator was brought online. ([area.name])") else if(area.has_gravity()) alert = 1 GLOB.gravity_is_on = 0 soundloop.stop(src) investigate_log("was brought offline and there is now no gravity for this level.", "gravity") - message_admins("The gravity generator was brought offline with no backup generator. ([area.name])") + message_admins("The gravity generator was brought offline with no backup generator. ([area.name])") update_icon() update_list(gravity_changed) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 4cdc8cce05a..ed1c054f60a 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -49,7 +49,7 @@ /obj/machinery/power/emitter/Destroy() if(special_emitter) - message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) log_game("Emitter deleted at ([x],[y],[z])") QDEL_NULL(wifi_receiver) @@ -87,7 +87,7 @@ if(user) to_chat(user, SPAN_NOTICE("You deactivate \the [src].")) if(special_emitter) - message_admins("Emitter turned off by [key_name_admin(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter turned off by [key_name_admin(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])") investigate_log("turned off by [user.key]","singulo") else @@ -98,7 +98,7 @@ if(user) to_chat(user, SPAN_NOTICE("You activate \the [src].")) if(special_emitter) - message_admins("Emitter turned on by [key_name_admin(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter turned on by [key_name_admin(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) log_game("Emitter turned on by [user.ckey]([user]) in ([x],[y],[z])") investigate_log("turned on by [user.key]","singulo") update_icon() diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index d3060d95ee6..18b411ae5e2 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -122,7 +122,7 @@ if(strength > strength_upper_limit) strength = strength_upper_limit else - message_admins("PA Control Computer increased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("PA Control Computer increased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) log_game("PA Control Computer increased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])") investigate_log("increased to [strength] by [usr.key]","singulo") strength_change() @@ -133,7 +133,7 @@ if(strength < 0) strength = 0 else - message_admins("PA Control Computer decreased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("PA Control Computer decreased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) log_game("PA Control Computer decreased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])") investigate_log("decreased to [strength] by [usr.key]","singulo") strength_change() @@ -214,7 +214,7 @@ /obj/machinery/particle_accelerator/control_box/toggle_power(mob/user) src.active = !src.active investigate_log("turned [active?SPAN_WARNING("ON"):"OFF"] by [user ? user.key : "outside forces"]","singulo") - message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user, TRUE, highlight_special = TRUE)] in ([x],[y],[z] - JMP)",0,1) + message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user, TRUE, highlight_special = TRUE)] in ([x],[y],[z] - JMP)",0,1) log_game("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user)] in ([x],[y],[z])") if(src.active) update_use_power(POWER_USE_ACTIVE) @@ -241,11 +241,11 @@ var/dat = "" dat += "Particle Accelerator Control Panel
    " - dat += "Close

    " + dat += "Close

    " dat += "Status:
    " if(!assembled) dat += "Unable to detect all parts!
    " - dat += "Run Scan

    " + dat += "Run Scan

    " else dat += "All parts in place.

    " dat += "Power:" @@ -253,9 +253,9 @@ dat += "On
    " else dat += "Off
    " - dat += "Toggle Power

    " + dat += "Toggle Power

    " dat += "Particle Strength: [src.strength] " - dat += "--|++

    " + dat += "--|++

    " var/datum/browser/pa_win = new(user, "pacontrol", capitalize_first_letters(name), 420, 500) pa_win.set_content(dat) diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index d569fe750bc..855d81c58bc 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -263,7 +263,7 @@ if(G.siemens_coefficient == 0) user_protected = 1 log_game("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100") - message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - JMP") + message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - JMP") switch (intensity) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 35803818b11..b456b06fb60 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -357,21 +357,21 @@ t += "Tracking:
    " switch(track) if(0) - t += "Off Timed Auto
    " + t += "Off Timed Auto
    " if(1) - t += "Off Timed Auto
    " + t += "Off Timed Auto
    " if(2) - t += "Off Timed Auto
    " + t += "Off Timed Auto
    " t += "Tracking Rate: [rate_control(src,"tdir","[trackrate] deg/h ([trackrate<0 ? "CCW" : "CW"])",1,30,180)]

    " t += "Connected devices:
    " - t += "Search for devices
    " + t += "Search for devices
    " t += "Solar panels : [connected_panels.len] connected
    " t += "Solar tracker : [connected_tracker ? SPAN_GOOD("Found") : SPAN_BAD("Not found")]

    " - t += "Close" + t += "Close" var/datum/browser/popup = new(user, "solar", name) popup.set_content(t) @@ -554,7 +554,7 @@ info = "

    Welcome

    At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or phoron! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.

    You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!

    Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the sun's movements and to send commands to the solar panels to change direction with the sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.

    Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.

    That's all to it, be safe, be green!

    " /proc/rate_control(var/S, var/V, var/C, var/Min=1, var/Max=5, var/Limit=null) //How not to name vars - var/href = "-"+rate+"[href]=[Limit]'>+" return rate diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 5521ea40fa8..26a1fe3fab2 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -263,7 +263,7 @@ is_charging = 0 if(!istype(user.get_active_hand(), src)) return - msg_admin_attack("[key_name_admin(user)] shot with \a [src.type] [key_name_admin(src)]'s target (JMP)",ckey=key_name(user),ckey_target=key_name(src)) + msg_admin_attack("[key_name_admin(user)] shot with \a [src.type] [key_name_admin(src)]'s target (JMP)",ckey=key_name(user),ckey_target=key_name(src)) return ..() @@ -355,7 +355,7 @@ is_charging = 0 if(!istype(user.get_active_hand(), src)) return - msg_admin_attack("[key_name_admin(user)] shot with \a [src.type] [key_name_admin(src)]'s target (JMP)",ckey=key_name(user),ckey_target=key_name(src)) + msg_admin_attack("[key_name_admin(user)] shot with \a [src.type] [key_name_admin(src)]'s target (JMP)",ckey=key_name(user),ckey_target=key_name(src)) return ..() @@ -440,7 +440,7 @@ is_charging = FALSE if(needs_wielding && user.get_active_hand() != src) return - msg_admin_attack("[key_name_admin(user)] shot with \a [src.type] [key_name_admin(src)]'s target (JMP)") + msg_admin_attack("[key_name_admin(user)] shot with \a [src.type] [key_name_admin(src)]'s target (JMP)") return ..() /obj/item/gun/energy/vaurca/thermaldrill/mounted diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index 71fe48983a2..59fa550f610 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -142,12 +142,12 @@ var/singleton/reagent/R = GET_SINGLETON(_R) dat += "
    [B.reagents.reagent_volumes[_R]] units of [R.name], " if (check_beaker_mixing(B)) - dat += "Mixing " + dat += "Mixing " else - dat += "Not mixing " + dat += "Not mixing " else dat += "nothing." - dat += " \[Eject\]
    " + dat += " \[Eject\]
    " i++ else dat += "There are no beakers inserted!

    " @@ -157,7 +157,7 @@ dat += "The dart cartridge has [ammo_magazine.stored_ammo.len] shots remaining." else dat += SPAN_WARNING("The dart cartridge is empty!") - dat += " \[Eject\]" + dat += " \[Eject\]" user << browse(dat, "window=dartgun") onclose(user, "dartgun", src) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 473fd135e0c..328917b1ede 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -467,11 +467,11 @@ [beaker_contents]
    "} if (is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN))) - dat += "Process the reagents
    " + dat += "Process the reagents
    " if(holdingitems && holdingitems.len > 0) - dat += "Eject the reagents
    " + dat += "Eject the reagents
    " if (beaker) - dat += "Detach the beaker
    " + dat += "Detach the beaker
    " else dat += "Please wait..." @@ -606,7 +606,7 @@ 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)) + 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 if(!do_after(usr, 35)) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 4c59231ee1c..6ada9282da1 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -192,7 +192,7 @@ var/temperature_text = "Temperature: ([temperature]K/[temperature]C)" 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)) + 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]!"), SPAN_WARNING("You splash the solution onto \the [target].")) @@ -276,7 +276,7 @@ var/contained = reagentlist() 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)) + 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) feed_sound(user) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index cc3e8ead687..b95b9a4b443 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -110,7 +110,7 @@ if(mode == i) t += "[reagent_names[i]]" else - t += "[reagent_names[i]]" + t += "[reagent_names[i]]" t = "Available reagents: [t]." to_chat(user, t) diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 78da8c770ed..3eb34bb3d48 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -149,7 +149,7 @@ update_icon() set_light(2, 2, LIGHT_COLOR_LAVA) if(REAGENT_VOLUME(reagents, /singleton/reagent/fuel) >= LETHAL_FUEL_CAPACITY && user) - msg_admin_attack("[user] ([user.ckey]) lit the fuse on an improvised [name] grenade. (JMP)",ckey=key_name(user)) + msg_admin_attack("[user] ([user.ckey]) lit the fuse on an improvised [name] grenade. (JMP)",ckey=key_name(user)) if(fuselength >= FUSELENGTH_MIN && fuselength <= FUSELENGTH_SHORT) user.visible_message(SPAN_DANGER("[user] accidentally takes \the [W] too close to \the [name]'s opening!")) detonate(TRUE) // it'd be a bit dull if the toy-levels of fuel had a chance to insta-pop, it's mostly just a way to keep the grenade balance in check diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 7a12d90a875..d55c12f44fc 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -134,7 +134,7 @@ var/contained = reagentlist() 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)) + 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) feed_sound(target) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 0e709a0e5ea..d44289cc7e4 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -51,7 +51,7 @@ var/contained = reagentlist() target_mob.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_mob)] Reagents: [contained]" - msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(target_mob)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob)) + msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(target_mob)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob)) if(reagents.total_volume) reagents.trans_to_mob(target_mob, reagents.total_volume, CHEM_INGEST) @@ -69,7 +69,7 @@ to_chat(user, SPAN_NOTICE("You dissolve \the [src] in [target].")) 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)) + 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) for(var/mob/O in viewers(2, user)) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index a3a55428ca8..03b6a0009e2 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -328,7 +328,7 @@ user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM)." target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: HARM)." - msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (JMP)",ckey=key_name(user),ckey_target=key_name(src)) + msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (JMP)",ckey=key_name(user),ckey_target=key_name(src)) return diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index f1d9e4b1ef6..7f50234b4df 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -70,7 +70,7 @@ SPAN_WARNING("You wrench \the [src]'s faucet [is_leaking ? "closed" : "open"]")) is_leaking = !is_leaking if (is_leaking) - message_admins("[key_name_admin(user)] wrench opened \the [src] at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking reagents. (JMP)") + message_admins("[key_name_admin(user)] wrench opened \the [src] at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking reagents. (JMP)") log_game("[key_name(user)] opened \the [src] at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking reagents.") START_PROCESSING(SSprocessing,src) @@ -169,7 +169,7 @@ var/obj/item/device/assembly_holder/H = attacking_item if (istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter)) - message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. (JMP)") + message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. (JMP)") log_game("[key_name(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion.") rig = attacking_item diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 7e5bee9af39..89442836999 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -231,7 +231,7 @@ qdel(G) 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)) + 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()) return TRUE @@ -292,7 +292,7 @@ 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)) + 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 if (target.client) @@ -368,21 +368,21 @@ if(!ai) // AI can't pull flush handle if(flush) - dat += "Disposal handle: Disengage Engaged" + dat += "Disposal handle: Disengage Engaged" else - dat += "Disposal handle: Disengaged Engage" + dat += "Disposal handle: Disengaged Engage" - dat += "
    Eject contents
    " + dat += "
    Eject contents
    " if(uses_air) if(mode <= 0) - dat += "Pump: Off On
    " + dat += "Pump: Off On
    " else if(mode == 1) - dat += "Pump: Off On (pressurizing)
    " + dat += "Pump: Off On (pressurizing)
    " else - dat += "Pump: Off On (idle)
    " + dat += "Pump: Off On (idle)
    " else - dat += "Pump: Off On (idle)
    " + dat += "Pump: Off On (idle)
    " var/per = 100* air_contents.return_pressure() / (SEND_PRESSURE) if(!uses_air) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 1c838db90c0..ea5b77f2770 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -263,13 +263,13 @@ dat += "" for(var/i = 1, i <= SSdisposals.tagger_locations.len, i++) - dat += "" + dat += "" if (i % 4==0) dat += "" dat += "
    [SSdisposals.tagger_locations[i]][SSdisposals.tagger_locations[i]]

    Current Selection: [currTag ? currTag : "None"]    " - dat += "
    Enter custom location." + dat += "
    Enter custom location." user << browse(dat, "window=destTagScreen;size=450x375") onclose(user, "destTagScreen") diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index eb023f25d0b..ab84c592cb0 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -504,7 +504,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(0.2) dat += "SYSTEM LOCKED

    " - dat += "Unlock" + dat += "Unlock" if(0.3) dat += "Constructing Prototype. Please Wait..." @@ -520,70 +520,70 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Loaded disk: " dat += (t_disk || d_disk) ? (t_disk ? "technology storage disk" : "design storage disk") : "None" dat += "
    " dat += "
    " if(1.1) //Research viewer - dat += "Main Menu || " - dat += "Print This Page
    " + dat += "Main Menu || " + dat += "Print This Page
    " dat += "Current Research Levels:
    " dat += GetResearchLevelsInfo() dat += "" if(1.2) //Technology Disk Menu - dat += "Main Menu
    " + dat += "Main Menu
    " dat += "Disk Contents: (Technology Data Disk)

    " dat += "
    " if(t_disk.stored == null) dat += "The disk has no data stored on it.
    " dat += "Operations: " - dat += "Load Tech to Disk || " + dat += "Load Tech to Disk || " else dat += "Name: [t_disk.stored.name]
    " dat += "Level: [t_disk.stored.level]
    " dat += "Description: [t_disk.stored.desc]
    " dat += "Operations: " - dat += "Upload to Database || " - dat += "Clear Disk || " - dat += "Eject Disk" + dat += "Upload to Database || " + dat += "Clear Disk || " + dat += "Eject Disk" dat += "
    " if(1.3) //Technology Disk submenu - dat += "
    Main Menu || " - dat += "Return to Disk Operations
    " + dat += "
    Main Menu || " + dat += "Return to Disk Operations
    " dat += "
    " dat += "Load Technology to Disk:

    " dat += "
      " for(var/tech_id in files.known_tech) var/datum/tech/T = files.known_tech[tech_id] dat += "
    • [T.name] " - dat += "\[copy to disk\]" + dat += "\[copy to disk\]" dat += "
    " dat += "
    " if(1.4) //Design Disk menu. - dat += "Main Menu
    " + dat += "Main Menu
    " dat += "
    " if(d_disk.blueprint == null) dat += "The disk has no data stored on it.
    " dat += "Operations: " - dat += "Load Design to Disk || " + dat += "Load Design to Disk || " else dat += "Name: [d_disk.blueprint.name]
    " switch(d_disk.blueprint.build_type) @@ -594,14 +594,14 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(copytext(M, 1, 2) == "$") dat += "* [copytext(M, 2)] x [d_disk.blueprint.materials[M]]
    " else dat += "* [M] x [d_disk.blueprint.materials[M]]
    " dat += "
    Operations: " - dat += "Upload to Database || " - dat += "Clear Disk || " - dat += "Eject Disk" + dat += "Upload to Database || " + dat += "Clear Disk || " + dat += "Eject Disk" dat += "
    " if(1.5) //Technology disk submenu - dat += "Main Menu || " - dat += "Return to Disk Operations
    " + dat += "Main Menu || " + dat += "Return to Disk Operations
    " dat += "
    " dat += "Load Design to Disk:

    " dat += "
      " @@ -609,50 +609,50 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/datum/design/D = files.known_designs[path] if(D.build_path) dat += "
    • [D.name] " - dat += "\[copy to disk\]" + dat += "\[copy to disk\]" dat += "
    " dat += "
    " if(1.6) //R&D console settings - dat += "Main Menu
    " + dat += "Main Menu
    " dat += "R&D Console Setting:
    " dat += "
    " dat += "
    " if(1.7) //R&D device linkage - dat += "Main Menu || " - dat += "Settings Menu
    " + dat += "Main Menu || " + dat += "Settings Menu
    " dat += "R&D Console Device Linkage Menu:
    " dat += "
    " - dat += "Re-sync with Nearby Devices
    " + dat += "Re-sync with Nearby Devices
    " dat += "Linked Devices:" dat += "
      " if(allow_analyzer) if(linked_destroy) - dat += "
    • Destructive Analyzer Disconnect" + dat += "
    • Destructive Analyzer Disconnect" else dat += "
    • (No Destructive Analyzer Linked)" if(allow_lathe) if(linked_lathe) - dat += "
    • Protolathe Disconnect" + dat += "
    • Protolathe Disconnect" else dat += "
    • (No Protolathe Linked)" if(allow_imprinter) if(linked_imprinter) - dat += "
    • Circuit Imprinter Disconnect" + dat += "
    • Circuit Imprinter Disconnect" else dat += "
    • (No Circuit Imprinter Linked)" dat += "
    " @@ -660,15 +660,15 @@ won't update every console in existence) but it's more of a hassle to do. Also, ////////////////////DESTRUCTIVE ANALYZER SCREENS//////////////////////////// if(2.0) - dat += "Main Menu
    " + dat += "Main Menu
    " dat += "NO DESTRUCTIVE ANALYZER LINKED TO CONSOLE

    " if(2.1) - dat += "Main Menu
    " + dat += "Main Menu
    " dat += "No Item Loaded. Standing-by...
    " if(2.2) - dat += "Main Menu
    " + dat += "Main Menu
    " dat += "Deconstruction Menu
    " dat += "Name: [linked_destroy.loaded_item.name]
    " dat += "Origin Tech:" @@ -679,25 +679,25 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += " (Current Level: [T.level] || Current Progress: [T.next_level_progress]/[T.next_level_threshold])" dat += "" if(!istype(linked_destroy.loaded_item, /obj/item/stack)) - dat += "
    Deconstruct Item || " + dat += "
    Deconstruct Item || " else - dat += "
    Deconstruct One In Stack || " - dat += "Eject Item" + dat += "
    Deconstruct One In Stack || " + dat += "Eject Item" /////////////////////PROTOLATHE SCREENS///////////////////////// if(3.0) - dat += "Main Menu
    " + dat += "Main Menu
    " dat += "NO PROTOLATHE LINKED TO CONSOLE

    " if(3.1) - dat += "Main Menu || " - dat += "View Queue || " - dat += "Material Storage || " - dat += "Chemical Storage
    " + dat += "Main Menu || " + dat += "View Queue || " + dat += "Material Storage || " + dat += "Chemical Storage
    " dat += "Protolathe Menu:
    " dat += "Material Amount: [linked_lathe.TotalMaterials()] cm3 (MAX: [linked_lathe.max_material_storage])
    " dat += "Chemical Volume: [linked_lathe.reagents.total_volume] (MAX: [linked_lathe.reagents.maximum_volume])
    " - dat += "Category: [protolathe_category]
    " + dat += "Category: [protolathe_category]
    " dat += "
    " dat += "
      " var/last_category = "" @@ -718,7 +718,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(temp_dat) temp_dat = " \[[copytext(temp_dat, 3)]\]" if(linked_lathe.canBuild(D)) - dat += "
    • [capitalize_first_letters(D.name)]" + dat += "
    • [capitalize_first_letters(D.name)]" else dat += "
    • [capitalize_first_letters(D.name)]
      " dat += "[temp_dat]
      [D.desc]" @@ -726,8 +726,8 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "
    " if(3.2) //Protolathe Material Storage Sub-menu - dat += "Main Menu || " - dat += "Protolathe Menu
    " + dat += "Main Menu || " + dat += "Protolathe Menu
    " dat += "Material Storage
    " dat += "
      " for(var/M in linked_lathe.materials) @@ -738,25 +738,25 @@ won't update every console in existence) but it's more of a hassle to do. Also, for (var/C in list(1, 3, 5, 10, 15, 20, 25, 30, 40)) if(amount < C * SHEET_MATERIAL_AMOUNT) break - dat += "[C > 1 ? ", " : ""][C] " + dat += "[C > 1 ? ", " : ""][C] " - dat += " or max sheets" + dat += " or max sheets" dat += "" dat += "
    " if(3.3) //Protolathe Chemical Storage Submenu - dat += "Main Menu || " - dat += "Protolathe Menu
    " + dat += "Main Menu || " + dat += "Protolathe Menu
    " dat += "Chemical Storage
    " for(var/_R in linked_lathe.reagents.reagent_volumes) var/singleton/reagent/R = GET_SINGLETON(_R) dat += "Name: [R.name] | Units: [linked_lathe.reagents.reagent_volumes[_R]] " - dat += "(Purge)
    " - dat += "Disposal All Chemicals in Storage
    " + dat += "(Purge)
    " + dat += "Disposal All Chemicals in Storage
    " if(3.4) // Protolathe queue - dat += "Main Menu || " - dat += "Protolathe Menu
    " + dat += "Main Menu || " + dat += "Protolathe Menu
    " dat += "Queue
    " if(!linked_lathe.queue.len) dat += "Empty" @@ -767,25 +767,25 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(linked_lathe.busy) dat += "1: [D.name]
    " else - dat += "1: [D.name] (Awaiting materials) Remove
    " + dat += "1: [D.name] (Awaiting materials) Remove
    " else - dat += "[tmp]: [D.name] Remove
    " + dat += "[tmp]: [D.name] Remove
    " ++tmp ///////////////////CIRCUIT IMPRINTER SCREENS//////////////////// if(4.0) - dat += "Main Menu
    " + dat += "Main Menu
    " dat += "NO CIRCUIT IMPRINTER LINKED TO CONSOLE

    " if(4.1) - dat += "Main Menu || " - dat += "View Queue || " - dat += "Material Storage || " - dat += "Chemical Storage
    " + dat += "Main Menu || " + dat += "View Queue || " + dat += "Material Storage || " + dat += "Chemical Storage
    " dat += "Circuit Imprinter Menu:
    " dat += "Material Amount: [linked_imprinter.TotalMaterials()] cm3
    " dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
    " - dat += "Category: [imprinter_category]
    " + dat += "Category: [imprinter_category]
    " dat += "
    " dat += "
      " var/last_category = "" @@ -806,7 +806,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(temp_dat) temp_dat = " \[[copytext(temp_dat,3)]\]" if(linked_imprinter.canBuild(D)) - dat += "
    • [D.name]" + dat += "
    • [D.name]" else dat += "
    • [D.name]
      " dat += "[temp_dat]
      [D.desc]" @@ -814,18 +814,18 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "
    " if(4.2) - dat += "Main Menu || " - dat += "Imprinter Menu
    " + dat += "Main Menu || " + dat += "Imprinter Menu
    " dat += "Chemical Storage
    " for(var/_R in linked_imprinter.reagents.reagent_volumes) var/singleton/reagent/R = GET_SINGLETON(_R) dat += "Name: [R.name] | Units: [linked_imprinter.reagents.reagent_volumes[_R]] " - dat += "(Purge)
    " - dat += "Disposal All Chemicals in Storage
    " + dat += "(Purge)
    " + dat += "Disposal All Chemicals in Storage
    " if(4.3) - dat += "Main Menu || " - dat += "Circuit Imprinter Menu
    " + dat += "Main Menu || " + dat += "Circuit Imprinter Menu
    " dat += "Material Storage
    " dat += "
      " for(var/M in linked_imprinter.materials) @@ -836,15 +836,15 @@ won't update every console in existence) but it's more of a hassle to do. Also, for (var/C in list(1, 3, 5, 10, 15, 20, 25, 30, 40)) if(amount < C * SHEET_MATERIAL_AMOUNT) break - dat += "[C > 1 ? ", " : ""][C] " + dat += "[C > 1 ? ", " : ""][C] " - dat += " or max sheets" + dat += " or max sheets" dat += "" dat += "
    " if(4.4) - dat += "Main Menu || " - dat += "Circuit Imprinter Menu
    " + dat += "Main Menu || " + dat += "Circuit Imprinter Menu
    " dat += "Queue
    " if(linked_imprinter.queue.len == 0) dat += "Empty" @@ -854,13 +854,13 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(tmp == 1) dat += "1: [D.name]
    " else - dat += "[tmp]: [D.name] Remove
    " + dat += "[tmp]: [D.name] Remove
    " ++tmp ///////////////////Research Information Browser//////////////////// if(5.0) - dat += "Main Menu || " - dat += "Print This Page
    " + dat += "Main Menu || " + dat += "Print This Page
    " dat += "List of Researched Technologies and Designs:
    " dat += GetResearchListInfo() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 12cacdd8990..1157be83125 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -303,9 +303,9 @@ if((istype(S, /obj/machinery/r_n_d/server/centcom) && !badmin) || (ST && !AreConnectedZLevels(ST.z, T.z))) continue dat += "[S.name] || " - dat += " Access Rights | " - dat += "Data Management" - if(badmin) dat += " | Server-to-Server Transfer" + dat += " Access Rights | " + dat += "Data Management" + if(badmin) dat += " | Server-to-Server Transfer" dat += "
    " if(1) //Access rights menu @@ -313,7 +313,7 @@ dat += "Consoles with Upload Access
    " for(var/obj/machinery/computer/rdconsole/C in consoles) var/turf/console_turf = get_turf(C) - dat += "* [console_turf.loc]" //FYI, these are all numeric ids, eventually. + dat += "* [console_turf.loc]" //FYI, these are all numeric ids, eventually. if(C.id in temp_server.id_with_upload) dat += " (Remove)
    " else @@ -321,12 +321,12 @@ dat += "Consoles with Download Access
    " for(var/obj/machinery/computer/rdconsole/C in consoles) var/turf/console_turf = get_turf(C) - dat += "* [console_turf.loc]" + dat += "* [console_turf.loc]" if(C.id in temp_server.id_with_download) dat += " (Remove)
    " else dat += " (Add)
    " - dat += "
    Main Menu" + dat += "
    Main Menu" if(2) //Data Management menu dat += "[temp_server.name] Data ManagementP

    " @@ -334,20 +334,20 @@ for(var/path in temp_server.files.known_tech) var/datum/tech/T = temp_server.files.known_tech[path] dat += "* [T.name] " - dat += "(Reset)
    " + dat += "(Reset)
    " dat += "Known Designs
    " for(var/path in temp_server.files.known_designs) var/datum/design/D = temp_server.files.known_designs[path] dat += "* [D.name] " - dat += "(Delete)
    " - dat += "
    Main Menu" + dat += "(Delete)
    " + dat += "
    Main Menu" if(3) //Server Data Transfer dat += "[temp_server.name] Server to Server Transfer

    " dat += "Send Data to what server?
    " for(var/obj/machinery/r_n_d/server/S in servers) - dat += "[S.name] (Transfer)
    " - dat += "
    Main Menu" + dat += "[S.name] (Transfer)
    " + dat += "
    Main Menu" user << browse("R&D Server Control
    [dat]", "window=server_control;size=575x400") onclose(user, "server_control") return diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm index d43089da16d..2022286cd0e 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm @@ -122,7 +122,7 @@ var/dat = "The control panel displays an incomprehensible selection of controls, many with unusual markings or text around them.
    " dat += "
    " for(var/index=1, index<=construction.len, index++) - dat += "\[[construction[index]]\]
    " + dat += "\[[construction[index]]\]
    " user << browse(dat, "window=alien_replicator") diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm index 944849f0cdf..561c538beae 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm @@ -43,14 +43,14 @@ dat += "Unable to locate analysis pad.
    " else if(scan_in_progress) dat += "Please wait. Analysis in progress.
    " - dat += "Halt scanning.
    " + dat += "Halt scanning.
    " else dat += "Scanner is ready.
    " - dat += "Begin scanning.
    " + dat += "Begin scanning.
    " dat += "
    " dat += "
    " - dat += "Refresh Close" + dat += "Refresh Close" user.set_machine(src) diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm index 4d549097a0a..e917022bad8 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm @@ -49,14 +49,14 @@ dat += "Please wait. Harvesting in progress ([round((inserted_battery.stored_charge/inserted_battery.capacity)*100)]%).
    " else dat += "Please wait. Energy dump in progress ([round((inserted_battery.stored_charge/inserted_battery.capacity)*100)]%).
    " - dat += "Halt early
    " + dat += "Halt early
    " else if(inserted_battery) dat += "[inserted_battery.name] inserted, charge level: [inserted_battery.stored_charge]/[inserted_battery.capacity] ([(inserted_battery.stored_charge/inserted_battery.capacity)*100]%)
    " dat += "Energy signature ID:[inserted_battery.battery_effect ? (inserted_battery.battery_effect.artifact_id == "" ? "???" : "[inserted_battery.battery_effect.artifact_id]") : "NA"]
    " - dat += "Eject battery
    " - dat += "Drain battery of all charge
    " - dat += "Begin harvesting
    " + dat += "Eject battery
    " + dat += "Drain battery of all charge
    " + dat += "Begin harvesting
    " else dat += "No battery inserted.
    " @@ -64,7 +64,7 @@ dat += "Unable to locate analysis pad.
    " dat += "
    " - dat += "Refresh Close
    " + dat += "    Refresh Close
    " var/datum/browser/harvester_win = new(user, "artharvester", capitalize_first_letters(name), 500, 500) harvester_win.set_content(dat) diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm index 12459ac0319..581a77240fe 100644 --- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm +++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm @@ -60,20 +60,20 @@ dat += "Charge: [inserted_battery.stored_charge] / [inserted_battery.capacity]
    " dat += "Time left activated: [round(max((time_end - last_process) / 10, 0))]
    " if(activated) - dat += "    Shutdown
    " + dat += "Shutdown
    " else - dat += "Start
    " + dat += "Start
    " dat += "
    " - dat += "Activate duration (sec): -- - [duration/10] + ++
    " - dat += "Activate interval (sec): -- - [interval/10] + ++
    " + dat += "Activate duration (sec): -- - [duration/10] + ++
    " + dat += "Activate interval (sec): -- - [interval/10] + ++
    " dat += "
    " - dat += "Eject battery
    " + dat += "Eject battery
    " else dat += "Please insert battery
    " dat += "
    " - dat += "Refresh Close" + dat += "Refresh Close" var/datum/browser/battery_win = new(user, "anodevice", capitalize_first_letters(name), 400, 500) battery_win.set_content(dat) @@ -220,4 +220,4 @@ if(inserted_battery.battery_effect) user.attack_log += "\[[time_stamp()]\] Tapped [target_mob.name] ([target_mob.ckey]) with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" target_mob.attack_log += "\[[time_stamp()]\] Tapped by [user.name] ([user.ckey]) with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" - msg_admin_attack("[key_name_admin(user)] tapped [key_name_admin(target_mob)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob) ) + msg_admin_attack("[key_name_admin(user)] tapped [key_name_admin(target_mob)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob) ) diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 892ce4c9eea..3445aadef7f 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -74,7 +74,7 @@ /obj/item/device/depth_scanner/interact(var/mob/user as mob) var/dat = "Co-ordinates with positive matches
    " - dat += "== Clear all ==
    " + dat += "== Clear all ==
    " if(current) dat += "Time: [current.time]
    " dat += "Coords: [current.coords]
    " @@ -86,7 +86,7 @@ dat += "Anomaly material: [GLOB.finds_as_strings[index]]
    " else dat += "Anomaly material: Unknown
    " - dat += "clear entry
    " + dat += "clear entry
    " else dat += "Select an entry from the list
    " dat += "
    " @@ -97,12 +97,12 @@ if(positive_locations.len) for(var/index=1, index<=positive_locations.len, index++) var/datum/depth_scan/D = positive_locations[index] - dat += "[D.time], coords: [D.coords]
    " + dat += "[D.time], coords: [D.coords]
    " else dat += "No entries recorded." dat += "
    " - dat += "Refresh
    " - dat += "Close
    " + dat += "Refresh
    " + dat += "Close
    " var/datum/browser/scanner_win = new(user, "depth_scanner", capitalize_first_letters(name), 300, 500) scanner_win.set_content(dat) diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm index ea9eca98579..e850c8c926a 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm @@ -71,7 +71,7 @@ +
    "} - dat += "Close
    " + dat += "Close
    " user << browse(dat,"window=locater;size=300x150") onclose(user, "locater") diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 72c93ff32dd..9490f81f205 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -76,15 +76,15 @@ if(screen == 1) dat += "Select an event to trigger:" if(screen == 2) dat += "Please swipe your card to authorize the following event: [event]" - dat += "

    Back" + dat += "

    Back" user << browse(dat, "window=keycard_auth;size=500x350") diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index ce5d3f35afb..5bd69e1e2a9 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -129,7 +129,7 @@ . = ..() /obj/machinery/power/supermatter/proc/explode() - message_admins("Supermatter exploded at ([x],[y],[z] - JMP)",0,1) + message_admins("Supermatter exploded at ([x],[y],[z] - JMP)",0,1) log_game("Supermatter exploded at ([x],[y],[z])") anchored = TRUE grav_pulling = TRUE diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index a7e8ca7d5e6..aca11d45b0b 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -199,15 +199,15 @@ t += "

    No telepad located.
    Please add telepad data via use of Multitool.

    " else if(inserted_gps) - t += "Eject GPS" - t += "Set GPS memory" + t += "Eject GPS" + t += "Set GPS memory" else t += "Eject GPS" t += "Set GPS memory" t += "
    [temp_msg]

    " - t += "Set Bearing" + t += "Set Bearing" t += "
    [rotation]°
    " - t += "Set Elevation" + t += "Set Elevation" t += "
    [angle]°
    " t += "Set Power" t += "
    " @@ -219,14 +219,14 @@ if(power == power_options[i]) t += "[power_options[i]]" continue - t += "[power_options[i]]" + t += "[power_options[i]]" t += "
    " - t += "Set Vertical Offset" + t += "Set Vertical Offset" t += "
    [!isnull(zlevel_offset) ? zlevel_offset : "No Data"]
    " - t += "
    Open Portal" - t += "
    Recalibrate Crystals Eject Crystals" + t += "
    Open Portal" + t += "
    Recalibrate Crystals Eject Crystals" // Information about the last teleport t += "
    " diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index f5372fb822b..3404e3c2ccf 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -60,7 +60,7 @@ */ /datum/tgui_panel/proc/on_initialize_timed_out() // Currently does nothing but sending a message to old chat. - to_target(client, "Failed to load fancy chat, click HERE to attempt to reload it.") + to_target(client, "Failed to load fancy chat, click HERE to attempt to reload it.") /** * private diff --git a/code/modules/vehicles/animal.dm b/code/modules/vehicles/animal.dm index 647ea032fc7..9a05df93530 100644 --- a/code/modules/vehicles/animal.dm +++ b/code/modules/vehicles/animal.dm @@ -157,7 +157,7 @@ var/mob/living/carbon/human/H = AM M.attack_log += "\[[time_stamp()]\] Was rammed by [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)" ) + 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) H.apply_damage(20, DAMAGE_BRUTE) @@ -258,7 +258,7 @@ if(M.m_intent == M_RUN) M.attack_log += "\[[time_stamp()]\] Was rammed by [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)" ) + 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) H.apply_damage(40, DAMAGE_BRUTE) @@ -299,7 +299,7 @@ var/mob/living/carbon/human/H = AM M.attack_log += "\[[time_stamp()]\] Was rammed by [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)" ) + 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) H.apply_damage(40, DAMAGE_BRUTE) diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index 5360bc3b645..6877fcc112e 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -304,7 +304,7 @@ var/mob/living/carbon/human/H = AM M.attack_log += "\[[time_stamp()]\] Was rammed by [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)" ) + 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) H.apply_damage(20, DAMAGE_BRUTE) @@ -380,7 +380,7 @@ if(M.m_intent == M_RUN) M.attack_log += "\[[time_stamp()]\] Was rammed by [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)" ) + 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) H.apply_effect(4, WEAKEN) diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index aad45dc7799..d4852b87f0c 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -226,7 +226,7 @@ to_chat(D, SPAN_DANGER("You ran over [H]!")) visible_message(SPAN_DANGER("\The [src] ran over [H]!")) 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)) + 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 += "\[[time_stamp()]\] ran over [H.name] ([H.ckey])" diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm index c8f28502063..0de4bea5642 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -67,7 +67,7 @@ if(isliving(load)) var/mob/living/D = load to_chat(D, SPAN_WARNING("You hit [M]!")) - msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. (JMP)",ckey=key_name(D),ckey_target=key_name(M)) + msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. (JMP)",ckey=key_name(D),ckey_target=key_name(M)) //------------------------------------------- diff --git a/code/modules/world_api/commands/admin.dm b/code/modules/world_api/commands/admin.dm index af59a1ee2a1..be9a9bee21e 100644 --- a/code/modules/world_api/commands/admin.dm +++ b/code/modules/world_api/commands/admin.dm @@ -98,8 +98,8 @@ if(!rank) rank = "Admin" - var/message = SPAN_WARNING("[rank] PM from [queryparams["senderkey"]]: [queryparams["msg"]]") - var/amessage = SPAN_NOTICE("[rank] PM from [queryparams["senderkey"]] to [key_name(C, highlight_special = 1)] : [queryparams["msg"]]") + var/message = SPAN_WARNING("[rank] PM from [queryparams["senderkey"]]: [queryparams["msg"]]") + var/amessage = SPAN_NOTICE("[rank] PM from [queryparams["senderkey"]] to [key_name(C, highlight_special = 1)] : [queryparams["msg"]]") C.received_discord_pm = world.time C.discord_admin = queryparams["senderkey"] diff --git a/code/modules/world_api/commands/cciaa.dm b/code/modules/world_api/commands/cciaa.dm index 7c8e6951326..d1a2be2c0bd 100644 --- a/code/modules/world_api/commands/cciaa.dm +++ b/code/modules/world_api/commands/cciaa.dm @@ -255,7 +255,7 @@ P.stamps += "
    This paper has been stamped by the Central Command Quantum Relay." if(F.receivefax(P)) - log_and_message_admins("[senderkey] sent a fax message to the [F.department] fax machine via the api. (JMP)") + log_and_message_admins("[senderkey] sent a fax message to the [F.department] fax machine via the api. (JMP)") GLOB.sent_faxes += P return TRUE else diff --git a/html/statbrowser.js b/html/statbrowser.js index b30900d5532..aeb7fd14cdc 100644 --- a/html/statbrowser.js +++ b/html/statbrowser.js @@ -396,7 +396,7 @@ function draw_mc() { var td2 = document.createElement("td"); if (part[2]) { var a = document.createElement("a"); - a.href = "?_src_=vars;Vars=" + part[2]; + a.href="byond://?_src_=vars;Vars=" + part[2]; a.textContent = part[1]; td2.appendChild(a); } else { @@ -518,7 +518,7 @@ function draw_sdql2() { var td2 = document.createElement("td"); if (part[2]) { var a = document.createElement("a"); - a.href = "?src=" + part[2] + ";statpanel_item_click=left"; + a.href="byond://?src=" + part[2] + ";statpanel_item_click=left"; a.textContent = part[1]; td2.appendChild(a); } else { @@ -545,12 +545,12 @@ function draw_tickets() { var td2 = document.createElement("td"); if (part[2]) { var a = document.createElement("a"); - a.href = "?_src_=holder;ahelp=" + part[2] + ";ahelp_action=ticket;statpanel_item_click=left;action=ticket"; + a.href="byond://?_src_=holder;ahelp=" + part[2] + ";ahelp_action=ticket;statpanel_item_click=left;action=ticket"; a.textContent = part[1]; td2.appendChild(a); } else if (part[3]) { var a = document.createElement("a"); - a.href = "?src=" + part[3] + ";statpanel_item_click=left"; + a.href="byond://?src=" + part[3] + ";statpanel_item_click=left"; a.textContent = part[1]; td2.appendChild(a); } else { @@ -572,7 +572,7 @@ function draw_interviews() { manDiv.className = "interview_panel_controls" var manLink = document.createElement("a"); manLink.textContent = "Open Interview Manager Panel"; - manLink.href = "?_src_=holder;interview_man=1;statpanel_item_click=left"; + manLink.href="byond://?_src_=holder;interview_man=1;statpanel_item_click=left"; manDiv.appendChild(manLink); body.appendChild(manDiv); @@ -605,7 +605,7 @@ function draw_interviews() { var td = document.createElement("td"); var a = document.createElement("a"); a.textContent = part["status"]; - a.href = "?_src_=holder;interview=" + part["ref"] + ";statpanel_item_click=left"; + a.href="byond://?_src_=holder;interview=" + part["ref"] + ";statpanel_item_click=left"; td.appendChild(a); tr.appendChild(td); table.appendChild(tr); @@ -625,7 +625,7 @@ function draw_spells(cat) { var td2 = document.createElement("td"); if (part[3]) { var a = document.createElement("a"); - a.href = "?src=" + part[3] + ";statpanel_item_click=left"; + a.href="byond://?src=" + part[3] + ";statpanel_item_click=left"; a.textContent = part[2]; td2.appendChild(a); } else { diff --git a/html/templates/welcome_screen.html b/html/templates/welcome_screen.html index 873724ded84..c20d55d0182 100644 --- a/html/templates/welcome_screen.html +++ b/html/templates/welcome_screen.html @@ -39,18 +39,18 @@

    Welcome to Aurorastation!

    - Aurorastation is a SS13 heavy roleplay server with antagonists enabled that has been running since 2013. We utilize a customized build of the Baystation12 codebase, which can be found here, on GitHub. + Aurorastation is a SS13 heavy roleplay server with antagonists enabled that has been running since 2013. We utilize a customized build of the Baystation12 codebase, which can be found here, on GitHub.

    - New players should take care to read the rules, especially if you're new to roleplay. Should any questions arise, you are expected to adminhelp (F1) them and ask! + New players should take care to read the rules, especially if you're new to roleplay. Should any questions arise, you are expected to adminhelp (F1) them and ask!

    Further information about the server can be found at the following places:

      -
    • The forums - For whitelist applications, announcements, general discussion, etcetera.
      • -
    • The wiki - Primarily for lore reference, and gameplay guides.
      • -
    • The web-interface - A custom website which adds additional functionality to the game. Anything from syndicate contracts, to reviewing your whitelists, bans, etcetera.
      • +
    • The forums - For whitelist applications, announcements, general discussion, etcetera.
      • +
    • The wiki - Primarily for lore reference, and gameplay guides.
      • +
    • The web-interface - A custom website which adds additional functionality to the game. Anything from syndicate contracts, to reviewing your whitelists, bans, etcetera.

    diff --git a/tgui/docs/tgui-for-custom-html-popups.md b/tgui/docs/tgui-for-custom-html-popups.md index 97eaf20446e..d99e3aa78ff 100644 --- a/tgui/docs/tgui-for-custom-html-popups.md +++ b/tgui/docs/tgui-for-custom-html-popups.md @@ -108,7 +108,7 @@ This removes the native window titlebar and border, which effectively turns wind It is very often necessary to exchange data between DM and JS, and in vanilla BYOND programming it is a huge pain in the butt, because the `browse()` API is very convoluted, out of box it can send only strings, and sending data back to DM requires using hrefs. ``` -location.href = '?src=12345¶m=1' +location.href='byond://?src=12345¶m=1' ``` If you're familiar with the href syntax of BYOND topic calls, then perhaps this doesn't surprise you, but this API artificially limits you to sending 2048 characters of string-typed data; you need to reinvent the wheel if you want to send something more complex than strings. It differs from the way you send messages from DM. And it's very hard to read as well. diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index dd020c2206a..f92b1dcc0ca 100755 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -163,15 +163,14 @@ 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 +echo "516 Href Styles" +NON_516_HREFS=`grep -r --include \*.dm -P --regexp="href[\s='\"\\\\]*\?"` +if [[ $NON_516_HREFS != '' ]]; 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 + echo "FAIL: BYOND requires internal href links to begin with \"byond://\":" >> code_error.log + echo $NON_516_HREFS >> code_error.log else - echo "PASS: No builtin calls to the text proc were found" >> code_error.log + echo "PASS: All href links are using 516 compatible syntax" >> code_error.log fi ##########################################################