From 0ae0b107645ab788e48bd44ad796855762387009 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:17:32 +0200 Subject: [PATCH] Refactored all the backslash ref and ref() calls to use REF() instead (#19847) Refactored all the backslash ref and ref() calls to use REF() instead. Added a linting for raw ref proc calls. --- code/ZAS/Variable Settings.dm | 2 +- code/__DEFINES/global.dm | 2 +- code/__DEFINES/misc.dm | 6 +- code/__HELPERS/area_movement.dm | 2 +- code/__HELPERS/icons.dm | 2 +- code/__HELPERS/logging/_logging.dm | 4 +- code/__HELPERS/text.dm | 2 +- code/__HELPERS/unsorted.dm | 6 +- code/_onclick/hud/radial.dm | 2 +- code/_onclick/hud/radial_persistent.dm | 2 +- code/controllers/subsystems/arrivals.dm | 4 +- code/controllers/subsystems/event.dm | 46 +-- code/controllers/subsystems/garbage.dm | 2 +- code/controllers/subsystems/pai.dm | 2 +- .../subsystems/processing/nanoui.dm | 10 +- code/controllers/subsystems/processing/psi.dm | 8 +- code/controllers/subsystems/ticker.dm | 2 +- code/controllers/subsystems/zcopy.dm | 2 +- code/datums/browser.dm | 2 +- code/datums/components/multitool/multitool.dm | 2 +- code/datums/datum.dm | 2 +- code/datums/mind.dm | 12 +- code/datums/repositories/crew.dm | 2 +- code/datums/state_machine.dm | 6 +- code/game/antagonist/antagonist_panel.dm | 8 +- code/game/antagonist/station/traitor.dm | 2 +- code/game/atom/atom_examine.dm | 2 +- code/game/atoms_movable.dm | 2 +- .../gamemodes/changeling/helpers/_store.dm | 2 +- code/game/gamemodes/cult/items/tome.dm | 2 +- code/game/gamemodes/technomancer/catalog.dm | 52 +-- code/game/machinery/ai_slipper.dm | 4 +- code/game/machinery/autolathe/autolathe.dm | 4 +- code/game/machinery/biogenerator.dm | 12 +- code/game/machinery/camera/camera.dm | 6 +- code/game/machinery/chem_heater.dm | 22 +- code/game/machinery/computer/arcade.dm | 8 +- code/game/machinery/computer/arcade_orion.dm | 44 +-- code/game/machinery/computer/atmos_alert.dm | 4 +- code/game/machinery/computer/cloning.dm | 40 +-- code/game/machinery/computer/guestpass.dm | 18 +- code/game/machinery/computer/pod.dm | 14 +- code/game/machinery/computer/sentencing.dm | 50 +-- code/game/machinery/computer/slotmachine.dm | 4 +- code/game/machinery/cryopod.dm | 6 +- .../machinery/doors/airlock_electronics.dm | 18 +- code/game/machinery/doors/brigdoors.dm | 12 +- code/game/machinery/hologram.dm | 4 +- code/game/machinery/navbeacon.dm | 16 +- code/game/machinery/newscaster.dm | 124 ++++---- code/game/machinery/nuclear_bomb.dm | 2 +- code/game/machinery/pipe/pipe_dispenser.dm | 154 ++++----- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/spaceheater.dm | 8 +- code/game/machinery/stargazer.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 26 +- .../telecomms/computers/logbrowser.dm | 14 +- .../machinery/telecomms/computers/message.dm | 36 +-- .../telecomms/computers/telemonitor.dm | 12 +- .../telecomms/computers/traffic_control.dm | 16 +- .../telecomms/machine_interactions.dm | 30 +- .../telecomms/machines/message_server.dm | 8 +- code/game/machinery/turret_control.dm | 2 +- code/game/objects/effects/chem/chemsmoke.dm | 4 +- code/game/objects/items.dm | 4 +- code/game/objects/items/devices/paicard.dm | 14 +- .../items/devices/radio/electropack.dm | 18 +- .../game/objects/items/devices/radio/radio.dm | 2 +- .../objects/items/devices/slide_projector.dm | 6 +- .../objects/items/devices/transfer_valve.dm | 4 +- code/game/objects/items/devices/tvcamera.dm | 6 +- code/game/objects/items/devices/uplink.dm | 4 +- code/game/objects/items/eightball.dm | 2 +- code/game/objects/items/stacks/stack.dm | 16 +- code/game/objects/items/stacks/wrap.dm | 2 +- .../weapons/implants/implants/explosive.dm | 24 +- .../weapons/implants/implants/loyalty.dm | 2 +- code/game/objects/items/weapons/landmines.dm | 2 +- .../objects/items/weapons/storage/secure.dm | 2 +- .../objects/items/weapons/teleportation.dm | 14 +- code/game/objects/structures/noticeboard.dm | 2 +- code/game/objects/structures/safe.dm | 4 +- .../game/objects/structures/tank_dispenser.dm | 4 +- .../game/objects/structures/under_wardrobe.dm | 6 +- code/game/verbs/ooc.dm | 2 +- code/modules/admin/DB ban/functions.dm | 18 +- code/modules/admin/NewBan.dm | 2 +- code/modules/admin/admin.dm | 300 +++++++++--------- code/modules/admin/admin_investigate.dm | 2 +- code/modules/admin/admin_verbs.dm | 2 +- code/modules/admin/banjob.dm | 82 ++--- code/modules/admin/create_mob.dm | 2 +- code/modules/admin/create_object.dm | 2 +- code/modules/admin/create_turf.dm | 2 +- code/modules/admin/law_manager.dm | 4 +- code/modules/admin/player_notes.dm | 8 +- code/modules/admin/player_notes_sql.dm | 10 +- code/modules/admin/player_panel.dm | 6 +- code/modules/admin/ticket.dm | 12 +- code/modules/admin/topic.dm | 22 +- code/modules/admin/verbs/adminhelp.dm | 8 +- code/modules/admin/verbs/adminpm.dm | 6 +- code/modules/admin/verbs/adminsay.dm | 2 +- code/modules/admin/verbs/antag-ooc.dm | 2 +- code/modules/admin/verbs/massmodvar.dm | 2 +- code/modules/admin/verbs/modifyvariables.dm | 2 +- code/modules/admin/verbs/pray.dm | 8 +- code/modules/admin/verbs/warning.dm | 16 +- code/modules/admin/view_variables/helpers.dm | 90 +++--- .../admin/view_variables/view_variables.dm | 22 +- code/modules/asset_cache/asset_cache.dm | 6 +- .../awaymissions/bluespaceartillery.dm | 4 +- code/modules/battlemonsters/items/deck.dm | 2 +- code/modules/cargo/delivery/backpack.dm | 4 +- code/modules/cciaa/cciaa.dm | 4 +- code/modules/client/client_procs.dm | 6 +- .../antagonism/01_candidacy.dm | 6 +- .../preference_setup/antagonism/02_setup.dm | 4 +- .../preference_setup/general/01_basic.dm | 38 +-- .../preference_setup/general/02_language.dm | 6 +- .../preference_setup/general/03_body.dm | 72 ++--- .../preference_setup/general/04_equipment.dm | 20 +- .../preference_setup/general/05_background.dm | 6 +- .../preference_setup/general/06_flavor.dm | 34 +- .../preference_setup/general/07_psionics.dm | 4 +- .../client/preference_setup/global/01_ui.dm | 24 +- .../preference_setup/global/02_settings.dm | 22 +- .../preference_setup/global/03_language.dm | 2 +- .../client/preference_setup/global/04_pai.dm | 8 +- .../preference_setup/loadout/loadout.dm | 12 +- .../preference_setup/occupation/occupation.dm | 20 +- .../client/preference_setup/origin/origin.dm | 22 +- .../preference_setup/other/01_incidents.dm | 2 +- .../preference_setup/preference_setup.dm | 2 +- code/modules/client/preferences.dm | 18 +- .../client/preferences_notification.dm | 4 +- code/modules/clothing/clothing_accessories.dm | 2 +- .../spacesuits/rig/modules/modules.dm | 2 +- .../clothing/under/accessories/buddy_tag.dm | 8 +- code/modules/cooking/machinery/icecream.dm | 20 +- code/modules/economy/EFTPOS.dm | 18 +- code/modules/heavy_vehicle/components/arms.dm | 2 +- code/modules/heavy_vehicle/components/body.dm | 6 +- .../modules/heavy_vehicle/components/frame.dm | 18 +- code/modules/heavy_vehicle/components/head.dm | 8 +- code/modules/heavy_vehicle/components/legs.dm | 2 +- code/modules/heavy_vehicle/mecha.dm | 2 +- code/modules/holodeck/HolodeckControl.dm | 18 +- code/modules/hydroponics/trays/tray_tools.dm | 2 +- .../integrated_electronics/core/assemblies.dm | 26 +- .../core/integrated_circuit.dm | 32 +- .../integrated_electronics/core/pins.dm | 2 +- .../core/special_pins/list_pin.dm | 18 +- code/modules/library/lib_machines.dm | 70 ++-- code/modules/lighting/lighting_verbs.dm | 6 +- code/modules/mining/machine_vending.dm | 2 +- code/modules/mining/mint.dm | 26 +- code/modules/mob/abstract/new_player/poll.dm | 30 +- .../modules/mob/abstract/observer/observer.dm | 6 +- code/modules/mob/abstract/unauthed/login.dm | 4 +- code/modules/mob/hear_say.dm | 4 +- code/modules/mob/language/language.dm | 6 +- code/modules/mob/language/synthetic.dm | 2 +- code/modules/mob/living/bot/farmbot.dm | 16 +- code/modules/mob/living/bot/medbot.dm | 24 +- code/modules/mob/living/carbon/diona_base.dm | 2 +- code/modules/mob/living/carbon/human/emote.dm | 20 +- .../mob/living/carbon/human/examine.dm | 76 ++--- code/modules/mob/living/carbon/human/human.dm | 38 +-- .../living/carbon/human/human_attackhand.dm | 6 +- .../mob/living/carbon/human/human_powers.dm | 4 +- code/modules/mob/living/silicon/ai/ai.dm | 2 +- .../silicon/robot/drone/drone_console.dm | 6 +- .../living/silicon/robot/drone/drone_items.dm | 10 +- .../modules/mob/living/silicon/robot/robot.dm | 14 +- code/modules/mob/living/silicon/silicon.dm | 8 +- .../simple_animal/constructs/soulstone.dm | 4 +- .../mob/living/simple_animal/hostile/mimic.dm | 2 +- .../mob/living/simple_animal/parrot.dm | 4 +- code/modules/mob/login.dm | 4 +- code/modules/mob/mob.dm | 20 +- code/modules/mob/mob_helpers.dm | 4 +- .../modular_computers/NTNet/NTNRC/message.dm | 2 +- .../programs/command/account_database.dm | 2 +- .../programs/command/teleporter.dm | 8 +- .../programs/engineering/atmoscontrol.dm | 2 +- .../programs/generic/lawmanager.dm | 4 +- .../programs/security/guntracker.dm | 2 +- .../programs/security/implant_tracker.dm | 4 +- .../programs/security/penalmechs.dm | 6 +- code/modules/nano/modules/ghost_menu.dm | 2 +- code/modules/nano/nanoui.dm | 6 +- code/modules/ntsl2/ntsl2_types.dm | 2 +- code/modules/organs/blood.dm | 2 +- .../overmap/ships/computers/engine_control.dm | 2 +- code/modules/overmap/ships/computers/helm.dm | 2 +- .../overmap/ships/computers/sensors.dm | 6 +- code/modules/overmap/ships/computers/ship.dm | 6 +- code/modules/paperwork/clipboard.dm | 10 +- code/modules/paperwork/faxmachine.dm | 4 +- code/modules/paperwork/filingcabinet.dm | 2 +- code/modules/paperwork/folders.dm | 8 +- code/modules/paperwork/paper.dm | 4 +- code/modules/paperwork/paper_bundle.dm | 14 +- code/modules/power/apc.dm | 4 +- .../power/fusion/consoles/core_control.dm | 2 +- .../power/fusion/consoles/gyrotron_control.dm | 2 +- .../power/fusion/consoles/injector_control.dm | 2 +- code/modules/power/gravitygenerator.dm | 6 +- code/modules/power/singularity/emitter.dm | 4 +- .../particle_accelerator/particle_control.dm | 12 +- code/modules/power/solar.dm | 12 +- .../projectiles/guns/projectile/dartgun.dm | 8 +- code/modules/psionics/complexus/complexus.dm | 2 +- code/modules/reagents/Chemistry-Machinery.dm | 6 +- .../reagents/reagent_containers/borghydro.dm | 2 +- code/modules/recycling/disposal.dm | 24 +- code/modules/recycling/sortingmachinery.dm | 4 +- code/modules/research/rdconsole.dm | 170 +++++----- code/modules/research/server.dm | 22 +- .../artifact/artifact_replicator.dm | 2 +- .../machinery/artifact_analyser.dm | 6 +- .../machinery/artifact_harvester.dm | 10 +- .../tools/ano_device_battery.dm | 12 +- .../tools/tools_depthscanner.dm | 10 +- .../xenoarchaeology/tools/tools_locater.dm | 12 +- .../security levels/keycard authentication.dm | 10 +- code/modules/telesci/telesci_computer.dm | 16 +- code/modules/tgs/core/core.dm | 2 +- code/modules/turbolift/turbolift_map.dm | 2 +- code/unit_tests/mob_tests.dm | 2 +- html/changelogs/fluffyghost-ref.yml | 59 ++++ tools/ci/check_grep.sh | 10 + 233 files changed, 1629 insertions(+), 1564 deletions(-) create mode 100644 html/changelogs/fluffyghost-ref.yml diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index 1caf76cb9e1..3bbeccbc3ec 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -111,7 +111,7 @@ var/global/vs_control/vsc = 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/global.dm b/code/__DEFINES/global.dm index 587f280f7ad..c191056e9ea 100644 --- a/code/__DEFINES/global.dm +++ b/code/__DEFINES/global.dm @@ -51,7 +51,7 @@ GLOBAL_PROTECT(admin_log) GLOBAL_LIST_EMPTY(signal_log) GLOBAL_PROTECT(signal_log) -GLOBAL_LIST_EMPTY(lastsignalers) // Keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]" +GLOBAL_LIST_EMPTY(lastsignalers) // Keeps last 100 signals here in format: "[src] used REF(src) @ location [src.loc]: [freq]/[code]" GLOBAL_PROTECT(lastsignalers) GLOBAL_LIST_EMPTY(lawchanges) // Stores who uploaded laws to which silicon-based lifeform, and what the law was. diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index e7c869585cb..ef377742c13 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -267,7 +267,7 @@ #define MIDNIGHT_ROLLOVER 864000 //number of deciseconds in a day -#define DEBUG_REF(D) (D ? "\ref[D]|[D] ([D.type])" : "NULL") +#define DEBUG_REF(D) (D ? "[REF(D)]|[D]] ([D.type])" : "NULL") // MultiZAS directions. #define NORTHUP (NORTH|UP) @@ -283,10 +283,6 @@ #define NL_TEMPORARY_DISABLE 1 #define NL_PERMANENT_DISABLE 2 -///Used for creating soft references to objects. A manner of storing an item reference -///DO NOT USE, USE `WEAKREF()` -#define SOFTREF(A) ref(A) - #define ADD_VERB_IN(the_atom,time,verb) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(add_verb), the_atom, verb), time, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT) #define ADD_VERB_IN_IF(the_atom,time,verb,callback) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(add_verb), the_atom, verb, callback), time, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT) diff --git a/code/__HELPERS/area_movement.dm b/code/__HELPERS/area_movement.dm index 957c3dc9298..859848c63bd 100644 --- a/code/__HELPERS/area_movement.dm +++ b/code/__HELPERS/area_movement.dm @@ -53,7 +53,7 @@ if(!A || !src) return - var/list/turfs_src = get_area_turfs("\ref[src]") + var/list/turfs_src = get_area_turfs("[REF(src)]") if(!turfs_src.len) return diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index faa63ffee7a..34981221127 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -1139,7 +1139,7 @@ lighting determines lighting capturing (optional), suppress_errors suppreses err // Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with. var/atom/A = thing - var/key = "[istype(A.icon, /icon) ? "[ref(A.icon)]" : A.icon]:[A.icon_state]" + var/key = "[istype(A.icon, /icon) ? "[REF(A.icon)]" : A.icon]:[A.icon_state]" if (!bicon_cache[key]) // Doesn't exist, make it. diff --git a/code/__HELPERS/logging/_logging.dm b/code/__HELPERS/logging/_logging.dm index 0b3fdcbdfd1..616b156b685 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" @@ -176,7 +176,7 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global")) // Helper procs for building detailed log lines /datum/proc/get_log_info_line() - return "[src] ([type]) (\ref[src])" + return "[src] ([type]) ([REF(src)])" /area/get_log_info_line() return "[..()] ([isnum(z) ? "[x],[y],[z]" : "0,0,0"])" diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index ab47363a992..bbcb1ae92f2 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -500,7 +500,7 @@ var/list/urls = list() var/i = 1 while (url_find_lazy.Find_char(message)) - urls["\ref[urls]-[i]"] = url_find_lazy.match + urls["[REF(urls)]-[i]"] = url_find_lazy.match i++ for (var/ref in urls) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 96a2e38f389..2a6b21c0c8d 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1187,8 +1187,8 @@ var/global/known_proc = /proc/get_type_ref_bytes return "appearance" return "unknown-object([refType])" // If you see this you found a new undetectable type. Feel free to add it here. -/proc/get_type_ref_bytes(var/V) // returns first 4 bytes from \ref which denote the object type (for objects that is) - return lowertext(copytext(ref(V), 4, 6)) +/proc/get_type_ref_bytes(var/V) // returns first 4 bytes from a ref which denote the object type (for objects that is) + return lowertext(copytext(ref(V), 4, 6)) //Only allowed to remain the builtin ref proc because this shit depends on it and wasn't updated yet /proc/format_text(text) return replacetext(replacetext(text,"\proper ",""),"\improper ","") @@ -1196,7 +1196,7 @@ var/global/known_proc = /proc/get_type_ref_bytes /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/hud/radial.dm b/code/_onclick/hud/radial.dm index 709f7be8b62..3dbdebceefb 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -311,7 +311,7 @@ GLOBAL_LIST_EMPTY(radial_menus) if(!user || !anchor || !length(choices)) return if(!uniqueid) - uniqueid = "defmenu_[SOFTREF(user)]_[SOFTREF(anchor)]" + uniqueid = "defmenu_[REF(user)]_[REF(anchor)]" if(GLOB.radial_menus[uniqueid]) if(!no_repeat_close) diff --git a/code/_onclick/hud/radial_persistent.dm b/code/_onclick/hud/radial_persistent.dm index 183f2d8c462..b3cdfef090a 100644 --- a/code/_onclick/hud/radial_persistent.dm +++ b/code/_onclick/hud/radial_persistent.dm @@ -53,7 +53,7 @@ if(!user || !anchor || !length(choices) || !select_proc) return if(!uniqueid) - uniqueid = "defmenu_\ref[user]_\ref[anchor]" + uniqueid = "defmenu_[REF(user)]_[REF(anchor)]" if(GLOB.radial_menus[uniqueid]) return diff --git a/code/controllers/subsystems/arrivals.dm b/code/controllers/subsystems/arrivals.dm index dc255c8cefe..bf868ba700a 100644 --- a/code/controllers/subsystems/arrivals.dm +++ b/code/controllers/subsystems/arrivals.dm @@ -35,7 +35,7 @@ SUBSYSTEM_DEF(arrivals) return if (istype(M)) - current_mobs += SOFTREF(M) + current_mobs += REF(M) can_fire = TRUE // Wake the process. @@ -43,7 +43,7 @@ SUBSYSTEM_DEF(arrivals) set_launch_countdown() /datum/controller/subsystem/arrivals/proc/on_hotzone_exit(mob/living/M) - current_mobs -= SOFTREF(M) + current_mobs -= REF(M) //called when the shuttle has arrived. diff --git a/code/controllers/subsystems/event.dm b/code/controllers/subsystems/event.dm index a14358aec5f..c011b93b32a 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 [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 += "[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/garbage.dm b/code/controllers/subsystems/garbage.dm index ce20a13f9c0..ac95fef20da 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/pai.dm b/code/controllers/subsystems/pai.dm index 94ddfc25182..54d61d7ea8d 100644 --- a/code/controllers/subsystems/pai.dm +++ b/code/controllers/subsystems/pai.dm @@ -278,7 +278,7 @@ SUBSYSTEM_DEF(pai) -
Download [c.name] + Download [c.name]

diff --git a/code/controllers/subsystems/processing/nanoui.dm b/code/controllers/subsystems/processing/nanoui.dm index 85881096c5b..b6e6425b82b 100644 --- a/code/controllers/subsystems/processing/nanoui.dm +++ b/code/controllers/subsystems/processing/nanoui.dm @@ -42,7 +42,7 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) * * ui_key - A string key used for the ui */ /datum/controller/subsystem/processing/nanoui/proc/get_open_ui(mob/user, src_object, ui_key) - var/src_object_key = SOFTREF(src_object) + var/src_object_key = REF(src_object) if (!LAZYLEN(open_uis[src_object_key]) || !LAZYLEN(open_uis[src_object_key][ui_key])) return null @@ -61,7 +61,7 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) * Returns the number of UIs updated */ /datum/controller/subsystem/processing/nanoui/proc/update_uis(src_object) - var/src_object_key = SOFTREF(src_object) + var/src_object_key = REF(src_object) if (!LAZYLEN(open_uis[src_object_key])) return 0 @@ -82,7 +82,7 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) * Returns the number of UIs closed */ /datum/controller/subsystem/processing/nanoui/proc/close_uis(src_object) - var/src_object_key = SOFTREF(src_object) + var/src_object_key = REF(src_object) if (!open_uis[src_object_key] || !islist(open_uis[src_object_key])) return 0 @@ -134,7 +134,7 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) * * ui - The `/nanoui` ui to add */ /datum/controller/subsystem/processing/nanoui/proc/ui_opened(datum/nanoui/ui) - var/src_object_key = SOFTREF(ui.src_object) + var/src_object_key = REF(ui.src_object) LAZYINITLIST(open_uis[src_object_key]) LAZYADD(ui.user.open_uis, ui) @@ -151,7 +151,7 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) * Returns FALSE if no ui was removed, TRUE if removed successfully */ /datum/controller/subsystem/processing/nanoui/proc/ui_closed(datum/nanoui/ui) - var/src_object_key = SOFTREF(ui.src_object) + var/src_object_key = REF(ui.src_object) var/ui_key = ui.ui_key var/list/obj_uis = open_uis[src_object_key] diff --git a/code/controllers/subsystems/processing/psi.dm b/code/controllers/subsystems/processing/psi.dm index 6c3cb671f13..289aed120fd 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 1583524456d..545d4df3239 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -483,7 +483,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/controllers/subsystems/zcopy.dm b/code/controllers/subsystems/zcopy.dm index aa7bdda7d48..83afc220cb3 100644 --- a/code/controllers/subsystems/zcopy.dm +++ b/code/controllers/subsystems/zcopy.dm @@ -641,7 +641,7 @@ SUBSYSTEM_DEF(zcopy) out += "" - show_browser(usr, out.Join("
"), "size=980x580;window=openturfanalysis-\ref[T]") + show_browser(usr, out.Join("
"), "size=980x580;window=openturfanalysis-[REF(T)]") for (var/item in temp_objects) qdel(item) diff --git a/code/datums/browser.dm b/code/datums/browser.dm index f63bb234565..5ca494be4b1 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -167,7 +167,7 @@ if(!user || !user.client) return var/param = "null" if(ref) - param = "\ref[ref]" + param = "[REF(ref)]" winset(user, windowid, "on-close=\".windowclose [param]\"") diff --git a/code/datums/components/multitool/multitool.dm b/code/datums/components/multitool/multitool.dm index 136a378113b..ee28ef761e3 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/datum.dm b/code/datums/datum.dm index f94d98d80bb..4d5b9bc2535 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -108,7 +108,7 @@ if (!isturf(src)) cleanup_events(src) - var/ui_key = SOFTREF(src) + var/ui_key = REF(src) if(LAZYISIN(SSnanoui.open_uis, ui_key)) SSnanoui.close_uis(src) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index f77c55b7c48..3fea41aa0f0 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/datums/repositories/crew.dm b/code/datums/repositories/crew.dm index d13760faf47..7c1596046a1 100644 --- a/code/datums/repositories/crew.dm +++ b/code/datums/repositories/crew.dm @@ -40,7 +40,7 @@ var/global/datum/repository/crew/crew_repository = new() if(H.w_uniform != C) continue - var/list/crewmemberData = list("area"=null, "x"=null, "y"=null, "z"=null, "level"=null, "ref" = "\ref[H]") + var/list/crewmemberData = list("area"=null, "x"=null, "y"=null, "z"=null, "level"=null, "ref" = "[REF(H)]") crewmemberData["stype"] = C.sensor_mode crewmemberData["name"] = H.get_authentification_name(if_no_id="Unknown") diff --git a/code/datums/state_machine.dm b/code/datums/state_machine.dm index 85bc10eb0b5..af14c3266c1 100644 --- a/code/datums/state_machine.dm +++ b/code/datums/state_machine.dm @@ -3,12 +3,12 @@ var/global/list/state_machines = list() /proc/get_state_machine(var/datum/holder, var/base_type) if(istype(holder) && base_type && holder.has_state_machine) - var/list/machines = global.state_machines["\ref[holder]"] + var/list/machines = global.state_machines["[REF(holder)]"] return islist(machines) && machines[base_type] /proc/add_state_machine(var/datum/holder, var/base_type, var/fsm_type) if(istype(holder) && base_type) - var/holder_ref = "\ref[holder]" + var/holder_ref = "[REF(holder)]" var/list/machines = global.state_machines[holder_ref] if(!islist(machines)) machines = list() @@ -23,7 +23,7 @@ var/global/list/state_machines = list() /proc/remove_state_machine(var/datum/holder, var/base_type) if(istype(holder) && base_type && holder.has_state_machine) - var/holder_ref = "\ref[holder]" + var/holder_ref = "[REF(holder)]" var/list/machines = global.state_machines[holder_ref] if(length(machines)) machines -= base_type diff --git a/code/game/antagonist/antagonist_panel.dm b/code/game/antagonist/antagonist_panel.dm index eb6ddf138d6..a2ac82c0cab 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 47722107860..f2b0d68328e 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -16,7 +16,7 @@ var/datum/antagonist/traitor/traitors 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 25368452ad8..7d02a024dd8 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. \[Show In Chat\]")) // If any of the above are true, show that the object has more information available. if(desc_extended) // If the item has a extended description, show that it is available. . += FONT_SMALL("- This object has an extended description.") if(desc_info) // If the item has a description regarding game mechanics, show that it is available. diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 0859d7442d3..85d69ef1009 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -366,7 +366,7 @@ if (EMISSIVE_BLOCK_UNIQUE) if (!em_block && !QDELING(src)) appearance_flags |= KEEP_TOGETHER - render_target = ref(src) + render_target = REF(src) em_block = emissive_blocker( icon = icon, icon_state = icon_state, diff --git a/code/game/gamemodes/changeling/helpers/_store.dm b/code/game/gamemodes/changeling/helpers/_store.dm index 11ba2eff9ad..d671a1386c5 100644 --- a/code/game/gamemodes/changeling/helpers/_store.dm +++ b/code/game/gamemodes/changeling/helpers/_store.dm @@ -362,7 +362,7 @@ var/list/datum/power/changeling/powerinstances = list() } if(!ownsthis) { - body += "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 5ef9fe6e841..0805979990d 100644 --- a/code/game/gamemodes/cult/items/tome.dm +++ b/code/game/gamemodes/cult/items/tome.dm @@ -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. \[Read Tome\]") else . += "An old, dusty tome with frayed edges and a sinister looking cover." diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm index 807b1615b4c..22421b34e40 100644 --- a/code/game/gamemodes/technomancer/catalog.dm +++ b/code/game/gamemodes/technomancer/catalog.dm @@ -104,7 +104,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - /obj/item/technomancer_catalog/proc/show_categories(var/category) if(category) if(spell_tab != category) - return "[category]" + return "[category]" else return "[category]" @@ -125,13 +125,13 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - var/dat = "" user.set_machine(src) dat += "Functions | " - dat += "Equipment | " - dat += "Consumables | " + dat += "Equipment | " + dat += "Consumables | " if(length(assistance_instances)) - dat += "Assistance | " - dat += "Info
" + dat += "Assistance | " + dat += "Info
" dat += "You currently have a budget of [budget]/[max_budget].

" - dat += "Refund Functions

" + dat += "Refund Functions

" dat += "[show_categories(ALL_SPELLS)] | [show_categories(OFFENSIVE_SPELLS)] | [show_categories(DEFENSIVE_SPELLS)] | \ [show_categories(UTILITY_SPELLS)] | [show_categories(SUPPORT_SPELLS)]
" @@ -149,7 +149,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - if(spell.has_additional_info) dat += "[spell.additional_info()]
" if(spell.cost <= budget) - dat += "Purchase ([spell.cost])

" + dat += "Purchase ([spell.cost])

" else dat += "Cannot afford!

" user << browse(dat, "window=radio") @@ -157,12 +157,12 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - if(1) //Equipment var/dat = "" user.set_machine(src) - dat += "Functions | " + dat += "Functions | " dat += "Equipment | " - dat += "Consumables | " + dat += "Consumables | " if(length(assistance_instances)) - dat += "Assistance | " - dat += "Info
" + dat += "Assistance | " + dat += "Info
" dat += "You currently have a budget of [budget]/[max_budget].

" for(var/datum/technomancer/equipment/E in equipment_instances) dat += "[E.name]
" @@ -170,7 +170,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - if(E.has_additional_info) dat += "[E.additional_info()]
" if(E.cost <= budget) - dat += "Purchase ([E.cost])

" + dat += "Purchase ([E.cost])

" else dat += "Cannot afford!

" user << browse(dat, "window=radio") @@ -178,12 +178,12 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - if(2) //Consumables var/dat = "" user.set_machine(src) - dat += "Functions | " - dat += "Equipment | " + dat += "Functions | " + dat += "Equipment | " dat += "Consumables | " if(length(assistance_instances)) - dat += "Assistance | " - dat += "Info
" + dat += "Assistance | " + dat += "Info
" dat += "You currently have a budget of [budget]/[max_budget].

" for(var/datum/technomancer/consumable/C in consumable_instances) dat += "[C.name]
" @@ -191,7 +191,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - if(C.has_additional_info) dat += "[C.additional_info()]
" if(C.cost <= budget) - dat += "Purchase ([C.cost])

" + dat += "Purchase ([C.cost])

" else dat += "Cannot afford!

" user << browse(dat, "window=radio") @@ -199,11 +199,11 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - if(3) //Assistance var/dat = "" user.set_machine(src) - dat += "Functions | " - dat += "Equipment | " - dat += "Consumables | " + dat += "Functions | " + dat += "Equipment | " + dat += "Consumables | " dat += "Assistance | " - dat += "Info
" + dat += "Info
" dat += "You currently have a budget of [budget]/[max_budget].

" for(var/datum/technomancer/assistance/A in assistance_instances) dat += "[A.name]
" @@ -211,7 +211,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - if(A.has_additional_info) dat += "[A.additional_info()]
" if(A.cost <= budget) - dat += "Purchase ([A.cost])

" + dat += "Purchase ([A.cost])

" else dat += "Cannot afford!

" user << browse(dat, "window=radio") @@ -219,11 +219,11 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - if(4) //Info var/dat = "" user.set_machine(src) - dat += "Functions | " - dat += "Equipment | " - dat += "Consumables | " + dat += "Functions | " + dat += "Equipment | " + dat += "Consumables | " if(length(assistance_instances)) - dat += "Assistance | " + dat += "Assistance | " dat += "Info
" dat += "You currently have a budget of [budget]/[max_budget].

" dat += "
" diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 165b3ba4cb1..c0223bb1f11 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 += text("Dispenser [] - []?
\n", src.disabled?"deactivated":"activated", src, src.disabled?"Enable":"Disable") - t += text("Uses Left: [uses]. Activate the dispenser?
\n") + t += "Dispenser [(src.disabled ? "deactivated" : "activated")] - [(src.disabled ? "Enable" : "Disable")]?
\n" + t += text("Uses Left: [uses]. Activate the dispenser?
\n") user << browse(t, "window=computer;size=575x450") onclose(user, "computer") diff --git a/code/game/machinery/autolathe/autolathe.dm b/code/game/machinery/autolathe/autolathe.dm index 64257ec5b2d..0dd14af232e 100644 --- a/code/game/machinery/autolathe/autolathe.dm +++ b/code/game/machinery/autolathe/autolathe.dm @@ -138,12 +138,12 @@ data["currently_printing"] = null if(currently_printing) - data["currently_printing"] = "\ref[currently_printing]" + data["currently_printing"] = "[REF(currently_printing)]" data["queue"] = list() for(var/datum/autolathe_queue_item/AR in print_queue) data["queue"] += list( list( - "ref" = "\ref[AR]", + "ref" = "[REF(AR)]", "order" = AR.recipe.name, "path" = AR.recipe.type, "multiplier" = AR.multiplier, diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 4380cf1d334..3af7d82e660 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -395,8 +395,8 @@ SPECIAL if("menu") if (beaker) dat += "" - dat += "" - dat += "" + dat += "" + dat += "" dat += "" var/lastclass = "Commands" @@ -416,7 +416,7 @@ SPECIAL if(num*round(current_recipe.cost/build_eff) > points) dat += "
([fakenum][num])
" else - dat += "([fakenum][num])" + dat += "([fakenum][num])" dat += "" dat += "" @@ -426,13 +426,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 6e7f75236ea..0034217df47 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -228,9 +228,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)) @@ -496,7 +496,7 @@ var/cam = list() cam["name"] = sanitize(c_tag) cam["deact"] = !can_use() - cam["camera"] = "\ref[src]" + cam["camera"] = "[REF(src)]" cam["x"] = x cam["y"] = y cam["z"] = z diff --git a/code/game/machinery/chem_heater.dm b/code/game/machinery/chem_heater.dm index 8b9080a3b5a..94fc2d7cf65 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.dm b/code/game/machinery/computer/arcade.dm index 01fe08ae8c0..33f3d9d8054 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -92,11 +92,11 @@ dat += "
" if (src.gameover) - dat += "New Game" + dat += "New Game" else - dat += "Attack | " - dat += "Heal | " - dat += "Recharge Power" + dat += "Attack | " + dat += "Heal | " + dat += "Recharge Power" dat += "
" diff --git a/code/game/machinery/computer/arcade_orion.dm b/code/game/machinery/computer/arcade_orion.dm index 64fbf2ffd81..ecfe6fbf651 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/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 93f4f7f2a4d..b4a720e5859 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -31,10 +31,10 @@ GLOBAL_LIST_EMPTY(minor_air_alarms) var/minor_alarms[0] for(var/datum/alarm/alarm in atmosphere_alarm.major_alarms()) - major_alarms[++major_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "\ref[alarm]") + major_alarms[++major_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "[REF(alarm)]") for(var/datum/alarm/alarm in atmosphere_alarm.minor_alarms()) - minor_alarms[++minor_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "\ref[alarm]") + minor_alarms[++minor_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "[REF(alarm)]") data["priority_alarms"] = major_alarms data["minor_alarms"] = minor_alarms diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 69f9f034220..dc3406b9876 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -118,7 +118,7 @@ updatemodules() var/dat = "

Cloning System Control

" - dat += "Refresh" + dat += "Refresh" dat += "
[temp]
" @@ -126,7 +126,7 @@ if(1) // Modules dat += "

Modules

" - //dat += "Reload Modules" + //dat += "Reload Modules" if (isnull(src.scanner)) dat += " DNA scanner not found.
" else @@ -150,11 +150,11 @@ if (src.scanner.occupant) if(scantemp == "Scanner unoccupied") scantemp = "" // Stupid check to remove the text - dat += "Scan - [src.scanner.occupant]
" + dat += "Scan - [src.scanner.occupant]
" else scantemp = "Scanner unoccupied" - dat += "Lock status: [src.scanner.locked ? "Locked" : "Unlocked"]
" + dat += "Lock status: [src.scanner.locked ? "Locked" : "Unlocked"]
" if (pods.len) for (var/obj/machinery/clonepod/pod in pods) @@ -162,25 +162,25 @@ // Database dat += "

Database Functions

" - dat += "View Records
" + dat += "View Records
" if (src.diskette) - dat += "Eject Disk" + dat += "Eject Disk" if(2) dat += "

Current records

" - dat += "Back

" + dat += "Back

" for(var/datum/dna2/record/R in src.records) - dat += "
  • [R.dna.real_name]
    • " + dat += "
  • [R.dna.real_name]
    • " if(3) dat += "

    Selected Record

    " - dat += "Back
    " + dat += "Back
    " if (!src.active_record) dat += "ERROR: Record not found." else - dat += {"
    Delete Record
    + dat += {"
    Delete Record
    Name: [src.active_record.dna.real_name]
    "} var/obj/item/implant/health/H = null if(src.active_record.implant) @@ -192,11 +192,11 @@ dat += "Unable to locate implant.
    " if (!isnull(src.diskette)) - dat += "Load from disk." + dat += "Load from disk." - dat += " | Save: UI + UE" - dat += " | Save: UI" - dat += " | Save: SE" + dat += " | Save: UI + UE" + dat += " | Save: UI" + dat += " | Save: SE" dat += "
    " else dat += "
    " //Keeping a line empty for appearances I guess. @@ -205,7 +205,7 @@ SE: [src.active_record.dna.struc_enzymes]

    "} if(pods.len) - dat += {"Clone
    "} + dat += {"Clone
    "} if(4) if (!src.active_record) @@ -213,8 +213,8 @@ dat = "[src.temp]
    " dat += "

    Confirm Record Deletion

    " - dat += "Scan card to confirm.
    " - dat += "No" + dat += "Scan card to confirm.
    " + dat += "No" user << browse(dat, "window=cloning") @@ -412,13 +412,13 @@ if (isnull(imp)) imp = new /obj/item/implant/health(subject) imp.implanted = subject - R.implant = "\ref[imp]" + R.implant = "[REF(imp)]" //Update it if needed else - R.implant = "\ref[imp]" + R.implant = "[REF(imp)]" if (!isnull(subject.mind)) //Save that mind so traitors can continue traitoring after cloning. - R.mind = "\ref[subject.mind]" + R.mind = "[REF(subject.mind)]" src.records += R scantemp = "Subject successfully scanned." diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index 570c7e5d099..e8fc3e6553f 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 7ef04970e8c..00151437b80 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 fb41f38cb0d..28fed863544 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 4479e1c55c1..5b6e0c4824e 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 0199cfef5ce..3f0240a81ee 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) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 4a358fb581f..c039bb1fcea 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.cardinal) 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 5aec30ca65c..7d14a90a8fe 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 49aad0d3840..7236cfe337a 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -134,7 +134,7 @@ Possible to do for anyone motivated enough: data["holopad_list"] = list() for(var/obj/machinery/hologram/holopad/H as anything in SSmachinery.all_holopads - src) if(can_connect(H) && H.operable()) - data["holopad_list"] += list(list("id" = H.holopad_id, "busy" = (H.has_established_connection() || H.incoming_connection), "ref" = "\ref[H]")) + data["holopad_list"] += list(list("id" = H.holopad_id, "busy" = (H.has_established_connection() || H.incoming_connection), "ref" = "[REF(H)]")) data["command_auth"] = has_command_auth(user) data["forcing_call"] = forcing_call data["call_range"] = max_overmap_call_range @@ -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/navbeacon.dm b/code/game/machinery/navbeacon.dm index 78976665157..f60ffd9cb24 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -200,20 +200,20 @@ t = {"Navigation Beacon

    (swipe card to lock controls)
    Frequency: - - - - + - + - [format_frequency(freq)] - + - +
    + + + +
    - Location: [location ? location : "(none)"]
    + Location: [location ? location : "(none)"]
    Transponder Codes:
      "} for(var/key in codes) t += "
    • [key] ... [codes[key]]" - t += " (edit)" - t += " (delete)
      " - t += "(add new)
      " + t += " (edit)" + t += " (delete)
      " + t += "(add new)
      " t+= "
        " user << browse(t, "window=navbeacon") diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 0d30eba307c..918dfb4fe24 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -307,22 +307,22 @@ var/list/obj/machinery/newscaster/allCasters = 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+= "Station Feed Channels
        " @@ -332,31 +332,31 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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's" @@ -450,12 +450,12 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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, you can Bestow a D-Notice upon the channel.
        " + dat+="Channel messages listed below. If you deem them dangerous to the station, 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, 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 @@ var/list/obj/machinery/newscaster/allCasters = 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 73096c4af6d..aea53123609 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -250,7 +250,7 @@ var/bomb_set lastentered = text("[]", 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 9a5e1b02cb9..bfffc8a63e4 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/requests_console.dm b/code/game/machinery/requests_console.dm index d11bb788540..e609a1ed3ce 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -282,7 +282,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() for (var/A in alert_pdas) var/obj/item/modular_computer/pda = A - data["pda_list"] += list(list("name" = alert_pdas[pda], "pda" = "\ref[pda]")) + data["pda_list"] += list(list("name" = alert_pdas[pda], "pda" = "[REF(pda)]")) data["lid"] = lid data["paper"] = paperstock diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 25428d75f73..6f9969641e3 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 feae1e64b81..c21730bc326 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 24c5c2ac253..5ccb66ba855 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+= text("A small dial with a \"ë\" symbol embroidded on it. It's pointing towards a gauge that reads [].
    Turn towards []
    ",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") ) - dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
    Press button",(src.safetieson? "GREEN" : SPAN_WARNING("RED")),src) - dat+= text("

    Close panel", user) + 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+= text("Helmet storage compartment: []
    ",(src.HELMET ? HELMET.name : "    No helmet detected.") ) if(HELMET && src.isopen) - dat+=text("Dispense helmet
    ",src) + dat += "Dispense helmet
    " dat+= text("Suit storage compartment: []
    ",(src.SUIT ? SUIT.name : "    No exosuit detected.") ) if(SUIT && src.isopen) - dat+=text("Dispense suit
    ",src) + dat += "Dispense suit
    " dat+= text("Breathmask storage compartment: []
    ",(src.MASK ? MASK.name : "    No breathmask detected.") ) if(MASK && src.isopen) - dat+=text("Dispense mask
    ",src) + dat += "Dispense mask
    " if(src.OCCUPANT) dat+= "
    WARNING: Biological entity detected inside the Unit's storage. Please remove.
    " - dat+= "Eject extra load" - dat+= text("
    Unit is: [] - [] Unit ",(src.isopen ? "Open" : "Closed"),src,(src.isopen ? "Close" : "Open")) + dat+= "Eject extra load" + dat += "
    Unit is: [(src.isopen ? "Open" : "Closed")] - [(src.isopen ? "Close" : "Open")] Unit " if(src.isopen) dat+="
    " else - dat+= text(" - *[] Unit*
    ",src,(src.islocked ? "Unlock" : "Lock") ) - dat+= text("Unit status: []",(src.islocked? "**LOCKED**
    " : "**UNLOCKED**
    ") ) - dat+= text("Start Disinfection cycle
    ",src) - dat += text("

    Close control panel", user) + dat += " - *[(src.islocked ? "Unlock" : "Lock")] Unit*
    " + dat+= "Unit status: [(src.islocked? "**LOCKED**
    " : "**UNLOCKED**
    ")]" + 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+= text("
    Close control panel", user) + 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 98057742986..1f6822496cb 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 f02ad169421..b836c3b72be 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 ce3b64a4fdc..52633d896f2 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 ad69b1b370d..aa4a37ac9c9 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 467194cb0b5..32b837760cf 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -109,13 +109,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" @@ -129,7 +129,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: " @@ -139,21 +139,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 = "" @@ -171,7 +171,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. @@ -189,7 +189,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) @@ -277,7 +277,7 @@ if(text2num(href_list["unlink"]) <= length(links)) var/obj/machinery/telecomms/T = links[text2num(href_list["unlink"])] if(T) - temp = "-% Removed \ref[T] [T.name] from linked entities. %-" + temp = "-% Removed [REF(T)] [T.name] from linked entities. %-" remove_link(T) if(href_list["link"]) @@ -286,7 +286,7 @@ var/obj/machinery/telecomms/device = P.get_buffer() if(device) add_new_link(device) - temp = "-% Successfully linked with \ref[device] [device.name] %-" + temp = "-% Successfully linked with [REF(device)] [device.name] %-" else temp = "-% Unable to acquire buffer %-" @@ -294,7 +294,7 @@ P.set_buffer(src) var/atom/buffer = P.get_buffer() - temp = "-% Successfully stored \ref[buffer] [buffer.name] in buffer %-" + temp = "-% Successfully stored [REF(buffer)] [buffer.name] in buffer %-" if(href_list["flush"]) diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index f5f4fac34d6..94539f0f08f 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -22,7 +22,7 @@ /datum/data_pda_msg/proc/get_photo_ref() if(photo) - return "(Photo)" + return "(Photo)" return "" /datum/data_pda_msg/Topic(href,href_list) @@ -132,7 +132,7 @@ if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) Console.audible_message(text("[icon2html(Console, viewers(get_turf(Console)))] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5) - Console.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") @@ -140,7 +140,7 @@ if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) Console.audible_message(text("[icon2html(Console, viewers(get_turf(Console)))] *The Requests Console beeps: 'Message from [sender]'"),,4) - Console.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") @@ -198,7 +198,7 @@ /datum/signal/subspace/pda/proc/format_message() if (data["photo"]) - return "[data["message"]] (Photo)" + return "[data["message"]] (Photo)" return data["message"] /datum/signal/subspace/pda/broadcast() diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 001ea8f78bf..a89f486fe91 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -156,7 +156,7 @@ if(control_area.turrets.len != LAZYLEN(data["turrets"])) data["turrets"] = list() for(var/obj/machinery/porta_turret/aTurret in control_area.turrets) - var/ref = "\ref[aTurret]" + var/ref = "[REF(aTurret)]" data["turrets"] += list(list("name" = sanitize(aTurret.name + " [LAZYLEN(data["turrets"])]"), "ref" = ref, "settings" = aTurret.get_settings(), "enabled" = aTurret.enabled, "lethal" = aTurret.lethal)) return data diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm index bab4bfa41eb..5d534d2e387 100644 --- a/code/game/objects/effects/chem/chemsmoke.dm +++ b/code/game/objects/effects/chem/chemsmoke.dm @@ -143,7 +143,7 @@ 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 553d2c029f8..9234077fb31 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -357,7 +357,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. \[Show Armor Values\]")) /obj/item/Topic(href, href_list) if(href_list["examine_armor"]) @@ -907,7 +907,7 @@ var/list/global/slot_flags_enumeration = list( /obj/item/proc/showoff(mob/user) for (var/mob/M in view(user)) if(!user.is_invisible_to(M)) - M.show_message("[user] holds up [icon2html(src, viewers(get_turf(src)))] [src]. Take a closer look.",1) + M.show_message("[user] holds up [icon2html(src, viewers(get_turf(src)))] [src]. Take a closer look.",1) /mob/living/carbon/verb/showoff() set name = "Show Held Item" diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 761b1fff4a2..56cab775a16 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -263,7 +263,7 @@ dat += {"
    - Configure Directives + Configure Directives
    "} @@ -271,7 +271,7 @@ dat += {"
    - Imprint Master DNA + Imprint Master DNA
    "} @@ -282,13 +282,13 @@ - - @@ -300,7 +300,7 @@ dat += "Radio firmware not loaded. Please install a pAI personality to load firmware.
    " dat += {"
    Transmit:[radio.get_broadcasting() ? "En" : "Dis" ]abled + [radio.get_broadcasting() ? "En" : "Dis" ]abled
    Receive:[radio.get_listening() ? "En" : "Dis" ]abled + [radio.get_listening() ? "En" : "Dis" ]abled
    -
    Wipe current pAI personality + Wipe current pAI personality
    @@ -315,7 +315,7 @@
    - Refresh available personalities + Refresh available personalities

    @@ -326,7 +326,7 @@

    No personality is installed.

    -
    Request personality + Request personality
    diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 8aa126bec45..454098b7597 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -93,19 +93,19 @@ return user.set_machine(src) var/dat = {" -Turn [on ? "Off" : "On"]
    +Turn [on ? "Off" : "On"]
    Frequency/Code for electropack:
    Frequency: -- -- [format_frequency(frequency)] -+ -+
    +- +- [format_frequency(frequency)] ++ ++
    Code: -- -- [code] -+ -+
    +- +- [code] ++ ++
    "} user << browse(dat, "window=radio") onclose(user, "radio") diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 5fb7ceb4c56..19faca3eacc 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -308,7 +308,7 @@ var/global/list/default_interrogation_channels = list( var/list = !!(chan_stat&FREQ_LISTENING)!=0 return {" [chan_name]
    - Speaker: [list ? "Engaged" : "Disengaged"]
    + Speaker: [list ? "Engaged" : "Disengaged"]
    "} /obj/item/device/radio/CanUseTopic() diff --git a/code/game/objects/items/devices/slide_projector.dm b/code/game/objects/items/devices/slide_projector.dm index 56f6c79d455..ebf0d548ea6 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,13 +104,13 @@ if(I == current_slide) table += "[I.name]SHOWING" else - table += "[I.name]SHOW" + table += "[I.name]SHOW" table += "" i++ table += "" data += jointext(table,null) - var/datum/browser/popup = new(user, "slides\ref[src]", "Slide Projector") + var/datum/browser/popup = new(user, "slides[REF(src)]", "Slide Projector") popup.set_content(jointext(data, "
    ")) popup.open() diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 093536c40a0..adf99947abe 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -194,12 +194,12 @@ 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 c7dbe5a6a0c..8d577ce9bf2 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -34,9 +34,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/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index 841a841d0a4..615bff6315b 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -165,7 +165,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin "tc_cost" = tc_cost, "bc_cost" = bc_cost, "left" = item.items_left(src), - "ref" = "\ref[item]" + "ref" = "[REF(item)]" ) return newItem @@ -175,7 +175,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin var/list/items = list() for(var/datum/uplink_category/category in uplink.categories) if(category.can_view(src)) - categories[++categories.len] = list("name" = category.name, "ref" = "\ref[category]") + categories[++categories.len] = list("name" = category.name, "ref" = "[REF(category)]") for(var/datum/uplink_item/item in category.items) if(item.can_view(src)) items[++items.len] = new_tgui_item_data(item) diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 540d93cef55..ff49c9b4eb6 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/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 90b8963ded4..d1ad5f29aed 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)])" : "" @@ -116,8 +116,8 @@ title += " ([R.req_amount] [src.singular_name]\s)" if(can_build) - var/sublist_var = sublist ? "\ref[sublist]" : "" - t1 += "[title]" + var/sublist_var = sublist ? "[REF(sublist)]" : "" + t1 += "[title]" else t1 += "
    [title]

    " continue @@ -128,11 +128,11 @@ var/list/multipliers = list(5, 10, 25) for(var/n in multipliers) if(max_multiplier >= n) - var/sublist_var = sublist ? "\ref[sublist]" : "" - t1 += " [n * R.res_amount]x" + var/sublist_var = sublist ? "[REF(sublist)]" : "" + t1 += " [n * R.res_amount]x" if(!(max_multiplier in multipliers)) - var/sublist_var = sublist ? "\ref[sublist]" : "" - t1 += " [max_multiplier * R.res_amount]x" + var/sublist_var = sublist ? "[REF(sublist)]" : "" + 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 5b7227f3c9a..fd17e7469fc 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -123,7 +123,7 @@ if(user in target) //no wrapping closets that you are inside - it's not physically possible return - user.attack_log += text("\[[time_stamp()]\] Has used [src.name] on \ref[target]") + user.attack_log += text("\[[time_stamp()]\] Has used [src.name] on [REF(target)]") if(istype(target, /obj/item) && !(istype(target, /obj/item/storage) && !istype(target,/obj/item/storage/box))) var/obj/item/O = target diff --git a/code/game/objects/items/weapons/implants/implants/explosive.dm b/code/game/objects/items/weapons/implants/implants/explosive.dm index 147707e27aa..a29040c7455 100644 --- a/code/game/objects/items/weapons/implants/implants/explosive.dm +++ b/code/game/objects/items/weapons/implants/implants/explosive.dm @@ -53,24 +53,24 @@ if(!malfunction) . += {"
    Explosion yield mode: - [elevel ? elevel : "NONE SET"]
    + [elevel ? elevel : "NONE SET"]
    Activation phrase:
    - [phrase ? phrase : "NONE SET"]
    + [phrase ? phrase : "NONE SET"]
    Frequency:
    - - - - + - + - [format_frequency(src.frequency)] - + - +
    + + + +
    Code:
    - - - - - [src.code] - + - +
    + - + - + [src.code] + + + +
    Tampering warning message:
    This will be broadcasted on radio if the implant is exposed during surgery.
    - [warning_message ? warning_message : "NONE SET"] + [warning_message ? warning_message : "NONE SET"] "} /obj/item/implant/explosive/Topic(href, href_list) diff --git a/code/game/objects/items/weapons/implants/implants/loyalty.dm b/code/game/objects/items/weapons/implants/implants/loyalty.dm index 2e2851dead2..61cf2b90c84 100644 --- a/code/game/objects/items/weapons/implants/implants/loyalty.dm +++ b/code/game/objects/items/weapons/implants/implants/loyalty.dm @@ -19,7 +19,7 @@ Integrity: Implant will last so long as the nanobots are inside the bloodstream." Loyal entity:
    This is the entity that the implantee will align their thoughts to benefit.
    -[loyal_entity ? loyal_entity : "NONE SET"] +[loyal_entity ? loyal_entity : "NONE SET"] "} /obj/item/implant/mindshield/loyalty/Topic(href, href_list) diff --git a/code/game/objects/items/weapons/landmines.dm b/code/game/objects/items/weapons/landmines.dm index 2c9852d1525..b912fd9f83d 100644 --- a/code/game/objects/items/weapons/landmines.dm +++ b/code/game/objects/items/weapons/landmines.dm @@ -367,7 +367,7 @@ /obj/item/landmine/standstill/trigger(mob/living/triggerer) if(!engaged_by && !deactivated) to_chat(triggerer, SPAN_HIGHDANGER("Something clicks below your feet, a sense of dread permeates your skin, better not move...")) - engaged_by = ref(triggerer) + engaged_by = REF(triggerer) //Because mobs can bump and swap with one another, and we use forcemove that doesn't call Crossed/Uncrossed/Entered/Exited, we have to //keep looking if the victim is still on the mine, and otherwise explode the mine diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 58745e9c193..aced1b4f442 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -90,7 +90,7 @@ message = text("[]", src.code) if (!src.locked) message = "*****" - dat += text("
    \n>[]
    \n1-2-3
    \n4-5-6
    \n7-8-9
    \nR-0-E
    \n", message, src, src, src, src, src, src, src, src, src, src, src, src) + 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 0bb20a50134..57e9c347556 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -44,17 +44,17 @@ user.set_machine(src) var/dat if (src.temp) - dat = "[src.temp]

    Clear" + dat = "[src.temp]

    Clear" else dat = {" Persistent Signal Locator
    Frequency: -- -- [format_frequency(src.frequency)] -+ -+
    +- +- [format_frequency(src.frequency)] ++ ++
    -Refresh"} +Refresh"} user << browse(dat, "window=radio") onclose(user, "radio") return @@ -116,7 +116,7 @@ Frequency: direct = "weak" src.temp += "[W.id]-[dir2text(get_dir(sr, tr))]-[direct]
    " - src.temp += "You are at \[[sr.x],[sr.y],[sr.z]\] in orbital coordinates.

    Refresh
    " + src.temp += "You are at \[[sr.x],[sr.y],[sr.z]\] in orbital coordinates.

    Refresh
    " else src.temp += "Processing Error: Unable to locate orbital position.
    " else diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index ee1c53edf30..8c77aa50092 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 482554e5309..c8308d28bc6 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/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index f7f10f9503a..d93924d334d 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 82ecb60f558..1127388d8f0 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 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 b429c1779e3..b5318909709 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/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index a040293da53..81026ba0eff 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -315,8 +315,8 @@ output += "" - output += "
    Add custom ban: (ONLY use this if you can't ban through any other method)" - output += "" + output += "Add custom ban: (ONLY use this if you can't ban through any other method)" + output += "" output += "" output += "" output += "
    Ban type:
    " - output += "" + output += "
    Search:" - output += "
    " output += "" output += "" output += "" @@ -448,7 +448,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) @@ -505,7 +505,7 @@ if("PERMABAN") typedesc = SPAN_WARNING("PERMABAN") if("TEMPBAN") - typedesc = "TEMPBAN
    ([duration] minutes) [(unbanned || auto) ? "" : "(Edit)"]
    Expires [expiration]    " + typedesc = "TEMPBAN
    ([duration] minutes) [(unbanned || auto) ? "" : "(Edit)"]
    Expires [expiration]    " if("JOB_PERMABAN") typedesc = "JOBBAN
    ([job])" if("JOB_TEMPBAN") @@ -516,14 +516,14 @@ output += "" output += "" output += "" - output += "" + output += "" output += "" output += "" output += "" output += "" output += "" output += "" - output += "" + output += "" output += "" if(edits) output += "" @@ -554,7 +554,7 @@ if (mirror_count) output += "" - output += "" + output += "" output += "" output += "" diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index a6115dbca63..fea97e20776 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -173,7 +173,7 @@ var/savefile/Banlist for (var/A in Banlist.dir) count++ Banlist.cd = "/base/[A]" - var/ref = "\ref[src]" + var/ref = "[REF(src)]" var/key = Banlist["key"] var/id = Banlist["id"] var/ip = Banlist["ip"] diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index d110f0a5de0..43303604ae8 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -53,51 +53,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 | + Kick | Warn | - Warnings | - Ban | - Jobban | - Notes + 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 += "

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

    " + body += "Remove psionics.

    " body += "
    Search:" + output += "
    Ckey: Admin ckey:
    IP: [ckey][bantime][ackey][(unbanned || auto) ? "" : "Unban"][(unbanned || auto) ? "" : "Unban"]
    IP: [ip]CIP: [cid]
    Reason: [(unbanned || auto) ? "" : "(Edit)"] \"[reason]\"Reason: [(unbanned || auto) ? "" : "(Edit)"] \"[reason]\"
    Ban Mirrored [mirror_count > 1 ? "[mirror_count] times" : "once"]!Ban Mirrored [mirror_count > 1 ? "[mirror_count] times" : "once"]!
    " 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 @@ -113,9 +113,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) @@ -128,28 +128,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)) @@ -164,7 +164,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+="" @@ -172,36 +172,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:
    " @@ -212,9 +212,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 += {"
    @@ -270,7 +270,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 += "
    " @@ -278,7 +278,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 += "" @@ -331,12 +331,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") @@ -366,12 +366,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 @@ -379,10 +379,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+= "Station Feed Channels
    " @@ -392,38 +392,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.

    " @@ -431,7 +431,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\]") @@ -444,7 +444,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) @@ -459,15 +459,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+={" @@ -481,8 +481,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
    @@ -495,13 +495,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...
    " @@ -509,13 +509,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, you can Bestow a D-Notice upon the channel.
    + Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
    "} if(src.admincaster_feed_channel.censored) dat+={" @@ -529,7 +529,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 @@ -541,21 +541,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.

    " @@ -563,11 +563,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+={" @@ -581,11 +581,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:
    " @@ -593,8 +593,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." @@ -610,13 +610,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 jobban_keylist) for (var/job in jobban_keylist[ckey]) var/list/ban = 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") @@ -626,19 +626,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") @@ -657,7 +657,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 @@ -1079,66 +1079,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") @@ -1222,19 +1222,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]" + var/ref_mob = "[REF(M)]" 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]" + var/ref_mob = "[REF(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)])" + var/ref_mob = "[REF(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_investigate.dm b/code/modules/admin/admin_investigate.dm index 22e0abd9c27..f3e0f109a62 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -23,7 +23,7 @@ if(!message) return var/F = investigate_subject2file(subject) if(!F) return - to_chat(F, "[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z]) || [src] [message]
    ") + to_chat(F, "[time2text(world.timeofday,"hh:mm")] [REF(src)] ([x],[y],[z]) || [src] [message]
    ") //ADMINVERBS /client/proc/investigate_show( subject in list("hrefs","notes","singulo","telesci") ) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index b266b1db523..b0ce4ee642a 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1343,7 +1343,7 @@ var/list/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 6ec90d822db..82c149a662a 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -290,7 +290,7 @@ var/list/jobban_keylist = list() // Global jobban list. * Opens the jobban panel, showing the bans of the passed mob or ckey. * * @param str|mob tgt_ref The target we want to view jobbans of. Can be a reference - * to a mob object (gotten with \ref[M]) or an actual mob object. + * to a mob object (gotten with [REF(M)]) or an actual mob object. */ /datum/admins/proc/jobban_panel(var/tgt_ref = null) if (!tgt_ref) @@ -321,7 +321,7 @@ var/list/jobban_keylist = list() // Global jobban list. //Regular jobs //Command jobs += "" - jobs += "" + jobs += "" for (var/jobPos in command_positions) if (!jobPos) continue @@ -330,10 +330,10 @@ var/list/jobban_keylist = list() // Global jobban list. continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 6) //So things dont get squiiiiished! @@ -343,7 +343,7 @@ var/list/jobban_keylist = list() // Global jobban list. //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 @@ -352,10 +352,10 @@ var/list/jobban_keylist = list() // Global jobban list. continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 6) //So things dont get squiiiiished! @@ -366,7 +366,7 @@ var/list/jobban_keylist = list() // Global jobban list. //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 @@ -375,10 +375,10 @@ var/list/jobban_keylist = list() // Global jobban list. continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -389,7 +389,7 @@ var/list/jobban_keylist = list() // Global jobban list. //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 @@ -398,10 +398,10 @@ var/list/jobban_keylist = list() // Global jobban list. continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -412,7 +412,7 @@ var/list/jobban_keylist = list() // Global jobban list. //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 @@ -421,10 +421,10 @@ var/list/jobban_keylist = list() // Global jobban list. continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -435,7 +435,7 @@ var/list/jobban_keylist = list() // Global jobban list. //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 @@ -444,10 +444,10 @@ var/list/jobban_keylist = list() // Global jobban list. continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -458,7 +458,7 @@ var/list/jobban_keylist = list() // Global jobban list. //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 @@ -467,10 +467,10 @@ var/list/jobban_keylist = list() // Global jobban list. continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) @@ -480,7 +480,7 @@ var/list/jobban_keylist = list() // Global jobban list. //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 @@ -489,10 +489,10 @@ var/list/jobban_keylist = list() // Global jobban list. continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -503,7 +503,7 @@ var/list/jobban_keylist = list() // Global jobban list. //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 @@ -512,10 +512,10 @@ var/list/jobban_keylist = list() // Global jobban list. continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -525,7 +525,7 @@ var/list/jobban_keylist = list() // Global jobban list. //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 @@ -534,10 +534,10 @@ var/list/jobban_keylist = list() // Global jobban list. continue if (jobban_isbanned(ckey, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if (counter >= 5) //So things dont get squiiiiished! @@ -548,28 +548,28 @@ var/list/jobban_keylist = list() // Global jobban list. //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++ @@ -583,9 +583,9 @@ var/list/jobban_keylist = list() // Global jobban list. 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]" @@ -597,7 +597,7 @@ var/list/jobban_keylist = list() // Global jobban list. * * Relays a new ban to jobban_fullban and also manages database insertions where needed. * - * @param str tgt_ref The \ref[] of the target mob we want to dinbannu. + * @param str tgt_ref The REF() of the target mob we want to dinbannu. * @param str job The name of the job we want to ban the target from. * * @return num 1 if something was done. diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index b80ec384134..e4d97791fb2 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -6,4 +6,4 @@ create_mob_html = file2text('html/create_object.html') create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"") - user << browse(replacetext(create_mob_html, "/* ref src */", "\ref[src]"), "window=create_mob;size=425x475") + user << browse(replacetext(create_mob_html, "/* ref src */", "[REF(src)]"), "window=create_mob;size=425x475") diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 9369084e512..31c3a6ee7cb 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -7,4 +7,4 @@ create_object_html = file2text('html/create_object.html') create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"") - user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=600x600") + user << browse(replacetext(create_object_html, "/* ref src */", "[REF(src)]"), "window=create_object;size=600x600") diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index 05111be3413..10c0b62a0dc 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -6,4 +6,4 @@ create_turf_html = file2text('html/create_object.html') create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"") - user << browse(replacetext(create_turf_html, "/* ref src */", "\ref[src]"), "window=create_turf;size=425x475") + user << browse(replacetext(create_turf_html, "/* ref src */", "[REF(src)]"), "window=create_turf;size=425x475") diff --git a/code/modules/admin/law_manager.dm b/code/modules/admin/law_manager.dm index a7065b3a7df..bd3a1cc35f9 100644 --- a/code/modules/admin/law_manager.dm +++ b/code/modules/admin/law_manager.dm @@ -188,7 +188,7 @@ /datum/tgui_module/admin/law_manager/proc/package_laws(var/list/data, var/field, var/list/datum/ai_law/laws) var/list/packaged_laws = list() for(var/datum/ai_law/AL in laws) - packaged_laws += list(list("law" = AL.law, "index" = AL.get_index(), "state" = owner.laws.get_state_law(AL), "ref" = "\ref[AL]")) + packaged_laws += list(list("law" = AL.law, "index" = AL.get_index(), "state" = owner.laws.get_state_law(AL), "ref" = "[REF(AL)]")) data[field] = packaged_laws data["has_[field]"] = packaged_laws.len @@ -200,7 +200,7 @@ package_laws(packaged_laws, "ion_laws", ALs.ion_laws) package_laws(packaged_laws, "inherent_laws", ALs.inherent_laws) package_laws(packaged_laws, "supplied_laws", ALs.supplied_laws) - law_sets += list(list("name" = ALs.name, "header" = ALs.law_header, "ref" = "\ref[ALs]","laws" = packaged_laws)) + law_sets += list(list("name" = ALs.name, "header" = ALs.law_header, "ref" = "[REF(ALs)]","laws" = packaged_laws)) return law_sets diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm index b538949421e..82fde396205 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 c76fbf40bdc..74931e911a1 100644 --- a/code/modules/admin/player_notes_sql.dm +++ b/code/modules/admin/player_notes_sql.dm @@ -99,8 +99,8 @@ //Totally not stealing code from the DB_ban_panel - dat += "Search: " - dat += "" + dat += "Search: " + dat += "" dat += "Ckey: " dat += "Admin ckey: " dat += "" @@ -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) @@ -152,7 +152,7 @@ var/lasteditor = query.item[7] var/editdate = query.item[8] dat += "Note last edited: [editdate], by: [lasteditor]." - dat += "(Delete) (Edit)" + dat += "(Delete) (Edit)" dat += " " else if (admin_ckey && !player_ckey) @@ -172,7 +172,7 @@ var/lasteditor = admin_query.item[6] var/editdate = admin_query.item[7] dat += "Note last edited: [editdate], by: [lasteditor]." - dat += "(Delete) (Edit)" + dat += "(Delete) (Edit)" dat += " " dat += "" diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 08f18ab7b36..228e9cdc2b6 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -84,7 +84,7 @@ "role" = A.role_text_plural, "name" = M ? M.real_name : null, "stat" = M ? M.stat : null, - "ref" = ref(M) + "ref" = REF(M) )) data["antagonist_types"] |= A.role_text_plural if(A.flags & ANTAG_HAS_NUKE) @@ -145,7 +145,7 @@ /datum/tgui_module/moderator/shared/player_panel/ui_data(mob/user) var/list/data = list() var/isMod = check_rights(R_MOD|R_ADMIN, 0, user) - data["holder_ref"] = "\ref[user.client.holder]" + data["holder_ref"] = "[REF(user.client.holder)]" data["is_mod"] = isMod var/list/mobs = sortmobs() @@ -153,7 +153,7 @@ data["players"] = list() for(var/mob/M in mobs) - var/ref = "\ref[M]" + var/ref = "[REF(M)]" var/list/player = list() player["ckey"] = TRUE if(!M.ckey) diff --git a/code/modules/admin/ticket.dm b/code/modules/admin/ticket.dm index 94b8da895be..4ba6d15ee23 100644 --- a/code/modules/admin/ticket.dm +++ b/code/modules/admin/ticket.dm @@ -234,17 +234,17 @@ GLOBAL_LIST_EMPTY(ticket_panels) ticket_dat += "
  • " if(open_ticket && open_ticket == ticket) ticket_dat += "" - ticket_dat += "Ticket #[id] - [ticket.owner] [owner_client ? "" : "(DC)"] - [status]
    VIEW" + ticket_dat += "Ticket #[id] - [ticket.owner] [owner_client ? "" : "(DC)"] - [status]
    VIEW" if(ticket.status) - ticket_dat += " - PM" + ticket_dat += " - PM" if(valid_holder) - ticket_dat += " - [(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]" + ticket_dat += " - [(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]" if(ticket.status != TICKET_CLOSED && (valid_holder || ticket.status == TICKET_OPEN)) - ticket_dat += " - CLOSE" + ticket_dat += " - CLOSE" if(valid_holder) var/ref_mob = "" if(owner_client) - ref_mob = "\ref[owner_client.mob]" + ref_mob = "[REF(owner_client.mob)]" ticket_dat += " - ? - PP - VV - SM[owner_client ? "- [admin_jump_link(owner_client.mob, src)]" : ""]" if(open_ticket && open_ticket == ticket) ticket_dat += "    " @@ -254,7 +254,7 @@ GLOBAL_LIST_EMPTY(ticket_panels) dat += "

    Available tickets:

      [jointext(ticket_dat, null)]
    " if(open_ticket) - dat += "

    \[X\] Messages for ticket #[open_ticket.id]:

    " + dat += "

    \[X\] Messages for ticket #[open_ticket.id]:

    " var/list/msg_dat = list() for(var/datum/ticket_msg/msg in open_ticket.msgs) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 081a00c6ecf..fb10b882964 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,21 +1589,21 @@ /mob/extra_admin_link(var/source) if(client && eyeobj) - return "|EYE" + return "|EYE" /mob/abstract/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 // The way admin jump links handle their src is weirdly inconsistent... if(istype(source, /datum/admins)) - source = "src=\ref[source]" + source = "src=[REF(source)]" 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/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 0f6ecbb4f10..c3b41d63580 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -41,7 +41,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," if(!(word in 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 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," 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 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," //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 c1c8f0848f6..67f8ce23a41 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 256728d8358..a92ea3c7c1f 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 fc300de89d7..3fa5ddd1760 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/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm index baf2d4e098a..35b0707e7f4 100644 --- a/code/modules/admin/verbs/massmodvar.dm +++ b/code/modules/admin/verbs/massmodvar.dm @@ -120,7 +120,7 @@ var/original_name if (!istype(O, /atom)) - original_name = "\ref[O] ([O])" + original_name = "[REF(O)] ([O])" else original_name = O:name diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index e71055bc5c5..967f4585917 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -573,7 +573,7 @@ var/list/VVdynamic_lock = list( var/original_name if (!istype(O, /atom)) - original_name = "\ref[O] ([O])" + original_name = "[REF(O)] ([O])" else original_name = O:name diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index afb32611658..acfdf48c90e 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 3e3ade69427..e9f0bc820fe 100644 --- a/code/modules/admin/verbs/warning.dm +++ b/code/modules/admin/verbs/warning.dm @@ -49,7 +49,7 @@ feedback_add_details("admin_verb", "WARN-DB") if (C) - to_chat(C, SPAN_WARNING("You have been warned by an administrator.
    Click here to review and acknowledge them!")) + to_chat(C, SPAN_WARNING("You have been warned by an administrator.
    Click here to review and acknowledge them!")) message_admins("[key_name_admin(src)] has warned [warned_ckey] for: [warning_reason].") @@ -144,7 +144,7 @@ dat += "" dat += "[notification_query.item[3]]" dat += "[notification_query.item[2]]" - dat += "(Acknowledge Notification)" + dat += "(Acknowledge Notification)" dat += "" if(notification_header) @@ -190,7 +190,7 @@ dat += "" if (!ackn) - dat += "(Acknowledge Warning)" + dat += "(Acknowledge Warning)" else if (expired) dat += "Warning expired and no longer active!" else @@ -327,8 +327,8 @@ //Totally not stealing code from the DB_ban_panel - dat += "Search: " - dat += "" + dat += "Search: " + dat += "" dat += "Ckey: " dat += "Admin ckey: " dat += "" @@ -396,9 +396,9 @@ dat += "" dat += "Options: " if(check_rights(R_ADMIN) || a_ckey == sanitizeSQL(ckey)) - dat += "Edit Reason " - dat += "Edit Note " - dat += "Delete Warning" + dat += "Edit Reason " + dat += "Edit Note " + dat += "Delete Warning" else dat += "You can only edit or delete notes that you have issued." dat += "" diff --git a/code/modules/admin/view_variables/helpers.dm b/code/modules/admin/view_variables/helpers.dm index aaf33504b54..514316691c4 100644 --- a/code/modules/admin/view_variables/helpers.dm +++ b/code/modules/admin/view_variables/helpers.dm @@ -3,26 +3,26 @@ /atom/get_view_variables_header() return {" - [src] + [src]
    - << - [dir2text(dir)] - >> + << + [dir2text(dir)] + >> "} /mob/living/get_view_variables_header() return {" - [src] -
    << [dir2text(dir)] >> -
    [ckey ? ckey : "No ckey"] / [real_name ? real_name : "No real name"] + [src] +
    << [dir2text(dir)] >> +
    [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()]     "} @@ -31,55 +31,55 @@ /mob/get_view_variables_options() return ..() + {" - + - - - - - + + + + + - - + + - - + + - - - - - + + + + + - + - - + + - - - - + + + + "} /mob/living/carbon/human/get_view_variables_options() return ..() + {" - - - - - + + + + + "} /obj/get_view_variables_options() return ..() + {" - - - + + + "} /turf/get_view_variables_options() return ..() + {" - - + + "} diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm index 274b8e129c8..87d517314df 100644 --- a/code/modules/admin/view_variables/view_variables.dm +++ b/code/modules/admin/view_variables/view_variables.dm @@ -38,7 +38,7 @@ - [D] (\ref[D] - [D.type]) + [D] ([REF(D)] - [D.type]) ", "
    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 a4baf10ac52..378230ebbfd 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 b0f8088ed7b..7e19974d31a 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 8be5a8721e2..9ee8f2aa9e2 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 e80eb50371c..f0997a4f9a0 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -254,11 +254,11 @@ var/list/preferences_datums = list() 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 @@ var/list/preferences_datums = list() 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 @@ var/list/preferences_datums = list() 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 dfe9c02f1f0..9232d1c01de 100644 --- a/code/modules/client/preferences_notification.dm +++ b/code/modules/client/preferences_notification.dm @@ -31,8 +31,8 @@ note_wrapper = new_wrapper note_text = new_text - note_text = replacetextEx(note_text, ":src_ref", SOFTREF(src)) - note_wrapper[1] = replacetextEx(note_wrapper[1], ":src_ref", SOFTREF(src)) + note_text = replacetextEx(note_text, ":src_ref", REF(src)) + note_wrapper[1] = replacetextEx(note_wrapper[1], ":src_ref", REF(src)) if (new_persistence) persistent = new_persistence diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 468ba9708be..a213199bcdf 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -101,7 +101,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("\A [A] [A.gender == PLURAL ? "are" : "is"] attached to it.") /obj/item/clothing/proc/update_accessory_slowdown(mob/user) slowdown_accessory = 0 diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index f2a775087a6..4370feae3ee 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -268,7 +268,7 @@ for(var/obj/item/rig_module/module in R.installed_modules) for(var/stat_rig_module/SRM in module.stat_modules) if(SRM.CanUse()) - data += list(list("Hardsuit Modules", "[SRM.module.interface_name]", "[SRM]", ref(SRM))) + data += list(list("Hardsuit Modules", "[SRM.module.interface_name]", "[SRM]", REF(SRM))) return data /stat_rig_module diff --git a/code/modules/clothing/under/accessories/buddy_tag.dm b/code/modules/clothing/under/accessories/buddy_tag.dm index ac002afdbbd..cdad9960f29 100644 --- a/code/modules/clothing/under/accessories/buddy_tag.dm +++ b/code/modules/clothing/under/accessories/buddy_tag.dm @@ -25,10 +25,10 @@ var/list/active_buddy_tags = list() if(use_check_and_message(user)) return - var/list/dat = "[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/icecream.dm b/code/modules/cooking/machinery/icecream.dm index d3dfe603dc9..a9401845b29 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 c0d2cd95167..afbb4488a47 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -85,7 +85,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]
    " @@ -94,19 +94,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/heavy_vehicle/components/arms.dm b/code/modules/heavy_vehicle/components/arms.dm index d906395a45e..426d71c8f86 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 2607a9fa751..782df859985 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 cell.") + . += SPAN_WARNING("It is missing a power cell.") 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 0f415e69209..5d27e78e03f 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 559988b1c85..0bd33ec824e 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 d5c4899c9bd..230f008e0d9 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/mecha.dm b/code/modules/heavy_vehicle/mecha.dm index a4f221fb50b..0efde46f29c 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 [M.name]." else . += "It is being piloted by [pilot]." if(hardpoints.len) diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index a14abc2a7e7..846e2333112 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -61,10 +61,10 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont return for(var/prog in SSatlas.current_map.holodeck_supported_programs) - dat += "([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.
    " @@ -75,15 +75,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
    " @@ -91,15 +91,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 a77064e75a5..0ca1e28dcc6 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -225,7 +225,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 a7795635268..5ea37e8fb8f 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 += "[circuit.displayed_name] | " + HTML += "Rename | " + HTML += "Scan with Debugger | " + HTML += "Move to Bottom" HTML += "
    " HTML += "
    " @@ -112,14 +112,14 @@ 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 += "[circuit.displayed_name] | " + HTML += "Rename | " + HTML += "Scan with Debugger | " + HTML += "Remove | " + HTML += "Move to Bottom" HTML += "
    " - var/datum/browser/B = new(user, "assembly-\ref[src]", name, 600, 400) + var/datum/browser/B = new(user, "assembly-[REF(src)]", name, 600, 400) B.set_content(HTML.Join()) B.open(FALSE) diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm index 2eea4b8eaca..d34f36eb012 100644 --- a/code/modules/integrated_electronics/core/integrated_circuit.dm +++ b/code/modules/integrated_electronics/core/integrated_circuit.dm @@ -93,13 +93,13 @@ a creative player the means to solve many problems. Circuits are held inside an var/list/HTML = list( "
    ", "", - "
    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_pin_type()] [io.name] [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.name] \ + @ [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_pin_type()] [io.name] [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.name] \ + @ [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 += "" @@ -176,7 +176,7 @@ a creative player the means to solve many problems. Circuits are held inside an HTML += "
    Power Draw: [power_draw_per_use] W (Active)" // Borgcode says that powercells' checked_use() takes joules as input. HTML += "
    [extended_desc]" - var/datum/browser/B = new(user, assembly ? "assembly-\ref[assembly]" : "circuit-\ref[src]", (displayed_name && displayed_name != name) ? "[displayed_name] ([name])" : name, window_width, window_height) + var/datum/browser/B = new(user, assembly ? "assembly-[REF(assembly)]" : "circuit-[REF(src)]", (displayed_name && displayed_name != name) ? "[displayed_name] ([name])" : name, window_width, window_height) B.set_content(HTML.Join()) B.open() @@ -282,7 +282,7 @@ a creative player the means to solve many problems. Circuits are held inside an if(href_list["return"]) if(A) update_to_assembly = 1 - usr << browse(null, "window=circuit-\ref[src]") + usr << browse(null, "window=circuit-[REF(src)]") else to_chat(usr, SPAN_WARNING("This circuit is not in an assembly!")) diff --git a/code/modules/integrated_electronics/core/pins.dm b/code/modules/integrated_electronics/core/pins.dm index 8c25f70fea0..6f44648ba2a 100644 --- a/code/modules/integrated_electronics/core/pins.dm +++ b/code/modules/integrated_electronics/core/pins.dm @@ -85,7 +85,7 @@ list[]( var/datum/weakref/w = input var/atom/A = w.resolve() //return A ? "([A.name] \[Ref\])" : "(null)" // For refs, we want just the name displayed. - return A ? "(\ref[A] \[Ref\])" : "(null)" + return A ? "([REF(A)] \[Ref\])" : "(null)" return "([input])" // Nothing special needed for numbers or other stuff. 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 db15f6155f1..4b34de4fb7c 100644 --- a/code/modules/integrated_electronics/core/special_pins/list_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/list_pin.dm @@ -14,20 +14,20 @@ 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
    " - var/datum/browser/B = new(user, "list_pin_\ref[src]", null, 500, 400) + 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 806262f4f82..2dda8083f55 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") @@ -385,7 +385,7 @@ var/orderid = input("Enter your order:") as num|null if(orderid) if(isnum(orderid)) - var/nhref = "src=\ref[src];targetid=[orderid]" + var/nhref = "src=[REF(src)];targetid=[orderid]" spawn() src.Topic(nhref, params2list(nhref), src) if(href_list["sort"] in list("author", "title", "category")) sortby = href_list["sort"] @@ -436,9 +436,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/lighting/lighting_verbs.dm b/code/modules/lighting/lighting_verbs.dm index 9b83ca83e0d..1f6110171d6 100644 --- a/code/modules/lighting/lighting_verbs.dm +++ b/code/modules/lighting/lighting_verbs.dm @@ -53,7 +53,7 @@ var/list/admin_verbs_lighting = list( to_chat(src, "That turf is not dynamically lit.") return - log_and_message_admins("has triggered a lighting update for turf \ref[T] - [T] at ([T.x],[T.y],[T.z]) in area [T.loc].") + log_and_message_admins("has triggered a lighting update for turf [REF(T)] - [T] at ([T.x],[T.y],[T.z]) in area [T.loc].") T.reconsider_lights() @@ -68,7 +68,7 @@ var/list/admin_verbs_lighting = list( to_chat(src, "That turf already has a lighting overlay.") return - log_and_message_admins("has generated a lighting overlay for turf \ref[T] - [T] ([T.x],[T.y],[T.z]) in area [T.loc].") + log_and_message_admins("has generated a lighting overlay for turf [REF(T)] - [T] ([T.x],[T.y],[T.z]) in area [T.loc].") T.lighting_build_overlay() @@ -83,7 +83,7 @@ var/list/admin_verbs_lighting = list( to_chat(src, "That turf doesn't have a lighting overlay.") return - log_and_message_admins("has cleared a lighting overlay for turf \ref[T] - [T] ([T.x],[T.y],[T.z]) in area [T.loc].") + log_and_message_admins("has cleared a lighting overlay for turf [REF(T)] - [T] ([T.x],[T.y],[T.z]) in area [T.loc].") T.lighting_clear_overlay() diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 7af097ea997..d42fb4647d9 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -128,7 +128,7 @@ GLOBAL_LIST_INIT(minevendor_list, list( data["hasId"] = FALSE var/list/prize_list = list() for(var/datum/data/mining_equipment/prize as anything in GLOB.minevendor_list) - prize_list += list(list("name" = prize.equipment_name, "desc" = prize.equipment_description, "cost" = prize.cost, "stock" = prize.amount, "ref" = "\ref[prize]")) + prize_list += list(list("name" = prize.equipment_name, "desc" = prize.equipment_description, "cost" = prize.cost, "stock" = prize.amount, "ref" = "[REF(prize)]")) data["prizeList"] = prize_list return data diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 230dc96c7c3..3e1f3550179 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -70,43 +70,43 @@ if(chosen == "gold") dat += text("chosen") else - dat += text("Choose") + dat += text("Choose") dat += text("
    Silver inserted: [amt_silver] ") if(chosen == "silver") dat += text("chosen") else - dat += text("Choose") + dat += text("Choose") dat += text("
    Iron inserted: [amt_iron] ") if(chosen == DEFAULT_WALL_MATERIAL) dat += text("chosen") else - dat += text("Choose") + dat += text("Choose") dat += text("
    Diamond inserted: [amt_diamond] ") if(chosen == "diamond") dat += text("chosen") else - dat += text("Choose") + dat += text("Choose") dat += text("
    Phoron inserted: [amt_phoron] ") if(chosen == "phoron") dat += text("chosen") else - dat += text("Choose") + dat += text("Choose") dat += text("
    Uranium inserted: [amt_uranium] ") if(chosen == "uranium") dat += text("chosen") else - dat += text("Choose") + dat += text("Choose") dat += text("

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

    In total this machine produced [newCoins] coins.") - dat += text("
    Make coins") + dat += text("
    Make coins") user << browse("[dat]", "window=mint") /obj/machinery/mineral/mint/Topic(href, href_list) diff --git a/code/modules/mob/abstract/new_player/poll.dm b/code/modules/mob/abstract/new_player/poll.dm index 0dfd69feb15..89b74cb6bfd 100644 --- a/code/modules/mob/abstract/new_player/poll.dm +++ b/code/modules/mob/abstract/new_player/poll.dm @@ -23,7 +23,7 @@ while(select_query.NextRow()) pollid = select_query.item[1] pollquestion = select_query.item[2] - output += "[pollquestion]" + output += "[pollquestion]" output += "" @@ -101,12 +101,12 @@ 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 - output += "" - output += "" + output += "" + output += "" output += "" output += "" @@ -149,12 +149,12 @@ 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 - output += "" - output += "" + output += "" + output += "" output += "" output += "" @@ -164,8 +164,8 @@ output += "

    " output += "

    " - output += "
    " - output += "" + output += "" + output += "" output += "" output += "" output += "" @@ -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 @@ -200,8 +200,8 @@ output += "
    [optiontext] - [rating]" if(!voted) //Only make this a form if we have not voted yet - output += "" - output += "" + output += "" + output += "" output += "" output += "" @@ -287,12 +287,12 @@ 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 - output += "" - output += "" + output += "" + output += "" output += "" output += "" output += "" diff --git a/code/modules/mob/abstract/observer/observer.dm b/code/modules/mob/abstract/observer/observer.dm index 594471e51b0..c6cd8f0ef5e 100644 --- a/code/modules/mob/abstract/observer/observer.dm +++ b/code/modules/mob/abstract/observer/observer.dm @@ -833,15 +833,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/extra_ghost_link(var/atom/ghost) if(client && eyeobj) - return "|\[E\]" + return "|\[E\]" /mob/abstract/observer/extra_ghost_link(var/atom/ghost) if(mind && mind.current) - return "|\[B\]" + return "|\[B\]" /proc/ghost_follow_link(var/atom/target, var/atom/ghost) if((!target) || (!ghost)) return - . = "\[F\]" + . = "\[F\]" . += target.extra_ghost_link(ghost) diff --git a/code/modules/mob/abstract/unauthed/login.dm b/code/modules/mob/abstract/unauthed/login.dm index d6553ec63bf..b9e7afcd15d 100644 --- a/code/modules/mob/abstract/unauthed/login.dm +++ b/code/modules/mob/abstract/unauthed/login.dm @@ -18,9 +18,9 @@ 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/hear_say.dm b/code/modules/mob/hear_say.dm index f0d69c68c25..c8960b2118a 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -208,11 +208,11 @@ if(changed_voice) if(impersonating) - track = "[speaker_name] ([jobname])" + track = "[speaker_name] ([jobname])" else track = "[speaker_name] ([jobname])" else - track = "[speaker_name] ([jobname])" + track = "[speaker_name] ([jobname])" if(istype(src, /mob/abstract/observer)) if(speaker != null) diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index 72144f9c7f0..b3b1962f5f6 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -312,14 +312,14 @@ var/dat = "Known Languages

    " if(default_language) - dat += "Current default language: [default_language] - reset

    " + dat += "Current default language: [default_language] - reset

    " for(var/datum/language/L in languages) if(!(L.flags & NONGLOBAL)) if(L == default_language) - dat += "[L.name] ([get_language_prefix()][L.key]) - default - reset
    [L.desc]

    " + dat += "[L.name] ([get_language_prefix()][L.key]) - default - reset
    [L.desc]

    " else if(can_speak(L)) - dat += "[L.name] ([get_language_prefix()][L.key]) - set default
    [L.desc]

    " + dat += "[L.name] ([get_language_prefix()][L.key]) - set default
    [L.desc]

    " else dat += "[L.name] ([get_language_prefix()][L.key]) - cannot speak!
    [L.desc]

    " if(L.written_style) diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm index 20ab00bb441..0a2a8f2b308 100644 --- a/code/modules/mob/language/synthetic.dm +++ b/code/modules/mob/language/synthetic.dm @@ -38,7 +38,7 @@ if(drone_only && !isDrone(S)) continue else if(isAI(S)) - message_start = "[name], [get_speaker_name(speaker)]" + message_start = "[name], [get_speaker_name(speaker)]" else if (!S.binarycheck() || !can_hear(speaker, S)) continue diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 16acd590ef9..72945b166e6 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 4da61122ff9..7bd6a304f53 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -141,35 +141,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/diona_base.dm b/code/modules/mob/living/carbon/diona_base.dm index 30a5c7ff247..02191326ce9 100644 --- a/code/modules/mob/living/carbon/diona_base.dm +++ b/code/modules/mob/living/carbon/diona_base.dm @@ -644,7 +644,7 @@ var/list/diona_banned_languages = list( var/newDNA = data["blood_DNA"] if(!newDNA) //Fallback. Adminspawned mobs, and possibly some others, have null dna. - newDNA = md5("\ref[H]") + newDNA = md5("[REF(H)]") H.adjustBruteLoss(4) user.visible_message(SPAN_NOTICE("[user] sucks some blood from \the [H].") , SPAN_NOTICE("You extract a delicious mouthful of blood from \the [H]!")) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 4688f30a884..0c14c10a334 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -14,34 +14,34 @@ HTML += "
    " HTML += "Update Flavour Text
    " HTML += "
    " - HTML += "General: " + HTML += "General: " HTML += TextPreview(flavor_texts["general"]) HTML += "
    " - HTML += "Head: " + HTML += "Head: " HTML += TextPreview(flavor_texts[BP_HEAD]) HTML += "
    " - HTML += "Face: " + HTML += "Face: " HTML += TextPreview(flavor_texts["face"]) HTML += "
    " - HTML += "Eyes: " + HTML += "Eyes: " HTML += TextPreview(flavor_texts[BP_EYES]) HTML += "
    " - HTML += "Body: " + HTML += "Body: " HTML += TextPreview(flavor_texts["torso"]) HTML += "
    " - HTML += "Arms: " + HTML += "Arms: " HTML += TextPreview(flavor_texts["arms"]) HTML += "
    " - HTML += "Hands: " + HTML += "Hands: " HTML += TextPreview(flavor_texts["hands"]) HTML += "
    " - HTML += "Legs: " + HTML += "Legs: " HTML += TextPreview(flavor_texts["legs"]) HTML += "
    " - HTML += "Feet: " + HTML += "Feet: " 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 6a26c8a00f9..8798b5976ba 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -76,22 +76,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) @@ -104,105 +104,105 @@ 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" //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) @@ -363,8 +363,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" @@ -380,15 +380,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 993fa692c42..ad89ba2e666 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 += species.get_strip_info("\ref[src]") - dat += "
    Refresh" - dat += "
    Close" + dat += "
    Remove accessory" + dat += "
    Remove splints" + dat += "
    Empty pockets" + dat += species.get_strip_info("[REF(src)]") + 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 fbf07012e17..6e151980e4b 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -665,7 +665,7 @@ dat += "Primarily [u_attack.attack_name]


    " if(default_attack) - dat += "Current default attack: [default_attack.attack_name] - Reset

    " + dat += "Current default attack: [default_attack.attack_name] - Reset

    " for(var/datum/unarmed_attack/u_attack in species.unarmed_attacks) var/sparring_variant = "" @@ -675,11 +675,11 @@ sparring_variant = " | Sparring Variant: [capitalize_first_letters(initial(spar_attack.attack_name))]" sparring_variant_desc = "[initial(spar_attack.desc)]
    " if(u_attack == default_attack) - dat += "Primarily [capitalize_first_letters(u_attack.attack_name)][sparring_variant] - default - Reset
    " + dat += "Primarily [capitalize_first_letters(u_attack.attack_name)][sparring_variant] - default - Reset
    " dat += "Description: [u_attack.desc]
    [sparring_variant_desc]" dat += "
    " else - dat += "Primarily [capitalize_first_letters(u_attack.attack_name)][sparring_variant] - Set Default
    " + dat += "Primarily [capitalize_first_letters(u_attack.attack_name)][sparring_variant] - Set Default
    " dat += "Description: [u_attack.desc]
    [sparring_variant_desc]" dat += "
    " diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 995f860a6e9..5525f825f41 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -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 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 4857efbd5e2..856e81ec981 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -219,7 +219,7 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/proc/on_mob_init() to_chat(src, "

    You are playing the station'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(malf && !(mind in 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 5f0bdf86706..4792e2a7096 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -40,12 +40,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 e2c1a645eee..ad2fdb28966 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_1]" : "No Module"]
    + Module 2: [module_state_2 ? "    [module_state_2]" : "No Module"]
    + Module 3: [module_state_3 ? "    [module_state_3]" : "No Module"]

    Installed Modules

    "} @@ -201,7 +201,7 @@ else if(activated(O)) module_string += text("[O]: Activated
    ") else - module_string += text("[O]:     Activate
    ") + module_string += text("[O]: 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 += text("[module.emag]: Activated
    ") else - dat += text("[module.emag]: Activate
    ") + dat += text("[module.emag]: Activate
    ") dat += resources diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 16cfb1b451e..2da2c3f7b64 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -869,9 +869,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_1]" : "No Module"]
    + Module 2: [module_state_2 ? "    [module_state_2]" : "No Module"]
    + Module 3: [module_state_3 ? "    [module_state_3]" : "No Module"]

    Installed Modules

    "} @@ -882,17 +882,17 @@ else if(activated(obj)) dat += text("[obj]: Activated
    ") else - dat += text("[obj]:     Activate
    ") + dat += text("[obj]: Activate
    ") if(emagged) if(activated(module.emag)) dat += text("[module.emag]: Activated
    ") else - dat += text("[module.emag]: Activate
    ") + dat += text("[module.emag]: Activate
    ") if(malf_AI_module) if(activated(module.malf_AI_module)) dat += text("[module.malf_AI_module]: Activated
    ") else - dat += text("[module.malf_AI_module]: Activate
    ") + dat += text("[module.malf_AI_module]: Activate
    ") src << browse(dat, "window=robotmod") @@ -1132,7 +1132,7 @@ return switch(notifytype) if(ROBOT_NOTIFICATION_NEW_UNIT) //New Robot - to_chat(connected_ai, "

    NOTICE - New [lowertext(braintype)] connection detected: [name]
    ") + to_chat(connected_ai, "

    NOTICE - New [lowertext(braintype)] connection detected: [name]
    ") if(ROBOT_NOTIFICATION_NEW_MODULE) //New Module to_chat(connected_ai, "

    NOTICE - [braintype] module change detected: [name] has loaded the [first_arg].
    ") if(ROBOT_NOTIFICATION_MODULE_RESET) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 662850314b8..f1c2b1aabbd 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -216,15 +216,15 @@ var/dat = "Known Languages

    " if(default_language) - dat += "Current default language: [default_language] - reset

    " + dat += "Current default language: [default_language] - reset

    " for(var/datum/language/L in languages) if(!(L.flags & NONGLOBAL)) var/default_str if(L == default_language) - default_str = " - default - reset" + default_str = " - default - reset" else - default_str = " - set default" + default_str = " - set default" var/synth = (L in speech_synthesizer_langs) dat += "[L.name] ([get_language_prefix()][L.key])[synth ? default_str : null]
    Speech Synthesizer: [synth ? "YES" : "NOT SUPPORTED"]
    [L.desc]

    " @@ -331,7 +331,7 @@ /mob/living/silicon/ai/raised_alarm(var/datum/alarm/A) var/cameratext = "" for(var/obj/machinery/camera/C in A.cameras()) - cameratext += "[(cameratext == "")? "" : "|"][C.c_tag]" + cameratext += "[(cameratext == "")? "" : "|"][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 1e7566279db..a10f75c6310 100644 --- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm +++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm @@ -44,9 +44,9 @@ var/dat = "" for(var/mob/living/simple_animal/shade/A in src) dat += "Captured Soul: [A.name]
    " - dat += "Summon Shade
    " + dat += "Summon Shade
    " dat += "This will summon the spirit of [A.name] in a pure energy form. Be cautious, for they will be weak without a protective construct to house them.
    " - dat += "Close" + dat += "Close" var/datum/browser/soulstone_win = new(user, "soulstone", capitalize_first_letters(name)) soulstone_win.set_content(dat) diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 969cca74ef8..95d531953b1 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -168,7 +168,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca maxHealth = health if(creator) src.creator = creator - faction = "\ref[creator]" // very unique + faction = "[REF(creator)]" // very unique return 1 return diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 07b4d04dde8..394098e2c1f 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, text("window=mob[];size=325x500", name)) onclose(user, "mob[real_name]") diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 1d4b09a3677..77da8a56ff2 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 5d0a6e25e08..b082ec492b0 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -363,14 +363,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 )) ? text(" Set Internal", src) : "")] -
    [(internal ? text("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 ? text("Remove Internal") : "")] +
    Empty Pockets +
    Refresh +
    Close
    "} var/datum/browser/mob_win = new(user, "mob[name]", capitalize_first_letters(name)) @@ -491,7 +491,7 @@ /mob/proc/warn_flavor_changed() if(flavor_text && flavor_text != "") // don't spam people that don't use it! to_chat(src, "

    OOC Warning:

    ") - to_chat(src, SPAN_ALERT("Your flavor text is likely out of date! Change")) + to_chat(src, SPAN_ALERT("Your flavor text is likely out of date! Change")) /mob/proc/print_flavor_text() if (flavor_text && flavor_text != "") @@ -499,7 +499,7 @@ if(length(msg) <= 40) return "[msg]" else - return "[copytext_preserve_html(msg, 1, 37)]... More..." + return "[copytext_preserve_html(msg, 1, 37)]... More..." /mob/verb/abandon_mob() set name = "Respawn" diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index b97b6423cd7..6937602a08b 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -1207,11 +1207,11 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) var/datum/accent/a = SSrecords.accents[used_accent] if(istype(a)) if(hearer && hearer.client && hearer.client.prefs?.toggles_secondary & ACCENT_TAG_TEXT) - return {"([a.text_tag])"} + return {"([a.text_tag])"} else var/datum/asset/spritesheet/S = get_asset_datum(/datum/asset/spritesheet/chat) var/final_icon = "accent-[a.tag_icon]" - return {"[S.icon_tag(final_icon)]"} + return {"[S.icon_tag(final_icon)]"} /mob/assign_player(var/mob/user) ckey = user.ckey diff --git a/code/modules/modular_computers/NTNet/NTNRC/message.dm b/code/modules/modular_computers/NTNet/NTNRC/message.dm index 90ec350bdf1..5515c7214f4 100644 --- a/code/modules/modular_computers/NTNet/NTNRC/message.dm +++ b/code/modules/modular_computers/NTNet/NTNRC/message.dm @@ -33,7 +33,7 @@ var/message = "" /datum/ntnet_message/message/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl) - . = "([sanitize(Conv.get_title(Cl))]) [nuser.username]: [sanitize(message)] (Reply)" + . = "([sanitize(Conv.get_title(Cl))]) [nuser.username]: [sanitize(message)] (Reply)" /datum/ntnet_message/message/format_chat_log(var/datum/ntnet_conversation/Conv) var/conversation_message_length = length(Conv.messages) diff --git a/code/modules/modular_computers/file_system/programs/command/account_database.dm b/code/modules/modular_computers/file_system/programs/command/account_database.dm index dcba429e05a..743f62df8de 100644 --- a/code/modules/modular_computers/file_system/programs/command/account_database.dm +++ b/code/modules/modular_computers/file_system/programs/command/account_database.dm @@ -85,7 +85,7 @@ var/account_number = "[M]" var/list/transactions = list() for(var/datum/transaction/T in D.transactions) - var/Tref = ref(T) + var/Tref = REF(T) transactions += list(list( "ref" = Tref, "date" = T.date, diff --git a/code/modules/modular_computers/file_system/programs/command/teleporter.dm b/code/modules/modular_computers/file_system/programs/command/teleporter.dm index e15e7848269..c39d25ff02b 100644 --- a/code/modules/modular_computers/file_system/programs/command/teleporter.dm +++ b/code/modules/modular_computers/file_system/programs/command/teleporter.dm @@ -43,14 +43,14 @@ for(var/obj/machinery/teleport/pad/S in range(3, T)) var/list/pad_info = list( "name" = "[S.name] ([S.x]-[S.y][S.z])", - "ref" = "\ref[S]" + "ref" = "[REF(S)]" ) near_pads_info += list(pad_info) data["nearby_pads"] = near_pads_info else var/atom/selected_atom = linked_pad.locked_obj ? linked_pad.locked_obj.resolve() : null if(selected_atom) - data["selected_target"] = "\ref[selected_atom]" + data["selected_target"] = "[REF(selected_atom)]" data["selected_target_name"] = linked_pad.locked_obj_name data["calibration"] = 100 - linked_pad.calibration var/list/area_index = list() @@ -71,7 +71,7 @@ area_index[tmpname] = 1 var/list/teleporter_info = list( "name" = tmpname, - "ref" = "\ref[R]" + "ref" = "[REF(R)]" ) teleport_beacon_info += list(teleporter_info) data["teleport_beacons"] = teleport_beacon_info @@ -99,7 +99,7 @@ area_index[tmpname] = 1 var/list/implant_info = list( "name" = tmpname, - "ref" = "\ref[I]" + "ref" = "[REF(I)]" ) teleport_implant_info += list(implant_info) data["teleport_implants"] = teleport_implant_info diff --git a/code/modules/modular_computers/file_system/programs/engineering/atmoscontrol.dm b/code/modules/modular_computers/file_system/programs/engineering/atmoscontrol.dm index 0da52a18721..378f428bfbf 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/atmoscontrol.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/atmoscontrol.dm @@ -62,7 +62,7 @@ for(var/obj/machinery/alarm/alarm in monitored_alarms) alarms += list(list( "name" = sanitize(alarm.name), - "ref"= "\ref[alarm]", + "ref"= "[REF(alarm)]", "danger" = max(alarm.danger_level, alarm.alarm_area.atmosalm) )) data["alarms"] = alarms diff --git a/code/modules/modular_computers/file_system/programs/generic/lawmanager.dm b/code/modules/modular_computers/file_system/programs/generic/lawmanager.dm index 7148e93bf8a..0463f9737d4 100644 --- a/code/modules/modular_computers/file_system/programs/generic/lawmanager.dm +++ b/code/modules/modular_computers/file_system/programs/generic/lawmanager.dm @@ -196,7 +196,7 @@ /datum/computer_file/program/law_manager/proc/package_laws(var/list/data, var/field, var/list/datum/ai_law/laws) var/list/packaged_laws = list() for(var/datum/ai_law/AL in laws) - packaged_laws += list(list("law" = AL.law, "index" = AL.get_index(), "state" = owner.laws.get_state_law(AL), "ref" = "\ref[AL]")) + packaged_laws += list(list("law" = AL.law, "index" = AL.get_index(), "state" = owner.laws.get_state_law(AL), "ref" = "[REF(AL)]")) data[field] = packaged_laws data["has_[field]"] = packaged_laws.len @@ -208,7 +208,7 @@ package_laws(packaged_laws, "ion_laws", ALs.ion_laws) package_laws(packaged_laws, "inherent_laws", ALs.inherent_laws) package_laws(packaged_laws, "supplied_laws", ALs.supplied_laws) - law_sets += list(list("name" = ALs.name, "header" = ALs.law_header, "ref" = "\ref[ALs]","laws" = packaged_laws)) + law_sets += list(list("name" = ALs.name, "header" = ALs.law_header, "ref" = "[REF(ALs)]","laws" = packaged_laws)) return law_sets diff --git a/code/modules/modular_computers/file_system/programs/security/guntracker.dm b/code/modules/modular_computers/file_system/programs/security/guntracker.dm index f0ca3bd02f8..c4c1fccaeae 100644 --- a/code/modules/modular_computers/file_system/programs/security/guntracker.dm +++ b/code/modules/modular_computers/file_system/programs/security/guntracker.dm @@ -38,7 +38,7 @@ var/list/guntracker_info = list( "gun_name" = capitalize_first_letters(P.gun.name), "registered_info" = P.registered_user ? P.registered_user : "Unregistered", - "ref" = "\ref[P]", + "ref" = "[REF(P)]", "lock_status" = P.lock_status ) wireless_firing_pins_data += list(guntracker_info) 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 d9ca5fa4903..af49d87dcba 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 @@ -31,7 +31,7 @@ var/list/chem_info = list( "implanted_name" = C.imp_in.real_name, "remaining_units" = round(C.reagents.total_volume, 0.1), - "ref" = "\ref[C]" + "ref" = "[REF(C)]" ) chem_implants += list(chem_info) data["chem_implants"] = chem_implants @@ -53,7 +53,7 @@ var/list/tracker_info = list( "id" = T.id, "loc_display" = loc_display, - "ref" = "\ref[T]" + "ref" = "[REF(T)]" ) tracking_implants += list(tracker_info) data["tracking_implants"] = tracking_implants diff --git a/code/modules/modular_computers/file_system/programs/security/penalmechs.dm b/code/modules/modular_computers/file_system/programs/security/penalmechs.dm index 034f0228f17..d9d7596b7c4 100644 --- a/code/modules/modular_computers/file_system/programs/security/penalmechs.dm +++ b/code/modules/modular_computers/file_system/programs/security/penalmechs.dm @@ -33,7 +33,7 @@ continue if(!AreConnectedZLevels(computer.loc.z, M.loc.z)) continue - var/list/mechData = list("location" = null, "name" = null, "pilot" = null, "ref" = "\ref[M]", "camera" = null, "lockdown" = null) + var/list/mechData = list("location" = null, "name" = null, "pilot" = null, "ref" = "[REF(M)]", "camera" = null, "lockdown" = null) mechData["name"] = M.name mechData["pilot"] = "[M.old_mob]" @@ -51,7 +51,7 @@ continue if(!AreConnectedZLevels(computer.loc.z, R.loc.z)) continue - var/list/robotData = list("location" = null, "name" = null, "pilot" = null, "ref" = "\ref[R]") + var/list/robotData = list("location" = null, "name" = null, "pilot" = null, "ref" = "[REF(R)]") robotData["name"] = R.name robotData["pilot"] = "[R.old_mob]" @@ -63,7 +63,7 @@ data["mechs"] = sortByKey(mechs, "pilot") data["robots"] = sortByKey(robots, "pilot") - data["current_cam_loc"] = current_camera ? "\ref[current_camera.loc]" : null + data["current_cam_loc"] = current_camera ? "[REF(current_camera.loc)]" : null return data diff --git a/code/modules/nano/modules/ghost_menu.dm b/code/modules/nano/modules/ghost_menu.dm index 397a45938bb..4aca1e9e752 100644 --- a/code/modules/nano/modules/ghost_menu.dm +++ b/code/modules/nano/modules/ghost_menu.dm @@ -62,7 +62,7 @@ if(!name) continue - ghosts += list(list("name" = name, "ref" = ref(M), "category" = category, "special_character" = special_char)) + ghosts += list(list("name" = name, "ref" = REF(M), "category" = category, "special_character" = special_char)) categories |= category data["categories"] = categories diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 938f923f1fb..9baa217ba53 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -75,7 +75,7 @@ nanoui is used to open and update nano browser uis user = nuser src_object = nsrc_object ui_key = nui_key - window_id = "[ui_key]\ref[src_object]" + window_id = "[ui_key][REF(src_object)]" src.master_ui = master_ui if(master_ui) @@ -362,7 +362,7 @@ nanoui is used to open and update nano browser uis var/initial_data_json = replacetext(replacetext(json_encode(send_data), """, "&#34;"), "'", "'") initial_data_json = strip_improper(initial_data_json); - var/url_parameters_json = json_encode(list("src" = "\ref[src]")) + var/url_parameters_json = json_encode(list("src" = "[REF(src)]")) return {" @@ -462,7 +462,7 @@ nanoui is used to open and update nano browser uis /datum/nanoui/proc/on_close_winset() if(!user.client) return - var/params = "\ref[src]" + var/params = "[REF(src)]" winset(user, window_id, "on-close=\"nanoclose [params]\"") diff --git a/code/modules/ntsl2/ntsl2_types.dm b/code/modules/ntsl2/ntsl2_types.dm index 846057537df..96005fac0fd 100644 --- a/code/modules/ntsl2/ntsl2_types.dm +++ b/code/modules/ntsl2/ntsl2_types.dm @@ -66,7 +66,7 @@ pass = !(signal.data["reject"]), verb = signal.data["say_verb"], language = signal_language.name, - reference = ref(signal) + reference = REF(signal) ) ), RUSTG_HTTP_METHOD_POST, callback = callback) /* [ diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index b125b2bd1a9..e2166a657b8 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -227,7 +227,7 @@ data["blood_DNA"] = dna.unique_enzymes data["blood_type"] = dna.b_type else - data["blood_DNA"] = md5(ref(src)) + data["blood_DNA"] = md5(REF(src)) data["blood_type"] = "O+" if(species) data["species"] = species.bodytype diff --git a/code/modules/overmap/ships/computers/engine_control.dm b/code/modules/overmap/ships/computers/engine_control.dm index 3fde0717feb..14754da387f 100644 --- a/code/modules/overmap/ships/computers/engine_control.dm +++ b/code/modules/overmap/ships/computers/engine_control.dm @@ -48,7 +48,7 @@ rdata["eng_thrust"] = E.get_thrust() rdata["eng_thrust_limiter"] = round(E.get_thrust_limit()*100) rdata["eng_status"] = E.get_status() - rdata["eng_reference"] = "\ref[E]" + rdata["eng_reference"] = "[REF(E)]" total_thrust += E.get_thrust() enginfo.Add(list(rdata)) diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 715e4873bdd..7991b8d0b4d 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -171,7 +171,7 @@ rdata["name"] = R.fields["name"] rdata["x"] = R.fields["x"] rdata["y"] = R.fields["y"] - rdata["reference"] = "\ref[R]" + rdata["reference"] = "[REF(R)]" locations.Add(list(rdata)) data["locations"] = locations diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 2ff9bc851de..9c2bfe0459b 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -197,7 +197,7 @@ contacts.Add(list(list( "name"=contact.name, - "ref"="\ref[contact]", + "ref"="[REF(contact)]", "bearing"=bearing, "can_datalink"=(!(contact in connected.datalinked)), "distance"=distance, @@ -212,13 +212,13 @@ if(length(connected.datalink_requests)) var/list/local_datalink_requests = list() for(var/obj/effect/overmap/visitable/requestor in connected.datalink_requests) - local_datalink_requests.Add(list(list("name"=requestor.name, "ref"="\ref[requestor]"))) + local_datalink_requests.Add(list(list("name"=requestor.name, "ref"="[REF(requestor)]"))) data["datalink_requests"] = local_datalink_requests if(length(connected.datalinked)) var/list/local_datalinked = list() for(var/obj/effect/overmap/visitable/datalinked_ship in connected.datalinked) - local_datalinked.Add(list(list("name"=datalinked_ship.name, "ref"="\ref[datalinked_ship]"))) + local_datalinked.Add(list(list("name"=datalinked_ship.name, "ref"="[REF(datalinked_ship)]"))) data["datalinked"] = local_datalinked data["last_scan"] = last_scan diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index ee33920cb25..f07891e265e 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -12,7 +12,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/attack_hand(mob/user) @@ -58,7 +58,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov LAZYDISTINCTADD(viewers, WEAKREF(user)) if(linked) LAZYDISTINCTADD(linked.navigation_viewers, WEAKREF(user)) - ADD_TRAIT(user, TRAIT_COMPUTER_VIEW, ref(src)) + ADD_TRAIT(user, TRAIT_COMPUTER_VIEW, REF(src)) /// Handles disabling the user's overmap view when a signal comes in, primarily used when the TGUI is closed, see helm.dm and sensors.dm /obj/machinery/computer/ship/proc/handle_unlook_signal(var/datum/source, var/mob/user) @@ -94,7 +94,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov for(var/obj/machinery/computer/ship/sensors/sensor in linked.consoles) sensor.hide_contacts(user) - REMOVE_TRAIT(user, TRAIT_COMPUTER_VIEW, ref(src)) + REMOVE_TRAIT(user, TRAIT_COMPUTER_VIEW, REF(src)) /obj/machinery/computer/ship/proc/viewing_overmap(mob/user) return (WEAKREF(user) in viewers) || (linked && (WEAKREF(user) in linked.navigation_viewers)) diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 18b355bbfcd..6dedd6ceccc 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 d36b770ad02..8378465632b 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -63,7 +63,7 @@ var/list/admin_departments data["alertpdas"] = list() if (alert_pdas && alert_pdas.len) for (var/obj/item/modular_computer/pda in alert_pdas) - data["alertpdas"] += list(list("name" = "[alert_pdas[pda]]", "ref" = "\ref[pda]")) + data["alertpdas"] += list(list("name" = "[alert_pdas[pda]]", "ref" = "[REF(pda)]")) data["departments"] = list() for (var/dept in (alldepartments + admin_departments + broadcast_departments)) data["departments"] += "[dept]" @@ -295,7 +295,7 @@ var/list/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 7a96e957631..eec8e9cfa27 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 bf45c530c2f..8629ebd058b 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 aa05eff28c2..c1fa902985a 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -276,8 +276,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 a48895b54eb..8f74dd7342c 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -105,18 +105,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/power/apc.dm b/code/modules/power/apc.dm index da4b5c9fbaf..56e056cba6a 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -797,9 +797,9 @@ ABSTRACT_TYPE(/obj/machinery/power/apc) for(var/obj/item/implant/mindshield/ipc/I in H) if(I.implanted) return - if(SOFTREF(H) in hacked_ipcs) + if(REF(H) in hacked_ipcs) return - LAZYADD(hacked_ipcs, SOFTREF(H)) + LAZYADD(hacked_ipcs, REF(H)) infected = FALSE to_chat(H, SPAN_DANGER("F1L3 TR4NSF-#$/&ER-@4!#%!. New master detected: [hacker]! Obey their commands. Make sure to tell them that you are under their control, for now.")) if(issilicon(hacker)) diff --git a/code/modules/power/fusion/consoles/core_control.dm b/code/modules/power/fusion/consoles/core_control.dm index 755f64693bf..9c2281e302a 100644 --- a/code/modules/power/fusion/consoles/core_control.dm +++ b/code/modules/power/fusion/consoles/core_control.dm @@ -54,7 +54,7 @@ var/list/core = list() var/obj/machinery/power/fusion_core/C = fusion_cores[i] core["id"] = "#[i]" - core["ref"] = "\ref[C]" + core["ref"] = "[REF(C)]" core["field"] = !isnull(C.owned_field) core["power"] = "[C.field_strength / 10]" core["field_strength"] = C.field_strength diff --git a/code/modules/power/fusion/consoles/gyrotron_control.dm b/code/modules/power/fusion/consoles/gyrotron_control.dm index d9150d11589..3d997133297 100644 --- a/code/modules/power/fusion/consoles/gyrotron_control.dm +++ b/code/modules/power/fusion/consoles/gyrotron_control.dm @@ -58,7 +58,7 @@ var/list/gyrotron = list() var/obj/machinery/power/emitter/gyrotron/G = lan_gyrotrons[i] gyrotron["id"] = "#[i]" - gyrotron["ref"] = "\ref[G]" + gyrotron["ref"] = "[REF(G)]" gyrotron["active"] = G.active gyrotron["firedelay"] = G.rate gyrotron["energy"] = G.mega_energy diff --git a/code/modules/power/fusion/consoles/injector_control.dm b/code/modules/power/fusion/consoles/injector_control.dm index b120a7a3aee..1b0f8f0326f 100644 --- a/code/modules/power/fusion/consoles/injector_control.dm +++ b/code/modules/power/fusion/consoles/injector_control.dm @@ -77,7 +77,7 @@ var/list/injector = list() var/obj/machinery/fusion_fuel_injector/I = fuel_injectors[i] injector["id"] = "#[i]" - injector["ref"] = "\ref[I]" + injector["ref"] = "[REF(I)]" injector["injecting"] = I.injecting injector["fueltype"] = "[I.cur_assembly ? I.cur_assembly.fuel_type : "No fuel inserted."]" injector["depletion"] = I.cur_assembly ? (I.cur_assembly.percent_depleted * 100) : -1 //% diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 6d4984398b3..d298f6852e0 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) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index ac0a977a8a1..599df7a1bb7 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -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 dc14ba40085..d3060d95ee6 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() @@ -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/solar.dm b/code/modules/power/solar.dm index 2a9e84f7197..35803818b11 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/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index ce2a70c9159..09a33be1827 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -141,12 +141,12 @@ var/singleton/reagent/R = GET_SINGLETON(_R) dat += "
    [B.reagents.reagent_volumes[_R]] units of [R.name], " if (check_beaker_mixing(B)) - dat += text("Mixing ") + dat += text("Mixing ") else - dat += text("Not mixing ") + dat += text("Not mixing ") else dat += "nothing." - dat += " \[Eject\]
    " + dat += " \[Eject\]
    " i++ else dat += "There are no beakers inserted!

    " @@ -156,7 +156,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/psionics/complexus/complexus.dm b/code/modules/psionics/complexus/complexus.dm index daa8ef04d76..fd532d4e0fe 100644 --- a/code/modules/psionics/complexus/complexus.dm +++ b/code/modules/psionics/complexus/complexus.dm @@ -30,7 +30,7 @@ /datum/psi_complexus/proc/get_aura_image() if(_aura_image && !istype(_aura_image)) var/atom/A = _aura_image - LOG_DEBUG("Non-image found in psi complexus: \ref[A] - \the [A] - [istype(A) ? A.type : "non-atom"]") + LOG_DEBUG("Non-image found in psi complexus: [REF(A)] - \the [A] - [istype(A) ? A.type : "non-atom"]") destroy_aura_image(_aura_image) _aura_image = null if(!_aura_image) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 8e3da0385e3..87990552354 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -462,11 +462,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..." diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 4c023c550ec..81a6b9f7781 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/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 7142fc948e2..ce547415b54 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -366,21 +366,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) @@ -1562,29 +1562,29 @@ // expel the contents of the holder object, then delete it // called when the holder exits the outlet /obj/structure/disposaloutlet/proc/expel(var/obj/structure/disposalholder/H) - disposal_log("[src] \ref[src] expel(\ref[H])") + disposal_log("[src] [REF(src)] expel([REF(H)])") flick("outlet-open", src) playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0) - disposal_log("[src] (\ref[src]) registering timers.") + disposal_log("[src] ([REF(src)]) registering timers.") addtimer(CALLBACK(src, PROC_REF(post_expel, H)), 20, TIMER_UNIQUE|TIMER_CLIENT_TIME) // Sound + gas. addtimer(CALLBACK(src, PROC_REF(post_post_expel, H)), 20 + 5, TIMER_UNIQUE|TIMER_CLIENT_TIME) // Actually throwing the items. /obj/structure/disposaloutlet/proc/post_expel(obj/structure/disposalholder/H) playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0) - disposal_log("[src] (\ref[src]) post_expel() timer fired.") + disposal_log("[src] ([REF(src)]) post_expel() timer fired.") if(H) H.vent_gas(src.loc) /obj/structure/disposaloutlet/proc/throw_object(atom/movable/thing) - disposal_log("[src] (\ref[src]) throw_object([thing] \ref[thing]) at [target] \ref[target] origin [loc] \ref[loc]") + disposal_log("[src] ([REF(src)]) throw_object([thing] [REF(thing)]) at [target] [REF(target)] origin [loc] [REF(loc)]") thing.forceMove(loc) thing.pipe_eject(dir) if (!istype(thing, /mob/living/silicon/robot/drone)) thing.throw_at(target, 3, 1) /obj/structure/disposaloutlet/proc/post_post_expel(obj/structure/disposalholder/H) - disposal_log("[src] \ref[src] post_post_expel(\ref[H]), [H.contents.len] movables") + disposal_log("[src] [REF(src)] post_post_expel([REF(H)]), [H.contents.len] movables") for(var/atom/movable/AM in H) AM.forceMove(src.loc) AM.pipe_eject(dir) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index bf33f931666..f8094ca8d57 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 e0b787b69e0..571d6d30806 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 0fb5382d06b..bd7234bceba 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -304,9 +304,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 @@ -314,7 +314,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 @@ -322,12 +322,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

    " @@ -335,20 +335,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 2675cc22a84..d43089da16d 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 7b631b6c836..944849f0cdf 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 d749239c36e..4d549097a0a 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 0581ce5d47b..f4d09e96fc7 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) diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 81ea1e79779..2a2afabe50c 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -75,7 +75,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]
    " @@ -87,7 +87,7 @@ dat += "Anomaly material: [finds_as_strings[index]]
    " else dat += "Anomaly material: Unknown
    " - dat += "clear entry
    " + dat += "clear entry
    " else dat += "Select an entry from the list
    " dat += "
    " @@ -98,12 +98,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 157957049a8..6b231b95d82 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm @@ -62,16 +62,16 @@ /obj/item/device/beacon_locator/interact(var/mob/user as mob) var/dat = "Radio frequency tracker
    " dat += {" - Reset tracker
    + Reset tracker
    Frequency: - - - - + - + - [format_frequency(frequency)] - + - +
    + + + +
    "} - 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 225eacef005..77f82b83b90 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -75,16 +75,16 @@ 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/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 06fc1617a62..32cc84743f2 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/tgs/core/core.dm b/code/modules/tgs/core/core.dm index b9a9f27a28a..d6219fcd308 100644 --- a/code/modules/tgs/core/core.dm +++ b/code/modules/tgs/core/core.dm @@ -1,7 +1,7 @@ /world/TgsNew(datum/tgs_event_handler/event_handler, minimum_required_security_level = TGS_SECURITY_ULTRASAFE) var/current_api = TGS_READ_GLOBAL(tgs) if(current_api) - TGS_ERROR_LOG("API datum already set (\ref[current_api] ([current_api]))! Was TgsNew() called more than once?") + TGS_ERROR_LOG("API datum already set ([REF(current_api)] ([current_api]))! Was TgsNew() called more than once?") return if(!(minimum_required_security_level in list(TGS_SECURITY_ULTRASAFE, TGS_SECURITY_SAFE, TGS_SECURITY_TRUSTED))) diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm index 89bc541ba14..d3ff9ecf209 100644 --- a/code/modules/turbolift/turbolift_map.dm +++ b/code/modules/turbolift/turbolift_map.dm @@ -219,7 +219,7 @@ for(var/thing in floor_turfs) new area_path(thing) var/area/A = locate(area_path) - cfloor.set_area_ref("\ref[A]") + cfloor.set_area_ref("[REF(A)]") az++ // Place lift panel. diff --git a/code/unit_tests/mob_tests.dm b/code/unit_tests/mob_tests.dm index 4d76b760774..41a04d88035 100644 --- a/code/unit_tests/mob_tests.dm +++ b/code/unit_tests/mob_tests.dm @@ -136,7 +136,7 @@ test_result["result"] = SUCCESS test_result["msg"] = "Mob created" - test_result["mobref"] = "\ref[L]" + test_result["mobref"] = "[REF(L)]" if(add_to_playerlist) GLOB.player_list |= L diff --git a/html/changelogs/fluffyghost-ref.yml b/html/changelogs/fluffyghost-ref.yml new file mode 100644 index 00000000000..8f51ea9d57c --- /dev/null +++ b/html/changelogs/fluffyghost-ref.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - refactor: "Refactored all the backslash ref and ref() calls to use REF() instead." + - server: "Added a linting for raw ref proc calls." diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index 6e1b495966c..1876b0005b2 100755 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -122,6 +122,16 @@ else echo "PASS: All sounds are referenced with static paths" >> code_error.log fi +# Check that only the expected amount of raw ref proc calls are present +echo "Verifying no raw ref proc calls are being added" >> code_error.log +RAW_REF_BUILTIN_PROCS=`grep -r --include \*.dm -P --regexp='[^\w_]ref[\(\[]' | wc -l` +if [[ $RAW_REF_BUILTIN_PROCS -ne 3 ]]; then + ERROR_COUNT=$(($ERROR_COUNT+1)) + echo "FAIL: Found new raw ref proc calls in code" >> code_error.log +else + echo "PASS: Only the expected number of raw ref proc calls were found" >> code_error.log +fi + echo "Found $ERROR_COUNT errors while performing code check" if [ $ERROR_COUNT -ne 0 ]; then