") + dat += text("No [organ_name] detected.
") if(occ["sdisabilities"] & BLIND) - dat += text("Cataracts detected.
") + dat += text("Cataracts detected.
") if(occ["sdisabilities"] & NEARSIGHTED) - dat += text("Retinal misalignment detected.
") + dat += text("Retinal misalignment detected.
") return dat diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 7ee5ae75ea1..cb1c48ef51b 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -262,7 +262,7 @@ update_flag if (holding) release_log += "Valve was closed by [key_name(admin)] (aghost), stopping the transfer into the [holding]
" else - release_log += "Valve was closed by [key_name(admin)] (aghost), stopping the transfer into the air
" + release_log += "Valve was closed by [key_name(admin)] (aghost), stopping the transfer into the air
" else if (alert(admin, "The release valve is currently closed. Do you want to open it?", "Open the valve?", "Yes", "No") == "No") return @@ -270,7 +270,7 @@ update_flag if (holding) release_log += "Valve was opened by [key_name(admin)] (aghost), starting the transfer into the [holding]
" else - release_log += "Valve was opened by [key_name(admin)] (aghost), starting the transfer into the air
" + release_log += "Valve was opened by [key_name(admin)] (aghost), starting the transfer into the air
" log_open(admin) valve_open = !valve_open @@ -354,12 +354,12 @@ update_flag if (holding) release_log += "Valve was closed by [usr] ([usr.ckey]), stopping the transfer into the [holding]
" else - release_log += "Valve was closed by [usr] ([usr.ckey]), stopping the transfer into the air
" + release_log += "Valve was closed by [usr] ([usr.ckey]), stopping the transfer into the air
" else if (holding) release_log += "Valve was opened by [usr] ([usr.ckey]), starting the transfer into the [holding]
" else - release_log += "Valve was opened by [usr] ([usr.ckey]), starting the transfer into the air
" + release_log += "Valve was opened by [usr] ([usr.ckey]), starting the transfer into the air
" log_open() valve_open = !valve_open diff --git a/code/game/machinery/computer/arcade_orion.dm b/code/game/machinery/computer/arcade_orion.dm index 7063aef15dc..698510b76bb 100644 --- a/code/game/machinery/computer/arcade_orion.dm +++ b/code/game/machinery/computer/arcade_orion.dm @@ -455,7 +455,7 @@ to_chat(usr, "You're never going to make it to Orion...") var/mob/living/M = usr M.visible_message("\The [M] starts rapidly deteriorating.") - to_chat(M, browse (null,"window=arcade")) + show_browser(M, null, "window=arcade") for(var/i=0;i<10;i++) sleep(10) M.Stun(5) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 7cc34a9cebe..27da1e1acce 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -64,7 +64,7 @@ var/obj/item/paper/monitorkey/MK = new/obj/item/paper/monitorkey MK.forceMove(src.loc) // Will help make emagging the console not so easy to get away with. - MK.info += "
£%@%(*$%&(£&?*(%&£/{}" + MK.info += "
£%@%(*$%&(£&?*(%&£/{}" addtimer(CALLBACK(src, .proc/UnmagConsole), 100 * length(linkedServer.decryptkey)) message = rebootmsg update_icon() @@ -100,10 +100,10 @@ if(auth) dat += "
\[Authenticated\] /"
- dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]
"
+ dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]"
else
- dat += " \[Unauthenticated\] /"
- dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]
"
+ dat += " \[Unauthenticated\] /"
+ dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]
"
if(hacking || emag)
screen = 2
@@ -130,10 +130,10 @@
dat += "" diff --git a/code/game/machinery/computer/slotmachine.dm b/code/game/machinery/computer/slotmachine.dm index 46cc6e576ff..80f987d14dd 100644 --- a/code/game/machinery/computer/slotmachine.dm +++ b/code/game/machinery/computer/slotmachine.dm @@ -4,7 +4,7 @@ #define JACKPOT 10000 #define SPIN_TIME 65 #define REEL_DEACTIVATE_DELAY 7 -#define SEVEN "7" +#define SEVEN "7" /obj/machinery/computer/slot_machine name = "slot machine" @@ -24,7 +24,7 @@ var/jackpots = 0 var/list/coinvalues = list() var/list/reels = list(list("", "", "") = 0, list("", "", "") = 0, list("", "", "") = 0, list("", "", "") = 0, list("", "", "") = 0) - var/list/symbols = list(SEVEN = 1, "&" = 2, "@" = 2, "$" = 2, "?" = 2, "#" = 2, "!" = 2, "%" = 2) //if people are winning too much, multiply every number in this list by 2 and see if they are still winning too much. + var/list/symbols = list(SEVEN = 1, "&" = 2, "@" = 2, "$" = 2, "?" = 2, "#" = 2, "!" = 2, "%" = 2) //if people are winning too much, multiply every number in this list by 2 and see if they are still winning too much. light_color = LIGHT_COLOR_BROWN diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index a2037962801..23e8c05a5c7 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -608,7 +608,7 @@ About the new airlock wires panel: else if(duration) //electrify door for the given duration seconds if(usr) LAZYADD(shockedby, "\[[time_stamp()]\] - [usr](ckey:[usr.ckey])") - usr.attack_log += text("\[[time_stamp()]\] Electrified the [name] at [x] [y] [z]") + usr.attack_log += text("\[[time_stamp()]\] Electrified the [name] at [x] [y] [z]") else LAZYADD(shockedby, "\[[time_stamp()]\] - EMP)") message = "The door is now electrified [duration == -1 ? "permanently" : "for [duration] second\s"]." @@ -1004,7 +1004,7 @@ About the new airlock wires panel: else if(!activate) if(issilicon(usr) && !player_is_antag(usr.mind)) to_chat(usr, SPAN_NOTICE("The door bolts will raise in five seconds.")) - src.visible_message("\icon[src.icon] [src] announces, \"Bolts set to raise in FIVE SECONDS.\"") + src.visible_message("[icon2html(src.icon, viewers(get_turf(src)))] [src] announces, \"Bolts set to raise in FIVE SECONDS.\"") addtimer(CALLBACK(src, .proc/unlock), 50) else if(unlock()) to_chat(usr, SPAN_NOTICE("The door bolts have been raised.")) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index ed1c1bd2842..f708acf0a5d 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -417,9 +417,7 @@ /obj/machinery/door/proc/set_broken() stat |= BROKEN - for (var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message("[src.name] breaks!" ) + visible_message(SPAN_WARNING("[src] breaks!")) update_icon() return diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index a81757d6c7c..bb5e8da92a3 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -117,7 +117,7 @@ return if(T.get_blood_volume() < 90 && !blood_message_sent) - visible_message("\icon[src] \The [src] flashes a warning light!") + visible_message("[icon2html(src, viewers(get_turf(src)))] \The [src] flashes a warning light!") playsound(src, 'sound/machines/buzz-two.ogg', 50) blood_message_sent = TRUE diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 3246c42faf1..368bf2c33c2 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -286,7 +286,7 @@ Class Procs: /obj/machinery/proc/state(var/msg) for(var/mob/O in hearers(src, null)) - O.show_message("\icon[src] [msg]", 2) + O.show_message("[icon2html(src, O)] [msg]", 2) /obj/machinery/proc/ping(text=null) if (!text) diff --git a/code/game/machinery/mecha_fabricator.dm b/code/game/machinery/mecha_fabricator.dm index 9cb5eb165be..f5bf0d56163 100644 --- a/code/game/machinery/mecha_fabricator.dm +++ b/code/game/machinery/mecha_fabricator.dm @@ -226,7 +226,7 @@ if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) user.visible_message(SPAN_WARNING("[user] feeds the [target]'s hair into the [src] and flicks it on!"), SPAN_ALERT("You turn the [src] on!")) do_hair_pull(target) - user.attack_log += text("\[[time_stamp()]\] Has fed [target.name]'s ([target.ckey]) hair into a [src].") + user.attack_log += text("\[[time_stamp()]\] Has fed [target.name]'s ([target.ckey]) hair into a [src].") target.attack_log += text("\[[time_stamp()]\] Has had their hair fed into [src] by [user.name] ([user.ckey])") msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(target)] in a [src]. (JMP)",ckey=key_name(user),ckey_target=key_name(target)) else @@ -245,20 +245,20 @@ switch(emagged) if(0) emagged = 0.5 - visible_message("\icon[src] [src] beeps: \"DB error \[Code 0x00F1\]\"") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps: \"DB error \[Code 0x00F1\]\"") sleep(10) - visible_message("\icon[src] [src] beeps: \"Attempting auto-repair\"") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps: \"Attempting auto-repair\"") sleep(15) - visible_message("\icon[src] [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"") sleep(30) - visible_message("\icon[src] [src] beeps: \"User DB truncated. Please contact your [current_map.company_name] system operator for future assistance.\"") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps: \"User DB truncated. Please contact your [current_map.company_name] system operator for future assistance.\"") req_access = null emagged = 1 return 1 if(0.5) - visible_message("\icon[src] [src] beeps: \"DB not responding \[Code 0x0003\]...\"") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps: \"DB not responding \[Code 0x0003\]...\"") if(1) - visible_message("\icon[src] [src] beeps: \"No records in User DB\"") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps: \"No records in User DB\"") /obj/machinery/mecha_part_fabricator/proc/update_busy() if(queue.len) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 4856af19fe3..27e33ef836c 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -166,7 +166,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co switch(screen) if(0) dat += "Welcome to Newscasting Unit #[src.unit_no].
Interface & News networks Operational." - dat += "
Property of Nanotransen Inc" + dat += "
Property of Nanotransen Inc" if(SSnews.wanted_issue) dat+= "
Read Wanted Issue" dat+= "
Create Feed Channel" @@ -184,7 +184,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue" dat+="
Censor Feed Stories" dat+="
Mark Feed Channel with [current_map.company_name] D-Notice" - dat+="
The newscaster recognises you as: [src.scanned_user]" + dat+="
The newscaster recognises you as: [src.scanned_user]" if(1) dat+= "Station Feed Channels
" if( isemptylist(SSnews.network_channels) ) @@ -193,21 +193,21 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co 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) ? ("***") : null]
" + dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" dat+="
Refresh" dat+="
Back" if(2) dat+="Creating new Feed Channel..." dat+="
Channel Name: [src.channel_name]
" - dat+="Channel Author: [src.scanned_user]
" + dat+="Channel Author: [src.scanned_user]
" 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+="Message Author: [src.scanned_user]
" + 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")]" @@ -219,17 +219,17 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="Feed Channel [src.channel_name] created successfully.
" dat+="
Return
" if(6) - dat+="ERROR: Could not submit Feed story to Network.
" + dat+="ERROR: Could not submit Feed story to Network.
" if(src.channel_name=="") - dat+="�Invalid receiving channel name.
" + dat+="�Invalid receiving channel name.
" if(src.scanned_user=="Unknown") - dat+="�Channel author unverified.
" + dat+="�Channel author unverified.
" if(src.msg == "" || src.msg == "\[REDACTED\]") - dat+="�Invalid message body.
" + dat+="�Invalid message body.
" dat+="
Return
" if(7) - dat+="ERROR: Could not submit Feed Channel to Network.
" + dat+="ERROR: Could not submit Feed Channel to Network.
" var/list/existing_authors = list() for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) @@ -238,9 +238,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else existing_authors += FC.author if(src.scanned_user in existing_authors) - dat+="�There already exists a Feed channel under your name.
" + dat+="�There already exists a Feed channel under your name.
" if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") - dat+="�Invalid channel name.
" + dat+="�Invalid channel name.BR>" var/check = 0 for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) @@ -248,9 +248,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co check = 1 break if(check) - dat+="�Channel name already in use.
" + dat+="�Channel name already in use.
" if(src.scanned_user=="Unknown") - dat+="�Channel author unverified.
" + dat+="�Channel author unverified.
" dat+="
Return
" if(8) var/total_num=length(SSnews.network_channels) @@ -267,10 +267,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="
Print Paper" dat+="
Cancel" if(9) - dat+="[src.viewing_channel.channel_name]: \[created by: [src.viewing_channel.author]\]
" + dat+="[src.viewing_channel.channel_name]: \[created by: [src.viewing_channel.author]\]
" if(src.viewing_channel.censored) - dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
" - dat+="No further feed story additions are allowed while the D-Notice is in effect.
" + dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
" + dat+="No further feed story additions are allowed while the D-Notice is in effect.
" else if( isemptylist(src.viewing_channel.messages) ) dat+="No feed messages found in channel...
" @@ -278,68 +278,68 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/i = 0 for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) i++ - dat+="
[MESSAGE.body] \[Likes: [MESSAGE.likes] Dislikes: [MESSAGE.dislikes]\]
" + dat+="[MESSAGE.body] \[Likes: [MESSAGE.likes] Dislikes: [MESSAGE.dislikes]\]
" if(MESSAGE.img) - to_chat(usr, browse_rsc(MESSAGE.img, "tmp_photo[i].png")) + send_rsc(usr, MESSAGE.img, "tmp_photo[i].png") dat+="
" if(MESSAGE.caption) - dat+="[MESSAGE.caption]
" + dat+="[MESSAGE.caption]
" dat+="
" - dat+="View Comments Add Comment Like Story Dislike Story
" - dat+="\[Story by [MESSAGE.author] - [MESSAGE.time_stamp]\]
" + dat+="View Comments Add Comment Like Story Dislike Story
" + dat+="\[Story by [MESSAGE.author] - [MESSAGE.time_stamp]\]
" dat+="
Refresh" dat+="
Back" if(10) dat+="[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.
" - dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it." + dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it." dat+="
Select Feed channel to get Stories from:
" if(isemptylist(SSnews.network_channels)) dat+="No feed channels found active...
" else for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) - dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" + dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" dat+="
Cancel" if(11) dat+="[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" dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed" - dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
" + dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
" if(isemptylist(SSnews.network_channels)) dat+="No feed channels found active...
" else for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) - dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" + dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" 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.channel_name]: \[ created by: [src.viewing_channel.author] \]
" + dat+="[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
" if( isemptylist(src.viewing_channel.messages) ) dat+="No feed messages found in channel...
" 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+="-[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" if(13) - dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" + 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.
" if(src.viewing_channel.censored) - dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
" + dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.
" else if( isemptylist(src.viewing_channel.messages) ) dat+="No feed messages found in channel...
" 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+="\[Story by [MESSAGE.author] - [MESSAGE.time_stamp]\]
" + dat+="
[MESSAGE.body] \[Likes: [MESSAGE.likes] Dislikes: [MESSAGE.dislikes]\]
" + dat+="View Comments Add Comment Like Story Dislike Story
" + dat+="\[Story by [MESSAGE.author] - [MESSAGE.time_stamp]\]
" dat+="
Back" if(14) @@ -351,54 +351,54 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co end_param = 2 if(wanted_already) - dat+="
A wanted issue is already in Feed Circulation. You can edit or cancel it below." + 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")]" if(wanted_already) - dat+="Wanted Issue created by: [SSnews.wanted_issue.backup_author]
" + dat+="Wanted Issue created by: [SSnews.wanted_issue.backup_author]
" else - dat+="Wanted Issue will be created under prosecutor: [src.scanned_user]
" + dat+="Wanted Issue will be created under prosecutor: [src.scanned_user]
" dat+="
[(wanted_already) ? ("Edit Issue") : ("Submit")]" if(wanted_already) dat+="
Take down Issue" dat+="
Cancel" if(15) - dat+="Wanted issue for [src.channel_name] is now in Network Circulation.
" + dat+="Wanted issue for [src.channel_name] is now in Network Circulation.
" dat+="
Return
" if(16) - dat+="ERROR: Wanted Issue rejected by Network.
" + dat+="ERROR: Wanted Issue rejected by Network.
" if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") - dat+="�Invalid name for person wanted.
" + dat+="�Invalid name for person wanted.
" if(src.scanned_user=="Unknown") - dat+="�Issue author unverified.
" + dat+="�Issue author unverified.
" if(src.msg == "" || src.msg == "\[REDACTED\]") - dat+="�Invalid description.
" + dat+="�Invalid description.
" dat+="
Return
" if(17) dat+="Wanted Issue successfully deleted from Circulation
" dat+="
Return
" if(18) - dat+="-- STATIONWIDE WANTED ISSUE --
\[Submitted by: [SSnews.wanted_issue.backup_author]\]
" + dat+="-- STATIONWIDE WANTED ISSUE --
\[Submitted by: [SSnews.wanted_issue.backup_author]\]
" dat+="Criminal: [SSnews.wanted_issue.author]
" dat+="Description: [SSnews.wanted_issue.body]
" dat+="Photo:: " if(SSnews.wanted_issue.img) - to_chat(usr, browse_rsc(SSnews.wanted_issue.img, "tmp_photow.png")) + send_rsc(usr, SSnews.wanted_issue.img, "tmp_photow.png") dat+="
"
else
dat+="None"
dat+="Back
" if(19) - dat+="Wanted issue for [src.channel_name] successfully edited.
" + dat+="Wanted issue for [src.channel_name] successfully edited.
" dat+="
Return
" if(20) - dat+="Printing successful. Please receive your newspaper from the bottom of the machine.
" + dat+="Printing successful. Please receive your newspaper from the bottom of the machine.
" dat+="Return" if(21) - dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personnel to refill machine storage.
" + dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personnel to refill machine storage.
" dat+="Return" if(22) //comments! dat+="Comments:" @@ -830,11 +830,11 @@ obj/item/newspaper/attack_self(mob/user as mob) src.pages = 0 switch(screen) if(0) //Cover - dat+="
The Griffon
"
- dat+="[current_map.company_name]-standard newspaper, for use on [current_map.company_name]� Space Facilities
" + dat+="
The Griffon
"
+ dat+="[current_map.company_name]-standard newspaper, for use on [current_map.company_name]� Space Facilities
" if(isemptylist(src.news_content)) if(src.important_message) - dat+="Contents:
- **Important Security Announcement** \[page [src.pages+2]\]
- **Important Security Announcement** \[page [src.pages+2]\]
" + dat+="**Important Security Announcement** \[page [src.pages+2]\]
" var/temp_page=0 for(var/datum/feed_channel/NP in src.news_content) temp_page++ - dat+="[NP.channel_name] \[page [temp_page+1]\]
" + dat+="[NP.channel_name] \[page [temp_page+1]\]
" dat+="" if(scribble_page==curr_page) dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" @@ -855,9 +855,9 @@ obj/item/newspaper/attack_self(mob/user as mob) for(var/datum/feed_channel/NP in src.news_content) src.pages++ //Let's get it right again. var/datum/feed_channel/C = src.news_content[src.curr_page] - dat+="[C.channel_name] \[created by: [C.author]\]
" + dat+="[C.channel_name] \[created by: [C.author]\]
" if(C.censored) - dat+="This channel was deemed dangerous to the general welfare of the station and therefore marked with a D-Notice. Its contents were not transferred to the newspaper at the time of printing." + dat+="This channel was deemed dangerous to the general welfare of the station and therefore marked with a D-Notice. Its contents were not transferred to the newspaper at the time of printing." else if(isemptylist(C.messages)) dat+="No Feed stories stem from this channel..." @@ -868,9 +868,9 @@ obj/item/newspaper/attack_self(mob/user as mob) i++ dat+="-[MESSAGE.body]
" if(MESSAGE.img) - to_chat(user, browse_rsc(MESSAGE.img, "tmp_photo[i].png")) + send_rsc(usr, MESSAGE.img, "tmp_photo[i].png") dat+="
" - dat+="\[[MESSAGE.message_type] by [MESSAGE.author]\]
" + dat+="\[[MESSAGE.message_type] by [MESSAGE.author]\]
" dat+="" if(scribble_page==curr_page) dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" @@ -879,12 +879,12 @@ obj/item/newspaper/attack_self(mob/user as mob) for(var/datum/feed_channel/NP in src.news_content) src.pages++ if(src.important_message!=null) - dat+="
Wanted Issue:
" - dat+="Criminal name: [important_message.author]
" + dat+="
Wanted Issue:
" + dat+="Criminal name: [important_message.author]
" dat+="Description: [important_message.body]
" dat+="Photo:: " if(important_message.img) - to_chat(user, browse_rsc(important_message.img, "tmp_photow.png")) + send_rsc(user, important_message.img, "tmp_photow.png") dat+="
"
else
dat+="None"
@@ -939,7 +939,7 @@ obj/item/newspaper/Topic(href, href_list)
obj/item/newspaper/attackby(obj/item/W as obj, mob/user as mob)
if(W.ispen())
if(src.scribble_page == src.curr_page)
- to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?")
+ to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?")
else
var/s = sanitize(input(user, "Write something", "Newspaper", ""))
s = sanitize(s)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 8271ce4d196..1880f1f4919 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -254,7 +254,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
screen = RCS_SENTPASS
message_log += "Message sent to [recipient][message]" else - audible_message(text("\icon[src] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4) + audible_message(text("[icon2html(src, viewers(get_turf(src)))] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4) //Handle screen switching if(href_list["setScreen"]) @@ -386,7 +386,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(inoperable(MAINT)) return if(screen == RCS_MESSAUTH) var/obj/item/stamp/T = O - msgStamped = text("Stamped with the [T.name]") + msgStamped = text("Stamped with the [T.name]") updateUsrDialog() else if (istype(O, /obj/item/paper_bundle)) if(lid) //More of that restocking business @@ -395,7 +395,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() user.drop_from_inventory(C,get_turf(src)) qdel(C) for (var/mob/U in hearers(4, src.loc)) - U.show_message(text("\icon[src] *The Requests Console beeps: 'Paper added.'")) + U.show_message(text("[icon2html(src, viewers(get_turf(src)))] *The Requests Console beeps: 'Paper added.'")) else to_chat(user, "I should open the lid to add more paper, or try faxing one paper at a time.") else if (istype(O, /obj/item/paper)) @@ -405,7 +405,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() qdel(C) paperstock++ for (var/mob/U in hearers(4, src.loc)) - U.show_message(text("\icon[src] *The Requests Console beeps: 'Paper added.'")) + U.show_message(text("[icon2html(src, viewers(get_turf(src)))] *The Requests Console beeps: 'Paper added.'")) else if(screen == 0) //Faxing them papers var/pass = 0 var/sendto = input("Select department.", "Send Fax", null, null) in allConsoles @@ -453,12 +453,12 @@ var/list/obj/machinery/requests_console/allConsoles = list() P.set_content_unsafe(pname, info) Console.print(P, 0, 'sound/machines/twobeep.ogg') for (var/mob/player in hearers(4, Console.loc)) - player.show_message(text("\icon[Console] *The Requests Console beeps: 'Fax received'")) + player.show_message(text("[icon2html(Console, viewers(get_turf(Console)))] *The Requests Console beeps: 'Fax received'")) Console.paperstock-- if(sent == 1) - user.show_message(text("\icon[src] *The Requests Console beeps: 'Message Sent.'")) + user.show_message(text("[icon2html(src, viewers(get_turf(src)))] *The Requests Console beeps: 'Message Sent.'")) else - user.show_message(text("\icon[src] *The Requests Console beeps: 'NOTICE: No server detected!'")) + user.show_message(text("[icon2html(src, viewers(get_turf(src)))] *The Requests Console beeps: 'NOTICE: No server detected!'")) return diff --git a/code/game/machinery/ringer.dm b/code/game/machinery/ringer.dm index a7fc6e084b1..5437122b70e 100644 --- a/code/game/machinery/ringer.dm +++ b/code/game/machinery/ringer.dm @@ -112,7 +112,7 @@ continue var/message = "Notification from \the [department]!" - pda.new_info(pda.message_silent, pda.ttone, "\icon[pda] [message]") + pda.new_info(pda.message_silent, pda.ttone, "[icon2html(pda, viewers(get_turf(pda)))] [message]") addtimer(CALLBACK(src, .proc/unping), 45 SECONDS) diff --git a/code/game/machinery/suit_cycler.dm b/code/game/machinery/suit_cycler.dm index 5a1bd3e3354..7de8c91835f 100644 --- a/code/game/machinery/suit_cycler.dm +++ b/code/game/machinery/suit_cycler.dm @@ -338,10 +338,10 @@ var/dat = "" if(src.active) - dat += "The [model_text ? "[model_text] " : ""]suit cycler is currently in use. Please wait..." + dat += "The [model_text ? "[model_text] " : ""]suit cycler is currently in use. Please wait..." else if(locked) - dat += "The [model_text ? "[model_text] " : ""]suit cycler is currently locked. Please contact your system administrator." + dat += "The [model_text ? "[model_text] " : ""]suit cycler is currently locked. Please contact your system administrator." if(src.allowed(usr)) dat += "
\[unlock unit\]" else @@ -510,7 +510,7 @@ occupant.apply_effect(radiation_level * 10, IRRADIATE) /obj/machinery/suit_cycler/proc/finished_job() - visible_message("\icon[src] \The [src] pings loudly.") + visible_message("[icon2html(src, viewers(get_turf(src)))] \The [src] pings loudly.") playsound(loc, 'sound/machines/ping.ogg', 50, FALSE) active = FALSE update_icon() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index fed420bf68c..c2b2e2bd07a 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -114,8 +114,8 @@ 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" : "RED"),src) + 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" : "RED"),src) dat+= text("
Close panel", user) //user << browse(dat, "window=ssu_m_panel;size=400x500") //onclose(user, "ssu_m_panel") @@ -129,7 +129,7 @@ else if(!src.isbroken) dat+= "" - dat+= "U-Stor-It Suit Storage Unit, model DS1900
" + dat+= "U-Stor-It Suit Storage Unit, model DS1900
" dat+= "Welcome to the Unit control panel.
" dat+= text("Helmet storage compartment: []
",(src.HELMET ? HELMET.name : "No helmet detected.") ) if(HELMET && src.isopen) @@ -227,7 +227,7 @@ if(!protected) playsound(src.loc, /decl/sound_category/spark_sound, 75, 1, -1) - to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.") + to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.") return*/ else //welp, the guy is protected, we can continue if(src.issuperUV) @@ -253,7 +253,7 @@ if(!protected) playsound(src.loc, /decl/sound_category/spark_sound, 75, 1, -1) - to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.") + to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.") return*/ else to_chat(user, "You push the button. The coloured LED next to it changes.") @@ -305,7 +305,7 @@ /obj/machinery/suit_storage_unit/proc/toggle_open(mob/user as mob) if(src.islocked || src.isUV) - to_chat(user, "Unable to open unit.") + to_chat(user, "Unable to open unit.") return if(src.OCCUPANT) src.eject_occupant(user) @@ -316,7 +316,7 @@ /obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user as mob) if(src.OCCUPANT && src.safetieson) - to_chat(user, "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments.") + to_chat(user, "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments.") return if(src.isopen) return @@ -328,10 +328,10 @@ if(src.isUV || src.isopen) //I'm bored of all these sanity checks return if(src.OCCUPANT && src.safetieson) - to_chat(user, "WARNING: Biological entity detected in the confines of the Unit's storage. Cannot initiate cycle.") + to_chat(user, "WARNING: Biological entity detected in the confines of the Unit's storage. Cannot initiate cycle.") return if(!src.HELMET && !src.MASK && !src.SUIT && !src.OCCUPANT ) //shit's empty yo - to_chat(user, "Unit storage bays empty. Nothing to disinfect -- Aborting.") + to_chat(user, "Unit storage bays empty. Nothing to disinfect -- Aborting.") return to_chat(user, "You start the Unit's cauterisation cycle.") src.cycletime_left = 20 @@ -372,7 +372,7 @@ src.SUIT = null if(src.MASK) src.MASK = null - visible_message("With a loud whining noise, [src]'s door grinds open. Puffs of ashen smoke come out of its chamber.", range = 3) + visible_message("With a loud whining noise, [src]'s door grinds open. Puffs of ashen smoke come out of its chamber.", range = 3) src.isbroken = 1 src.isopen = 1 src.islocked = 0 @@ -396,9 +396,9 @@ if (src.OCCUPANT.client) if(user != OCCUPANT) - to_chat(OCCUPANT, "The machine kicks you out!") + to_chat(OCCUPANT, "The machine kicks you out!") if(user.loc != src.loc) - to_chat(OCCUPANT, "You leave the not-so-cozy confines of the SSU.") + to_chat(OCCUPANT, "You leave the not-so-cozy confines of the SSU.") src.OCCUPANT.client.eye = src.OCCUPANT.client.mob src.OCCUPANT.client.perspective = MOB_PERSPECTIVE @@ -432,13 +432,13 @@ if (usr.stat != 0) return if (!src.isopen) - to_chat(usr, "The unit's doors are shut.") + to_chat(usr, "The unit's doors are shut.") return if (!src.ispowered || src.isbroken) - to_chat(usr, "The unit is not operational.") + to_chat(usr, "The unit is not operational.") return if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) - to_chat(usr, "It's too cluttered inside for you to fit in!") + to_chat(usr, "It's too cluttered inside for you to fit in!") return usr.visible_message("[usr] starts squeezing into [src]!", "You start squeezing into [src]!", range = 3) if(do_after(usr, 10)) @@ -464,7 +464,7 @@ if(I.isscrewdriver()) src.panelopen = !src.panelopen playsound(src.loc, I.usesound, 100, 1) - to_chat(user, text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") )) + to_chat(user, text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") )) update_icon() src.updateUsrDialog() return @@ -473,13 +473,13 @@ if( !(ismob(G.affecting)) ) return if (!src.isopen) - to_chat(usr, "The unit's doors are shut.") + to_chat(usr, "The unit's doors are shut.") return if (!src.ispowered || src.isbroken) - to_chat(usr, "The unit is not operational.") + to_chat(usr, "The unit is not operational.") return if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty - to_chat(user, "The unit's storage area is too cluttered.") + to_chat(user, "The unit's storage area is too cluttered.") return user.visible_message("[user] starts putting [G.affecting] into [src].", "You start putting [G.affecting] into [src].", range = 3) if(do_after(user, 20)) @@ -502,7 +502,7 @@ return var/obj/item/clothing/suit/space/S = I if(src.SUIT) - to_chat(user, "The unit already contains a suit.") + to_chat(user, "The unit already contains a suit.") return to_chat(user, "You load the [S.name] into the storage compartment.") user.drop_from_inventory(S,src) @@ -515,7 +515,7 @@ return var/obj/item/clothing/head/helmet/H = I if(src.HELMET) - to_chat(user, "The unit already contains a helmet.") + to_chat(user, "The unit already contains a helmet.") return to_chat(user, "You load the [H.name] into the storage compartment.") user.drop_from_inventory(H,src) @@ -528,7 +528,7 @@ return var/obj/item/clothing/mask/M = I if(src.MASK) - to_chat(user, "The unit already contains a mask.") + to_chat(user, "The unit already contains a mask.") return to_chat(user, "You load the [M.name] into the storage compartment.") user.drop_from_inventory(M,src) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index c8e04cedae6..99118a82321 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -232,7 +232,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/list/obj/item/device/radio/radios = list() // --- Gets the accent icon, if there is any --- - var/accent_icon = M.get_accent_icon(speaking) + var/accent_icon = M.get_accent_icon(speaking, M) // --- Broadcast only to intercom devices --- @@ -352,8 +352,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/part_a = "[accent_icon ? accent_icon + " " : ""]\[[freq_text]\][part_b_extra] " // goes in the actual output // --- Some more pre-message formatting --- - var/part_b = " " + var/part_b = " " // Tweaked for security headsets -- TLE + var/part_c = "" // --- Filter the message; place it in quotes apply a verb --- @@ -411,33 +411,33 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept if (length(heard_masked)) for (var/mob/R in heard_masked) - R.hear_radio(message,verbage, speaking, part_a, part_b, M, 0, name) + R.hear_radio(message, verbage, speaking, part_a, part_b, part_c, M, 0, name) /* --- Process all the mobs that heard the voice normally (understood) --- */ if (length(heard_normal)) for (var/mob/R in heard_normal) - R.hear_radio(message, verbage, speaking, part_a, part_b, M, 0, realname) + R.hear_radio(message, verbage, speaking, part_a, part_b, part_c, M, 0, realname) /* --- Process all the mobs that heard the voice normally (did not understand) --- */ if (length(heard_voice)) for (var/mob/R in heard_voice) - R.hear_radio(message,verbage, speaking, part_a, part_b, M,0, vname) + R.hear_radio(message,verbage, speaking, part_a, part_b, part_c, M,0, vname) /* --- Process all the mobs that heard a garbled voice (did not understand) --- */ // Displays garbled message (ie "f*c* **u, **i*er!") if (length(heard_garbled)) for (var/mob/R in heard_garbled) - R.hear_radio(message, verbage, speaking, part_a, part_b, M, 1, vname) + R.hear_radio(message, verbage, speaking, part_a, part_b, part_c, M, 1, vname) /* --- Complete gibberish. Usually happens when there's a compressed message --- */ if (length(heard_gibberish)) for (var/mob/R in heard_gibberish) - R.hear_radio(message, verbage, speaking, part_a, part_b, M, 1) + R.hear_radio(message, verbage, speaking, part_a, part_b, part_c, M, 1) return 1 diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index fe63888a87d..3a7919df9fc 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -343,13 +343,13 @@ // This is not a status display message, since it's something the character // themselves is meant to see BEFORE putting the money in - to_chat(usr, "\icon[cashmoney] That is not enough money.") + to_chat(user, "[icon2html(cashmoney, user)] That is not enough money.") return 0 if(istype(cashmoney, /obj/item/spacecash/bundle)) // Bundles can just have money subtracted, and will work - visible_message("\The [usr] inserts some cash into \the [src].") + visible_message("\The [user] inserts some cash into \the [src].") var/obj/item/spacecash/bundle/cashmoney_bundle = cashmoney cashmoney_bundle.worth -= currently_vending.price @@ -364,9 +364,9 @@ // This is really dirty, but there's no superclass for all bills, so we // just assume that all spacecash that's not something else is a bill - visible_message("\The [usr] inserts a bill into \the [src].") + visible_message("\The [user] inserts a bill into \the [src].") var/left = cashmoney.worth - currently_vending.price - usr.drop_from_inventory(cashmoney,get_turf(src)) + user.drop_from_inventory(cashmoney,get_turf(src)) qdel(cashmoney) if(left) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 006d6d7f5a4..159e3dba572 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1157,7 +1157,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS)) // src.client is so that ghosts don't have to listen to rats if(istype(M, /mob/abstract/new_player)) continue - M.show_message("PDA Message - [owner] -> [P.owner]: ") + M.show_message("PDA Message - [owner] -> [P.owner]: ") if(!conversations.Find("\ref[P]")) conversations.Add("\ref[P]") @@ -1173,7 +1173,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if (!beep_silent) playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(2, loc)) - O.show_message(text("\icon[src] *[message_tone]*")) + O.show_message(text("[icon2html(src, O)] *[message_tone]*")) //Search for holder of the PDA. var/mob/living/L = null if(loc && isliving(loc)) @@ -1188,7 +1188,7 @@ var/global/list/obj/item/device/pda/PDAs = list() SSnanoui.update_user_uis(L, src) // Update the receiving user's PDA UI so that they can see the new message /obj/item/device/pda/proc/new_news(var/message) - new_info(news_silent, newstone, news_silent ? "" : "\icon[src] [message]") + new_info(news_silent, newstone, news_silent ? "" : "[icon2html(src, viewers(get_turf(src)))] [message]") if(!news_silent) new_news = 1 @@ -1201,7 +1201,7 @@ var/global/list/obj/item/device/pda/PDAs = list() new_message(sending_device, sending_device.owner, sending_device.ownjob, message) /obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message) - var/reception_message = "\icon[src] Message from [sender] ([sender_job]), \"[message]\" (Reply)" + var/reception_message = "[icon2html(src, viewers(get_turf(src)))] Message from [sender] ([sender_job]), \"[message]\" (Reply)" new_info(message_silent, ttone, reception_message) log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]",ckey=key_name(usr),ckey_target=key_name(name)) @@ -1213,7 +1213,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(ismob(sending_unit.loc) && isAI(loc)) track = "(Follow)" - var/reception_message = "\icon[src] Message from [sender] ([sender_job]), \"[message]\" (Reply) [track]" + var/reception_message = "[icon2html(src, viewers(get_turf(src)))] Message from [sender] ([sender_job]), \"[message]\" (Reply) [track]" new_info(message_silent, newstone, reception_message) log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]",ckey=key_name(usr),ckey_target=key_name(name)) @@ -1534,7 +1534,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/CouldUseTopic(var/mob/user) ..() if(iscarbon(user)) - playsound(src, 'sound/machines/pda_click.ogg', 20) + playsound(loc, 'sound/machines/pda_click.ogg', 20) //Some spare PDAs in a box /obj/item/storage/box/PDAs diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 998b3b8849d..decfc71dc42 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -36,7 +36,7 @@ if(!user || !M) return //sanity M.attack_log += text("\[[time_stamp()]\] Has been flashed (attempt) with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to flash [M.name] ([M.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to flash [M.name] ([M.ckey])") msg_admin_attack("[user.name] ([user.ckey]) Used the [src.name] to flash [M.name] ([M.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm index f2e201e6972..d917004def6 100644 --- a/code/game/objects/items/devices/hacktool.dm +++ b/code/game/objects/items/devices/hacktool.dm @@ -57,7 +57,7 @@ to_chat(user, SPAN_WARNING("You are already hacking this door!")) return 0 if(!is_type_in_list(target, supported_types)) - to_chat(user, "\icon[src] Unable to hack this target!") + to_chat(user, "[icon2html(src, user)] Unable to hack this target!") return 0 if(istype(target, /obj/machinery/door/airlock)) var/obj/machinery/door/airlock/door = target diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 6ebed0a65ee..8ea33bfff20 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -205,7 +205,7 @@ var/global/list/default_medbay_channels = list( /obj/item/device/radio/CouldUseTopic(var/mob/user) ..() if(clicksound && iscarbon(user)) - playsound(src, clicksound, clickvol) + playsound(loc, clicksound, clickvol) /obj/item/device/radio/Topic(href, href_list) if(..()) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index c4ffae25ca8..54497109cf4 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -565,14 +565,14 @@ BREATH ANALYZER if(0 to 25) to_chat(user,"Subject oxygen levels nominal.") if(25 to 50) - to_chat(user,"Subject oxygen levels abnormal.") + to_chat(user,"Subject oxygen levels abnormal.") if(50 to INFINITY) - to_chat(user,"Severe oxygen deprivation detected.") + to_chat(user,"Severe oxygen deprivation detected.") var/obj/item/organ/internal/L = H.internal_organs_by_name[BP_LUNGS] if(istype(L)) if(L.is_bruised()) - to_chat(user,"Ruptured lung detected.") + to_chat(user,"Ruptured lung detected.") else if(L.is_damaged()) to_chat(user,"Damaged lung detected.") else @@ -588,11 +588,11 @@ BREATH ANALYZER if(INTOX_MUSCLEIMP to INTOX_VOMIT) additional_string = "\[MODERATELY INTOXICATED\]" if(INTOX_VOMIT to INTOX_BALANCE) - additional_string = "\[HEAVILY INTOXICATED\]" + additional_string = "\[HEAVILY INTOXICATED\]" if(INTOX_BALANCE to INTOX_DEATH) - additional_string = "\[ALCOHOL POISONING LIKELY\]" + additional_string = "\[ALCOHOL POISONING LIKELY\]" if(INTOX_DEATH to INFINITY) - additional_string = "\[DEATH IMMINENT\]" + additional_string = "\[DEATH IMMINENT\]" to_chat(user,"Blood Alcohol Content: [round(bac,0.01)] [additional_string]") if(H.breathing && H.breathing.total_volume) diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 1e58472222a..b0935bfd885 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -35,7 +35,7 @@ effective or pretty fucking useless. to_chat(user, "The mind batterer has been burnt out!") return - user.attack_log += text("\[[time_stamp()]\] Used [src] to knock down people in the area.") + user.attack_log += text("\[[time_stamp()]\] Used [src] to knock down people in the area.") for(var/mob/living/carbon/human/M in orange(10, user)) spawn() diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 2b0ba8fffcb..6ec95ba7bd9 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -68,7 +68,7 @@ H.forceMove(present) H.attack_log += text("\[[time_stamp()]\] Has been wrapped with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to wrap [H.name] ([H.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to wrap [H.name] ([H.ckey])") msg_admin_attack("[key_name_admin(user)] used [src] to wrap [key_name_admin(H)] (JMP)",ckey=key_name(user),ckey_target=key_name(H)) else @@ -101,7 +101,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))) diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 223ad387b3d..bfbc6d4d444 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -109,13 +109,13 @@ if(0) damage_desc = "Unknown" if(1 to 5) - damage_desc = "negligible" + damage_desc = "negligible" if(5 to 15) - damage_desc = "light" + damage_desc = "light" if(15 to 30) damage_desc = "moderate" if(30 to 1000) - damage_desc = "severe" + damage_desc = "severe" if(!total_score) total_score = D.organs_scanned.len diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index f4d462ef2f1..c88f0ef1589 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -139,10 +139,10 @@ var/const/NO_EMAG_ACT = -50 /obj/item/card/id/proc/prevent_tracking() return 0 -/obj/item/card/id/proc/show(mob/user as mob) +/obj/item/card/id/proc/show(mob/user) if(front && side) - to_chat(user, browse_rsc(front, "front.png")) - to_chat(user, browse_rsc(side, "side.png")) + send_rsc(user, front, "front.png") + send_rsc(user, side, "side.png") var/datum/browser/popup = new(user, "idcard", name, 650, 260) popup.set_content(dat()) popup.set_title_image(usr.browse_rsc_icon(src.icon, src.icon_state)) @@ -214,8 +214,8 @@ var/const/NO_EMAG_ACT = -50 to_chat(user, "Biometric Imprinting successful!") return - for(var/mob/O in viewers(user, null)) - O.show_message(text("[] shows you: \icon[] []: assignment: []", user, src, src.name, src.assignment), 1) + user.visible_message("[user] shows you: [icon2html(src, viewers(get_turf(src)))] [src.name]. The assignment on the card: [src.assignment]",\ + "You flash your ID card: [icon2html(src, viewers(get_turf(src)))] [src.name]. The assignment on the card: [src.assignment]") src.add_fingerprint(user) return @@ -280,7 +280,7 @@ var/const/NO_EMAG_ACT = -50 set category = "Object" set src in usr - to_chat(usr, text("\icon[] []: The current assignment on the card is [].", src, src.name, src.assignment)) + to_chat(usr, text("[icon2html(src, usr)] []: The current assignment on the card is [].", src.name, src.assignment)) to_chat(usr, "The age on the card is [age].") to_chat(usr, "The citizenship on the card is [citizenship].") to_chat(usr, "The religion on the card is [religion].") diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index c8d08b2e2d5..af11666b7f5 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -138,7 +138,7 @@ injected_with_monkey = " (MONKEY)" M.attack_log += text("\[[time_stamp()]\] Has been injected with [name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [name] to inject [M.name] ([M.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [name] to inject [M.name] ([M.ckey])") log_attack("[user.name] ([user.ckey]) used the [name] to inject [M.name] ([M.ckey])",ckey=key_name(user),ckey_target=key_name(M)) message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with \the [src][injected_with_monkey]") diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 7669c8d0624..e1ffa736074 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -125,7 +125,7 @@ if(!ptank) to_chat(user, "Attach a phoron tank first!") return - var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
\n Tank Pressure: [ptank.air_contents.return_pressure()]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove phorontank - Close") + var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
\n Tank Pressure: [ptank.air_contents.return_pressure()]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove phorontank - Close") user << browse(dat, "window=flamethrower;size=600x300") onclose(user, "flamethrower") return diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 881cce7ec25..86d4cbc2f5b 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -75,7 +75,7 @@ if(user) H.attack_log += text("\[[time_stamp()]\] Has been handcuffed (attempt) by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Attempted to handcuff [H.name] ([H.ckey])") + user.attack_log += text("\[[time_stamp()]\] Attempted to handcuff [H.name] ([H.ckey])") msg_admin_attack("[key_name_admin(user)] attempted to handcuff [key_name_admin(H)] (JMP)",ckey=key_name(user),ckey_target=key_name(H)) feedback_add_details("handcuffs","H") @@ -118,7 +118,7 @@ var/s = SPAN_WARNING("[H] chews on [H.get_pronoun("his")] [O.name]!") H.visible_message(s, SPAN_WARNING("You chew on your [O.name]!")) message_admins("[key_name_admin(H)] is chewing on [H.get_pronoun("his")] restrained hand - (JMP)") - H.attack_log += text("\[[time_stamp()]\] [s] ([H.ckey])") + H.attack_log += text("\[[time_stamp()]\] [s] ([H.ckey])") log_attack("[s] ([H.ckey])",ckey=key_name(H)) if(O.take_damage(3, 0, damage_flags = DAM_SHARP|DAM_EDGE, used_weapon = "teeth marks")) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 1f8c6a479cc..4fda369c4b9 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -489,7 +489,7 @@ the implant may become unstable and either pre-maturely inject the subject or si Implant Specifications:
Name: Cybersun Industries Adrenalin Implant
Life: Five days.
-Important Notes: Illegal
+Important Notes: Illegal
Implant Details: Subjects injected with implant can activate a massive injection of adrenalin.
Function: Contains nanobots to stimulate body to mass-produce Adrenalin.
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 6ff142c92a9..c7d6b7aa513 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -202,7 +202,7 @@ user.visible_message(SPAN_WARNING("\The [user] tags \the [M] with \the [src]!"), SPAN_NOTICE("You tag \the [M] with \the [src]."), range = 3) M.attack_log += text("\[[time_stamp()]\] Implanted with [src.name] ([src.ipc_tag.name]) by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] ([src.ipc_tag.name]) to implant [M.name] ([M.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] ([src.ipc_tag.name]) to implant [M.name] ([M.ckey])") msg_admin_attack("[key_name_admin(user)] implanted [key_name_admin(M)] with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) ipc_tag.replaced(H, H.organs_by_name[BP_HEAD]) diff --git a/code/game/objects/items/weapons/implants/implantfreedom.dm b/code/game/objects/items/weapons/implants/implantfreedom.dm index d86051b2e3a..5a0360deb7e 100644 --- a/code/game/objects/items/weapons/implants/implantfreedom.dm +++ b/code/game/objects/items/weapons/implants/implantfreedom.dm @@ -58,7 +58,7 @@ Implant Specifications:
Name: Freedom Beacon
Life: optimum 5 uses
-Important Notes: Illegal
+Important Notes: Illegal
Implant Details:
Function: Transmits a specialized cluster of signals to override handcuff locking diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index b32794072d3..3e934844aed 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -76,7 +76,7 @@
-
-
- PANIC! +
- PANIC!
- Get your ass over to engineering! QUICKLY!!!
- Get to the Area Power Controller which controls the power to the emitters.
- Swipe it with your ID card - if it doesn't unlock, continue with step 15. diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 045e3f845b0..e91a53f2768 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -476,7 +476,7 @@ /obj/item/storage/box/mousetraps name = "box of Pest-B-Gon mousetraps" - desc = "WARNING: Keep out of reach of children." + desc = "WARNING: Keep out of reach of children." icon_state = "mousetraps" starts_with = list(/obj/item/device/assembly/mousetrap = 6) diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 8256fab1306..e0c19e49e07 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -103,7 +103,7 @@ Frequency: src.temp += "You are at \[[sr.x],[sr.y],[sr.z]\] in orbital coordinates.
- Current warning level: [config.ipintel_rating_bad ? "[config.ipintel_rating_bad]" : "DISABLED"]. Edit " - data += "
- Current kick level: [config.ipintel_rating_kick ? "[config.ipintel_rating_kick]" : "DISABLED"]. Edit " + data += "
- Current warning level: [config.ipintel_rating_bad ? "[config.ipintel_rating_bad]" : "DISABLED"]. Edit " + data += "
- Current kick level: [config.ipintel_rating_kick ? "[config.ipintel_rating_kick]" : "DISABLED"]. Edit " data += "
- New players: [config.access_deny_new_players ? "DENIED" : "ALLOWED"]. Toggle " - data += "
- Account age restriction: [config.access_deny_new_accounts == -1 ? "DISABLED" : "[config.access_deny_new_accounts] DAYS"]. Edit " + data += "
- New players: [config.access_deny_new_players ? "DENIED" : "ALLOWED"]. Toggle " + data += "
- Account age restriction: [config.access_deny_new_accounts == -1 ? "DISABLED" : "[config.access_deny_new_accounts] DAYS"]. Edit " data += "
- VM identifier count to warn on: [config.access_warn_vms ? "[config.access_warn_vms]" : "DISABLED"]. Edit " - data += "
- VM identifier count to kick on: [config.access_deny_vms ? "[config.access_deny_vms]" : "DISABLED"]. Edit " + data += "
- VM identifier count to warn on: [config.access_warn_vms ? "[config.access_warn_vms]" : "DISABLED"]. Edit " + data += "
- VM identifier count to kick on: [config.access_deny_vms ? "[config.access_deny_vms]" : "DISABLED"]. Edit " data += "
- Guests [(config.guests_allowed || config.external_auth) ? "CAN" : "CAN NOT"] join. " - data += "
- Guests [config.guests_allowed ? "CAN" : "CAN NOT"] play. Toggle " - data += "
- External authetification: [config.external_auth ? "ENABLED" : "DISABLED"]. Toggle " + data += "
- Guests [(config.guests_allowed || config.external_auth) ? "CAN" : "CAN NOT"] join. " + data += "
- Guests [config.guests_allowed ? "CAN" : "CAN NOT"] play. Toggle " + data += "
- External authetification: [config.external_auth ? "ENABLED" : "DISABLED"]. Toggle " data += "
- null c_tag for sec camera at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) " + output += "
- null c_tag for sec camera at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) " for(var/obj/machinery/camera/C2 in CL) if(C1 != C2) if(C1.c_tag == C2.c_tag) - output += "
- c_tag match for sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) and \[[C2.x], [C2.y], [C2.z]\] ([C2.loc.loc]) - c_tag is [C1.c_tag] " + output += "
- c_tag match for sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) and \[[C2.x], [C2.y], [C2.z]\] ([C2.loc.loc]) - c_tag is [C1.c_tag] " if(C1.loc == C2.loc && C1.dir == C2.dir && C1.pixel_x == C2.pixel_x && C1.pixel_y == C2.pixel_y) - output += "
- FULLY overlapping sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Networks: [C1.network] and [C2.network] " + output += "
- FULLY overlapping sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Networks: [C1.network] and [C2.network] " if(C1.loc == C2.loc) output += "
- overlapping sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Networks: [C1.network] and [C2.network]
Refresh
" else - src.temp += "Processing Error: Unable to locate orbital position.
" + src.temp += "Processing Error: Unable to locate orbital position.
" else if (href_list["freq"]) src.frequency += text2num(href_list["freq"]) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 69a5f88b4db..b57b1c976f7 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -292,7 +292,7 @@ /obj/item/weldingtool/examine(mob/user) if(..(user, 0)) - to_chat(user, text("\icon[] [] contains []/[] units of fuel!", src, src.name, get_fuel(),src.max_fuel )) + to_chat(user, text("[icon2html(src, user)] [] contains []/[] units of fuel!", src.name, get_fuel(),src.max_fuel )) /obj/item/weldingtool/attackby(obj/item/W, mob/user) if(W.isscrewdriver()) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 0a781515a81..049c303f921 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -197,6 +197,6 @@ attack_verb = list("banned") /obj/item/banhammer/attack(mob/M as mob, mob/user as mob) - to_chat(M, " You have been banned FOR NO REISIN by [user]") - to_chat(user, " You have BANNED [M]") + to_chat(M, " You have been banned FOR NO REISIN by [user]") + to_chat(user, " You have BANNED [M]") playsound(loc, 'sound/effects/adminhelp.ogg', 15) diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index 03075033a2d..396136b4f30 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -50,5 +50,5 @@ /obj/item/weldpack/examine(mob/user) ..(user) - to_chat(user, text("\icon[] [] units of fuel left!", src, src.reagents.total_volume)) + to_chat(user, text("[icon2html(src, user)] [] units of fuel left!", src.reagents.total_volume)) return diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index f090daeef74..a0227dd7c95 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -50,7 +50,7 @@ /obj/CanUseTopic(var/mob/user, var/datum/topic_state/state) if(user.CanUseObjTopic(src)) return ..() - to_chat(user, "\icon[src]Access Denied!") + to_chat(user, "[icon2html(src, user)]Access Denied!") return STATUS_CLOSE /mob/living/silicon/CanUseObjTopic(var/obj/O) @@ -159,13 +159,6 @@ /obj/proc/hear_talk(mob/M as mob, text, verb, datum/language/speaking) if(talking_atom) talking_atom.catchMessage(text, M) -/* - var/mob/mo = locate(/mob) in src - if(mo) - var/rendered = "[M.name]: " - mo.show_message(rendered, 2) - */ - return /obj/proc/see_emote(mob/M as mob, text, var/emote_type) return diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 76db4537804..0806485fc65 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -59,9 +59,9 @@ if(..(user, 1)) if (mybucket) var/contains = mybucket.reagents.total_volume - to_chat(user, "\icon[src] The bucket contains [contains] unit\s of liquid!") + to_chat(user, "[icon2html(src, user)] The bucket contains [contains] unit\s of liquid!") else - to_chat(user, "\icon[src] There is no bucket mounted on it!") + to_chat(user, "[icon2html(src, user)] There is no bucket mounted on it!") //everything else is visible, so doesn't need to be mentioned diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index dda05914649..51ba07a3a22 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -168,7 +168,7 @@ if(pulling) occupant.visible_message("[pulling] has thrusted \the [name] into \the [A], throwing \the [occupant] out of it!") - pulling.attack_log += "\[[time_stamp()]\] Crashed [occupant.name]'s ([occupant.ckey]) [name] into \a [A]" + pulling.attack_log += "\[[time_stamp()]\] Crashed [occupant.name]'s ([occupant.ckey]) [name] into \a [A]" occupant.attack_log += "\[[time_stamp()]\] Thrusted into \a [A] by [pulling.name] ([pulling.ckey]) with \the [name]" msg_admin_attack("[pulling.name] ([pulling.ckey]) has thrusted [occupant.name]'s ([occupant.ckey]) [name] into \a [A] (JMP)",ckey=key_name(pulling),ckey_target=key_name(occupant)) else diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index b6275678211..e08bd7da167 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -58,9 +58,9 @@ else display_name = holder.fakekey if(holder && !holder.fakekey && (holder.rights & R_ADMIN) && config.allow_admin_ooccolor && (src.prefs.ooccolor != initial(src.prefs.ooccolor))) // keeping this for the badmins - to_chat(target, "" + create_text_tag("ooc", "OOC:", target) + " [display_name]: ") + to_chat(target, "" + create_text_tag("OOC", target) + " [display_name]: ") else - to_chat(target, "" + create_text_tag("ooc", "OOC:", target) + " [display_name]: ") + to_chat(target, "" + create_text_tag("OOC", target) + " [display_name]: ") /client/verb/looc(msg as text) set name = "LOOC" @@ -150,7 +150,7 @@ if(target.mob in messagemobs) prefix = "" if((target.mob in messagemobs) || display_remote) - to_chat(target, "" + create_text_tag("looc", "LOOC:", target) + " [prefix][display_name][admin_stuff]: ") + to_chat(target, "" + create_text_tag("LOOC", target) + " [prefix][display_name][admin_stuff]: ") /client/verb/stop_all_sounds() set name = "Stop all sounds" diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index a233d8586c9..ed566e246a5 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -41,7 +41,7 @@ msg += " - [age]" if(is_special_character(C.mob)) - msg += " - Antagonist" + msg += " - Antagonist" msg += " (?)" msg += "
" total_num++ diff --git a/code/global.dm b/code/global.dm index 7db1a17c1f9..ec92e970fed 100644 --- a/code/global.dm +++ b/code/global.dm @@ -91,8 +91,6 @@ var/datum/moduletypes/mods = new() var/gravity_is_on = 1 -var/datum/server_greeting/server_greeting = null - var/list/awaydestinations = list() // Away missions. A list of landmarks that the warpgate can take you to. // For FTP requests. (i.e. downloading runtime logs.) diff --git a/code/js/byjax.dm b/code/js/byjax.dm index 7189bcb4763..9a7dc651715 100644 --- a/code/js/byjax.dm +++ b/code/js/byjax.dm @@ -45,6 +45,6 @@ proc/send_byjax(receiver, control_id, target_element, new_content=null, callback /* if(callback_args) argums += "&[list2params(callback_args)]" */ - to_chat(receiver, output(argums,"[control_id]:replaceContent")) + send_output(receiver, argums, "[control_id]:replaceContent") return diff --git a/code/modules/admin/DB ban/ban_mirroring.dm b/code/modules/admin/DB ban/ban_mirroring.dm index 53a0d6ac666..41d5adb7a2a 100644 --- a/code/modules/admin/DB ban/ban_mirroring.dm +++ b/code/modules/admin/DB ban/ban_mirroring.dm @@ -342,7 +342,7 @@ data += list(list(C.ckey, C.address, C.computer_id)) var/data_str = json_encode(data) - to_chat(C, output(list2params(list("E-DAT", data_str, 900)), "greeting.browser:setCookie")) + send_output(C, list2params(list("E-DAT", data_str, 900)), "greeting.browser:setCookie") #undef BAD_CID #undef BAD_IP diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index cc3b66f9e3b..b670b18fb5d 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -64,7 +64,7 @@ ip = query.item[3] if(!validckey) if(!banned_mob || (banned_mob && !IsGuestKey(banned_mob.key))) - message_admins("[key_name_admin(usr)] attempted to ban [ckey], but [ckey] has not been seen yet. Please only ban actual players.",1) + message_admins("[key_name_admin(usr)] attempted to ban [ckey], but [ckey] has not been seen yet. Please only ban actual players.",1) return var/a_ckey @@ -507,7 +507,7 @@ var/typedesc ="" switch(bantype) if("PERMABAN") - typedesc = "PERMABAN" + typedesc = "PERMABAN" if("TEMPBAN") typedesc = "TEMPBAN
([duration] minutes) [(unbanned || auto) ? "" : "(Edit)"]
Expires [expiration]" if("JOB_PERMABAN") diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index d699988281b..0ede3b88592 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -397,7 +397,7 @@ proc/admin_notice(var/message, var/rights) if(FC.is_admin_channel) dat+="[FC.channel_name]
" else - dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" + dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" dat+={"
Refresh
Back "} @@ -452,7 +452,7 @@ proc/admin_notice(var/message, var/rights) dat+="[src.admincaster_feed_channel.channel_name]: \[created by: [src.admincaster_feed_channel.author]\]
" if(src.admincaster_feed_channel.censored) dat+={" - ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
+ ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
No further feed story additions are allowed while the D-Notice is in effect.
"} else @@ -464,7 +464,7 @@ proc/admin_notice(var/message, var/rights) i++ dat+="
[MESSAGE.body] \[Likes: [MESSAGE.likes] Dislikes: [MESSAGE.dislikes]\]
" if(MESSAGE.img) - to_chat(usr, browse_rsc(MESSAGE.img, "tmp_photo[i].png")) + send_rsc(usr, MESSAGE.img, "tmp_photo[i].png") dat+="
" dat+="View Comments Add Comment Like Story Dislike Story
" dat+="\[Story by [MESSAGE.author] - [MESSAGE.time_stamp]\]
" @@ -484,7 +484,7 @@ proc/admin_notice(var/message, var/rights) else for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) - dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" + dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" dat+="
Cancel" if(11) dat+={" @@ -498,7 +498,7 @@ proc/admin_notice(var/message, var/rights) else for(var/channel in SSnews.network_channels) var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel) - dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" + dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
" dat+="
Back" if(12) @@ -522,7 +522,7 @@ proc/admin_notice(var/message, var/rights) "} if(src.admincaster_feed_channel.censored) dat+={" - ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
+ ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
No further feed story additions are allowed while the D-Notice is in effect.
"} else @@ -580,7 +580,7 @@ proc/admin_notice(var/message, var/rights) Photo:: "} if(SSnews.wanted_issue.img) - to_chat(usr, browse_rsc(SSnews.wanted_issue.img, "tmp_photow.png")) + send_rsc(usr, SSnews.wanted_issue.img, "tmp_photow.png") dat+="
"
else
dat+="None"
@@ -817,11 +817,11 @@ proc/admin_notice(var/message, var/rights)
if(SSticker.current_state == GAME_STATE_PREGAME)
SSticker.current_state = GAME_STATE_SETTING_UP
log_admin("[usr.key] has started the game.")
- message_admins("[usr.key] has started the game.")
+ message_admins("[usr.key] has started the game.")
feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return 1
else
- to_chat(usr, "Error: Start Now: Game has already started.")
+ to_chat(usr, "Error: Start Now: Game has already started.")
return 0
/datum/admins/proc/toggleenter()
@@ -1363,7 +1363,7 @@ proc/admin_notice(var/message, var/rights)
if(check_rights(R_ADMIN|R_MOD))
if (H.paralysis == 0)
msg = "has paralyzed [key_name_admin(H)]."
- H.visible_message("OOC Information: [H] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.", "You have been winded by a member of staff! Please stand by until they contact you!")
+ H.visible_message("OOC Information: [H] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.", "You have been winded by a member of staff! Please stand by until they contact you!")
H.paralysis = 8000
else
if (alert("The player is currently winded. Do you want to unwind him?", "Unwind player?", "Yes", "No") == "No")
@@ -1371,7 +1371,7 @@ proc/admin_notice(var/message, var/rights)
H.paralysis = 0
msg = "has unparalyzed [key_name_admin(H)]."
- H.visible_message("OOC Information: [H] has been unwinded by a member of staff!", "You have been unwinded by a member of staff!")
+ H.visible_message("OOC Information: [H] has been unwinded by a member of staff!", "You have been unwinded by a member of staff!")
log_and_message_admins(msg)
feedback_add_details("admin_verb", "WIND")
diff --git a/code/modules/admin/admin_attack_log.dm b/code/modules/admin/admin_attack_log.dm
index 3c5d560a3cc..1e8b45b29ce 100644
--- a/code/modules/admin/admin_attack_log.dm
+++ b/code/modules/admin/admin_attack_log.dm
@@ -27,7 +27,7 @@ proc/admin_attack_log(var/mob/attacker, var/mob/victim, var/attacker_message, va
victim.attack_log += text("\[[time_stamp()]\] [key_name(attacker)] - [victim_message]")
jmp_link = " (JMP)"
if(attacker)
- attacker.attack_log += text("\[[time_stamp()]\] [key_name(victim)] - [attacker_message]")
+ attacker.attack_log += text("\[[time_stamp()]\] [key_name(victim)] - [attacker_message]")
jmp_link = " (JMP)"
msg_admin_attack("[key_name_admin(attacker)] [admin_message] [key_name_admin(victim)] (INTENT: [attacker? uppertext(attacker.a_intent) : "N/A"])[jmp_link]",ckey=key_name(attacker),ckey_target=key_name(victim))
diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm
index 8dc1e9de747..38f12df1257 100644
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -34,7 +34,7 @@
if("singulo", "telesci") //general one-round-only stuff
var/F = investigate_subject2file(subject)
if(!F)
- to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.")
+ to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.")
return
src << browse(F,"window=investigate[subject];size=800x300")
@@ -43,8 +43,8 @@
if(href_logfile)
src << browse(href_logfile,"window=investigate[subject];size=800x300")
else
- to_chat(src, "Error: admin_investigate: No href logfile found.")
+ to_chat(src, "Error: admin_investigate: No href logfile found.")
return
else
- to_chat(src, "Error: admin_investigate: Href Logging is not on.")
+ to_chat(src, "Error: admin_investigate: Href Logging is not on.")
return
diff --git a/code/modules/admin/admin_server_greeting.dm b/code/modules/admin/admin_server_greeting.dm
deleted file mode 100644
index 0c7ecfcfd13..00000000000
--- a/code/modules/admin/admin_server_greeting.dm
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * A file containing the admin commands for interfacing with the server_greeting datum.
- */
-/client/proc/admin_edit_motd()
- set name = "Edit MotD"
- set category = "Server"
-
- if (!check_rights(R_SERVER))
- return
-
- var/new_message = input(usr, "Please edit the Message of the Day as necessary.", "Message of the Day", server_greeting.motd) as message
-
- if (!new_message)
- new_message = "[html_encode(new_message)]") - -/client/proc/admin_memo_control(task in list("write", "delete")) - set name = "Edit Memos" - set category = "Server" - - if (!check_rights(R_ADMIN)) - return - - switch (task) - if ("write") - admin_memo_write() - if ("delete") - admin_memo_delete() - -/client/proc/admin_memo_write() - var/current_memo = "" - if (server_greeting.memo_list.len && server_greeting.memo_list[ckey]) - current_memo = server_greeting.memo_list[ckey] - - var/new_memo = input(usr, "Please write your memo.", "Memo", current_memo) as message - - if (server_greeting.update_value("memo_write", list(ckey, new_memo))) - to_chat(src, "Operation carried out successfully.") - message_admins("[ckey] wrote a new memo:
[html_encode(new_memo)]") - else - to_chat(src, "Error carrying out desired operation.") - - return - -/client/proc/admin_memo_delete() - if (!server_greeting.memo_list.len) - to_chat(src, "No memos are currently saved.") - return - - if (!check_rights(R_SERVER)) - if (!server_greeting.memo_list[ckey]) - to_chat(src, "You do not have a memo saved. Cancelling.") - - else if (alert("Do you wish to delete your own memo, written on [server_greeting.memo_list[ckey]["date"]]?", "Choices", "Yes", "No") == "Yes") - if (server_greeting.update_value("memo_delete", ckey)) - to_chat(src, "Operation carried out successfully.") - message_admins("[ckey] has deleted their own memo.") - else - to_chat(src, "Error carrying out desired operation.") - - else - to_chat(src, "Cancelled.") - - return - else - var/input = input(usr, "Whose memo shall we delete?", "Remove Memo", null) as null|anything in server_greeting.memo_list - - if (!input) - to_chat(src, "Cancelled.") - return - - if (server_greeting.update_value("memo_delete", input)) - to_chat(src, "Operation carried out successfully.") - message_admins("[ckey] has deleted the memo of [input].") - else - to_chat(src, "Error carrying out desired operation.") - - return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index c012774b9b4..25233ba51a7 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -48,7 +48,6 @@ var/list/admin_verbs_admin = list( /client/proc/rename_silicon, //properly renames silicons, /client/proc/manage_silicon_laws, // Allows viewing and editing silicon laws. , /client/proc/check_antagonists, - /client/proc/admin_memo_control, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/ /client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/ /client/proc/toggleprayers, /*toggles prayers on/off*/ // /client/proc/toggle_hear_deadcast, /*toggles whether we hear deadchat*/ @@ -172,7 +171,6 @@ var/list/admin_verbs_server = list( /client/proc/toggle_random_events, /client/proc/check_customitem_activity, /client/proc/nanomapgen_DumpImage, - /client/proc/admin_edit_motd, /client/proc/toggle_recursive_explosions, /client/proc/restart_controller, /client/proc/cmd_ss_panic, @@ -273,7 +271,6 @@ var/list/admin_verbs_hideable = list( /client/proc/toggle_antagHUD_use, /client/proc/toggle_antagHUD_restrictions, /client/proc/event_manager_panel, - /client/proc/admin_edit_motd, /client/proc/empty_ai_core_toggle_latejoin, /client/proc/empty_ai_core_toggle_latejoin, /client/proc/cmd_admin_change_custom_event, @@ -301,7 +298,6 @@ var/list/admin_verbs_hideable = list( /client/proc/add_client_color, /datum/admins/proc/force_mode_latespawn, /datum/admins/proc/toggleenter, - /client/proc/admin_memo_control, /datum/admins/proc/toggleguests, /datum/admins/proc/capture_map_part, /client/proc/Set_Holiday, @@ -569,13 +565,13 @@ var/list/admin_verbs_cciaa = list( ghost.reenter_corpse() log_admin("[src] reentered their corpose using aghost.",admin_key=key_name(src)) else - to_chat(ghost, "Error: Aghost: Can't reenter corpse.") + to_chat(ghost, "Error: Aghost: Can't reenter corpse.") return feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! else if(istype(mob,/mob/abstract/new_player)) - to_chat(src, "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first.") + to_chat(src, "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first.") else //ghostize var/mob/body = mob @@ -728,7 +724,7 @@ var/list/admin_verbs_cciaa = list( C.cure_all_traumas(TRUE, CURE_ADMIN) log_and_message_admins("cured [key_name(C)]'s traumas.") - feedback_add_details("admin_verb","TB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!\ + feedback_add_details("admin_verb","TB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/add_traumas(mob/T as mob in mob_list) set category = "Fun" diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 5bc686eebe1..1bccf6892c6 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -87,13 +87,13 @@ NOTE: It checks usr by default. Supply the "user" argument if you wish to check return 1 else if(show_msg) - to_chat(user, "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].") + to_chat(user, "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].") else if(user.client.holder) return 1 else if(show_msg) - to_chat(user, "Error: You are not an admin.") + to_chat(user, "Error: You are not an admin.") return 0 //probably a bit iffy - will hopefully figure out a better solution @@ -105,7 +105,7 @@ NOTE: It checks usr by default. Supply the "user" argument if you wish to check if(usr.client.holder.rights != other.holder.rights) if( (usr.client.holder.rights & other.holder.rights) == other.holder.rights ) return 1 //we have all the rights they have and more - to_chat(usr, "Error: Cannot proceed. They have more or equal rights to us.") + to_chat(usr, "Error: Cannot proceed. They have more or equal rights to us.") return 0 /client/proc/deadmin() diff --git a/code/modules/admin/map_capture.dm b/code/modules/admin/map_capture.dm index 206e24cd77b..90420e263d2 100644 --- a/code/modules/admin/map_capture.dm +++ b/code/modules/admin/map_capture.dm @@ -24,7 +24,7 @@ var/cap = generate_image(tx ,ty ,tz ,range, CAPTURE_MODE_PARTIAL, null, ligths, 1) var/file_name = "map_capture_x[tx]_y[ty]_z[tz]_r[range].png" to_chat(usr, "Saved capture in cache as [file_name].") - to_chat(usr, browse_rsc(cap, file_name)) + send_rsc(usr, cap, file_name) else to_chat(usr, "Target coordinates are incorrect.") @@ -33,7 +33,7 @@ var/cap = generate_image(currentx ,currenty ,currentz ,16, CAPTURE_MODE_PARTIAL, null, ligths, 1) var/file_name = "map_capture_x[currentx]_y[currenty]_z[currentz]_r16.png" to_chat(usr, "Saved capture in cache as [file_name].") - to_chat(usr, browse_rsc(cap, file_name)) + send_rsc(usr, cap, file_name) currentx = currentx + 16 spawn (6) del(cap) @@ -45,7 +45,7 @@ var/cap = generate_image(currentx ,currenty ,currentz ,16, CAPTURE_MODE_PARTIAL, null, ligths, 1) var/file_name = "map_capture_x[currentx]_y[currenty]_z[currentz]_r16.png" to_chat(usr, "Saved capture in cache as [file_name].") - to_chat(usr, browse_rsc(cap, file_name)) + send_rsc(usr, cap, file_name) currentx = currentx + 16 spawn (6) del(cap) diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm index fa7cd9b17cc..9f7c2d2b0d7 100644 --- a/code/modules/admin/player_notes.dm +++ b/code/modules/admin/player_notes.dm @@ -10,7 +10,7 @@ datum/admins/proc/notes_show(var/ckey) datum/admins/proc/notes_gethtml(var/ckey) var/savefile/notesfile = new(NOTESFILE) - if(!notesfile) return "Error: Cannot access [NOTESFILE]" + if(!notesfile) return "Error: Cannot access [NOTESFILE]" if(ckey) . = "Notes for [ckey]: \[+\] \[-\]
" notesfile.cd = "/[ckey]" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 9e0af39d87b..a9b5e68d84a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -827,7 +827,7 @@ //Job + antagonist if(M.mind) - special_role_description = "Role: [M.mind.assigned_role]; Antagonist: [M.mind.special_role]; Has been rev: [(M.mind.has_been_rev)?"Yes":"No"]" + special_role_description = "Role: [M.mind.assigned_role]; Antagonist: [M.mind.special_role]; Has been rev: [(M.mind.has_been_rev)?"Yes":"No"]" else special_role_description = "Role: Mind datum missing Antagonist: Mind datum missing; Has been rev: Mind datum missing;" @@ -838,7 +838,7 @@ switch (M.stat) if (0) status = "Alive" if (1) status = "Unconscious" - if (2) status = "Dead" + if (2) status = "Dead" health_description = "Status: [status]" health_description += "
Oxy: [L.getOxyLoss()] - Tox: [L.getToxLoss()] - Fire: [L.getFireLoss()] - Brute: [L.getBruteLoss()] - Clone: [L.getCloneLoss()] - Brain: [L.getBrainLoss()]" else @@ -853,7 +853,7 @@ //GenDer switch(M.gender) if(MALE,FEMALE) gender_description = "[M.gender]" - else gender_description = "[M.gender]" + else gender_description = "[M.gender]" var/dat = "Info about [M.name]:
" dat += "Mob type: [M.type]
" diff --git a/code/modules/admin/verbs/access_control.dm b/code/modules/admin/verbs/access_control.dm index 6f1608a473c..65adb902e02 100644 --- a/code/modules/admin/verbs/access_control.dm +++ b/code/modules/admin/verbs/access_control.dm @@ -13,27 +13,27 @@ data += "If you do not know what these do, you shouldn't be touching them!
" data += "
Hub Visibility Setting:
" - data += "Currently [world.visibility ? "VISIBLE" : "HIDDEN"]. Toggle
" + data += "Currently [world.visibility ? "VISIBLE" : "HIDDEN"]. Toggle
" data += "
IP Intel Settings:
- "
- data += "
" data += "
Player Age Settings:
- "
- data += "
" data += "
VM Detection Settings:
- "
- data += "
Guest join settings:
- "
- data += "
Click here to review and acknowledge them!") + to_chat(C, "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].") @@ -63,7 +63,7 @@ /client/proc/warn_legacy(warned_ckey) if (!warned_ckey) - to_chat(usr, "Error: warn_legacy(): No ckey passed!") + to_chat(usr, "Error: warn_legacy(): No ckey passed!") return var/datum/preferences/D @@ -72,14 +72,14 @@ else D = preferences_datums[warned_ckey] if(!D) - to_chat(src, "Error: warn_legacy(): No such ckey found.") + to_chat(src, "Error: warn_legacy(): No such ckey found.") return if(++D.warns >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:) ban_unban_log_save("[ckey] warned [warned_ckey], resulting in a [AUTOBANTIME] minute autoban.") if(C) message_admins("[key_name_admin(src)] has warned [key_name_admin(C)] resulting in a [AUTOBANTIME] minute ban.") - to_chat(C, "You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.") + to_chat(C, "You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.") qdel(C) else message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban.") @@ -87,7 +87,7 @@ feedback_inc("ban_warn",1) else if(C) - to_chat(C, "You have been warned by an administrator.
Further warnings will result in an autoban.") + to_chat(C, "You have been warned by an administrator.
Further warnings will result in an autoban.") message_admins("[key_name_admin(src)] has warned [key_name_admin(C)]. They have [MAX_WARNS-D.warns] strikes remaining.") else message_admins("[key_name_admin(src)] has warned [warned_ckey] (DC). They have [MAX_WARNS-D.warns] strikes remaining.") diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm index 54cb7bf9616..2c859a776c1 100644 --- a/code/modules/admin/view_variables/view_variables.dm +++ b/code/modules/admin/view_variables/view_variables.dm @@ -24,9 +24,9 @@ var/atom/A = D if(A.icon && A.icon_state) sprite = icon(A.icon, A.icon_state) - to_chat(usr, browse_rsc(sprite, "view_vars_sprite.png")) + send_rsc(usr, sprite, "view_vars_sprite.png") - to_chat(usr, browse_rsc('code/js/view_variables.js', "view_variables.js")) + send_rsc(usr, 'code/js/view_variables.js', "view_variables.js") var/html = {" diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index a04acd70ae4..1080fe9e623 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -58,7 +58,7 @@ return /obj/item/device/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here. - visible_message("\icon[src] *beep* *beep*", "*beep* *beep*") + visible_message("[icon2html(src, viewers(get_turf(src)))] *beep* *beep*", "*beep* *beep*") sleep(10) if(!src) return diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 8e19f97e205..738cdf95127 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -196,7 +196,7 @@ process_activation(var/obj/D, var/normal = 1, var/special = 1) if(!D) return 0 if(!secured) - visible_message("\icon[src] *beep* *beep*", "*beep* *beep*") + visible_message("[icon2html(src, viewers(get_turf(src)))] *beep* *beep*", "*beep* *beep*") if((normal) && (a_right) && (a_left)) if(a_right != D) a_right.pulsed(0) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index cab1b960070..664ab1ce8dc 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -101,7 +101,7 @@ if((!secured)||(!on)||(cooldown > 0)) return 0 pulse(0) if(!holder) - visible_message("\icon[src] *beep* *beep*") + visible_message("[icon2html(src, viewers(get_turf(src)))] *beep* *beep*") cooldown = 2 addtimer(CALLBACK(src, .proc/process_cooldown), 10) return diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 1481edd047b..774484d9ad8 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -52,12 +52,10 @@ sense() var/turf/mainloc = get_turf(src) -// if(scanning && cooldown <= 0) -// mainloc.visible_message("\icon[src] *boop* *boop*", "*boop* *boop*") if((!holder && !secured)||(!scanning)||(cooldown > 0)) return 0 pulse(0) if(!holder) - mainloc.visible_message("\icon[src] *beep* *beep*", "*beep* *beep*") + mainloc.visible_message("[icon2html(src, viewers(get_turf(src)))] *beep* *beep*", "*beep* *beep*") cooldown = 2 addtimer(CALLBACK(src, .proc/process_cooldown), 10) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index a5e06a62e60..846908be902 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -139,9 +139,9 @@ pulse(1) if(machine) - machine.visible_message("\icon[machine] [capitalize_first_letters(src.name)] beeps, \"Beep beep!\"") + machine.visible_message("[icon2html(machine, viewers(get_turf(machine)))] [capitalize_first_letters(src.name)] beeps, \"Beep beep!\"") else if(!holder) - visible_message("\icon[src] [capitalize_first_letters(src.name)] beeps, \"Beep beep!\"") + visible_message("[icon2html(src, viewers(get_turf(src)))] [capitalize_first_letters(src.name)] beeps, \"Beep beep!\"") return diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 13e4d09a178..03fddb5ff8e 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -42,7 +42,7 @@ if(!secured) return 0 pulse(0) if(!holder) - visible_message("\icon[src] *beep* *beep*", "*beep* *beep*") + visible_message("[icon2html(src, viewers(get_turf(src)))] *beep* *beep*", "*beep* *beep*") cooldown = 2 addtimer(CALLBACK(src, .proc/process_cooldown), 10) return diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 7b1bf582c7c..15104fdfb29 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -22,7 +22,7 @@ recorded = msg listening = FALSE var/turf/T = get_turf(src) //otherwise it won't work in hand - T.visible_message("\icon[src] beeps, \"Activation message is '[recorded]'.\"") + T.visible_message("[icon2html(src, viewers(get_turf(T)))] beeps, \"Activation message is '[recorded]'.\"") else if(findtext(msg, recorded)) pulse(0) @@ -32,7 +32,7 @@ if(!holder) listening = !listening var/turf/T = get_turf(src) - T.visible_message("\icon[src] beeps, \"[listening ? "Now" : "No longer"] recording input.\"") + T.visible_message("[icon2html(src, viewers(get_turf(T)))] beeps, \"[listening ? "Now" : "No longer"] recording input.\"") /obj/item/device/assembly/voice/attack_self(mob/user) diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 78f60aaf740..062e6d4f650 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -48,7 +48,7 @@ if (src.reload < 180) return if ((user.contents.Find(src) || (in_range(src, user) && istype(src.loc, /turf))) || (istype(user, /mob/living/silicon))) command_announcement.Announce("Bluespace artillery fire detected. Brace for impact.") - to_world(sound('sound/effects/yamato_fire.ogg')) + sound_to(world, ('sound/effects/yamato_fire.ogg')) message_admins("[key_name_admin(usr)] has launched an artillery strike.", 1) explosion(t,2,5,11) reload = 0 diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 8a1ef1cebfe..88ae6a4f82a 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -127,6 +127,12 @@ You can set verify to TRUE if you want send() to sleep until the client has the /proc/register_asset(asset_name, asset) SSassets.cache[asset_name] = asset +//Generated names do not include file extention. +//Used mainly for code that deals with assets in a generic way +//The same asset will always lead to the same asset name +/proc/generate_asset_name(file) + return "asset.[md5(fcopy_rsc(file))]" + //These datums are used to populate the asset cache, the proc "register()" does this. //all of our asset datums, used for referring to these later @@ -231,6 +237,16 @@ var/list/asset_datums = list() /datum/asset/chem_master/send(client) send_asset_list(client, assets) +/datum/asset/simple/accents + verify = FALSE + +/datum/asset/simple/accents/register() + for(var/A in subtypesof(/datum/accent)) //yes we have to do this here, SSrecords isn't initialized yet + var/datum/accent/accent = new A + var/name = "[accent.tag_icon].png" + assets[name] = icon('./icons/accent_tags.dmi', accent.tag_icon) + ..() + /datum/asset/simple/faction_icons assets = list( "faction_EPMC.png" = 'icons/misc/factions/ECFlogo.png', @@ -241,3 +257,48 @@ var/list/asset_datums = list() "faction_Hepht.png" = 'icons/misc/factions/Hephaestuslogo.png', "faction_unaffiliated.png" = 'icons/misc/factions/Unaffiliatedlogo.png' ) + +/datum/asset/group + var/list/children + +/datum/asset/group/register() + for(var/type in children) + get_asset_datum(type) + +/datum/asset/group/send(client/C) + for(var/type in children) + var/datum/asset/A = get_asset_datum(type) + A.send(C) + +/datum/asset/group/goonchat + children = list( + /datum/asset/simple/jquery, + /datum/asset/simple/goonchat, + /datum/asset/simple/fontawesome + ) + +/datum/asset/simple/jquery + verify = FALSE + assets = list( + "jquery.min.js" = 'code/modules/goonchat/browserassets/js/jquery.min.js', + ) + +/datum/asset/simple/goonchat + verify = TRUE + assets = list( + "json2.min.js" = 'code/modules/goonchat/browserassets/js/json2.min.js', + "browserOutput.js" = 'code/modules/goonchat/browserassets/js/browserOutput.js', + "browserOutput.css" = 'code/modules/goonchat/browserassets/css/browserOutput.css', + "browserOutput_white.css" = 'code/modules/goonchat/browserassets/css/browserOutput_white.css' + ) + +/datum/asset/simple/fontawesome + verify = FALSE + assets = list( + "fa-regular-400.eot" = 'html/font-awesome/webfonts/fa-regular-400.eot', + "fa-regular-400.woff" = 'html/font-awesome/webfonts/fa-regular-400.woff', + "fa-solid-900.eot" = 'html/font-awesome/webfonts/fa-solid-900.eot', + "fa-solid-900.woff" = 'html/font-awesome/webfonts/fa-solid-900.woff', + "font-awesome.css" = 'html/font-awesome/css/all.min.css', + "v4shim.css" = 'html/font-awesome/css/v4-shims.min.css' + ) diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index 7c25c5cddf7..52e377e2c9a 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -77,3 +77,8 @@ var/authed = TRUE var/is_initialized = FALSE // Used to track whether the client has been initialized with InitClient. + + preload_rsc = 0 + + ///goonchat chatoutput of the client + var/datum/chatOutput/chatOutput diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 726bd93416a..8cd1240d983 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -42,8 +42,6 @@ if (!info_sent) handle_connection_info(src, href_list["data"]) info_sent = 1 - else - server_greeting.close_window(src, "Your greeting window has malfunctioned and has been shut down.") return @@ -96,6 +94,11 @@ if("usr") hsrc = mob if("prefs") return prefs.process_link(usr,href_list) if("vars") return view_var_Topic(href,href_list,hsrc) + if("chat") return chatOutput.Topic(href, href_list) + + switch(href_list["action"]) + if("openLink") + send_link(src, href_list["link"]) if(href_list["warnacknowledge"]) var/queryid = text2num(href_list["warnacknowledge"]) @@ -143,13 +146,13 @@ query_details["new_status"] = "confirmed" query_details["id"] = request_id - feedback_message = "Account successfully linked!" + feedback_message = "Account successfully linked!" if ("deny") query_contents = "UPDATE ss13_player_linking SET status = :new_status:, deleted_at = NOW() WHERE id = :id:" query_details["new_status"] = "rejected" query_details["id"] = request_id - feedback_message = "Link request rejected!" + feedback_message = "Link request rejected!" else to_chat(src, "Invalid command sent.") return @@ -210,11 +213,6 @@ if ("webint") src.open_webint() - // Forward appropriate topics to the server greeting datum. - if ("greeting") - if (server_greeting) - server_greeting.handle_call(href_list, src) - // Handle the updating of MotD and Memo tabs upon click. if ("updateHashes") var/save = 0 @@ -308,13 +306,13 @@ //This stops files larger than UPLOAD_LIMIT being sent from client to server via input(), client.Import() etc. /client/AllowUpload(filename, filelength) if(filelength > UPLOAD_LIMIT) - to_chat(src, "Error: AllowUpload(): File Upload too large. Upload Limit: [UPLOAD_LIMIT/1024]KiB.") + to_chat(src, "Error: AllowUpload(): File Upload too large. Upload Limit: [UPLOAD_LIMIT/1024]KiB.") return 0 /* //Don't need this at the moment. But it's here if it's needed later. //Helps prevent multiple files being uploaded at once. Or right after eachother. var/time_to_wait = fileaccess_timer - world.time if(time_to_wait > 0) - to_chat(src, "Error: AllowUpload(): Spam prevention. Please wait [round(time_to_wait/10)] seconds.") + to_chat(src, "Error: AllowUpload(): Spam prevention. Please wait [round(time_to_wait/10)] seconds.") return 0 fileaccess_timer = world.time + FTPDELAY */ return 1 @@ -326,6 +324,9 @@ /client/New(TopicData) TopicData = null //Prevent calls to client.Topic from connect + // Load goonchat + chatOutput = new(src) + if(!(connection in list("seeker", "web"))) //Invalid connection type. return null if(byond_version < MIN_CLIENT_VERSION) //Out of date client. @@ -355,6 +356,7 @@ m.client = src src.InitPrefs() //Init some default prefs m.LateLogin() + chatOutput.start() return m //Do auth shit else @@ -362,6 +364,7 @@ src.InitClient() src.InitPrefs() mob.LateLogin() + chatOutput.start() /client/proc/InitPrefs() //preferences datum - also holds some persistant data for the client (because we may as well keep these datums to a minimum) @@ -376,12 +379,6 @@ prefs.last_id = computer_id //these are gonna be used for banning if (byond_version >= 511 && prefs.clientfps) fps = prefs.clientfps - if(SStheming) - SStheming.apply_theme_from_perfs(src) - - // Server greeting shenanigans. - if (server_greeting.find_outdated_info(src, 1) && !info_sent) - server_greeting.display_to_client(src) /client/proc/InitClient() to_chat(src, "If the title screen is black, resources are still downloading. Please be patient until the title screen appears.") @@ -686,15 +683,6 @@ send_link(src, linkURL) return -/client/verb/show_greeting() - set name = "Open Greeting" - set category = "OOC" - - // Update the information just in case. - server_greeting.find_outdated_info(src, 1) - - server_greeting.display_to_client(src) - /client/proc/check_ip_intel() set waitfor = 0 //we sleep when getting the intel, no need to hold up the client connection while we sleep if (config.ipintel_email) @@ -751,4 +739,4 @@ if(istype(gun) && gun.can_autofire()) M.set_dir(get_dir(M, over_object)) gun.Fire(get_turf(over_object), mob, params, (get_dist(over_object, mob) <= 1), FALSE) - CHECK_TICK \ No newline at end of file + CHECK_TICK diff --git a/code/modules/client/darkmode.dm b/code/modules/client/darkmode.dm new file mode 100644 index 00000000000..0b2c074be18 --- /dev/null +++ b/code/modules/client/darkmode.dm @@ -0,0 +1,132 @@ +//Darkmode preference by Kmc2000// + +/* +This lets you switch chat themes by using winset and CSS loading, you must relog to see this change (or rebuild your browseroutput datum) +Things to note: +If you change ANYTHING in interface/skin.dmf you need to change it here: +Format: +winset(src, "window as appears in skin.dmf after elem", "var to change = currentvalue;var to change = desired value") +How this works: +I've added a function to browseroutput.js which registers a cookie for darkmode and swaps the chat accordingly. You can find the button to do this under the "cog" icon next to the ping button (top right of chat) +This then swaps the window theme automatically +Thanks to spacemaniac and mcdonald for help with the JS side of this. +*/ + +/client/proc/force_white_theme() //There's no way round it. We're essentially changing the skin by hand. It's painful but it works, and is the way Lummox suggested. + //Main windows + winset(src, "infowindow", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = none") + winset(src, "infowindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "rpane", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = none") + winset(src, "rpane", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "info", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "info", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "browseroutput", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "browseroutput", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "outputwindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "outputwindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "rpanewindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "rpanewindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "mainwindow", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = none") + winset(src, "split", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "mainvsplit", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + //Buttons + winset(src, "textb", "background-color = #494949;background-color = none") + winset(src, "textb", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "infob", "background-color = #494949;background-color = none") + winset(src, "infob", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "rulesb", "background-color = #494949;background-color = none") + winset(src, "rulesb", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "Lore", "background-color = #494949;background-color = none") + winset(src, "Lore", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "wikib", "background-color = #494949;background-color = none") + winset(src, "wikib", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "forumb", "background-color = #494949;background-color = none") + winset(src, "forumb", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "changelog", "background-color = #494949;background-color = none") + winset(src, "changelog", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "interfaceb", "background-color = #494949;background-color = none") + winset(src, "interfaceb", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "discordb", "background-color = #494949;background-color = none") + winset(src, "discordb", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "reportbugb", "background-color = #494949;background-color = none") + winset(src, "reportbugb", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "hotkey_toggle", "background-color = #494949;background-color = none") + winset(src, "hotkey_toggle", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + //Status and verb tabs + winset(src, "output", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "output", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "outputwindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "outputwindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "statwindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "statwindow", "text-color = #eaeaea;text-color = #000000") + winset(src, "info", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = #FFFFFF") + winset(src, "info", "tab-background-color = [COLOR_DARKMODE_BACKGROUND];tab-background-color = none") + winset(src, "info", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "info", "tab-text-color = [COLOR_DARKMODE_TEXT];tab-text-color = #000000") + winset(src, "info", "prefix-color = [COLOR_DARKMODE_TEXT];prefix-color = #000000") + winset(src, "info", "suffix-color = [COLOR_DARKMODE_TEXT];suffix-color = #000000") + //Say, OOC, me Buttons etc. + winset(src, "saybutton", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "saybutton", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "asset_cache_browser", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "asset_cache_browser", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + +/client/proc/force_dark_theme() //Inversely, if theyre using white theme and want to swap to the superior dark theme, let's get WINSET() ing + //Main windows + winset(src, "infowindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "infowindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "rpane", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "rpane", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "info", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "browseroutput", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "browseroutput", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "outputwindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "outputwindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "rpanewindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "rpanewindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "mainwindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "split", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "mainvsplit", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + //Buttons + winset(src, "textb", "background-color = none;background-color = #494949") + winset(src, "textb", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "infob", "background-color = none;background-color = #494949") + winset(src, "infob", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "rulesb", "background-color = none;background-color = #494949") + winset(src, "rulesb", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "Lore", "background-color = none;background-color = #494949") + winset(src, "Lore", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "wikib", "background-color = none;background-color = #494949") + winset(src, "wikib", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "forumb", "background-color = none;background-color = #494949") + winset(src, "forumb", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "changelog", "background-color = none;background-color = #494949") + winset(src, "changelog", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "interfaceb", "background-color = none;background-color = #494949") + winset(src, "interfaceb", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "discordb", "background-color = none;background-color = #494949") + winset(src, "discordb", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "reportbugb", "background-color = none;background-color = #494949") + winset(src, "reportbugb", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "hotkey_toggle", "background-color = none;background-color = #494949") + winset(src, "hotkey_toggle", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + //Status and verb tabs + winset(src, "output", "background-color = none;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "output", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "outputwindow", "background-color = none;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "outputwindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "statwindow", "background-color = none;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "statwindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "background-color = #FFFFFF;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "info", "tab-background-color = none;tab-background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "info", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "tab-text-color = #000000;tab-text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "prefix-color = #000000;prefix-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "suffix-color = #000000;suffix-color = [COLOR_DARKMODE_TEXT]") + //Say, OOC, me Buttons etc. + winset(src, "saybutton", "background-color = none;background-color = #494949") + winset(src, "saybutton", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "asset_cache_browser", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "asset_cache_browser", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 463dc5c6a43..f4af2292b35 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -699,7 +699,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(current_species.preview_icon) var/icon/preview = icon(current_species.preview_icon, "") preview.Scale(64, 64) // Scale it here to stop it blurring. - to_chat(usr, browse_rsc(icon(icon = preview, icon_state = ""), "species_preview_[current_species.short_name].png")) + send_rsc(usr, icon(icon = preview, icon_state = ""), "species_preview_[current_species.short_name].png") dat += "
" dat += "Language: [current_species.language]
" dat += "" @@ -740,9 +740,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(restricted) if(restricted == 1) - dat += "You cannot play as this species.If you wish to be whitelisted, you can make an application post on the forums." + dat += "You cannot play as this species.If you wish to be whitelisted, you can make an application post on the forums." else if(restricted == 2) - dat += "You cannot play as this species.This species is not available for play as a station race." + dat += "You cannot play as this species.This species is not available for play as a station race." if(!restricted || check_rights(R_ADMIN, 0)) dat += "\[select\]" dat += "" diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm index d80aa5e437a..c389942ee72 100644 --- a/code/modules/client/preference_setup/global/01_ui.dm +++ b/code/modules/client/preference_setup/global/01_ui.dm @@ -7,7 +7,6 @@ S["UI_style_color"] >> pref.UI_style_color S["UI_style_alpha"] >> pref.UI_style_alpha S["html_UI_style"] >> pref.html_UI_style - S["skin_theme"] >> pref.skin_theme S["ooccolor"] >> pref.ooccolor S["clientfps"] >> pref.clientfps @@ -16,7 +15,6 @@ S["UI_style_color"] << pref.UI_style_color S["UI_style_alpha"] << pref.UI_style_alpha S["html_UI_style"] << pref.html_UI_style - S["skin_theme"] << pref.skin_theme S["ooccolor"] << pref.ooccolor S["clientfps"] << pref.clientfps @@ -28,7 +26,6 @@ "UI_style_color", "UI_style_alpha", "html_UI_style", - "skin_theme", "ooccolor", "clientfps", "tooltip_style" @@ -47,7 +44,6 @@ "UI_style_color", "UI_style_alpha", "html_UI_style", - "skin_theme", "ooccolor", "clientfps", "tooltip_style", @@ -62,7 +58,6 @@ "UI_style_color" = pref.UI_style_color, "UI_style" = pref.UI_style, "html_UI_style" = pref.html_UI_style, - "skin_theme" = pref.skin_theme, "ooccolor" = pref.ooccolor, "clientfps" = pref.clientfps, "tooltip_style" = pref.tooltip_style @@ -74,7 +69,6 @@ pref.UI_style_alpha = sanitize_integer(text2num(pref.UI_style_alpha), 0, 255, initial(pref.UI_style_alpha)) pref.clientfps = sanitize_integer(text2num(pref.clientfps), 0, 1000, initial(pref.clientfps)) pref.html_UI_style = sanitize_inlist(pref.html_UI_style, SStheming.available_html_themes, initial(pref.html_UI_style)) - pref.skin_theme = sanitize_inlist(pref.skin_theme, SStheming.skin_themes, initial(pref.skin_theme)) pref.ooccolor = sanitize_hexcolor(pref.ooccolor, initial(pref.ooccolor)) /datum/category_item/player_setup_item/player_global/ui/content(mob/user) @@ -86,7 +80,6 @@ dat += "-Alpha(transparency): [pref.UI_style_alpha] - reset
" dat += "Tooltip Style: [pref.tooltip_style]
" dat += "HTML UI Style: [pref.html_UI_style]
" - dat += "Main UI Style: [pref.skin_theme]
" dat += "-FPS: [pref.clientfps] - reset
" if(can_select_ooc_color(user)) dat += "OOC Color: " @@ -122,14 +115,6 @@ pref.html_UI_style = html_style_new return TOPIC_REFRESH - else if(href_list["select_skin_theme"]) - var/skin_theme_new = input(user, "Choose HTML UI style.", "Global Preference", pref.skin_theme) as null|anything in SStheming.skin_themes - if(isnull(skin_theme_new) || !CanUseTopic(user)) return TOPIC_NOACTION - pref.skin_theme = skin_theme_new - if(SStheming) - SStheming.apply_theme_from_perfs(user) - return TOPIC_REFRESH - else if(href_list["select_ooc_color"]) var/new_ooccolor = input(user, "Choose OOC color:", "Global Preference") as color|null if(new_ooccolor && can_select_ooc_color(user) && CanUseTopic(user)) diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 433b5f5d380..e589e37fa77 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -234,7 +234,7 @@ 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
" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 90dfe20752c..afa45cff5a1 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -27,7 +27,6 @@ datum/preferences var/UI_style_color = "#ffffff" var/UI_style_alpha = 255 var/html_UI_style = "Nano" - var/skin_theme = "Light" //Style for popup tooltips var/tooltip_style = "Midnight" var/motd_hash = "" //Hashes for the new server greeting window. diff --git a/code/modules/client/preferences_ambience.dm b/code/modules/client/preferences_ambience.dm index 514524a8f76..e66d78d8253 100644 --- a/code/modules/client/preferences_ambience.dm +++ b/code/modules/client/preferences_ambience.dm @@ -27,7 +27,7 @@ if(prefs.asfx_togs & ASFX_AMBIENCE) to_chat(src, "You will now hear ambient sounds.") else - to_chat(src, "You will no longer hear ambient sounds.") + to_chat(src, "You will no longer hear ambient sounds.") src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1) src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2) feedback_add_details("admin_verb","TSFXAmbi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -42,7 +42,7 @@ if(prefs.asfx_togs & ASFX_FOOTSTEPS) to_chat(src, "You will now hear footstep sounds.") else - to_chat(src, "You will no longer hear footstep sounds.") + to_chat(src, "You will no longer hear footstep sounds.") feedback_add_details("admin_verb","TSFXFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/Toggle_asfx_vote() @@ -54,7 +54,7 @@ if(prefs.asfx_togs & ASFX_VOTE) to_chat(src, "You will now hear the vote alarm.") else - to_chat(src, "You will no longer hear the vote alarm.") + to_chat(src, "You will no longer hear the vote alarm.") feedback_add_details("admin_verb","TSFXFV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_vox_voice() @@ -76,7 +76,7 @@ if(prefs.asfx_togs & ASFX_DROPSOUND) to_chat(src, "You will now hear dropping and throwing sounds.") else - to_chat(src, "You will no longer hear dropping and throwing sounds.") + to_chat(src, "You will no longer hear dropping and throwing sounds.") /client/proc/Toggle_arcadesounds() set name = "Toggle Arcade SFX" @@ -88,7 +88,7 @@ if(prefs.asfx_togs & ASFX_ARCADE) to_chat(src, "You will now hear arcade sounds.") else - to_chat(src, "You will no longer hear arcade sounds.") + to_chat(src, "You will no longer hear arcade sounds.") /client/proc/Toggle_radiosounds() set name = "Toggle Radio SFX" @@ -100,7 +100,7 @@ if(prefs.asfx_togs & ASFX_RADIO) to_chat(src, "You will now hear radio sounds.") else - to_chat(src, "You will no longer hear radio sounds.") + to_chat(src, "You will no longer hear radio sounds.") /client/proc/Toggle_instrumentsounds() set name = "Toggle Instrument SFX" @@ -112,4 +112,4 @@ if(prefs.asfx_togs & ASFX_INSTRUMENT) to_chat(src, "You will now hear instrument sounds.") else - to_chat(src, "You will no longer hear instrument sounds.") \ No newline at end of file + to_chat(src, "You will no longer hear instrument sounds.") \ No newline at end of file diff --git a/code/modules/client/preferences_notification.dm b/code/modules/client/preferences_notification.dm index f8b30b51718..32af64c2d0d 100644 --- a/code/modules/client/preferences_notification.dm +++ b/code/modules/client/preferences_notification.dm @@ -205,7 +205,7 @@ if(panel_notification) new_notification("warning","You have [notification_count] unread notifications! Click here to review and acknowledge them!") if(chat_notification) - to_chat(user,"You have unacknowledged notifications.
Click here to review and acknowledge them!") + to_chat(user,"You have unacknowledged notifications.
Click here to review and acknowledge them!") /* * Helper proc for getting a count of active CCIA actions against the player's characters. diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 89b2084564d..094ab4fd41c 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -215,8 +215,8 @@ else user.drop_from_inventory(ai,src) ai_card = ai - to_chat(ai_mob, "You have been transferred to \the [holder]'s [src].") - to_chat(user, "You load [ai_mob] into \the [holder]'s [src].") + to_chat(ai_mob, "You have been transferred to \the [holder]'s [src].") + to_chat(user, "You load [ai_mob] into \the [holder]'s [src].") integrated_ai = ai_mob diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index f3a03d8121b..5b24377e2ec 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -91,17 +91,17 @@ var/list/species_restricted = list(BODYTYPE_HUMAN,BODYTYPE_TAJARA,BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU) /obj/item/rig/examine() - to_chat(usr, "This is \icon[src][src.name].") + to_chat(usr, "This is [icon2html(src, usr)][src.name].") to_chat(usr, "[src.desc]") if(wearer) for(var/obj/item/piece in list(helmet,gloves,chest,boots)) if(!piece || piece.loc != wearer) continue - to_chat(usr, "\icon[piece] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed.") + to_chat(usr, "[icon2html(piece, usr)] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed.") if(src.loc == usr) to_chat(usr, "The maintenance panel is [open ? "open" : "closed"].") - to_chat(usr, "Hardsuit systems are [offline ? "offline" : "online"].") + to_chat(usr, "Hardsuit systems are [offline ? "offline" : "online"].") /obj/item/rig/Initialize() . = ..() @@ -232,7 +232,7 @@ if(!failed_to_seal) if(!instant) - wearer.visible_message("[wearer]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") + wearer.visible_message("[wearer]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") if(seal_delay && !do_after(wearer, seal_delay, act_target = src)) if(wearer) to_chat(wearer, "You must remain still while the suit is adjusting the components.") playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) @@ -266,16 +266,16 @@ piece.item_state = "[initial(icon_state)][!seal_target ? "_sealed" : ""]" switch(msg_type) if("boots") - to_chat(wearer, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") + to_chat(wearer, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") wearer.update_inv_shoes() if("gloves") - to_chat(wearer, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") + to_chat(wearer, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") wearer.update_inv_gloves() if(BP_CHEST) - to_chat(wearer, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") + to_chat(wearer, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") wearer.update_inv_wear_suit() if("helmet") - to_chat(wearer, "\The [piece] hisses [!seal_target ? "closed" : "open"].") + to_chat(wearer, "\The [piece] hisses [!seal_target ? "closed" : "open"].") wearer.update_inv_head() if(helmet) helmet.update_light(wearer) @@ -309,17 +309,17 @@ // Success! canremove = seal_target - to_chat(wearer, "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].") + to_chat(wearer, "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].") playsound(src, 'sound/items/rped.ogg', 20, FALSE) if (has_sealed_state) icon_state = canremove ? initial(icon_state) : "[initial(icon_state)]_sealed" if(dnaLock && !offline) if(dnaLock != wearer.dna) - visible_message("\icon[src.icon] [src] announces, \"DNA mismatch. Unauthorized access detected.\"") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] announces, \"DNA mismatch. Unauthorized access detected.\"") crushing = TRUE if(wearer != initiator) - to_chat(initiator, "Suit adjustment complete. Suit is now [canremove ? "unsealed" : "sealed"].") + to_chat(initiator, "Suit adjustment complete. Suit is now [canremove ? "unsealed" : "sealed"].") if(canremove) for(var/obj/item/rig_module/module in installed_modules) @@ -613,7 +613,7 @@ ..() if(seal_delay > 0 && istype(M) && M.back == src) - M.visible_message("[M] starts putting on \the [src]...", "You start putting on \the [src]...") + M.visible_message("[M] starts putting on \the [src]...", "You start putting on \the [src]...") if(!do_after(M,seal_delay)) if(M && M.back == src) if(!M.unEquip(src)) @@ -622,7 +622,7 @@ return if(istype(M) && M.back == src) - M.visible_message("[M] struggles into \the [src].", "You struggle into \the [src].") + M.visible_message("[M] struggles into \the [src].", "You struggle into \the [src].") wearer = M wearer.wearing_rig = src update_icon() diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm index 6f6f7c563e9..bc805048277 100644 --- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm +++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm @@ -218,11 +218,11 @@ if(!istype(module)) selected_module = null - to_chat(usr, "Primary system is now: deselected.") + to_chat(usr, "Primary system is now: deselected.") return selected_module = module - to_chat(usr, "Primary system is now: [selected_module.interface_name].") + to_chat(usr, "Primary system is now: [selected_module.interface_name].") /obj/item/rig/verb/toggle_module() diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 82e51fb4b50..9b796246511 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -96,7 +96,7 @@ /obj/item/clothing/suit/bomb_suit/equipped(var/mob/user, var/slot) if (slot == slot_wear_suit) var/mob/living/carbon/human/H = user - H.visible_message("[H] starts putting on \the [src]...", "You start putting on \the [src]...") + H.visible_message("[H] starts putting on \the [src]...", "You start putting on \the [src]...") if(!do_after(H,50)) if(H && H.wear_suit == src) H.wear_suit = null diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 54674dd9629..745fc7b7632 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -99,7 +99,7 @@ last_process_worldtime = world.time /obj/machinery/dnaforensics/proc/complete_scan() - visible_message("\icon[src] makes an insistent chime.", range = 2) + visible_message("[icon2html(src, viewers(get_turf(src)))] makes an insistent chime.", range = 2) update_icon() if(bloodsamp) var/obj/item/paper/P = new() diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 7d19598f6d0..d6e4030b1d4 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -100,14 +100,14 @@ log transactions //display a message to the user var/response = pick("Initiating withdraw. Have a nice day!", "CRITICAL ERROR: Activating cash chamber panic siphon.","PIN Code accepted! Emptying account balance.", "Jackpot!") - to_chat(user, "\icon[src] The [src] beeps: \"[response]\"") + to_chat(user, "[icon2html(src, user)] The [src] beeps: \"[response]\"") return 1 /obj/machinery/atm/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/card)) if(emagged) //prevent inserting id into an emagged ATM - to_chat(user, "\icon[src] CARD READER ERROR. This system has been compromised!") + to_chat(user, "[icon2html(src, user)] CARD READER ERROR. This system has been compromised!") return else if(istype(I,/obj/item/card/emag)) I.resolve_attackby(src, user) @@ -148,7 +148,7 @@ log transactions /obj/machinery/atm/attack_hand(mob/user as mob) if(istype(user, /mob/living/silicon)) - to_chat(user, "\icon[src] Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per system banking regulation #1005.") + to_chat(user, "[icon2html(src, user)] Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per system banking regulation #1005.") return if(get_dist(src,user) <= 1) @@ -259,7 +259,7 @@ log transactions var/target_account_number = text2num(href_list["target_acc_number"]) var/transfer_purpose = href_list["purpose"] if(SSeconomy.charge_to_account(target_account_number, authenticated_account.owner_name, transfer_purpose, machine_id, transfer_amount)) - to_chat(usr, "\icon[src]Funds transfer successful.") + to_chat(usr, "[icon2html(src, usr)]Funds transfer successful.") authenticated_account.money -= transfer_amount //create an entry in the account transaction log @@ -272,10 +272,10 @@ log transactions T.amount = "([transfer_amount])" SSeconomy.add_transaction_log(authenticated_account,T) else - to_chat(usr, "\icon[src]Funds transfer failed.") + to_chat(usr, "[icon2html(src, usr)]Funds transfer failed.") else - to_chat(usr, "\icon[src]You don't have enough funds to do that!") + to_chat(usr, "[icon2html(src, usr)]You don't have enough funds to do that!") if("view_screen") view_screen = text2num(href_list["view_screen"]) if("change_security_level") @@ -294,7 +294,7 @@ log transactions var/tried_pin = text2num(href_list["account_pin"]) var/datum/money_account/potential_account = SSeconomy.get_account(tried_account_num) if (!potential_account) - to_chat(usr, "\icon[src] Account number not found.") + to_chat(usr, "[icon2html(src, usr)] Account number not found.") number_incorrect_tries++ handle_lockdown() return @@ -311,7 +311,7 @@ log transactions else to_chat(usr, "Account card not found.") if (!authenticated_account) number_incorrect_tries++ - to_chat(usr, "\icon[src] Incorrect pin/account combination entered, [(max_pin_attempts+1) - number_incorrect_tries] attempts remaining.") + to_chat(usr, "[icon2html(src, usr)] Incorrect pin/account combination entered, [(max_pin_attempts+1) - number_incorrect_tries] attempts remaining.") handle_lockdown(tried_account_num) else SSeconomy.bank_log_access(authenticated_account, machine_id) @@ -319,7 +319,7 @@ log transactions playsound(src, 'sound/machines/twobeep.ogg', 50, 1) ticks_left_timeout = 120 view_screen = NO_SCREEN - to_chat(usr, " \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'") + to_chat(usr, " [icon2html(src, usr)] Access granted. Welcome user '[authenticated_account.owner_name].'") previous_account_number = tried_account_num if("e_withdrawal") @@ -347,7 +347,7 @@ log transactions T.time = worldtime2text() SSeconomy.add_transaction_log(authenticated_account,T) else - to_chat(usr, "\icon[src]You don't have enough funds to do that!") + to_chat(usr, "[icon2html(src, usr)]You don't have enough funds to do that!") if("withdrawal") var/amount = max(text2num(href_list["funds_amount"]),0) amount = round(amount, 0.01) @@ -372,7 +372,7 @@ log transactions T.time = worldtime2text() SSeconomy.add_transaction_log(authenticated_account,T) else - to_chat(usr, "\icon[src]You don't have enough funds to do that!") + to_chat(usr, "[icon2html(src, usr)]You don't have enough funds to do that!") if("balance_statement") if(authenticated_account) var/obj/item/paper/R = new() @@ -452,7 +452,7 @@ log transactions if(!held_card) //this might happen if the user had the browser window open when somebody emagged it if(emagged) - to_chat(usr, "\icon[src] The ATM card reader rejected your ID because this machine has been sabotaged!") + to_chat(usr, "[icon2html(src, usr)] The ATM card reader rejected your ID because this machine has been sabotaged!") else var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/card/id)) @@ -480,7 +480,7 @@ log transactions if(I) authenticated_account = SSeconomy.attempt_account_access(I.associated_account_number) if(authenticated_account) - to_chat(human_user, "\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'") + to_chat(human_user, "[icon2html(src, usr)] Access granted. Welcome user '[authenticated_account.owner_name].'") //create a transaction log entry var/datum/transaction/T = new() diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index c878eafc3dd..5ab16c09d9d 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -111,7 +111,7 @@ else user << browse(null,"window=eftpos") -/obj/item/device/eftpos/attackby(obj/item/O as obj, user as mob) +/obj/item/device/eftpos/attackby(var/obj/item/O, var/mob/user) var/obj/item/card/id/I = O.GetID() @@ -119,7 +119,7 @@ if(linked_account) scan_card(I, O) else - to_chat(usr, "\icon[src]Unable to connect to linked account.") + to_chat(user, "[icon2html(src, user)]Unable to connect to linked account.") else if (istype(O, /obj/item/spacecash/ewallet)) var/obj/item/spacecash/ewallet/E = O if (linked_account) @@ -127,7 +127,7 @@ if(transaction_locked && !transaction_paid) if(transaction_amount <= E.worth) playsound(src, 'sound/machines/chime.ogg', 50, 1) - src.visible_message("\icon[src] \The [src] chimes.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] \The [src] chimes.") transaction_paid = 1 //transfer the money @@ -144,11 +144,11 @@ T.time = worldtime2text() SSeconomy.add_transaction_log(linked_account,T) else - to_chat(usr, "\icon[src]\The [O] doesn't have that much money!") + to_chat(user, "[icon2html(src, user)]\The [O] doesn't have that much money!") else - to_chat(usr, "\icon[src]Connected account has been suspended.") + to_chat(user, "[icon2html(src, user)]Connected account has been suspended.") else - to_chat(usr, "\icon[src]EFTPOS is not connected to an account.") + to_chat(user, "[icon2html(src, user)]EFTPOS is not connected to an account.") else ..() @@ -166,14 +166,14 @@ alert("That is not a valid code!") print_reference() else - to_chat(usr, "\icon[src]Incorrect code entered.") + to_chat(usr, "[icon2html(src, usr)]Incorrect code entered.") if("change_id") var/attempt_code = text2num(input("Re-enter the current EFTPOS access code", "Confirm EFTPOS code")) if(attempt_code == access_code) eftpos_name = sanitize(input("Enter a new terminal ID for this device", "Enter new EFTPOS ID"), MAX_NAME_LEN) + " EFTPOS scanner" print_reference() else - to_chat(usr, "\icon[src]Incorrect code entered.") + to_chat(usr, "[icon2html(src, usr)]Incorrect code entered.") if("link_account") if (!prelocked_account) var/attempt_account_num = input("Enter account number to pay EFTPOS charges into", "New account number") as num @@ -182,9 +182,9 @@ if(linked_account) if(linked_account.suspended) linked_account = null - to_chat(usr, "\icon[src]Account has been suspended.") + to_chat(usr, "[icon2html(src, usr)]Account has been suspended.") else - to_chat(usr, "\icon[src]Account not found.") + to_chat(usr, "[icon2html(src, usr)]Account not found.") if("trans_purpose") var/choice = sanitize(input("Enter reason for EFTPOS transaction", "Transaction purpose")) if(choice) transaction_purpose = choice @@ -207,14 +207,14 @@ else if(linked_account) transaction_locked = 1 else - to_chat(usr, "\icon[src]No account connected to send transactions to.") + to_chat(usr, "[icon2html(src, usr)]No account connected to send transactions to.") if("scan_card") if(linked_account) var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/card)) scan_card(I) else - to_chat(usr, "\icon[src]Unable to link accounts.") + to_chat(usr, "[icon2html(src, usr)]Unable to link accounts.") if("reset") //reset the access code - requires HoP/captain access var/obj/item/I = usr.get_active_hand() @@ -222,10 +222,10 @@ var/obj/item/card/id/C = I if((access_cent_captain in C.access) || (access_hop in C.access) || (access_captain in C.access)) access_code = 0 - to_chat(usr, "\icon[src]Access code reset to 0.") + to_chat(usr, "[icon2html(src, usr)]Access code reset to 0.") else if (istype(I, /obj/item/card/emag)) access_code = 0 - to_chat(usr, "\icon[src]Access code reset to 0.") + to_chat(usr, "[icon2html(src, usr)]Access code reset to 0.") src.attack_self(usr) @@ -241,21 +241,21 @@ var/message = SSeconomy.transfer_money(C.associated_account_number, linked_account.account_number, transaction_purpose, machine_id, transaction_amount, null, usr) if(message) - to_chat(usr,"\icon[src][message].") + to_chat(usr,"[icon2html(src, usr)][message].") else playsound(src, 'sound/machines/chime.ogg', 50, 1) - src.visible_message("\icon[src] \The [src] chimes.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] \The [src] chimes.") transaction_paid = 1 else - to_chat(usr, "\icon[src]EFTPOS is not connected to an account.") + to_chat(usr, "[icon2html(src, usr)]EFTPOS is not connected to an account.") else if (istype(I, /obj/item/card/emag)) if(transaction_locked) if(transaction_paid) - to_chat(usr, "\icon[src]You stealthily swipe \the [I] through \the [src].") + to_chat(usr, "[icon2html(src, usr)]You stealthily swipe \the [I] through \the [src].") transaction_locked = 0 transaction_paid = 0 else usr.visible_message("\The [usr] swipes a card through \the [src].") playsound(src, 'sound/machines/chime.ogg', 50, 1) - src.visible_message("\icon[src] \The [src] chimes.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] \The [src] chimes.") transaction_paid = 1 diff --git a/code/modules/economy/quikpay.dm b/code/modules/economy/quikpay.dm index 565b3219a4b..d2d7780b0f0 100644 --- a/code/modules/economy/quikpay.dm +++ b/code/modules/economy/quikpay.dm @@ -112,10 +112,10 @@ var/transaction = SSeconomy.transfer_money(I.associated_account_number, SSeconomy.get_department_account(destinationact)?.account_number,transaction_purpose,transaction_terminal,transaction_amount,null,usr) if(transaction) - to_chat(usr,"\icon[src][transaction].") + to_chat(user,"[icon2html(src, user)][transaction].") else playsound(src, 'sound/machines/chime.ogg', 50, 1) - src.visible_message("\icon[src] \The [src] chimes.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] \The [src] chimes.") print_receipt() sum = 0 receipt = "" diff --git a/code/modules/events/money_spam.dm b/code/modules/events/money_spam.dm index c5962eb125b..1f6f920d5f1 100644 --- a/code/modules/events/money_spam.dm +++ b/code/modules/events/money_spam.dm @@ -177,7 +177,8 @@ if (!P.message_silent) playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(3, P.loc)) - if(!P.message_silent) O.show_message(text("\icon[P] *[P.ttone]*")) + if(!P.message_silent) + O.show_message(text("[icon2html(P, O)] *[P.ttone]*")) //Search for holder of the PDA. var/mob/living/L = null if(P.loc && isliving(P.loc)) @@ -187,4 +188,4 @@ L = get(P, /mob/living/silicon) if(L) - to_chat(L, "\icon[P] Message from [sender] (Unknown / spam?), \"[message]\" (Unable to Reply)") + to_chat(L, "[icon2html(P, L)] Message from [sender] (Unknown / spam?), \"[message]\" (Unable to Reply)") diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm index 6d542852c41..030a42942c2 100644 --- a/code/modules/examine/examine.dm +++ b/code/modules/examine/examine.dm @@ -53,7 +53,7 @@ description_holders["cult"] = show_cult_info ? A.get_description_cult() : "" description_holders["name"] = "[A.name]" - description_holders["icon"] = "\icon[A]" + description_holders["icon"] = "[icon2html(A, usr)]" description_holders["desc"] = A.desc /client/Stat() diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm index 6bfee62afac..269a028a9bb 100644 --- a/code/modules/games/boardgame.dm +++ b/code/modules/games/boardgame.dm @@ -111,7 +111,7 @@ if(board["[i]"]) var/obj/item/I = board["[i]"] - to_chat(user, browse_rsc(board_icons["[I.icon] [I.icon_state]"],"[I.icon_state].png")) + send_rsc(user, board_icons["[I.icon] [I.icon_state]"],"[I.icon_state].png") dat += " style='background-image:url([I.icon_state].png)'>" else dat+= ">" diff --git a/code/modules/goonchat/_helpers.dm b/code/modules/goonchat/_helpers.dm new file mode 100644 index 00000000000..0cff1928982 --- /dev/null +++ b/code/modules/goonchat/_helpers.dm @@ -0,0 +1,112 @@ +var/regex/is_http_protocol = regex("^https?://") + + +//Converts an icon to base64. Operates by putting the icon in the iconCache savefile, +// exporting it as text, and then parsing the base64 from that. +// (This relies on byond automatically storing icons in savefiles as base64) +/proc/icon2base64(icon/icon, iconKey = "misc") + if (!isicon(icon)) + return FALSE + to_save(iconCache[iconKey], icon) + var/iconData = iconCache.ExportText(iconKey) + var/list/partial = splittext(iconData, "{") + return replacetext(copytext(partial[2], 3, -5), "\n", "") + +/proc/icon2html(thing, target, icon_state, dir, frame = 1, moving = FALSE, realsize = FALSE, class = null) + if (!thing) + return + + var/key + var/icon/I = thing + if (!target) + return + if (target == world) + target = clients + + var/list/targets + if (!islist(target)) + targets = list(target) + else + targets = target + if (!targets.len) + return + if (!isicon(I)) + if (isfile(thing)) //special snowflake + var/name = "[generate_asset_name(thing)].png" + register_asset(name, thing) + for (var/thing2 in targets) + send_asset(thing2, key, FALSE) + return "
"
+
+ // 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]"
+
+
+ if (!bicon_cache[key]) // Doesn't exist, make it.
+ var/icon/I = icon(A.icon, A.icon_state, SOUTH, 1)
+ if (ishuman(thing)) // Shitty workaround for a BYOND issue.
+ var/icon/temp = I
+ I = icon()
+ I.Insert(temp, dir = SOUTH)
+
+ bicon_cache[key] = icon2base64(I, key)
+
+ return "
"
+
+//Costlier version of icon2html() that uses getFlatIcon() to account for overlays, underlays, etc. Use with extreme moderation, ESPECIALLY on mobs.
+/proc/costly_icon2html(thing, target)
+ if (!thing)
+ return
+
+ if (isicon(thing))
+ return icon2html(thing, target)
+
+ var/icon/I = getFlatIcon(thing)
+ return icon2html(I, target)
diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm
new file mode 100644
index 00000000000..b654d0d7d7f
--- /dev/null
+++ b/code/modules/goonchat/browserOutput.dm
@@ -0,0 +1,286 @@
+/*********************************
+For the main html chat area
+*********************************/
+
+//Precaching a bunch of shit
+var/savefile/iconCache = new("data/tmp/iconCache.sav") //Cache of icons for the browser output
+
+//Should match the value set in the browser js
+#define MAX_COOKIE_LENGTH 5
+
+//On client, created on login
+/datum/chatOutput
+ var/client/owner //client ref
+ // How many times client data has been checked
+ var/total_checks = 0
+ // When to next clear the client data checks counter
+ var/next_time_to_clear = 0
+ var/loaded = FALSE // Has the client loaded the browser output area?
+ var/list/messageQueue //If they haven't loaded chat, this is where messages will go until they do
+ var/cookieSent = FALSE // Has the client sent a cookie for analysis
+ var/broken = FALSE
+ var/list/connectionHistory //Contains the connection history passed from chat cookie
+
+/datum/chatOutput/New(client/C)
+ owner = C
+ messageQueue = list()
+ connectionHistory = list()
+
+/datum/chatOutput/proc/start()
+ //Check for existing chat
+ if(!owner)
+ return FALSE
+
+ if(!winexists(owner, "browseroutput")) // Oh goddamnit.
+ set waitfor = FALSE
+ broken = TRUE
+ message_admins("Couldn't start chat for [key_name_admin(owner)]!")
+ . = FALSE
+ alert(owner.mob, "Updated chat window does not exist. If you are using a custom skin file please allow the game to update.")
+ return
+
+ //It seems if someone disconnects while loading this can runtime, so we have to check for owner again
+ if(owner && winget(owner, "browseroutput", "is-visible") == "true") //Already setup
+ doneLoading()
+
+ else //Not setup
+ load()
+
+ return TRUE
+
+/datum/chatOutput/proc/load()
+ set waitfor = FALSE
+ if(!owner)
+ return
+
+ var/datum/asset/stuff = get_asset_datum(/datum/asset/group/goonchat)
+ stuff.send(owner)
+
+ show_browser(owner, file('code/modules/goonchat/browserassets/html/browserOutput.html'), "window=browseroutput")
+
+/datum/chatOutput/Topic(href, list/href_list)
+ if(usr.client != owner)
+ return TRUE
+
+ // Build arguments.
+ // Arguments are in the form "param[paramname]=thing"
+ var/list/params = list()
+ for(var/key in href_list)
+ if(length(key) > 7 && findtext(key, "param")) // 7 is the amount of characters in the basic param key template.
+ var/param_name = copytext(key, 7, -1)
+ var/item = href_list[key]
+
+ params[param_name] = item
+
+ var/data // Data to be sent back to the chat.
+ switch(href_list["proc"])
+ if("doneLoading")
+ data = doneLoading(arglist(params))
+
+ if("debug")
+ data = debug(arglist(params))
+
+ if("ping")
+ data = ping(arglist(params))
+
+ if("analyzeClientData")
+ data = analyzeClientData(arglist(params))
+
+ if("swaptodarkmode")
+ swaptodarkmode()
+
+ if("swaptolightmode")
+ swaptolightmode()
+
+ if(data)
+ ehjax_send(data = data)
+
+
+//Called on chat output done-loading by JS.
+/datum/chatOutput/proc/doneLoading()
+ if(loaded)
+ return
+
+ loaded = TRUE
+ showChat()
+
+
+ for(var/message in messageQueue)
+ // whitespace has already been handled by the original to_chat
+ to_chat(owner, message, handle_whitespace=FALSE)
+
+ messageQueue = null
+ sendClientData()
+
+ syncRegex()
+
+ //do not convert to to_chat()
+ legacy_chat(owner, "Failed to load fancy chat, reverting to old chat. Certain features won't work.")
+
+/datum/chatOutput/proc/showChat()
+ winset(owner, "output", "is-visible=false")
+ winset(owner, "browseroutput", "is-disabled=false;is-visible=true")
+
+/proc/syncChatRegexes()
+ for (var/user in clients)
+ var/client/C = user
+ var/datum/chatOutput/Cchat = C.chatOutput
+ if (Cchat && !Cchat.broken && Cchat.loaded)
+ Cchat.syncRegex()
+
+/datum/chatOutput/proc/syncRegex()
+ var/list/regexes = list()
+
+ if (regexes.len)
+ ehjax_send(data = list("syncRegex" = regexes))
+
+/datum/chatOutput/proc/ehjax_send(client/C = owner, window = "browseroutput", data)
+ if(islist(data))
+ data = json_encode(data)
+ send_output(C, "[data]", "[window]:ehjaxCallback")
+
+//Sends client connection details to the chat to handle and save
+/datum/chatOutput/proc/sendClientData()
+ //Get dem deets
+ var/list/deets = list("clientData" = list())
+ deets["clientData"]["ckey"] = owner.ckey
+ deets["clientData"]["ip"] = owner.address
+ deets["clientData"]["compid"] = owner.computer_id
+ var/data = json_encode(deets)
+ ehjax_send(data = data)
+
+//Called by client, sent data to investigate (cookie history so far)
+/datum/chatOutput/proc/analyzeClientData(cookie = "")
+ //Spam check
+ if(world.time > next_time_to_clear)
+ next_time_to_clear = world.time + (3 SECONDS)
+ total_checks = 0
+
+ total_checks += 1
+
+ if(total_checks > SPAM_TRIGGER_AUTOMUTE)
+ message_admins("[key_name(owner)] kicked for goonchat topic spam")
+ qdel(owner)
+ return
+
+ if(!cookie)
+ return
+
+ if(cookie != "none")
+ var/list/connData = json_decode(cookie)
+ if (connData && islist(connData) && connData.len > 0 && connData["connData"])
+ connectionHistory = connData["connData"] //lol fuck
+ var/list/found = new()
+
+ if(connectionHistory.len > MAX_COOKIE_LENGTH)
+ message_admins("[key_name(src.owner)] was kicked for an invalid ban cookie)")
+ qdel(owner)
+ return
+
+ for(var/i in connectionHistory.len to 1 step -1)
+ if(QDELETED(owner))
+ //he got cleaned up before we were done
+ return
+ var/list/row = src.connectionHistory[i]
+ if (!row || row.len < 3 || (!row["ckey"] || !row["compid"] || !row["ip"])) //Passed malformed history object
+ return
+ if (world.IsBanned(row["ckey"], row["ip"], row["compid"]))
+ found = row
+ break
+ CHECK_TICK
+
+ //Uh oh this fucker has a history of playing on a banned account!!
+ if (found.len > 0)
+ var/msg = "[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])"
+ //TODO: add a new evasion ban for the CURRENT client details, using the matched row details
+ message_admins(msg)
+ log_admin(msg)
+
+ cookieSent = TRUE
+
+//Called by js client every 60 seconds
+/datum/chatOutput/proc/ping()
+ return "pong"
+
+//Called by js client on js error
+/datum/chatOutput/proc/debug(error)
+ log_debug("\[[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]\] Client: [(src.owner.key ? src.owner.key : src.owner)] triggered JS error: [error]")
+
+//Global chat procs
+/proc/to_chat_immediate(target, message, handle_whitespace = TRUE, trailing_newline = TRUE)
+ if(!target || !message)
+ return
+
+ if(target == world)
+ target = clients
+
+ var/original_message = message
+ if(handle_whitespace)
+ message = replacetext(message, "\n", "") + message = replacetext(message, "\t", "[FOURSPACES][FOURSPACES]") + + //Replace expanded \icon macro with icon2html + //regex/Replace with a proc won't work here because icon2html takes target as an argument and there is no way to pass it to the replacement proc + //not even hacks with reassigning usr work + var/regex/i = new(@/
" + + if(islist(target)) + // Do the double-encoding outside the loop to save nanoseconds + var/twiceEncoded = url_encode(url_encode(message)) + for(var/I in target) + var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible + + if (!C) + continue + + //Send it to the old style output window. + legacy_chat(C, original_message) + + if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file. + continue + + if(!C.chatOutput.loaded) + //Client still loading, put their messages in a queue + C.chatOutput.messageQueue += message + continue + + send_output(C, twiceEncoded, "browseroutput:output") + else + var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible + + if (!C) + return + + //Send it to the old style output window. + legacy_chat(C, original_message) + + if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file. + return + + if(!C.chatOutput.loaded) + //Client still loading, put their messages in a queue + C.chatOutput.messageQueue += message + return + + // url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript. + send_output(C, url_encode(url_encode(message)), "browseroutput:output") + +/proc/to_chat(target, message, handle_whitespace = TRUE, trailing_newline = TRUE) + set waitfor = FALSE + if(Master.initializing || !SSchat) + to_chat_immediate(target, message, handle_whitespace, trailing_newline) + return + SSchat.queue(target, message, handle_whitespace, trailing_newline) + +/datum/chatOutput/proc/swaptolightmode() //Dark mode light mode stuff. Yell at KMC if this breaks! (See darkmode.dm for documentation) + owner.force_white_theme() + +/datum/chatOutput/proc/swaptodarkmode() + owner.force_dark_theme() + +#undef MAX_COOKIE_LENGTH diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css new file mode 100644 index 00000000000..cbf73d180e9 --- /dev/null +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -0,0 +1,398 @@ +/***************************************** +* +* GLOBAL STYLES +* +******************************************/ +html, body { + padding: 0; + margin: 0; + height: 100%; + color: #a4bad6; +} +body { + background: #171717; + font-family: Verdana, sans-serif; + font-size: 13px; + color: #a4bad6; + line-height: 1.2; + overflow-x: hidden; + overflow-y: scroll; + word-wrap: break-word; + scrollbar-face-color:#1A1A1A; + scrollbar-track-color:#171717; + scrollbar-highlight-color:#171717; +} + +em { + font-style: normal; + font-weight: bold; +} + +img { + margin: 0; + padding: 0; + line-height: 1; + -ms-interpolation-mode: nearest-neighbor; + image-rendering: pixelated; +} +img.icon { + height: 1em; + min-height: 1em; + width: auto; + vertical-align: bottom; +} + +.r:before { /* "repeated" badge class for combined messages */ + content: 'x'; +} +.r { + display: inline-block; + min-width: 0.5em; + font-size: 0.7em; + padding: 0.2em 0.3em; + line-height: 1; + color: white; + text-align: center; + white-space: nowrap; + vertical-align: middle; + background-color: crimson; + border-radius: 10px; +} + +a {color: #397ea5;} +a.visited {color: #7c00e6;} +a:visited {color: #7c00e6;} +a.popt {text-decoration: none;} + +/***************************************** +* +* OUTPUT NOT RELATED TO ACTUAL MESSAGES +* +******************************************/ +#loading { + position: fixed; + width: 300px; + height: 150px; + text-align: center; + left: 50%; + top: 50%; + margin: -75px 0 0 -150px; +} +#loading i {display: block; padding-bottom: 3px;} + +#messages { + font-size: 13px; + padding: 3px; + margin: 0; + word-wrap: break-word; +} +#newMessages { + position: fixed; + display: block; + bottom: 0; + right: 0; + padding: 8px; + background: #202020; + text-decoration: none; + font-variant: small-caps; + font-size: 1.1em; + font-weight: bold; + color: #a4bad6; +} +#newMessages:hover {background: #171717;} +#newMessages i {vertical-align: middle; padding-left: 3px;} +#ping { + position: fixed; + top: 0; + right: 135px; + width: 45px; + background: #202020; + height: 30px; + padding: 8px 0 2px 0; +} +#ping i {display: block; text-align: center;} +#ping .ms { + display: block; + text-align: center; + font-size: 8pt; + padding-top: 2px; +} +#userBar { + position: fixed; + top: 0; + right: 0; +} +#userBar .subCell { + background: #202020; + height: 30px; + padding: 5px 0; + display: block; + color: #a4bad6; + text-decoration: none; + line-height: 28px; + border-top: 1px solid #171717; +} +#userBar .subCell:hover {background: #202020;} +#userBar .toggle { + width: 45px; + background: #202020; + border-top: 0; + float: right; + text-align: center; +} +#userBar .sub {clear: both; display: none; width: 180px;} +#userBar .sub.scroll {overflow-y: scroll;} +#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;} +#userBar .sub span { + display: block; + line-height: 30px; + float: left; +} +#userBar .sub i { + display: block; + padding: 0 5px; + font-size: 1.1em; + width: 22px; + text-align: center; + line-height: 30px; + float: right; +} +#userBar .sub input { + position: absolute; + padding: 7px 5px; + width: 121px; + line-height: 30px; + float: left; +} +#userBar .topCell {border-top: 0;} + +/* POPUPS */ +.popup { + position: fixed; + top: 50%; + left: 50%; + background: #ddd; +} +.popup .close { + position: absolute; + background: #aaa; + top: 0; + right: 0; + color: #333; + text-decoration: none; + z-index: 2; + padding: 0 10px; + height: 30px; + line-height: 30px; +} +.popup .close:hover {background: #999;} +.popup .head { + background: #999; + color: #ddd; + padding: 0 10px; + height: 30px; + line-height: 30px; + text-transform: uppercase; + font-size: 0.9em; + font-weight: bold; + border-bottom: 2px solid green; +} +.popup input {border: 1px solid #999; background: #fff; margin: 0; padding: 5px; outline: none; color: #333;} +.popup input[type=text]:hover, .popup input[type=text]:active, .popup input[type=text]:focus {border-color: green;} +.popup input[type=submit] {padding: 5px 10px; background: #999; color: #ddd; text-transform: uppercase; font-size: 0.9em; font-weight: bold;} +.popup input[type=submit]:hover, .popup input[type=submit]:focus, .popup input[type=submit]:active {background: #aaa; cursor: pointer;} + +.changeFont {padding: 10px;} +.changeFont a {display: block; text-decoration: none; padding: 3px; color: #333;} +.changeFont a:hover {background: #ccc;} + +.highlightPopup {padding: 10px; text-align: center;} +.highlightPopup input[type=text] {display: block; width: 215px; text-align: left; margin-top: 5px;} +.highlightPopup input.highlightColor {background-color: #FFFF00;} +.highlightPopup input.highlightTermSubmit {margin-top: 5px;} + +/* ADMIN CONTEXT MENU */ +.contextMenu { + background-color: #ddd; + position: fixed; + margin: 2px; + width: 150px; +} +.contextMenu a { + display: block; + padding: 2px 5px; + text-decoration: none; + color: #333; +} + +.contextMenu a:hover { + background-color: #ccc; +} + +/* ADMIN FILTER MESSAGES MENU */ +.filterMessages {padding: 5px;} +.filterMessages div {padding: 2px 0;} +.filterMessages input {} +.filterMessages label {} + +.icon-stack {height: 1em; line-height: 1em; width: 1em; vertical-align: middle; margin-top: -2px;} + + +/***************************************** +* +* OUTPUT ACTUALLY RELATED TO MESSAGES +* +******************************************/ + +/* MOTD */ +.motd {color: #a4bad6; font-family: Verdana, sans-serif;} +.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #a4bad6; text-decoration: underline;} +.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #a4bad6;} + +/* ADD HERE FOR BOLD */ +.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;} + +/* ADD HERE FOR ITALIC */ +.italic, .italics, .emote {font-style: italic;} + +/* OUTPUT COLORS */ +.highlight {background: yellow;} + +h1, h2, h3, h4, h5, h6 {color: #a4bad6; font-family: Georgia, Verdana, sans-serif; line-height: 10%;} + +em {font-style: normal; font-weight: bold;} + +/* LOG */ +.log_message {color: #386aff; font-weight: bold;} + +/* CHAT TAGS */ +.tag {color: #fff; border-radius: 15px; font-size: 80%; padding-left: 4px; padding-right: 4px;} +.ooc_tag {background-color: #3c5dc0;} +.looc_tag {color: #000; background-color: #46b2b2;} +.dev_tag {background-color: #2c7731;} +.admin_tag {background-color: #9611d4;} +.mod_tag {background-color: #663a0e;} +.dead_tag {background-color: #9269c7;} +.pmin_tag {background-color: #ff0000;} +.pmout_tag {background-color: #ff0000;} +.pmoutalt_tag {background-color: #b54a4a;} +.pmother_tag {background-color: #498db6;} +.help_tag {background-color: #ff0000;} +.aooc_tag {background-color: #920000;} + +/* OOC */ +.ooc {font-weight: bold;} +.ooc img.text_tag {width: 32px; height: 10px; vertical-align: middle;} + +.ooc .everyone {color: #3c5dc0;} +.ooc .looc {color: #6699CC;} +.ooc .elevated {color: #2e78d9;} +.ooc .moderator {color: #184880;} +.ooc .developer {color: #2c7731;} +.ooc .admin {color: #b82e00;} + +/* Admin: Private Messages */ +.pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;} +.pm .in {color: #ff0000;} +.pm .out {color: #ff0000;} +.pm .other {color: #0000ff;} + +/* Admin: Channels */ +.mod_channel {color: #735638; font-weight: bold;} +.mod_channel .admin {color: #b82e00; font-weight: bold;} +.admin_channel {color: #9611D4; font-weight: bold;} +.cciaasay {color: #22a9b4; font-weight: bold;} +.devsay {color: #2c7731; font-weight: bold;} + +/* Radio: Misc */ +.deadsay {color: #9269c7;} +.radio {color: #00a700;} +.deptradio {color: #ff00ff;} /* when all other department colors fail */ +.newscaster {color: #b43c3c;} + +/* Radio Channels */ +.comradio {color: #5b8deb;} +.syndradio {color: #ac6667;} +.centradio {color: #7272a7;} +.airadio {color: #ec00ec;} +.entradio {color: #d19a46;} + +.secradio {color: #e21111;} +.engradio {color: #cc7b01;} +.medradio {color: #0f7e62;} +.sciradio {color: #c03bc0;} +.supradio {color: #c09141;} +.srvradio {color: #7fc732;} + +/* Miscellaneous */ +.name {font-weight: bold;} +.alert {color: #d82020;} +.vote {color: #9933ff;} +h1.alert, h2.alert {color: #a4bad6;} + +.emote {font-style: italic;} + +/* Game Messages */ +.attack {color: #ff0000;} +.moderate {color: #cc0000;} +.disarm {color: #990000;} +.passive {color: #660000;} + +.danger {color: #c51e1e; font-weight: bold} +.warning {color: #c51e1e; font-style: italic;} +.boldannounce {color: #c51e1e; font-weight: bold;} +.rose {color: #ff5050;} +.info {color: #6685f5;} +.notice {color: #6685f5;} +.alium {color: #00ff00;} +.cult {color: #aa1c1c;} + +/* Languages */ +.alien {color: #ad67ad;} +.tajaran {color: #b15377;} +.tajaran_signlang {color: #cc2c2c;} +.skrell {color: #00CED1;} +.vaurca {color: #b9b943;} +.soghun {color: #2cad2c;} +.solcom {color: #5f5fd4;} +.soghun_alt {color: #1d9b1d;} +.changeling {color: #ad14ad;} +.vox {color: #bb19bb;} +.rough {font-family: "Trebuchet MS", cursive, sans-serif;} +.say_quote {font-family: Georgia, Verdana, sans-serif;} +.yassa {color: #6323b6;} +.delvahhi {color: #914123; font-weight: bold;} +.siiktau {color: #be3434;} + +.interface {color: #750e75;} + +.good {color: #4f7529; font-weight: bold;} +.bad {color: #ee0000; font-weight: bold;} + +@keyframes hypnocolor { + 0% {color: #202020;} + 25% {color: #4b02ac;} + 50% {color: #9f41f1;} + 75% {color: #541c9c;} + 100% {color: #7adbf3;} +} + +.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;} +@keyframes phobia { + 0% {color: #f75a5a;} + 50% {color: #dd0000;} + 100% {color: #f75a5a;} +} + +.icon {height: 1em; width: auto;} + +.connectionClosed, .fatalError {background: red; color: white; padding: 5px;} +.connectionClosed.restored {background: green;} +.internal.boldnshit {color: #3d5bc3; font-weight: bold;} + +/* HELPER CLASSES */ +.text-normal {font-weight: normal; font-style: normal;} +.hidden {display: none; visibility: hidden;} +.ml-1 {margin-left: 1em;} +.ml-2 {margin-left: 2em;} +.ml-3 {margin-left: 3em;} diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css new file mode 100644 index 00000000000..adc8c9e34d0 --- /dev/null +++ b/code/modules/goonchat/browserassets/css/browserOutput_white.css @@ -0,0 +1,395 @@ +/***************************************** +* +* GLOBAL STYLES for white theme normies +* +******************************************/ +html, body { + padding: 0; + margin: 0; + height: 100%; + color: #000000; +} +body { + background: #fff; + font-family: Verdana, sans-serif; + font-size: 13px; + line-height: 1.2; + overflow-x: hidden; + overflow-y: scroll; + word-wrap: break-word; +} + +em { + font-style: normal; + font-weight: bold; +} + +img { + margin: 0; + padding: 0; + line-height: 1; + -ms-interpolation-mode: nearest-neighbor; + image-rendering: pixelated; +} +img.icon { + height: 1em; + min-height: 1em; + width: auto; + vertical-align: bottom; +} + + +.r:before { /* "repeated" badge class for combined messages */ + content: 'x'; +} +.r { + display: inline-block; + min-width: 0.5em; + font-size: 0.7em; + padding: 0.2em 0.3em; + line-height: 1; + color: white; + text-align: center; + white-space: nowrap; + vertical-align: middle; + background-color: crimson; + border-radius: 10px; +} + +a {color: #0000ff;} +a.visited {color: #ff00ff;} +a:visited {color: #ff00ff;} +a.popt {text-decoration: none;} + +/***************************************** +* +* OUTPUT NOT RELATED TO ACTUAL MESSAGES +* +******************************************/ +#loading { + position: fixed; + width: 300px; + height: 150px; + text-align: center; + left: 50%; + top: 50%; + margin: -75px 0 0 -150px; +} +#loading i {display: block; padding-bottom: 3px;} + +#messages { + font-size: 13px; + padding: 3px; + margin: 0; + word-wrap: break-word; +} +#newMessages { + position: fixed; + display: block; + bottom: 0; + right: 0; + padding: 8px; + background: #ddd; + text-decoration: none; + font-variant: small-caps; + font-size: 1.1em; + font-weight: bold; + color: #333; +} +#newMessages:hover {background: #ccc;} +#newMessages i {vertical-align: middle; padding-left: 3px;} +#ping { + position: fixed; + top: 0; + right: 135px; + width: 45px; + background: #ddd; + height: 30px; + padding: 8px 0 2px 0; +} +#ping i {display: block; text-align: center;} +#ping .ms { + display: block; + text-align: center; + font-size: 8pt; + padding-top: 2px; +} +#userBar { + position: fixed; + top: 0; + right: 0; +} +#userBar .subCell { + background: #ddd; + height: 30px; + padding: 5px 0; + display: block; + color: #333; + text-decoration: none; + line-height: 28px; + border-top: 1px solid #b4b4b4; +} +#userBar .subCell:hover {background: #ccc;} +#userBar .toggle { + width: 45px; + background: #ccc; + border-top: 0; + float: right; + text-align: center; +} +#userBar .sub {clear: both; display: none; width: 180px;} +#userBar .sub.scroll {overflow-y: scroll;} +#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;} +#userBar .sub span { + display: block; + line-height: 30px; + float: left; +} +#userBar .sub i { + display: block; + padding: 0 5px; + font-size: 1.1em; + width: 22px; + text-align: center; + line-height: 30px; + float: right; +} +#userBar .sub input { + position: absolute; + padding: 7px 5px; + width: 121px; + line-height: 30px; + float: left; +} +#userBar .topCell {border-top: 0;} + +/* POPUPS */ +.popup { + position: fixed; + top: 50%; + left: 50%; + background: #ddd; +} +.popup .close { + position: absolute; + background: #aaa; + top: 0; + right: 0; + color: #333; + text-decoration: none; + z-index: 2; + padding: 0 10px; + height: 30px; + line-height: 30px; +} +.popup .close:hover {background: #999;} +.popup .head { + background: #999; + color: #ddd; + padding: 0 10px; + height: 30px; + line-height: 30px; + text-transform: uppercase; + font-size: 0.9em; + font-weight: bold; + border-bottom: 2px solid green; +} +.popup input {border: 1px solid #999; background: #fff; margin: 0; padding: 5px; outline: none; color: #333;} +.popup input[type=text]:hover, .popup input[type=text]:active, .popup input[type=text]:focus {border-color: green;} +.popup input[type=submit] {padding: 5px 10px; background: #999; color: #ddd; text-transform: uppercase; font-size: 0.9em; font-weight: bold;} +.popup input[type=submit]:hover, .popup input[type=submit]:focus, .popup input[type=submit]:active {background: #aaa; cursor: pointer;} + +.changeFont {padding: 10px;} +.changeFont a {display: block; text-decoration: none; padding: 3px; color: #333;} +.changeFont a:hover {background: #ccc;} + +.highlightPopup {padding: 10px; text-align: center;} +.highlightPopup input[type=text] {display: block; width: 215px; text-align: left; margin-top: 5px;} +.highlightPopup input.highlightColor {background-color: #FFFF00;} +.highlightPopup input.highlightTermSubmit {margin-top: 5px;} + +/* ADMIN CONTEXT MENU */ +.contextMenu { + background-color: #ddd; + position: fixed; + margin: 2px; + width: 150px; +} +.contextMenu a { + display: block; + padding: 2px 5px; + text-decoration: none; + color: #333; +} + +.contextMenu a:hover { + background-color: #ccc; +} + +/* ADMIN FILTER MESSAGES MENU */ +.filterMessages {padding: 5px;} +.filterMessages div {padding: 2px 0;} +.filterMessages input {} +.filterMessages label {} + +.icon-stack {height: 1em; line-height: 1em; width: 1em; vertical-align: middle; margin-top: -2px;} + + +/***************************************** +* +* OUTPUT ACTUALLY RELATED TO MESSAGES +* +******************************************/ + +/* MOTD */ +.motd {color: #638500; font-family: Verdana, sans-serif;} +.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #638500; text-decoration: underline;} +.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #638500;} + +/* ADD HERE FOR BOLD */ +.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;} + +/* ADD HERE FOR ITALIC */ +.italic, .italics, .emote {font-style: italic;} + +/* OUTPUT COLORS */ +.highlight {background: yellow;} + +h1, h2, h3, h4, h5, h6 {color: #0000ff; font-family: Georgia, Verdana, sans-serif; line-height: 10%;} + +em {font-style: normal;font-weight: bold;} + +/* LOG */ +.log_message {color: #386aff;font-weight: bold;} + +/* CHAT TAGS */ +.tag {color: #fff; border-radius: 15px; font-size: 80%; padding-left: 4px; padding-right: 4px;} +.ooc_tag {background-color: #002eb8;} +.looc_tag {color: #000; background-color: #46b2b2;} +.dev_tag {background-color: #2c7731;} +.admin_tag {background-color: #9611d4;} +.mod_tag {background-color: #663a0e;} +.dead_tag {background-color: #530fad;} +.pmin_tag {background-color: #ff0000;} +.pmout_tag {background-color: #ff0000;} +.pmoutalt_tag {background-color: #b54a4a;} +.pmother_tag {background-color: #498db6;} +.help_tag {background-color: #ff0000;} +.aooc_tag {background-color: #920000;} + +/* OOC */ +.ooc {font-weight: bold;} +.ooc img.text_tag {width: 32px; height: 10px; vertical-align: middle;} + +.ooc .everyone {color: #002eb8;} +.ooc .looc {color: #6699CC;} +.ooc .elevated {color: #2e78d9;} +.ooc .moderator {color: #184880;} +.ooc .developer {color: #2c7731;} +.ooc .admin {color: #b82e00;} + +/* Admin: Private Messages */ +.pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;} +.pm .in {color: #ff0000;} +.pm .out {color: #ff0000;} +.pm .other {color: #0000ff;} + +/* Admin: Channels */ +.mod_channel {color: #735638; font-weight: bold;} +.mod_channel .admin {color: #b82e00; font-weight: bold;} +.admin_channel {color: #9611D4; font-weight: bold;} +.cciaasay {color: #22a9b4; font-weight: bold;} +.devsay {color: #2c7731; font-weight: bold;} + +/* Radio: Misc */ +.deadsay {color: #530FAD;} +.radio {color: #008000;} +.deptradio {color: #ff00ff;} /* when all other department colors fail */ +.newscaster {color: #750000;} + +/* Radio Channels */ +.comradio {color: #193A7A;} +.syndradio {color: #6D3F40;} +.centradio {color: #5C5C8A;} +.airadio {color: #FF00FF;} +.entradio {color: #bd893c;} + +.secradio {color: #A30000;} +.engradio {color: #A66300;} +.medradio {color: #0a5c47;} +.sciradio {color: #993399;} +.supradio {color: #5F4519;} +.srvradio {color: #6eaa2c;} + +/* Miscellaneous */ +.name {font-weight: bold;} +.alert {color: #ff0000;} +.vote {color: #6c18c0} +h1.alert, h2.alert {color: #000080;} + +.emote {font-style: italic;} + +/* Game Messages */ +.attack {color: #ff0000;} +.moderate {color: #cc0000;} +.disarm {color: #990000;} +.passive {color: #660000;} + +.danger {color: #ff0000; font-weight: bold} +.warning {color: #ff0000; font-style: italic;} +.boldannounce {color: #ff0000; font-weight: bold;} +.rose {color: #ff5050;} +.info {color: #0000CC;} +.notice {color: #000099;} +.alium {color: #00ff00;} +.cult {color: #800080; font-weight: bold; font-style: italic;} + +/* Languages */ +.alien {color: #543354;} +.tajaran {color: #803B56;} +.tajaran_signlang {color: #941C1C;} +.skrell {color: #00CED1;} +.vaurca {color: #9e9e39;} +.soghun {color: #228B22;} +.solcom {color: #22228B;} +.soghun_alt {color: #024402;} +.changeling {color: #800080;} +.vox {color: #AA00AA;} +.rough {font-family: "Trebuchet MS", cursive, sans-serif;} +.say_quote {font-family: Georgia, Verdana, sans-serif;} +.yassa {color: #400987;} +.delvahhi {color: #5E2612; font-weight: bold;} +.siiktau {color: #A52A2A;} + +.interface {color: #750e75;} + +.good {color: #4f7529; font-weight: bold;} +.bad {color: #ee0000; font-weight: bold;} + +@keyframes hypnocolor { + 0% {color: #0d0d0d;} + 25% {color: #410194;} + 50% {color: #7f17d8;} + 75% {color: #410194;} + 100% {color: #3bb5d3;} +} + +.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;} +@keyframes phobia { + 0% {color: #0d0d0d;} + 50% {color: #dd0000;} + 100% {color: #0d0d0d;} +} + +.icon {height: 1em; width: auto;} + +.connectionClosed, .fatalError {background: red; color: white; padding: 5px;} +.connectionClosed.restored {background: green;} +.internal.boldnshit {color: blue; font-weight: bold;} + +/* HELPER CLASSES */ +.text-normal {font-weight: normal; font-style: normal;} +.hidden {display: none; visibility: hidden;} +.ml-1 {margin-left: 1em;} +.ml-2 {margin-left: 2em;} +.ml-3 {margin-left: 3em;} diff --git a/code/modules/goonchat/browserassets/css/styles_template.css b/code/modules/goonchat/browserassets/css/styles_template.css new file mode 100644 index 00000000000..09938c9bbeb --- /dev/null +++ b/code/modules/goonchat/browserassets/css/styles_template.css @@ -0,0 +1,365 @@ +/***************************************** +* +* GLOBAL STYLES +* +******************************************/ +html, body { + padding: 0; + margin: 0; + height: 100%; + color: #a4bad6; +} +body { + background: #171717; + font-family: Verdana, sans-serif; + font-size: 13px; + color: #a4bad6; + line-height: 1.2; + overflow-x: hidden; + overflow-y: scroll; + word-wrap: break-word; + scrollbar-face-color:#1A1A1A; + scrollbar-track-color:#171717; + scrollbar-highlight-color:#171717; +} + +em { + font-style: normal; + font-weight: bold; +} + +img { + margin: 0; + padding: 0; + line-height: 1; + -ms-interpolation-mode: nearest-neighbor; + image-rendering: pixelated; +} + +img.icon { + height: 1em; + min-height: 1em; + width: auto; + vertical-align: bottom; +} + +.r:before { /* "repeated" badge class for combined messages */ + content: 'x'; +} +.r { + display: inline-block; + min-width: 0.5em; + font-size: 0.7em; + padding: 0.2em 0.3em; + line-height: 1; + color: white; + text-align: center; + white-space: nowrap; + vertical-align: middle; + background-color: crimson; + border-radius: 10px; +} + +a {color: #397ea5;} +a.visited {color: #7c00e6;} +a:visited {color: #7c00e6;} +a.popt {text-decoration: none;} + +/***************************************** +* +* OUTPUT NOT RELATED TO ACTUAL MESSAGES +* +******************************************/ +#loading { + position: fixed; + width: 300px; + height: 150px; + text-align: center; + left: 50%; + top: 50%; + margin: -75px 0 0 -150px; +} +#loading i {display: block; padding-bottom: 3px;} + +#messages { + font-size: 13px; + padding: 3px; + margin: 0; + word-wrap: break-word; +} +#newMessages { + position: fixed; + display: block; + bottom: 0; + right: 0; + padding: 8px; + background: #202020; + text-decoration: none; + font-variant: small-caps; + font-size: 1.1em; + font-weight: bold; + color: #a4bad6; +} +#newMessages:hover {background: #171717;} +#newMessages i {vertical-align: middle; padding-left: 3px;} +#userBar { + position: fixed; + top: 0; + right: 0; +} +#userBar .subCell { + background: #202020; + height: 30px; + padding: 5px 0; + display: block; + color: #a4bad6; + text-decoration: none; + line-height: 28px; + border-top: 1px solid #171717; +} +#userBar .subCell:hover {background: #202020;} +#userBar .toggle { + width: 45px; + background: #202020; + border-top: 0; + float: right; + text-align: center; +} +#userBar .sub {clear: both; display: none; width: 180px;} +#userBar .sub.scroll {overflow-y: scroll;} +#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;} +#userBar .sub span { + display: block; + line-height: 30px; + float: left; +} +#userBar .sub i { + display: block; + padding: 0 5px; + font-size: 1.1em; + width: 22px; + text-align: center; + line-height: 30px; + float: right; +} +#userBar .sub input { + position: absolute; + padding: 7px 5px; + width: 121px; + line-height: 30px; + float: left; +} +#userBar .topCell {border-top: 0;} + +/* POPUPS */ +.popup { + position: fixed; + top: 50%; + left: 50%; + background: #ddd; +} +.popup .close { + position: absolute; + background: #aaa; + top: 0; + right: 0; + color: #333; + text-decoration: none; + z-index: 2; + padding: 0 10px; + height: 30px; + line-height: 30px; +} +.popup .close:hover {background: #999;} +.popup .head { + background: #999; + color: #ddd; + padding: 0 10px; + height: 30px; + line-height: 30px; + text-transform: uppercase; + font-size: 0.9em; + font-weight: bold; + border-bottom: 2px solid green; +} +.popup input {border: 1px solid #999; background: #fff; margin: 0; padding: 5px; outline: none; color: #333;} +.popup input[type=text]:hover, .popup input[type=text]:active, .popup input[type=text]:focus {border-color: green;} +.popup input[type=submit] {padding: 5px 10px; background: #999; color: #ddd; text-transform: uppercase; font-size: 0.9em; font-weight: bold;} +.popup input[type=submit]:hover, .popup input[type=submit]:focus, .popup input[type=submit]:active {background: #aaa; cursor: pointer;} + +.changeFont {padding: 10px;} +.changeFont a {display: block; text-decoration: none; padding: 3px; color: #333;} +.changeFont a:hover {background: #ccc;} + +.highlightPopup {padding: 10px; text-align: center;} +.highlightPopup input[type=text] {display: block; width: 215px; text-align: left; margin-top: 5px;} +.highlightPopup input.highlightColor {background-color: #FFFF00;} +.highlightPopup input.highlightTermSubmit {margin-top: 5px;} + +/* ADMIN CONTEXT MENU */ +.contextMenu { + background-color: #ddd; + position: fixed; + margin: 2px; + width: 150px; +} +.contextMenu a { + display: block; + padding: 2px 5px; + text-decoration: none; + color: #333; +} + +.contextMenu a:hover { + background-color: #ccc; +} + +/* ADMIN FILTER MESSAGES MENU */ +.filterMessages {padding: 5px;} +.filterMessages div {padding: 2px 0;} +.filterMessages input {} +.filterMessages label {} + +.icon-stack {height: 1em; line-height: 1em; width: 1em; vertical-align: middle; margin-top: -2px;} + + +/***************************************** +* +* OUTPUT ACTUALLY RELATED TO MESSAGES +* +******************************************/ + +/* MOTD */ +.motd {color: #a4bad6; font-family: Verdana, sans-serif;} +.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #a4bad6; text-decoration: underline;} +.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #a4bad6;} + +/* ADD HERE FOR BOLD */ +.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;} + +/* ADD HERE FOR ITALIC */ +.italic, .italics, .emote {font-style: italic;} + +/* OUTPUT COLORS */ +.highlight {background: yellow;} + +h1, h2, h3, h4, h5, h6 {color: #a4bad6; font-family: Georgia, Verdana, sans-serif; margin-bottom: 20%;} + +em {font-style: normal; font-weight: bold;} + +/* LOG */ +.log_message {color: #386aff; font-weight: bold;} + +/* OOC */ +.ooc {font-weight: bold;} +.ooc img.text_tag {width: 32px; height: 10px; vertical-align: middle;} + +.ooc .everyone {color: #002eb8;} +.ooc .looc {color: #6699CC;} +.ooc .elevated {color: #2e78d9;} +.ooc .moderator {color: #184880;} +.ooc .developer {color: #1b521f;} +.ooc .admin {color: #b82e00;} + +/* Admin: Private Messages */ +.pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;} +.pm .in {color: #ff0000;} +.pm .out {color: #ff0000;} +.pm .other {color: #0000ff;} + +/* Admin: Channels */ +.mod_channel {color: #735638; font-weight: bold;} +.mod_channel .admin {color: #b82e00; font-weight: bold;} +.admin_channel {color: #9611D4; font-weight: bold;} +.cciaasay {color: #22a9b4; font-weight: bold;} +.devsay {color: #1b521f; font-weight: bold;} + +/* Radio: Misc */ +.deadsay {color: #530FAD;} +.radio {color: #008000;} +.deptradio {color: #ff00ff;} /* when all other department colors fail */ +.newscaster {color: #750000;} + +/* Radio Channels */ +.comradio {color: #193A7A;} +.syndradio {color: #6D3F40;} +.centradio {color: #5C5C8A;} +.airadio {color: #FF00FF;} +.entradio {color: #bd893c;} + +.secradio {color: #A30000;} +.engradio {color: #A66300;} +.medradio {color: #0a5c47;} +.sciradio {color: #993399;} +.supradio {color: #5F4519;} +.srvradio {color: #6eaa2c;} + +/* Miscellaneous */ +.name {font-weight: bold;} +.alert {color: #ff0000;} +h1.alert, h2.alert {color: #000080;} + +.emote {font-style: italic;} + +/* Game Messages */ +.attack {color: #ff0000;} +.moderate {color: #cc0000;} +.disarm {color: #990000;} +.passive {color: #660000;} + +.danger {color: #ff0000; font-weight: bold;} +.warning {color: #ff0000; font-style: italic;} +.boldannounce {color: #ff0000; font-weight: bold;} +.rose {color: #ff5050;} +.info {color: #0000cc;} +.notice {color: #000099;} +.alium {color: #00ff00;} +.cult {color: #800080; font-weight: bold; font-style: italic;} + + +/* Languages */ +.alien {color: #543354;} +.tajaran {color: #803B56;} +.tajaran_signlang {color: #941C1C;} +.skrell {color: #00CED1;} +.vaurca {color: #9e9e39;} +.soghun {color: #228B22;} +.solcom {color: #22228B;} +.soghun_alt {color: #024402;} +.changeling {color: #800080;} +.vox {color: #AA00AA;} +.rough {font-family: "Trebuchet MS", cursive, sans-serif;} +.say_quote {font-family: Georgia, Verdana, sans-serif;} +.yassa {color: #400987;} +.delvahhi {color: #5E2612; font-weight: bold;} +.siiktau {color: #A52A2A;} + +.interface {color: #750e75;} + +.good {color: #4f7529; font-weight: bold;} +.bad {color: #ee0000; font-weight: bold;} + +@keyframes hypnocolor { + 0% {color: #202020;} + 25% {color: #4b02ac;} + 50% {color: #9f41f1;} + 75% {color: #541c9c;} + 100% {color: #7adbf3;} +} + +.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;} +@keyframes phobia { + 0% {color: #f75a5a;} + 50% {color: #dd0000;} + 100% {color: #f75a5a;} +} + +.icon {height: 1em; width: auto;} + +.connectionClosed, .fatalError {background: red; color: white; padding: 5px;} +.connectionClosed.restored {background: green;} +.internal.boldnshit {color: #3d5bc3; font-weight: bold;} + +/* HELPER CLASSES */ +.text-normal {font-weight: normal; font-style: normal;} +.hidden {display: none; visibility: hidden;} diff --git a/code/modules/goonchat/browserassets/html/browserOutput.html b/code/modules/goonchat/browserassets/html/browserOutput.html new file mode 100644 index 00000000000..11840cc9a78 --- /dev/null +++ b/code/modules/goonchat/browserassets/html/browserOutput.html @@ -0,0 +1,71 @@ + + + +
+
+
+
+ Loading...
+ If this takes longer than 30 seconds, it will automatically reload a maximum of 5 times.
+ If it still doesn't work, use the bug report button at the top right of the window. +
+ + If this takes longer than 30 seconds, it will automatically reload a maximum of 5 times.
+ If it still doesn't work, use the bug report button at the top right of the window. +
+
+
+
+
+
+
diff --git a/code/modules/goonchat/browserassets/js/browserOutput.js b/code/modules/goonchat/browserassets/js/browserOutput.js
new file mode 100644
index 00000000000..1146c8b98d8
--- /dev/null
+++ b/code/modules/goonchat/browserassets/js/browserOutput.js
@@ -0,0 +1,1038 @@
+
+/*****************************************
+*
+* FUNCTION AND VAR DECLARATIONS
+*
+******************************************/
+
+//DEBUG STUFF
+var escaper = encodeURIComponent || escape;
+var decoder = decodeURIComponent || unescape;
+window.onerror = function(msg, url, line, col, error) {
+ if (document.location.href.indexOf("proc=debug") <= 0) {
+ var extra = !col ? '' : ' | column: ' + col;
+ extra += !error ? '' : ' | error: ' + error;
+ extra += !navigator.userAgent ? '' : ' | user agent: ' + navigator.userAgent;
+ var debugLine = 'Error: ' + msg + ' | url: ' + url + ' | line: ' + line + extra;
+ window.location = '?_src_=chat&proc=debug¶m[error]='+escaper(debugLine);
+ }
+ return true;
+};
+
+//Globals
+window.status = 'Output';
+var $messages, $subTheme, $subOptions, $subFont, $selectedSub, $contextMenu, $filterMessages, $last_message;
+var opts = {
+ //General
+ 'messageCount': 0, //A count...of messages...
+ 'messageLimit': 2053, //A limit...for the messages...
+ 'scrollSnapTolerance': 10, //If within x pixels of bottom
+ 'clickTolerance': 10, //Keep focus if outside x pixels of mousedown position on mouseup
+ 'imageRetryDelay': 50, //how long between attempts to reload images (in ms)
+ 'imageRetryLimit': 50, //how many attempts should we make?
+ 'popups': 0, //Amount of popups opened ever
+ 'wasd': false, //Is the user in wasd mode?
+ 'priorChatHeight': 0, //Thing for height-resizing detection
+ 'restarting': false, //Is the round restarting?
+ 'iconsize': 12,
+
+ //Options menu
+ 'selectedSubLoop': null, //Contains the interval loop for closing the selected sub menu
+ 'suppressSubClose': false, //Whether or not we should be hiding the selected sub menu
+ 'highlightTerms': [],
+ 'highlightLimit': 5,
+ 'highlightColor': '#FFFF00', //The color of the highlighted message
+ 'pingDisabled': false, //Has the user disabled the ping counter
+
+ //Ping display
+ 'lastPang': 0, //Timestamp of the last response from the server.
+ 'pangLimit': 70000,
+ 'pingTime': 0, //Timestamp of when ping sent
+ 'pongTime': 0, //Timestamp of when ping received
+ 'noResponse': false, //Tracks the state of the previous ping request
+ 'noResponseCount': 0, //How many failed pings?
+
+ //Clicks
+ 'mouseDownX': null,
+ 'mouseDownY': null,
+ 'preventFocus': false, //Prevents switching focus to the game window
+
+ //Client Connection Data
+ 'clientDataLimit': 5,
+ 'clientData': [],
+
+ 'font': 'Arial',
+ 'messageCombining': true,
+
+};
+var replaceRegexes = {};
+
+function clamp(val, min, max) {
+ return Math.max(min, Math.min(val, max))
+}
+
+//Polyfill for fucking date now because of course IE8 and below don't support it
+if (!Date.now) {
+ Date.now = function now() {
+ return new Date().getTime();
+ };
+}
+//Polyfill for trim() (IE8 and below)
+if (typeof String.prototype.trim !== 'function') {
+ String.prototype.trim = function () {
+ return this.replace(/^\s+|\s+$/g, '');
+ };
+}
+
+// Linkify the contents of a node, within its parent.
+function linkify(parent, insertBefore, text) {
+ var start = 0;
+ var match;
+ var regex = /(?:(?:https?:\/\/)|(?:www\.))(?:[^ ]*?\.[^ ]*?)+[-A-Za-z0-9+&@#\/%?=~_|$!:,.;()]+/ig;
+ while ((match = regex.exec(text)) !== null) {
+ // add the unmatched text
+ parent.insertBefore(document.createTextNode(text.substring(start, match.index)), insertBefore);
+
+ var href = match[0];
+ if (!/^https?:\/\//i.test(match[0])) {
+ href = "http://" + match[0];
+ }
+
+ // add the link
+ var link = document.createElement("a");
+ link.href = href;
+ link.textContent = match[0];
+ parent.insertBefore(link, insertBefore);
+
+ start = regex.lastIndex;
+ }
+ if (start !== 0) {
+ // add the remaining text and remove the original text node
+ parent.insertBefore(document.createTextNode(text.substring(start)), insertBefore);
+ parent.removeChild(insertBefore);
+ }
+}
+
+// Recursively linkify the children of a given node.
+function linkify_node(node) {
+ var children = node.childNodes;
+ // work backwards to avoid the risk of looping forever on our own output
+ for (var i = children.length - 1; i >= 0; --i) {
+ var child = children[i];
+ if (child.nodeType == Node.TEXT_NODE) {
+ // text is to be linkified
+ linkify(node, child, child.textContent);
+ } else if (child.nodeName != "A" && child.nodeName != "a") {
+ // do not linkify existing links
+ linkify_node(child);
+ }
+ }
+}
+
+//Shit fucking piece of crap that doesn't work god fuckin damn it
+function linkify_fallback(text) {
+ var rex = /((?:The connection has been closed because the server is restarting. Please wait while you automatically reconnect.
', 'internal');
+ } else {
+ //Oh we're actually being sent data instead of an instruction
+ var dataJ;
+ try {
+ dataJ = $.parseJSON(data);
+ } catch (e) {
+ //But...incorrect :sadtrombone:
+ window.onerror('JSON: '+e+'. '+data, 'browserOutput.html', 327);
+ return;
+ }
+ data = dataJ;
+
+ if (data.clientData) {
+ if (opts.restarting) {
+ opts.restarting = false;
+ $('.connectionClosed.restarting:not(.restored)').addClass('restored').text('The round restarted and you successfully reconnected!');
+ }
+ if (!data.clientData.ckey && !data.clientData.ip && !data.clientData.compid) {
+ //TODO: Call shutdown perhaps
+ return;
+ } else {
+ handleClientData(data.clientData.ckey, data.clientData.ip, data.clientData.compid);
+ }
+ } else if (data.syncRegex) {
+ for (var i in data.syncRegex) {
+
+ var regexData = data.syncRegex[i];
+ var regexName = regexData[0];
+ var regexFlags = regexData[1];
+ var regexReplaced = regexData[2];
+
+ replaceRegexes[i] = [new RegExp(regexName, regexFlags), regexReplaced];
+ }
+ }
+ }
+}
+
+function createPopup(contents, width) {
+ opts.popups++;
+ $('body').append('');
+
+ //Attach close popup event
+ var $popup = $('#popup'+opts.popups);
+ var height = $popup.outerHeight();
+ $popup.css({'height': height+'px', 'margin': '-'+(height/2)+'px 0 0 -'+(width/2)+'px'});
+
+ $popup.on('click', '.close', function(e) {
+ e.preventDefault();
+ $popup.remove();
+ });
+}
+
+function toggleWasd(state) {
+ opts.wasd = (state == 'on' ? true : false);
+}
+
+function subSlideUp() {
+ $(this).removeClass('scroll');
+ $(this).css('height', '');
+}
+
+function startSubLoop() {
+ if (opts.selectedSubLoop) {
+ clearInterval(opts.selectedSubLoop);
+ }
+ return setInterval(function() {
+ if (!opts.suppressSubClose && $selectedSub.is(':visible')) {
+ $selectedSub.slideUp('fast', subSlideUp);
+ clearInterval(opts.selectedSubLoop);
+ }
+ }, 5000); //every 5 seconds
+}
+
+function handleToggleClick($sub, $toggle) {
+ if ($selectedSub !== $sub && $selectedSub.is(':visible')) {
+ $selectedSub.slideUp('fast', subSlideUp);
+ }
+ $selectedSub = $sub
+ if ($selectedSub.is(':visible')) {
+ $selectedSub.slideUp('fast', subSlideUp);
+ clearInterval(opts.selectedSubLoop);
+ } else {
+ $selectedSub.slideDown('fast', function() {
+ var windowHeight = $(window).height();
+ var toggleHeight = $toggle.outerHeight();
+ var priorSubHeight = $selectedSub.outerHeight();
+ var newSubHeight = windowHeight - toggleHeight;
+ $(this).height(newSubHeight);
+ if (priorSubHeight > (windowHeight - toggleHeight)) {
+ $(this).addClass('scroll');
+ }
+ });
+ opts.selectedSubLoop = startSubLoop();
+ }
+}
+
+/*****************************************
+*
+* DOM READY
+*
+******************************************/
+
+if (typeof $ === 'undefined') {
+ var div = document.getElementById('loading').childNodes[1];
+ div += 'ERROR: Jquery did not load.'; +} + +$(function() { + $messages = $('#messages'); + $subTheme = $('#subTheme'); + $subOptions = $('#subOptions'); + $subFont = $('#subFont'); + $selectedSub = $subOptions; + + //Hey look it's a controller loop! + setInterval(function() { + if (opts.lastPang + opts.pangLimit < Date.now() && !opts.restarting) { //Every pingLimit + if (!opts.noResponse) { //Only actually append a message if the previous ping didn't also fail (to prevent spam) + opts.noResponse = true; + opts.noResponseCount++; + internalOutput('
You are either AFK, experiencing lag or the connection has closed.
', 'internal');
+ }
+ } else if (opts.noResponse) { //Previous ping attempt failed ohno
+ $('.connectionClosed[data-count="'+opts.noResponseCount+'"]:not(.restored)').addClass('restored').text('Your connection has been restored (probably)!');
+ opts.noResponse = false;
+ }
+ }, 2000); //2 seconds
+
+
+ /*****************************************
+ *
+ * LOAD SAVED CONFIG
+ *
+ ******************************************/
+ var savedConfig = {
+ fontsize: getCookie('fontsize'),
+ iconsize: getCookie('iconsize'),
+ lineheight: getCookie('lineheight'),
+ 'spingDisabled': getCookie('pingdisabled'),
+ 'shighlightTerms': getCookie('highlightterms'),
+ 'shighlightColor': getCookie('highlightcolor'),
+ 'sfont': getCookie('font'),
+ 'smessagecombining': getCookie('messagecombining'),
+ 'stheme': getCookie('theme'),
+ };
+
+ if (savedConfig.fontsize) {
+ $messages.css('font-size', savedConfig.fontsize);
+ internalOutput('Loaded font size setting of: '+savedConfig.fontsize+'', 'internal');
+ }
+ if (savedConfig.iconsize) {
+ opts.iconsize = savedConfig.iconsize;
+ updateIconsSize($messages);
+ internalOutput('Loaded icon size setting of: '+savedConfig.iconsize+'', 'internal');
+ }
+ if (savedConfig.lineheight) {
+ $("body").css('line-height', savedConfig.lineheight);
+ internalOutput('Loaded line height setting of: '+savedConfig.lineheight+'', 'internal');
+ }
+ if(savedConfig.stheme){
+ setTheme(savedConfig.stheme);
+ }
+ if (savedConfig.spingDisabled) {
+ if (savedConfig.spingDisabled == 'true') {
+ opts.pingDisabled = true;
+ $('#ping').hide();
+ }
+ internalOutput('Loaded ping display of: '+(opts.pingDisabled ? 'hidden' : 'visible')+'', 'internal');
+ }
+ if (savedConfig.shighlightTerms) {
+ var savedTerms = $.parseJSON(savedConfig.shighlightTerms).filter(function (entry) {
+ return entry !== null && /\S/.test(entry);
+ });
+ var actualTerms = savedTerms.length != 0 ? savedTerms.join(', ') : null;
+ if (actualTerms) {
+ internalOutput('Loaded highlight strings of: ' + actualTerms+'', 'internal');
+ opts.highlightTerms = savedTerms;
+ }
+ }
+ if (savedConfig.shighlightColor) {
+ opts.highlightColor = savedConfig.shighlightColor;
+ internalOutput('Loaded highlight color of: '+savedConfig.shighlightColor+'', 'internal');
+ }
+ if (savedConfig.sfont) {
+ $('body').css({'font-family': savedConfig.sfont});
+ internalOutput('Loaded font: '+savedConfig.sfont+'', 'internal');
+ }
+
+ if (savedConfig.smessagecombining) {
+ if (savedConfig.smessagecombining == 'false') {
+ opts.messageCombining = false;
+ } else {
+ opts.messageCombining = true;
+ }
+ }
+ (function() {
+ var dataCookie = getCookie('connData');
+ if (dataCookie) {
+ var dataJ;
+ try {
+ dataJ = $.parseJSON(dataCookie);
+ } catch (e) {
+ window.onerror('JSON '+e+'. '+dataCookie, 'browserOutput.html', 434);
+ return;
+ }
+ opts.clientData = dataJ;
+ }
+ })();
+
+
+ /*****************************************
+ *
+ * BASE CHAT OUTPUT EVENTS
+ *
+ ******************************************/
+
+ $('body').on('click', 'a', function(e) {
+ e.preventDefault();
+ });
+
+ $('body').on('mousedown', function(e) {
+ var $target = $(e.target);
+
+ if ($contextMenu && opts.hasOwnProperty('contextMenuTarget') && opts.contextMenuTarget) {
+ hideContextMenu();
+ return false;
+ }
+
+ if ($target.is('a') || $target.parent('a').length || $target.is('input') || $target.is('textarea')) {
+ opts.preventFocus = true;
+ } else {
+ opts.preventFocus = false;
+ opts.mouseDownX = e.pageX;
+ opts.mouseDownY = e.pageY;
+ }
+ });
+
+ $messages.on('mousedown', function(e) {
+ if ($selectedSub && $selectedSub.is(':visible')) {
+ $selectedSub.slideUp('fast', subSlideUp);
+ clearInterval(opts.selectedSubLoop);
+ }
+ });
+
+ $('body').on('mouseup', function(e) {
+ if (!opts.preventFocus &&
+ (e.pageX >= opts.mouseDownX - opts.clickTolerance && e.pageX <= opts.mouseDownX + opts.clickTolerance) &&
+ (e.pageY >= opts.mouseDownY - opts.clickTolerance && e.pageY <= opts.mouseDownY + opts.clickTolerance)
+ ) {
+ opts.mouseDownX = null;
+ opts.mouseDownY = null;
+ runByond('byond://winset?mapwindow.map.focus=true');
+ }
+ });
+
+ $messages.on('click', 'a', function(e) {
+ var href = $(this).attr('href');
+ $(this).addClass('visited');
+ if (href[0] == '?' || (href.length >= 8 && href.substring(0,8) == 'byond://')) {
+ runByond(href);
+ } else {
+ href = escaper(href);
+ runByond('?action=openLink&link='+href);
+ }
+ runByond('byond://winset?mapwindow.map.focus=true');
+ });
+
+ //Fuck everything about this event. Will look into alternatives.
+ $('body').on('keydown', function(e) {
+ if (e.target.nodeName == 'INPUT' || e.target.nodeName == 'TEXTAREA') {
+ return;
+ }
+
+ if (e.ctrlKey || e.altKey || e.shiftKey) { //Band-aid "fix" for allowing ctrl+c copy paste etc. Needs a proper fix.
+ return;
+ }
+ runByond('byond://winset?mapwindow.map.focus=true');
+ });
+
+ //Mildly hacky fix for scroll issues on mob change (interface gets resized sometimes, messing up snap-scroll)
+ $(window).on('resize', function(e) {
+ if ($(this).height() !== opts.priorChatHeight) {
+ $('body,html').scrollTop($messages.outerHeight());
+ opts.priorChatHeight = $(this).height();
+ }
+ });
+
+
+ /*****************************************
+ *
+ * OPTIONS INTERFACE EVENTS
+ *
+ ******************************************/
+
+ $('body').on('click', '#newMessages', function(e) {
+ var messagesHeight = $messages.outerHeight();
+ $('body,html').scrollTop(messagesHeight);
+ $('#newMessages').remove();
+ runByond('byond://winset?mapwindow.map.focus=true');
+ });
+
+ $('#toggleOptions').click(function(e) {
+ handleToggleClick($subOptions, $(this));
+ });
+
+ $('#toggleTheme').click(function(e) {
+ handleToggleClick($subTheme, $(this));
+ });
+
+ $('#toggleFont').click(function(e) {
+ handleToggleClick($subFont, $(this));
+ });
+
+ $('.sub, .toggle').mouseenter(function() {
+ opts.suppressSubClose = true;
+ });
+
+ $('.sub, .toggle').mouseleave(function() {
+ opts.suppressSubClose = false;
+ });
+
+ $('#setWhiteTheme').click(function() {
+ setTheme('white');
+ savedConfig.stheme = 'white';
+ })
+
+ $('#setDarkTheme').click(function() {
+ setTheme('dark');
+ savedConfig.stheme = 'dark';
+ })
+
+ $('#decreaseFont').click(function(e) {
+ savedConfig.fontsize = Math.max(parseInt(savedConfig.fontsize || 13) - 1, 1) + 'px';
+ $messages.css({'font-size': savedConfig.fontsize});
+ setCookie('fontsize', savedConfig.fontsize, 365);
+ internalOutput('Font size set to '+savedConfig.fontsize+'', 'internal');
+ });
+
+ $('#increaseFont').click(function(e) {
+ savedConfig.fontsize = (parseInt(savedConfig.fontsize || 13) + 1) + 'px';
+ $messages.css({'font-size': savedConfig.fontsize});
+ setCookie('fontsize', savedConfig.fontsize, 365);
+ internalOutput('Font size set to '+savedConfig.fontsize+'', 'internal');
+ });
+
+ $('#decreaseIcon').click(function(e) {
+ savedConfig.iconsize = Math.max((parseInt(savedConfig.iconsize) || 12) - 1, 1);
+ updateIconsSize($messages);
+ setCookie('iconsize', savedConfig.iconsize, 365);
+ opts.iconsize = savedConfig.iconsize;
+ internalOutput('Icon size set to '+savedConfig.iconsize+'', 'internal');
+ })
+
+ $('#increaseIcon').click(function(e) {
+ savedConfig.iconsize = (parseInt(savedConfig.iconsize || 12) + 1);
+ updateIconsSize($messages);
+ setCookie('iconsize', savedConfig.iconsize, 365);
+ opts.iconsize = savedConfig.iconsize;
+ internalOutput('Icon size set to '+savedConfig.iconsize+'', 'internal');
+ })
+
+ $('#decreaseLineHeight').click(function(e) {
+ savedConfig.lineheight = Math.max(parseFloat(savedConfig.lineheight || 1.2) - 0.1, 0.1).toFixed(1);
+ $("body").css({'line-height': savedConfig.lineheight});
+ setCookie('lineheight', savedConfig.lineheight, 365);
+ internalOutput('Line height set to '+savedConfig.lineheight+'', 'internal');
+ });
+
+ $('#increaseLineHeight').click(function(e) {
+ savedConfig.lineheight = (parseFloat(savedConfig.lineheight || 1.2) + 0.1).toFixed(1);
+ $("body").css({'line-height': savedConfig.lineheight});
+ setCookie('lineheight', savedConfig.lineheight, 365);
+ internalOutput('Line height set to '+savedConfig.lineheight+'', 'internal');
+ });
+
+ $('#togglePing').click(function(e) {
+ if (opts.pingDisabled) {
+ $('#ping').slideDown('fast');
+ opts.pingDisabled = false;
+ } else {
+ $('#ping').slideUp('fast');
+ opts.pingDisabled = true;
+ }
+ setCookie('pingdisabled', (opts.pingDisabled ? 'true' : 'false'), 365);
+ });
+
+ $('#saveLog').click(function(e) {
+ // Requires IE 10+ to issue download commands. Just opening a popup
+ // window will cause Ctrl+S to save a blank page, ignoring innerHTML.
+ if (!window.Blob) {
+ output('This function is only supported on IE 10 and up. Upgrade if possible.', 'internal');
+ return;
+ }
+
+ $.ajax({
+ type: 'GET',
+ url: 'browserOutput_white.css',
+ success: function(styleData) {
+ var blob = new Blob(['String Highlighting
' +
+ '' +
+ '
';
+ createPopup(popupContent, 250);
+ });
+
+ $('body').on('keyup', '#highlightColor', function() {
+ var color = $('#highlightColor').val();
+ color = color.trim();
+ if (!color || color.charAt(0) != '#') return;
+ $('#highlightColor').css('background-color', color);
+ });
+
+ $('body').on('submit', '#highlightTermForm', function(e) {
+ e.preventDefault();
+
+ opts.highlightTerms = [];
+ for (var count = 0; count < opts.highlightLimit; count++) {
+ var term = $('#highlightTermInput'+count).val();
+ if (term !== null && /\S/.test(term)) {
+ opts.highlightTerms.push(term.trim().toLowerCase());
+ }
+ }
+
+ var color = $('#highlightColor').val();
+ color = color.trim();
+ if (color == '' || color.charAt(0) != '#') {
+ opts.highlightColor = '#FFFF00';
+ } else {
+ opts.highlightColor = color;
+ }
+ var $popup = $('#highlightPopup').closest('.popup');
+ $popup.remove();
+
+ setCookie('highlightterms', JSON.stringify(opts.highlightTerms), 365);
+ setCookie('highlightcolor', opts.highlightColor, 365);
+ });
+
+ $('#clearMessages').click(function() {
+ $messages.empty();
+ opts.messageCount = 0;
+ });
+
+ $('#fontInputSpan').hover(function() {
+ $('#fontInput').removeClass('hidden');
+ }, function() {
+ $('#fontInput').addClass('hidden');
+ });
+
+ $('#fontInput').change(function() {
+ var newFont = $('#fontInput').val() || 'Verdana, sans-serif';
+ $('body').css({'font-family': newFont});
+ setCookie('font', newFont, 365);
+ opts.font = newFont;
+ internalOutput('Font set to: '+newFont+'', 'internal');
+ });
+
+ $('#toggleCombine').click(function(e) {
+ opts.messageCombining = !opts.messageCombining;
+ setCookie('messagecombining', (opts.messageCombining ? 'true' : 'false'), 365);
+ });
+
+ $('img.icon').error(iconError);
+
+
+
+
+ /*****************************************
+ *
+ * KICK EVERYTHING OFF
+ *
+ ******************************************/
+
+ runByond('?_src_=chat&proc=doneLoading');
+ if ($('#loading').is(':visible')) {
+ $('#loading').remove();
+ }
+ $('#userBar').show();
+ opts.priorChatHeight = $(window).height();
+});
diff --git a/code/modules/goonchat/browserassets/js/jquery.min.js b/code/modules/goonchat/browserassets/js/jquery.min.js
new file mode 100644
index 00000000000..ab28a24729b
--- /dev/null
+++ b/code/modules/goonchat/browserassets/js/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++dChoose up to '+opts.highlightLimit+' strings that will highlight the line when they appear in chat.
' +
+ '' +
+ '","
"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?"| t |
").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/code/modules/goonchat/browserassets/js/json2.min.js b/code/modules/goonchat/browserassets/js/json2.min.js
new file mode 100644
index 00000000000..d867407f265
--- /dev/null
+++ b/code/modules/goonchat/browserassets/js/json2.min.js
@@ -0,0 +1 @@
+"object"!=typeof JSON&&(JSON={}),function(){"use strict";function f(t){return 10>t?"0"+t:t}function this_value(){return this.valueOf()}function quote(t){return rx_escapable.lastIndex=0,rx_escapable.test(t)?'"'+t.replace(rx_escapable,function(t){var e=meta[t];return"string"==typeof e?e:"\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+t+'"'}function str(t,e){var r,n,o,u,f,a=gap,i=e[t];switch(i&&"object"==typeof i&&"function"==typeof i.toJSON&&(i=i.toJSON(t)),"function"==typeof rep&&(i=rep.call(e,t,i)),typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i)return"null";if(gap+=indent,f=[],"[object Array]"===Object.prototype.toString.apply(i)){for(u=i.length,r=0;u>r;r+=1)f[r]=str(r,i)||"null";return o=0===f.length?"[]":gap?"[\n"+gap+f.join(",\n"+gap)+"\n"+a+"]":"["+f.join(",")+"]",gap=a,o}if(rep&&"object"==typeof rep)for(u=rep.length,r=0;u>r;r+=1)"string"==typeof rep[r]&&(n=rep[r],o=str(n,i),o&&f.push(quote(n)+(gap?": ":":")+o));else for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(o=str(n,i),o&&f.push(quote(n)+(gap?": ":":")+o));return o=0===f.length?"{}":gap?"{\n"+gap+f.join(",\n"+gap)+"\n"+a+"}":"{"+f.join(",")+"}",gap=a,o}}var rx_one=/^[\],:{}\s]*$/,rx_two=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,rx_three=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,rx_four=/(?:^|:|,)(?:\s*\[)+/g,rx_escapable=/[\\\"\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,rx_dangerous=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;"function"!=typeof Date.prototype.toJSON&&(Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},Boolean.prototype.toJSON=this_value,Number.prototype.toJSON=this_value,String.prototype.toJSON=this_value);var gap,indent,meta,rep;"function"!=typeof JSON.stringify&&(meta={"\b":"\\b"," ":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},JSON.stringify=function(t,e,r){var n;if(gap="",indent="","number"==typeof r)for(n=0;r>n;n+=1)indent+=" ";else"string"==typeof r&&(indent=r);if(rep=e,e&&"function"!=typeof e&&("object"!=typeof e||"number"!=typeof e.length))throw new Error("JSON.stringify");return str("",{"":t})}),"function"!=typeof JSON.parse&&(JSON.parse=function(text,reviver){function walk(t,e){var r,n,o=t[e];if(o&&"object"==typeof o)for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(n=walk(o,r),void 0!==n?o[r]=n:delete o[r]);return reviver.call(t,e,o)}var j;if(text=String(text),rx_dangerous.lastIndex=0,rx_dangerous.test(text)&&(text=text.replace(rx_dangerous,function(t){return"\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4)})),rx_one.test(text.replace(rx_two,"@").replace(rx_three,"]").replace(rx_four,"")))return j=eval("("+text+")"),"function"==typeof reviver?walk({"":j},""):j;throw new SyntaxError("JSON.parse")})}();
\ No newline at end of file
diff --git a/code/modules/hallucinations/hallucinations.dm b/code/modules/hallucinations/hallucinations.dm
index 28e1c0ffe07..f968f8270cb 100644
--- a/code/modules/hallucinations/hallucinations.dm
+++ b/code/modules/hallucinations/hallucinations.dm
@@ -61,7 +61,7 @@
to_chat(M, "[holder] [chosen_emote]")
//For adding accent tags when you imagine people talking to you
-/datum/hallucination/proc/get_hallucinated_accent(var/mob/living/talker)
+/datum/hallucination/proc/get_hallucinated_accent(var/mob/living/talker, var/mob/hearer)
var/hal_accent
if(ishuman(talker))
var/mob/living/carbon/human/T = talker
@@ -71,4 +71,4 @@
var/datum/accent/a = SSrecords.accents[hal_accent]
var/final_icon = a.tag_icon
- return "
"
\ No newline at end of file
+ return "![](\"[final_icon].png\")
"
\ No newline at end of file
diff --git a/code/modules/hallucinations/mob.dm b/code/modules/hallucinations/mob.dm
index cddd9f3c4b4..dde2d03a4a1 100644
--- a/code/modules/hallucinations/mob.dm
+++ b/code/modules/hallucinations/mob.dm
@@ -10,7 +10,7 @@
log_say("Hallucination level changed [orig_message] by [speaker] to [message] for [key_name(src)].", ckey=key_name(src))
return ..()
-/mob/living/carbon/hear_radio(var/message, var/verb="says", var/datum/language/language, var/part_a, var/part_b, var/mob/speaker, var/hard_to_hear = 0, var/vname ="")
+/mob/living/carbon/hear_radio(var/message, var/verb="says", var/datum/language/language, var/part_a, var/part_b, var/part_c, var/mob/speaker, var/hard_to_hear = 0, var/vname ="")
if(hallucination >= 60 && prob(1))
var/orig_message = message
message = pick(SShallucinations.hallucinated_phrases)
diff --git a/code/modules/hallucinations/types/basic.dm b/code/modules/hallucinations/types/basic.dm
index 0e132ef0c9b..cf80265d084 100644
--- a/code/modules/hallucinations/types/basic.dm
+++ b/code/modules/hallucinations/types/basic.dm
@@ -51,7 +51,7 @@
if(9)
sound_to(holder, 'sound/effects/nuclearsiren.ogg')
- to_chat(holder, "Supermatter Monitor states, \"WARNING: SUPERMATTER CRYSTAL DELAMINATION IMMINENT.\"")
+ to_chat(holder, "Supermatter Monitor states, \"WARNING: SUPERMATTER CRYSTAL DELAMINATION IMMINENT.\"")
addtimer(CALLBACK(src, .proc/delam_call), 20)
addtimer(CALLBACK(src, .proc/delam_call), 35)
@@ -82,9 +82,9 @@
return
var/radio_exclaim = pick("Oh SHIT!", "Oh fuck.", "Uhhh!", "That's not good!", "FUCK.", "Engineering?", "It's under control!", "We're fucked!", "Ohhhh boy.", "What?!", "Um, what?!")
var/mob/living/caller = pick(people)
- var/caller_accent = get_hallucinated_accent(caller)
+ var/caller_accent = get_hallucinated_accent(caller, holder)
- to_chat(holder, "[caller_accent] [pick(people)] says, \"[radio_exclaim]\"")
+ to_chat(holder, "[caller_accent] [pick(people)] says, \"[radio_exclaim]\"")
/datum/hallucination/pda //fake PDA messages. this only plays the beep and sends something to chat; it won't show up in the PDA.
@@ -269,7 +269,7 @@
"[pal] will keep you safe.",
"You feel captivated by [pal]'s charisma.",
"[pal] might as well be family to you.")
- to_chat(holder, "[pick(halpal_emotes)]")
+ to_chat(holder, "[pick(halpal_emotes)]")
/datum/hallucination/passive
duration = 600 //minute fallback
@@ -419,7 +419,7 @@
var/mob/living/talker = pick(candidates) //Who is talking to us?
var/message //What will they say?
- var/accent_tag = get_hallucinated_accent(talker) //Can't forget the accent
+ var/accent_tag = get_hallucinated_accent(talker, holder) //Can't forget the accent
//Name selection. This gives us variety. Sometimes it will be your last name, sometimes your first.
var/list/names = list()
@@ -478,7 +478,7 @@
whisper_candidates += M
if(whisper_candidates.len)
var/mob/living/whisperer = pick(whisper_candidates)
- var/whisper_accent = get_hallucinated_accent(whisperer)
+ var/whisper_accent = get_hallucinated_accent(whisperer, holder)
if(prob(70))
to_chat(holder, "[whisper_accent] [whisperer] whispers, \"[pick(SShallucinations.hallucinated_phrases)]\"")
else
diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm
index dce73c0a2da..21e84e03f27 100644
--- a/code/modules/heavy_vehicle/mech_interaction.dm
+++ b/code/modules/heavy_vehicle/mech_interaction.dm
@@ -157,8 +157,8 @@
playsound(src.loc, arms.punch_sound, 45 + 25 * (arms.melee_damage / 50), -1 )
if(ismob(A))
var/mob/target = A
- user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])"
- src.attack_log += "\[[time_stamp()]\] [user] ([user.ckey]) attacked [target.name] ([target.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])"
+ user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])"
+ src.attack_log += "\[[time_stamp()]\] [user] ([user.ckey]) attacked [target.name] ([target.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])"
target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])"
msg_admin_attack("[key_name(user, highlight_special = 1)] attacked [key_name(target, highlight_special = 1)] with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target) )
return A.attack_generic(src, arms.melee_damage, "attacked")
@@ -543,7 +543,7 @@
var/mob/living/carbon/human/D = H
if(D.lying)
D.attack_log += "\[[time_stamp()]\] Was trampled by [src]"
- attack_log += text("\[[time_stamp()]\] trampled [D.name] ([D.ckey]) with \the [src].")
+ attack_log += text("\[[time_stamp()]\] trampled [D.name] ([D.ckey]) with \the [src].")
msg_admin_attack("[src] trampled [key_name(D)] at (JMP)" )
src.visible_message("\The [src] runs over \the [D]!")
D.apply_damage(legs.trample_damage, BRUTE)
diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm
index df73bcedc8a..ae10342c3f1 100644
--- a/code/modules/hydroponics/seed_machines.dm
+++ b/code/modules/hydroponics/seed_machines.dm
@@ -68,15 +68,15 @@
active = 0
if(failed_task)
failed_task = 0
- visible_message("\icon[src] [src] pings unhappily, flashing a red warning light.")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] pings unhappily, flashing a red warning light.")
else
- visible_message("\icon[src] [src] pings happily.")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] pings happily.")
if(eject_disk)
eject_disk = 0
if(loaded_disk)
loaded_disk.forceMove(get_turf(src))
- visible_message("\icon[src] [src] beeps and spits out [loaded_disk].")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps and spits out [loaded_disk].")
loaded_disk = null
/obj/machinery/botany/attackby(obj/item/W as obj, mob/user as mob)
@@ -190,14 +190,14 @@
SSplants.seeds[seed.seed.name] = seed.seed
seed.update_seed()
- visible_message("\icon[src] [src] beeps and spits out [seed].")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps and spits out [seed].")
seed = null
if(href_list["eject_disk"])
if(!loaded_disk) return
loaded_disk.forceMove(get_turf(src))
- visible_message("\icon[src] [src] beeps and spits out [loaded_disk].")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps and spits out [loaded_disk].")
loaded_disk = null
usr.set_machine(src)
diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm
index 0a5e4a608ae..ecf9a57994d 100644
--- a/code/modules/hydroponics/seed_storage.dm
+++ b/code/modules/hydroponics/seed_storage.dm
@@ -172,7 +172,7 @@
var/dat = "
" diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 7e98156a6f3..da107f30ddf 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -257,7 +257,7 @@ var/list/mineral_can_smooth_with = list( if(do_after(user,25)) if(!istype(src, /turf/simulated/mineral)) return - to_chat(user, SPAN_NOTICE("\icon[P] \The [src] has been excavated to a depth of [2 * excavation_level]cm.")) + to_chat(user, SPAN_NOTICE("[icon2html(P, user)] \The [src] has been excavated to a depth of [2 * excavation_level]cm.")) return if(istype(W, /obj/item/pickaxe) && W.simulated) // Pickaxe offhand is not simulated. diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 269aec73d82..e36928542a1 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -61,10 +61,10 @@ if(!input) dat += text("input connection status: ") - dat += text("NOT CONNECTED
") + dat += text("NOT CONNECTED
") if(!output) dat += text("
output connection status: ") - dat += text("NOT CONNECTED
") + dat += text("NOT CONNECTED
") dat += text("
Gold inserted: [amt_gold] ") if(chosen == "gold") diff --git a/code/modules/mob/abstract/new_player/login.dm b/code/modules/mob/abstract/new_player/login.dm index 7f75440b574..e68316ac69b 100644 --- a/code/modules/mob/abstract/new_player/login.dm +++ b/code/modules/mob/abstract/new_player/login.dm @@ -19,6 +19,4 @@ sight |= SEE_TURFS player_list |= src - spawn(40) - if(client) - client.playtitlemusic() \ No newline at end of file + client.playtitlemusic() diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm index 6e0d40fb5c7..93a5da830a7 100644 --- a/code/modules/mob/abstract/new_player/new_player.dm +++ b/code/modules/mob/abstract/new_player/new_player.dm @@ -304,12 +304,12 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles. if(emergency_shuttle.going_to_centcom()) //Shuttle is going to centcomm, not recalled - dat += "The station has been evacuated.
" + dat += "The station has been evacuated.
" if(emergency_shuttle.online()) if (emergency_shuttle.evac) // Emergency shuttle is past the point of no recall - dat += "The station is currently undergoing evacuation procedures.
" + dat += "The station is currently undergoing evacuation procedures.
" else // Crew transfer initiated - dat += "The station is currently undergoing crew transfer procedures.
" + dat += "The station is currently undergoing crew transfer procedures.
" var/unique_role_available = FALSE for(var/ghost_role in SSghostroles.spawners) @@ -456,7 +456,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) /mob/abstract/new_player/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "",var/italics = 0, var/mob/speaker = null) return -/mob/abstract/new_player/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0) +/mob/abstract/new_player/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/part_c, var/mob/speaker = null, var/hard_to_hear = 0) return /mob/abstract/new_player/MayRespawn() diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 1f2d5b635b1..bdfc789d98a 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -41,7 +41,7 @@ else message = stars(message) - var/accent_icon = speaker.get_accent_icon(language) + var/accent_icon = speaker.get_accent_icon(language, src) var/speaker_name = speaker.name if(ishuman(speaker)) var/mob/living/carbon/human/H = speaker @@ -87,7 +87,7 @@ if(vr_mob) to_chat(vr_mob, "[time] [message]") -/mob/proc/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="") +/mob/proc/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/part_c, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="") if(!client && !vr_mob) return @@ -197,6 +197,7 @@ formatted = language.format_message_radio(message, verb) else formatted = "[verb], \"[message]\"" + formatted += part_c if(isdeaf(src)) if(prob(20)) to_chat(src, "You feel your headset vibrate but can hear nothing from it!") @@ -209,7 +210,7 @@ /mob/proc/on_hear_radio(part_a, speaker_name, track, part_b, formatted, accent_icon) var/accent_tag if(accent_icon) - accent_tag = ""
+ accent_tag = "![](\"[accent_icon].png\")
"
to_chat(src, "[part_a][speaker_name][part_b][formatted]")
if(vr_mob)
to_chat(vr_mob, "[part_a][accent_tag][speaker_name][part_b][formatted]")
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 45058c4a09c..844b1276503 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -365,7 +365,7 @@ var/list/slot_equipment_priority = list( \
var/end_T_descriptor = "tile at [end_T.x], [end_T.y], [end_T.z] in area [get_area(end_T)]"
M.attack_log += text("\[[time_stamp()]\] Has been thrown by [usr.name] ([usr.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
- usr.attack_log += text("\[[time_stamp()]\] Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
+ usr.attack_log += text("\[[time_stamp()]\] Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
msg_admin_attack("[usr.name] ([usr.ckey]) has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor] (JMP)",ckey=key_name(usr),ckey_target=key_name(M))
qdel(G)
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 881ee044acc..e10ad82a21e 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -54,7 +54,7 @@
if(!..(user))
return
- var/msg = "*---------*\nThis is \icon[src] \a [src]!\n[desc]\n"
+ var/msg = "*---------*\nThis is [icon2html(src, user)] \a [src]!\n[desc]\n"
msg += ""
if(brainmob?.key)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 6554778e28c..81de9ccfe1b 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -184,7 +184,7 @@
G.last_action = world.time
flick(G.hud.icon_state, G.hud)
- user.attack_log += "\[[time_stamp()]\] Knifed [name] ([ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])"
+ user.attack_log += "\[[time_stamp()]\] Knifed [name] ([ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])"
src.attack_log += "\[[time_stamp()]\] Got knifed by [user.name] ([user.ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])"
msg_admin_attack("[key_name_admin(user)] knifed [key_name_admin(src)] with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])",ckey=key_name(user),ckey_target=key_name(src) )
return 1
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 25a5e8b8902..2f357333804 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -29,7 +29,7 @@
var/list/msg = list("*---------*\nThis is ")
if(icon)
- msg += "\icon[icon] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated
+ msg += icon2html(icon, user)
msg += "[src.name]"
@@ -49,9 +49,9 @@
tie_msg_warn += "! Attached to it is [lowertext(english_list(U.accessories))]"
if(w_uniform.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] [fluid_color_type_map(w_uniform.blood_color)]-stained [w_uniform.name][tie_msg_warn].\n"
+ msg += "[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 \icon[w_uniform] \a [w_uniform][tie_msg].\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] \a [w_uniform][tie_msg].\n"
//when the player is winded by an admin
if(paralysis > 6000)
@@ -60,9 +60,9 @@
//head
if(head)
if(head.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[head] [head.gender==PLURAL?"some":"a"] [fluid_color_type_map(head.blood_color)]-stained [head.name] on [get_pronoun("his")] head!\n"
+ msg += "[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] on [get_pronoun("his")] head!\n"
else
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[head] \a [head] on [get_pronoun("his")] head.\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] \a [head] on [get_pronoun("his")] head.\n"
//suit/armor
if(wear_suit)
@@ -75,42 +75,42 @@
tie_msg_warn += "! Attached to it is [lowertext(english_list(U.accessories))]"
if(wear_suit.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[wear_suit] [wear_suit.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_suit.blood_color)]-stained [wear_suit.name][tie_msg_warn].\n"
+ msg += "[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 \icon[wear_suit] \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 += "[get_pronoun("He")] [get_pronoun("is")] carrying \icon[s_store] [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 += "[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 \icon[s_store] \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 += "[get_pronoun("He")] [get_pronoun("is")] carrying \icon[s_store] [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 += "[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 \icon[s_store] \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 += "[get_pronoun("He")] [get_pronoun("has")] \icon[back] [fluid_color_type_map(back.blood_color)]-stained [back] on [get_pronoun("his")] back.\n"
+ msg += "[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")] \icon[back] \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 += "[get_pronoun("He")] [get_pronoun("is")] holding \icon[l_hand] [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 += "[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 \icon[l_hand] \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 += "[get_pronoun("He")] [get_pronoun("is")] holding \icon[r_hand] [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 += "[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 \icon[r_hand] \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)
@@ -121,60 +121,60 @@
if(ID)
gloves_name = "[C.name] ([ID.registered_name] ([ID.assignment]))"
if(gloves.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("has")] \icon[gloves] [gloves.gender==PLURAL?"some":"a"] [fluid_color_type_map(gloves.blood_color)]-stained [gloves_name] on [get_pronoun("his")] hands!\n"
+ msg += "[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")] \icon[gloves] \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 += "[get_pronoun("He")] [get_pronoun("has")] [fluid_color_type_map(hand_blood_color)]-stained hands!\n"
//handcuffed?
if(handcuffed)
if(istype(handcuffed, /obj/item/handcuffs/cable))
- msg += "[get_pronoun("He")] [get_pronoun("is")] \icon[handcuffed] restrained with cable!\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] [icon2html(handcuffed, user)] restrained with cable!\n"
else
- msg += "[get_pronoun("He")] [get_pronoun("is")] \icon[handcuffed] handcuffed!\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] [icon2html(handcuffed, user)] handcuffed!\n"
//buckled
if(buckled)
- msg += "[get_pronoun("He")] [get_pronoun("is")] \icon[buckled] buckled to [buckled]!\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] [icon2html(buckled, user)] buckled to [buckled]!\n"
//belt
if(belt)
if(belt.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("has")] \icon[belt] [belt.gender==PLURAL?"some":"a"] [fluid_color_type_map(belt.blood_color)]-stained [belt.name] about [get_pronoun("his")] waist!\n"
+ msg += "[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")] \icon[belt] \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 += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[shoes] [shoes.gender==PLURAL?"some":"a"] [fluid_color_type_map(shoes.blood_color)]-stained [shoes.name] on [get_pronoun("his")] feet!\n"
+ msg += "[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 \icon[shoes] \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 += "[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 += "[get_pronoun("He")] [get_pronoun("has")] \icon[wear_mask] [wear_mask.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_mask.blood_color)]-stained [wear_mask.name] on [get_pronoun("his")] face!\n"
+ msg += "[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] on [get_pronoun("his")] face!\n"
else
- msg += "[get_pronoun("He")] [get_pronoun("has")] \icon[wear_mask] \a [wear_mask] on [get_pronoun("his")] face.\n"
+ msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] \a [wear_mask] on [get_pronoun("his")] face.\n"
//eyes
if(glasses && !skipeyes)
if(glasses.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("has")] \icon[glasses] [glasses.gender==PLURAL?"some":"a"] [fluid_color_type_map(glasses.blood_color)]-stained [glasses] covering [get_pronoun("his")] eyes!\n"
+ msg += "[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")] \icon[glasses] \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")] \icon[l_ear] \a [l_ear] on [get_pronoun("his")] left ear.\n"
+ msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(l_ear, user)] \a [l_ear] on [get_pronoun("his")] left ear.\n"
//right ear
if(r_ear && !skipears)
- msg += "[get_pronoun("He")] [get_pronoun("has")] \icon[r_ear] \a [r_ear] on [get_pronoun("his")] right ear.\n"
+ msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(r_ear, user)] \a [r_ear] on [get_pronoun("his")] right ear.\n"
//ID
if(wear_id)
@@ -184,7 +184,7 @@
var/obj/item/card/id/ID = C.GetID()
if(ID)
id_name = "[C.name] ([ID.registered_name] ([ID.assignment]))"
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[wear_id] \a [id_name].\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_id, user)] \a [id_name].\n"
//Jitters
if(is_jittery)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 5731d577c2b..60ac3f24989 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -2021,7 +2021,7 @@
randmutg(src) // Applies good mutation
domutcheck(src,null,MUTCHK_FORCED)
-/mob/living/carbon/human/get_accent_icon(var/datum/language/speaking = null)
+/mob/living/carbon/human/get_accent_icon(var/datum/language/speaking, var/mob/hearer, var/force_accent)
var/used_accent = accent //starts with the mob's default accent
if(mind?.changeling)
@@ -2038,7 +2038,7 @@
if(changer && changer.active && changer.current_accent)
used_accent = changer.current_accent
- return ..(speaking, used_accent)
+ return ..(speaking, hearer, used_accent)
/mob/living/carbon/human/proc/generate_valid_accent()
var/list/valid_accents = new()
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 16319810fc5..8e45c536c9d 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -47,7 +47,7 @@
if(G.cell.charge >= 2500)
G.cell.use(G.cell.charge) //So it drains the cell.
visible_message("[src] has been touched with the stun gloves by [M]!")
- M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])")
+ M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] Has been stungloved by [M.name] ([M.ckey])")
msg_admin_attack("[key_name_admin(M)] stungloved [src.name] ([src.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src))
@@ -296,7 +296,7 @@
H.visible_message("[attack_message]")
playsound(loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1)
- H.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [src.name] ([src.ckey])")
+ H.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Was missed by" : "Has blocked") : "Has Been [pick(attack.attack_verb)]"] by [H.name] ([H.ckey])")
msg_admin_attack("[key_name(H)] [miss_type ? (miss_type == 1 ? "has missed" : "was blocked by") : "has [pick(attack.attack_verb)]"] [key_name(src)] (JMP)",ckey=key_name(H),ckey_target=key_name(src))
@@ -368,7 +368,7 @@
if(attacker_style && attacker_style.disarm_act(H, src))
return TRUE
- M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])")
+ M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [M.name] ([M.ckey])")
msg_admin_attack("[key_name(M)] disarmed [src.name] ([src.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src))
@@ -467,7 +467,7 @@
if(!damage)
return
- user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])")
+ user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] was attacked by [user.name] ([user.ckey])")
src.visible_message("[user] has [attack_message] [src]!")
user.do_attack_animation(src)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 4b5d4172579..c9df5c36e57 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -409,7 +409,7 @@ emp_act
var/client/assailant = M.client
if(assailant)
src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])")
- M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]")
+ M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]")
if(!istype(src,/mob/living/simple_animal/rat))
msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src))
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index c625d02508e..19c7ce69de9 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -727,7 +727,7 @@ mob/living/carbon/human/proc/change_monitor()
if (brokesomething)
playsound(get_turf(target), 'sound/weapons/heavysmash.ogg', 100, 1)
- attack_log += "\[[time_stamp()]\]crashed into [brokesomething] objects at ([target.x];[target.y];[target.z]) "
+ attack_log += "\[[time_stamp()]\]crashed into [brokesomething] objects at ([target.x];[target.y];[target.z]) "
msg_admin_attack("[key_name(src)] crashed into [brokesomething] objects at (JMP)" )
if (!done && target.Enter(src, null))
@@ -752,7 +752,7 @@ mob/living/carbon/human/proc/change_monitor()
if (istype(A, /mob/living))
var/mob/living/M = A
- attack_log += "\[[time_stamp()]\] Crashed into [key_name(M)]"
+ attack_log += "\[[time_stamp()]\] Crashed into [key_name(M)]"
M.attack_log += "\[[time_stamp()]\] Was rammed by [key_name(src)]"
msg_admin_attack("[key_name(src)] crashed into [key_name(M)] at (JMP)" )
diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm
index ddd92724851..76094b14c7c 100644
--- a/code/modules/mob/living/carbon/human/stripping.dm
+++ b/code/modules/mob/living/carbon/human/stripping.dm
@@ -61,7 +61,7 @@
if(istype(A, /obj/item/clothing/accessory/badge) || istype(A, /obj/item/clothing/accessory/medal))
user.visible_message("\The [user] tears off \the [A] from [src]'s [suit.name]!")
attack_log += "\[[time_stamp()]\] Has had \the [A] removed by [user.name] ([user.ckey])"
- user.attack_log += "\[[time_stamp()]\] Attempted to remove [name]'s ([ckey]) [A.name]"
+ user.attack_log += "\[[time_stamp()]\] Attempted to remove [name]'s ([ckey]) [A.name]"
suit.remove_accessory(user, A)
return 1
@@ -116,7 +116,7 @@
to_chat(user, "\The [src]'s suit sensor controls are locked.")
return
attack_log += text("\[[time_stamp()]\] Has had their sensors toggled by [user.name] ([user.ckey])")
- user.attack_log += text("\[[time_stamp()]\] Attempted to toggle [name]'s ([ckey]) sensors")
+ user.attack_log += text("\[[time_stamp()]\] Attempted to toggle [name]'s ([ckey]) sensors")
suit.set_sensors(user)
// Remove all splints.
diff --git a/code/modules/mob/living/carbon/slime/say.dm b/code/modules/mob/living/carbon/slime/say.dm
index 509f77e4a4b..f157628f525 100644
--- a/code/modules/mob/living/carbon/slime/say.dm
+++ b/code/modules/mob/living/carbon/slime/say.dm
@@ -31,7 +31,7 @@
speech_buffer.Add(lowertext(html_decode(message)))
return ..()
-/mob/living/carbon/slime/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="")
+/mob/living/carbon/slime/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/part_c, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="")
if(is_friend(speaker))
speech_buffer = list()
speech_buffer.Add(speaker)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index ba95239fc52..7f8c14e7729 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -216,7 +216,7 @@
var/client/assailant = M.client
if(assailant)
src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])")
- M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]")
+ M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]")
if(!istype(src,/mob/living/simple_animal/rat))
msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src))
@@ -278,7 +278,7 @@
return
adjustBruteLoss(damage)
- user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])")
+ user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] was attacked by [user.name] ([user.ckey])")
if (attack_message)
src.visible_message("[user] has [attack_message] [src]!")
diff --git a/code/modules/mob/living/parasite/meme.dm b/code/modules/mob/living/parasite/meme.dm
index 2ea11f5e812..039edc0df1d 100644
--- a/code/modules/mob/living/parasite/meme.dm
+++ b/code/modules/mob/living/parasite/meme.dm
@@ -204,30 +204,7 @@ var/controlling
to_chat(M, "[message]")
to_chat(src, "You said: \"[message]\" to [M]")
return
-/*
- var/list/candidates = indoctrinated.Copy()
- if(!(src.host in candidates))
- candidates.Add(src.host)
- var/mob/target = select_indoctrinated("Thought", "Select a target which will hear your thought.")
-
- if(!target) return
-
- var/speaker = input("Select the voice in which you would like to make yourself heard.", "Voice") as text
- //if(!speaker) return
-
- var/message = input("What would you like to say?", "Message") as text
- if(!message) return
-
- // Use the points at the end rather than the beginning, because the user might cancel
- if(!use_points(150)) return
-
- message = say_quote(message)
- var/rendered = "[speaker] "
- target.show_message(rendered)
-
- to_chat(usr, "You make [target] hear: [rendered]")
-*/
// Mutes the host
/mob/living/parasite/meme/verb/Mute()
set category = "Meme"
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 87f417d45c9..ef8cae1099c 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -249,7 +249,7 @@ proc/get_radio_key_from_channel(var/channel)
message_range = speaking.get_talkinto_msg_range(message)
var/msg
if(!speaking || !(speaking.flags & NO_TALK_MSG))
- msg = "\The [src] talks into \the [used_radios[1]]"
+ msg = "\The [src] talks into \the [used_radios[1]]."
for(var/mob/living/M in hearers(5, src))
if((M != src) && msg)
M.show_message(msg)
diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm
index 4f4dd1f9887..3f61e306c34 100644
--- a/code/modules/mob/living/silicon/robot/analyzer.dm
+++ b/code/modules/mob/living/silicon/robot/analyzer.dm
@@ -44,8 +44,8 @@
to_chat(user, SPAN_NOTICE("Analyzing Results for [M]:"))
to_chat(user, SPAN_NOTICE("Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.getHalLoss()]% functional"]"))
- to_chat(user, "Key: Electronics/Brute")
- to_chat(user, "Damage Specifics: [BU] - [BR]")
+ to_chat(user, "Key: Electronics/Brute")
+ to_chat(user, "Damage Specifics: [BU] - [BR]")
if(M.tod && M.stat == DEAD)
to_chat(user, SPAN_NOTICE("Time of Disable: [M.tod]"))
var/mob/living/silicon/robot/H = M
@@ -55,11 +55,11 @@
for(var/datum/robot_component/org in damaged)
user.show_message(text("\t []: [][] - [] - [] - []", \
capitalize(org.name), \
- (org.installed == -1) ? "DESTROYED " :"",\
+ (org.installed == -1) ? "DESTROYED " :"",\
(org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \
- (org.brute_damage > 0) ? "[org.brute_damage]" :0, \
- (org.toggled) ? "Toggled ON" : "Toggled OFF",\
- (org.powered) ? "Power ON" : "Power OFF"),1)
+ (org.brute_damage > 0) ? "[org.brute_damage]" :0, \
+ (org.toggled) ? "Toggled ON" : "Toggled OFF",\
+ (org.powered) ? "Power ON" : "Power OFF"),1)
else
to_chat(user, SPAN_NOTICE("Components are OK."))
if(H.emagged && prob(5))
@@ -68,7 +68,7 @@
if("prosthetics")
var/mob/living/carbon/human/H = M
to_chat(user, SPAN_NOTICE("Analyzing Results for \the [H]:"))
- to_chat(user, "Key: Electronics/Brute")
+ to_chat(user, "Key: Electronics/Brute")
to_chat(user, SPAN_NOTICE("External prosthetics:"))
var/organ_found
@@ -77,7 +77,7 @@
if(!(E.status & ORGAN_ROBOT))
continue
organ_found = TRUE
- to_chat(user, "[E.name]: [E.brute_dam] [E.burn_dam]")
+ to_chat(user, "[E.name]: [E.brute_dam] [E.burn_dam]")
if(!organ_found)
to_chat(user, SPAN_NOTICE("No prosthetics located."))
to_chat(user, "
") @@ -94,7 +94,7 @@ if(!show_tag && istype(O, /obj/item/organ/internal/ipc_tag)) continue organ_found = TRUE - to_chat(user, "[O.name]: [O.damage]") + to_chat(user, "[O.name]: [O.damage]") if(!organ_found) to_chat(user, SPAN_NOTICE("No prosthetics located.")) 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 8c2e1002e98..f052d542cdf 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -32,7 +32,7 @@ continue else if (isNotStationLevel(src.z) && src.z != D.z) //If the console is not on the station, only list drones on the current level continue - dat += "
[D.real_name] ([D.stat == 2 ? "INACTIVE" : "ACTIVE"])" + dat += "
[D.real_name] ([D.stat == 2 ? "INACTIVE" : "ACTIVE"])" dat += "
Cell charge: [D.cell.charge]/[D.cell.maxcharge]." dat += "
Currently located in: [get_area(D)]." dat += "
Resync | Shutdown" @@ -113,4 +113,4 @@ dronefab.produce_drones = !dronefab.produce_drones to_chat(usr, SPAN_NOTICE("You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.")) - src.updateUsrDialog() \ No newline at end of file + src.updateUsrDialog() diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 70404df4487..ba65665237c 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -284,7 +284,7 @@ /mob/living/silicon/robot/proc/describe_module(var/slot) var/list/index_module = list(module_state_1,module_state_2,module_state_3) var/result = " Hardpoint [slot] holds " - result += (index_module[slot]) ? "\icon[index_module[slot]] [index_module[slot]]." : "nothing." + result += (index_module[slot]) ? "[icon2html(index_module[slot], viewers(get_turf(src)))] [index_module[slot]]." : "nothing." result += "\n" return result diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm index f48d08dfc13..6719a427162 100644 --- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm +++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm @@ -27,7 +27,7 @@ return..() M.attack_log += text("\[[time_stamp()]\] Has had their soul captured with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to capture the soul of [M.name] ([M.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to capture the soul of [M.name] ([M.ckey])") msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to capture the soul of [M.name] ([M.ckey]) (JMP)",ckey=key_name(src),ckey_target=key_name(M)) transfer_soul("VICTIM", M, user) diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index 09d5d06a63b..a406032b306 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -222,7 +222,7 @@ if( ishuman(AM) ) if(!stat) var/mob/M = AM - to_chat(M, "\icon[src] Squeek!") + to_chat(M, "[icon2html(src, M)] Squeek!") poke(1) //Wake up if stepped on if (prob(95)) squeak(0) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index ff8540a04f3..ea945dc7144 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -285,7 +285,7 @@ /mob/living/simple_animal/spiderbot/examine(mob/user) ..(user) if(src.held_item) - to_chat(user, "It is carrying \icon[src.held_item] \a [src.held_item].") + to_chat(user, "It is carrying [icon2html(src.held_item, user)] \a [src.held_item].") /mob/living/simple_animal/spiderbot/cannot_use_vents() return diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index efe01611d42..484117b99af 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -95,7 +95,7 @@ //repair a bit of damage if(prob(1)) - src.visible_message(SPAN_ALERT("\The [src] shudders and shakes as some of its damaged systems come back online.")) + src.visible_message(SPAN_WARNING("\The [src] shudders and shakes as some of its damaged systems come back online.")) spark(src, 3, alldirs) health += rand(25,100) @@ -109,7 +109,7 @@ src.visible_message(SPAN_NOTICE("\The [src] retracts several targetting vanes, and dulls its running lights.")) hostile_drone = 0 else - src.visible_message(SPAN_ALERT("\The [src] suddenly lights up, and additional targetting vanes slide into place.")) + src.visible_message(SPAN_WARNING("\The [src] suddenly lights up, and additional targetting vanes slide into place.")) hostile_drone = 1 if(health / maxHealth > 0.9) @@ -138,9 +138,9 @@ if(exploding && prob(20)) if(prob(50)) - src.visible_message(SPAN_ALERT("\The [src] begins to spark and shake violenty!")) + src.visible_message(SPAN_WARNING("\The [src] begins to spark and shake violenty!")) else - src.visible_message(SPAN_ALERT("\The [src] sparks and shakes like it's about to explode!")) + src.visible_message(SPAN_WARNING("\The [src] sparks and shakes like it's about to explode!")) spark(src, 3, alldirs) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 063bfeb3bea..c21ffda5793 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -734,7 +734,7 @@ -/mob/living/simple_animal/parrot/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0) +/mob/living/simple_animal/parrot/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/part_c, var/mob/speaker = null, var/hard_to_hear = 0) if(prob(50)) parrot_hear("[pick(available_channels)] [message]") ..(message,verb,language,part_a,part_b,speaker,hard_to_hear) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 8b1a8a3fecb..f06303a22bf 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -17,10 +17,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("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) + message_admins("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)].",ckey=key_name(src)) else - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) + message_admins("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).",ckey=key_name(src)) /** @@ -89,3 +89,5 @@ // Check code/modules/admin/verbs/antag-ooc.dm for definition client.add_aooc_if_necessary() + + simple_asset_ensure_is_sent(client, /datum/asset/simple/accents) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index e1cdc17474e..bc050800907 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -440,16 +440,9 @@ if (flavor_text && flavor_text != "") var/msg = replacetext(flavor_text, "\n", " ") if(length(msg) <= 40) - return "[msg]" + return "" else - return "[copytext_preserve_html(msg, 1, 37)]... More..." - -/* -/mob/verb/help() - set name = "Help" - src << browse('html/help.html', "window=help") - return -*/ + return " More..." /mob/verb/abandon_mob() set name = "Respawn" @@ -502,6 +495,78 @@ M.mind.reset() return +/client/verb/fix_chat() + set name = "Fix Chat" + set category = "OOC" + if (!chatOutput || !istype(chatOutput)) + var/action = alert(src, "Invalid Chat Output data found!\nRecreate data?", "Wot?", "Recreate Chat Output data", "Cancel") + if (action != "Recreate Chat Output data") + return + chatOutput = new /datum/chatOutput(src) + chatOutput.start() + action = alert(src, "Goon chat reloading, wait a bit and tell me if it's fixed", "", "Fixed", "Nope") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by re-creating the chatOutput datum") + else + chatOutput.load() + action = alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by re-creating the chatOutput datum and forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.\nWe could also disable fancy chat and re-enable oldchat", "", "Thanks anyways", "Switch to old chat") + if (action == "Switch to old chat") + winset(src, "output", "is-visible=true;is-disabled=false") + winset(src, "browseroutput", "is-visible=false") + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window after recreating the chatOutput and forcing a load()") + + else if (chatOutput.loaded) + var/action = alert(src, "ChatOutput seems to be loaded\nDo you want me to force a reload, wiping the chat log or just refresh the chat window because it broke/went away?", "Hmmm", "Force Reload", "Refresh", "Cancel") + switch (action) + if ("Force Reload") + chatOutput.loaded = FALSE + chatOutput.start() //this is likely to fail since it asks , but we should try it anyways so we know. + action = alert(src, "Goon chat reloading, wait a bit and tell me if it's fixed", "", "Fixed", "Nope") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a start()") + else + chatOutput.load() + action = alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.", "", "Thanks anyways",) + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window forcing a start() and forcing a load()") + + if ("Refresh") + chatOutput.showChat() + action = alert(src, "Goon chat refreshing, wait a bit and tell me if it's fixed", "", "Fixed", "Nope, force a reload") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a show()") + else + chatOutput.loaded = FALSE + chatOutput.load() + action = alert(src, "How about now? (give it a moment)", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.", "", "Thanks anyways") + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window forcing a show() and forcing a load()") + return + + else + chatOutput.start() + var/action = alert(src, "Manually loading Chat, wait a bit and tell me if it's fixed", "", "Fixed", "Nope") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by manually calling start()") + else + chatOutput.load() + alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by manually calling start() and forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.", "", "Thanks anyways") + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window after manually calling start() and forcing a load()") + /client/verb/changes() set name = "Changelog" set category = "OOC" @@ -1296,7 +1361,7 @@ return SetWeakened(200) - visible_message("OOC Information: [src] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.", "You have been winded by a member of staff! Please stand by until they contact you!") + visible_message("OOC Information: [src] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.", "You have been winded by a member of staff! Please stand by until they contact you!") log_admin("[key_name(admin)] winded [key_name(src)]!",admin_key=key_name(admin),ckey=key_name(src)) message_admins("[key_name_admin(admin)] winded [key_name_admin(src)]!", 1) @@ -1312,7 +1377,7 @@ return SetWeakened(0) - visible_message("OOC Information: [src] has been unwinded by a member of staff!", "You have been unwinded by a member of staff!") + visible_message("OOC Information: [src] has been unwinded by a member of staff!", "You have been unwinded by a member of staff!") log_admin("[key_name(admin)] unwinded [key_name(src)]!",admin_key=key_name(admin),ckey=key_name(src)) message_admins("[key_name_admin(admin)] unwinded [key_name_admin(src)]!", 1) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index dcd4b42b76a..830da5fa297 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -287,7 +287,7 @@ state = GRAB_NECK icon_state = "grabbed+1" affecting.attack_log += "\[[time_stamp()]\] Has had their neck grabbed by [assailant.name] ([assailant.ckey])" - assailant.attack_log += "\[[time_stamp()]\] Grabbed the neck of [affecting.name] ([affecting.ckey])" + assailant.attack_log += "\[[time_stamp()]\] Grabbed the neck of [affecting.name] ([affecting.ckey])" msg_admin_attack("[key_name_admin(assailant)] grabbed the neck of [key_name_admin(affecting)]",ckey=key_name(assailant),ckey_target=key_name(affecting)) hud.icon_state = "kill" hud.name = "kill" @@ -305,7 +305,7 @@ assailant.visible_message(SPAN_DANGER("[assailant] starts strangling [affecting]!"), SPAN_DANGER("You start strangling [affecting]!")) affecting.attack_log += "\[[time_stamp()]\] is being strangled by [assailant.name] ([assailant.ckey])" - assailant.attack_log += "\[[time_stamp()]\] is strangling [affecting.name] ([affecting.ckey])" + assailant.attack_log += "\[[time_stamp()]\] is strangling [affecting.name] ([affecting.ckey])" msg_admin_attack("[key_name_admin(assailant)] is strangling [key_name_admin(affecting)]",ckey=key_name(assailant),ckey_target=key_name(affecting)) affecting.setClickCooldown(10) diff --git a/code/modules/mob/mob_grab_specials.dm b/code/modules/mob/mob_grab_specials.dm index 0a5a0c7ce44..25bba3d9308 100644 --- a/code/modules/mob/mob_grab_specials.dm +++ b/code/modules/mob/mob_grab_specials.dm @@ -109,7 +109,7 @@ target.visible_message("[target] [target.species.knockout_message]") playsound(attacker.loc, /decl/sound_category/swing_hit_sound, 25, 1, -1) - attacker.attack_log += text("\[[time_stamp()]\] Headbutted [target.name] ([target.ckey])") + attacker.attack_log += text("\[[time_stamp()]\] Headbutted [target.name] ([target.ckey])") target.attack_log += text("\[[time_stamp()]\] Headbutted by [attacker.name] ([attacker.ckey])") msg_admin_attack("[key_name(attacker)] has headbutted [key_name(target)]",ckey=key_name(attacker),ckey_target=key_name(target)) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 31490caad2e..5b36001f5f2 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -494,7 +494,7 @@ proc/is_blind(A) for(var/mob/M in targets) var/turf/targetturf = get_turf(M) if(targetturf && (targetturf.z == sourceturf.z)) - M.show_message("\icon[icon] [message]", 1) + M.show_message("[icon2html(icon, M)] [message]", 1) /proc/mobs_in_area(var/area/A) var/list/mobs = new @@ -546,7 +546,7 @@ proc/is_blind(A) else // Everyone else (dead people who didn't ghost yet, etc.) lname = name lname = "[lname] " - to_chat(M, "[follow] " + create_text_tag("dead", "DEAD:", M.client) + " [lname][message]") + to_chat(M, "[follow] " + create_text_tag("DEAD", M.client) + " [lname][message]") //Announces that a ghost has joined/left, mainly for use with wizards /proc/announce_ghost_joinleave(O, var/joined_ghosts = 1, var/message = "") @@ -1178,10 +1178,10 @@ proc/is_blind(A) /mob/proc/set_intent(var/set_intent) a_intent = set_intent -/mob/proc/get_accent_icon(var/datum/language/speaking = null, var/force_accent) +/mob/proc/get_accent_icon(var/datum/language/speaking, var/mob/hearer, var/force_accent) SHOULD_CALL_PARENT(TRUE) var/used_accent = force_accent ? force_accent : accent if(used_accent && speaking?.allow_accents) var/datum/accent/a = SSrecords.accents[used_accent] var/final_icon = a.tag_icon - return ""
+ return ""
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 8b201834dce..8d82b1689fd 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -68,7 +68,7 @@
message = process_chat_markup(message, list("~", "_"))
- say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], ", src)
+ say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], ", src)
/mob/proc/say_understands(var/mob/other,var/datum/language/speaking = null)
diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm
index 621c1bdb6e4..e60f94e9c49 100644
--- a/code/modules/modular_computers/computers/modular_computer/interaction.dm
+++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm
@@ -146,7 +146,7 @@
return
enrolled = 0
hard_drive.reset_drive()
- visible_message("\icon[src.icon] [src] pings, \"Enrollment status reset! Have a NanoTrasen day.\"")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] pings, \"Enrollment status reset! Have a NanoTrasen day.\"")
if(istype(W, /obj/item/card/id)) // ID Card, try to insert it.
var/obj/item/card/id/I = W
if(!card_slot)
diff --git a/code/modules/modular_computers/file_system/programs/pai/signaler.dm b/code/modules/modular_computers/file_system/programs/pai/signaler.dm
index f4159b3556b..d98d37e3631 100644
--- a/code/modules/modular_computers/file_system/programs/pai/signaler.dm
+++ b/code/modules/modular_computers/file_system/programs/pai/signaler.dm
@@ -51,7 +51,7 @@
if(href_list["send"])
host.sradio.send_signal("ACTIVATE")
for(var/mob/O in hearers(1, host.loc))
- O.show_message(text("\icon[] *beep* *beep*", host), 3, "*beep* *beep*", 2)
+ O.show_message(text("[icon2html(host, viewers(get_turf(src)))] *beep* *beep*"), 3, "*beep* *beep*", 2)
return 1
else if(href_list["freq"])
diff --git a/code/modules/modular_computers/file_system/programs/system/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/system/ntdownloader.dm
index 1737ac34f4f..a5e3d0a7e7e 100644
--- a/code/modules/modular_computers/file_system/programs/system/ntdownloader.dm
+++ b/code/modules/modular_computers/file_system/programs/system/ntdownloader.dm
@@ -226,7 +226,7 @@
finish_from_queue(active_download)
active_download = null
playsound(get_turf(computer), 'sound/machines/ping.ogg', 40, 0)
- computer.output_message("\icon[computer] [capitalize_first_letters(computer)] pings, \"Software download completed successfully!\"", 1)
+ computer.output_message("[icon2html(computer, viewers(get_turf(computer)))] [capitalize_first_letters(computer)] pings, \"Software download completed successfully!\"", 1)
SSvueui.check_uis_for_change(src)
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
index 808e3e82a8d..0cbd1a1c20a 100644
--- a/code/modules/nano/nanoui.dm
+++ b/code/modules/nano/nanoui.dm
@@ -471,7 +471,7 @@ nanoui is used to open and update nano browser uis
var/list/send_data = get_send_data(data)
//to_chat(user, list2json(data) // used for debugging)
- to_chat(user, output(list2params(list(json_encode(send_data))),"[window_id].browser:receiveUpdateData"))
+ send_output(user, list2params(list(json_encode(send_data))),"[window_id].browser:receiveUpdateData")
/**
* This Topic() proc is called whenever a user clicks on a link within a Nano UI
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index db3d066e045..2882be85ee6 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -367,7 +367,7 @@
if(owner && vital)
if(user)
- user.attack_log += "\[[time_stamp()]\] removed a vital organ ([src]) from [owner.name] ([owner.ckey]) [user ? "(INTENT: [uppertext(user.a_intent)])" : ""]"
+ user.attack_log += "\[[time_stamp()]\] removed a vital organ ([src]) from [owner.name] ([owner.ckey]) [user ? "(INTENT: [uppertext(user.a_intent)])" : ""]"
owner.attack_log += "\[[time_stamp()]\] had a vital organ ([src]) removed by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])"
msg_admin_attack("[user.name] ([user.ckey]) removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(owner))
owner.death()
diff --git a/code/modules/organs/subtypes/vaurca.dm b/code/modules/organs/subtypes/vaurca.dm
index 88ae78d9862..ec52c25e689 100644
--- a/code/modules/organs/subtypes/vaurca.dm
+++ b/code/modules/organs/subtypes/vaurca.dm
@@ -158,13 +158,13 @@ obj/item/organ/vaurca/neuralsocket/process()
var/obj/icon = src
if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
- user.visible_message("[user] has used [W] on \icon[icon] [src]")
+ user.visible_message("[user] has used [W] on [icon2html(icon, viewers(get_turf(user)))] [src].")
var/pressure = air_contents.return_pressure()
manipulated_by = user.real_name //This person is aware of the contents of the tank.
var/total_moles = air_contents.total_moles
- to_chat(user, "Results of analysis of \icon[icon]")
+ to_chat(user, "Results of analysis of [icon2html(icon, user)]")
if (total_moles>0)
to_chat(user, "Pressure: [round(pressure,0.1)] kPa")
for(var/g in air_contents.gas)
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 2569aa590b5..d744ea3d7ba 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -314,4 +314,4 @@ var/list/admin_departments
continue
var/message = "New fax has arrived at [src.department] fax machine."
- pda.new_info(pda.message_silent, pda.ttone, "\icon[pda] [message]")
\ No newline at end of file
+ pda.new_info(pda.message_silent, pda.ttone, "[icon2html(pda, viewers(get_turf(pda)))] [message]")
\ No newline at end of file
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index fa9b544f05f..fa05753fa2c 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -127,7 +127,7 @@
user << browse(dat, "window=[name]")
else if(istype(pages[page], /obj/item/photo))
var/obj/item/photo/P = W
- to_chat(user, browse_rsc(P.img, "tmp_photo.png"))
+ send_rsc(user, P.img, "tmp_photo.png")
user << browse(dat + "[P.name] " + "" + " 
Written on the back:
[P.scribble]" : null]" + "", "window=[name]") /obj/item/paper_bundle/attack_self(mob/user as mob) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index e6030cf08db..227fc1eb27b 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -121,7 +121,7 @@ Pen exclusive commands to_chat(user, "You stab [M] with \the [src].") // to_chat(M, "\red You feel a tiny prick!" //That's a whole lot of meta!) M.attack_log += text("\[[time_stamp()]\] Has been stabbed with [name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [name] to stab [M.name] ([M.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [name] to stab [M.name] ([M.ckey])") msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) return diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 0b3bcf12c71..cbb9ec6c465 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -59,7 +59,7 @@ var/global/photo_count = 0 to_chat(user, "It is too far away.") /obj/item/photo/proc/show(mob/user as mob) - to_chat(user, browse_rsc(img, "tmp_photo_[id].png")) + send_rsc(user, img, "tmp_photo_[id].png") user << browse("[name] " + "" + "
" + "[scribble ? "
Written on the back:
[scribble]" : ""]" + "", "window=book;size=[64*photo_size]x[scribble ? 400 : 64*photo_size]") onclose(user, "[name]") return diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 26d453481e1..a74a1749076 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -238,7 +238,7 @@ proc/cardinalrange(var/center) /obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user) if(I.ismultitool() && isturf(loc)) if(locate(/obj/machinery/am_shielding/) in loc) - to_chat(user, "\icon[src]There is already an antimatter reactor section there.") + to_chat(user, "[icon2html(src, user)]There is already an antimatter reactor section there.") return //Search for shielding first @@ -254,7 +254,7 @@ proc/cardinalrange(var/center) new/obj/machinery/am_shielding(src.loc, AMC) qdel(src) else //Stranded & Alone - to_chat(user, "\icon[src]Couldn't connect to an Antimatter Control Unit.") + to_chat(user, "[icon2html(src, user)]Couldn't connect to an Antimatter Control Unit.") return ..() diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 3ceeb329244..675f58568fa 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -281,7 +281,7 @@ if(href_list["gentoggle"]) breaker = !breaker - investigate_log("was toggled [breaker ? "ON" : "OFF"] by [usr.key].", "gravity") + investigate_log("was toggled [breaker ? "ON" : "OFF"] by [usr.key].", "gravity") set_power() src.updateUsrDialog() else if(href_list["eshutoff"]) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index c821deb483d..4baf609e02e 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -33,7 +33,7 @@ var/global/list/rad_collectors = list() if(P) if(P.air_contents.gas[GAS_PHORON] == 0) - investigate_log("out of fuel.","singulo") + investigate_log("out of fuel.","singulo") eject() else P.air_contents.adjust_gas(GAS_PHORON, -0.001*drainratio) @@ -46,7 +46,7 @@ var/global/list/rad_collectors = list() toggle_power() user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \ "You turn the [src.name] [active? "on":"off"].") - investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas[GAS_PHORON]/0.29)]%":"It is empty"].","singulo") + investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas[GAS_PHORON]/0.29)]%":"It is empty"].","singulo") return else to_chat(user, "The controls are locked!") diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 0a986ec3291..648722a65b3 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -51,7 +51,7 @@ if(special_emitter) message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) log_game("Emitter deleted at ([x],[y],[z])") - investigate_log("deleted at ([x],[y],[z])","singulo") + investigate_log("deleted at ([x],[y],[z])","singulo") QDEL_NULL(wifi_receiver) QDEL_NULL(spark_system) QDEL_NULL(signaler) @@ -89,7 +89,7 @@ if(special_emitter) 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])",ckey=key_name(user)) - investigate_log("turned off by [user.key]","singulo") + investigate_log("turned off by [user.key]","singulo") else active = TRUE shot_number = 0 @@ -134,7 +134,7 @@ powered = FALSE update_icon() if(special_emitter) - investigate_log("lost power and turned off","singulo") + investigate_log("lost power and turned off","singulo") return last_shot = world.time @@ -269,4 +269,4 @@ if(!locked) activate(null) else - visible_message("\icon[src] [src] whines, \"Access denied!\"") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] whines, \"Access denied!\"") \ No newline at end of file diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index ccee0921984..03e68453556 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -199,7 +199,7 @@ field_generator power level display else visible_message(SPAN_ALERT("\The [src] shuts down!")) turn_off() - investigate_log("ran out of power and deactivated","singulo") + investigate_log("ran out of power and deactivated","singulo") src.power = 0 return 0 @@ -317,5 +317,5 @@ field_generator power level display if((world.time - O.last_warning) > 50) //to stop message-spam temp = 0 message_admins("A singulo exists and a containment field has failed.",1) - investigate_log("has failed whilst a singulo exists.","singulo") + investigate_log("has failed whilst a singulo exists.","singulo") O.last_warning = world.time diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index feb073d61c0..3d581bb3f12 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -110,7 +110,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin ..() if(master && master.active) master.toggle_power() - investigate_log("was moved whilst active; it powered down.","singulo") + investigate_log("was moved whilst active; it powered down.","singulo") /obj/structure/particle_accelerator/ex_act(severity) switch(severity) diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 567cfca0ac2..e6b1b47ce05 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -124,7 +124,7 @@ else 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])",ckey=key_name(usr)) - investigate_log("increased to [strength] by [usr.key]","singulo") + investigate_log("increased to [strength] by [usr.key]","singulo") strength_change() /obj/machinery/particle_accelerator/control_box/proc/remove_strength(var/s) @@ -152,7 +152,7 @@ if(src.active) //a part is missing! if(length(connected_parts) < 6) - investigate_log("lost a connected part; It powered down.","singulo") + investigate_log("lost a connected part; It powered down.","singulo") src.toggle_power() return //emit some particles @@ -213,7 +213,7 @@ /obj/machinery/particle_accelerator/control_box/proc/toggle_power(mob/user) src.active = !src.active - investigate_log("turned [active?"ON":"OFF"] by [user ? user.key : "outside forces"]","singulo") + investigate_log("turned [active?"ON":"OFF"] by [user ? user.key : "outside forces"]","singulo") message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user, TRUE, highlight_special = TRUE)] in ([x],[y],[z] - JMP)",0,1) log_game("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user)] in ([x],[y],[z])",ckey=key_name(user)) if(src.active) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 72d4eaab405..c4408b161df 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -112,7 +112,7 @@ log_and_message_admins("A singulo has been created without containment fields active.", location = get_turf(src)) - investigate_log("was created.[count ? "" : " No containment fields were active."]. usr=[usr ? key_name(usr) : "null"]", I_SINGULO) + investigate_log("was created.[count ? "" : " No containment fields were active."]. usr=[usr ? key_name(usr) : "null"]", I_SINGULO) /obj/singularity/proc/dissipate() if (!dissipate) @@ -248,7 +248,7 @@ visible_message("You witness the creation of a destructive force that cannot possibly be stopped by human hands.") if (current_size == allowed_size) - investigate_log("grew to size [current_size].", I_SINGULO) + investigate_log("grew to size [current_size].", I_SINGULO) return 1 else if (current_size < (--temp_allowed_size) && current_size != STAGE_SUPER) expand(temp_allowed_size) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index f2059675168..f7a8ef9c7de 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -429,7 +429,7 @@ output_level = input(usr, "Enter new output level (0-[output_level_max])", "SMES Output Power Control", output_level) as num output_level = max(0, min(output_level_max, output_level)) // clamp to range - investigate_log("input/output; on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [usr.key]","singulo") + investigate_log("input/output; on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [usr.key]","singulo") return 1 diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index 6eba0c75d33..66511d394c2 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -142,7 +142,7 @@ if (check_beaker_mixing(B)) dat += text("Mixing ") else - dat += text("Not mixing ") + dat += text("Not mixing ") else dat += "nothing." dat += " \[Eject\]
" @@ -154,7 +154,7 @@ if(ammo_magazine.stored_ammo && ammo_magazine.stored_ammo.len) dat += "The dart cartridge has [ammo_magazine.stored_ammo.len] shots remaining." else - dat += "The dart cartridge is empty!" + dat += "The dart cartridge is empty!" dat += " \[Eject\]" user << browse(dat, "window=dartgun") diff --git a/code/modules/psionics/events/mini_spasm.dm b/code/modules/psionics/events/mini_spasm.dm index 55ecc9f33af..6792a1e82cc 100644 --- a/code/modules/psionics/events/mini_spasm.dm +++ b/code/modules/psionics/events/mini_spasm.dm @@ -41,12 +41,12 @@ return if(victim.psi) - to_chat(victim, SPAN_DANGER("A hauntingly familiar sound hisses from \icon[source] \the [source], and your vision flickers!")) + to_chat(victim, SPAN_DANGER("A hauntingly familiar sound hisses from [icon2html(source, victim)] \the [source], and your vision flickers!")) victim.psi.backblast(rand(5,15)) victim.Paralyse(5) victim.make_jittery(100) else - to_chat(victim, SPAN_DANGER("An indescribable, brain-tearing sound hisses from \icon[source] \the [source], and you collapse in a seizure!")) + to_chat(victim, SPAN_DANGER("An indescribable, brain-tearing sound hisses from [icon2html(source, victim)] \the [source], and you collapse in a seizure!")) victim.seizure() var/new_latencies = rand(2,4) var/list/faculties = list(PSI_COERCION, PSI_REDACTION, PSI_ENERGISTICS, PSI_PSYCHOKINESIS) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index ced1e279e2a..9e795b5e836 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -548,7 +548,7 @@ target.apply_damage(25, PAIN) target.say("*scream") - user.attack_log += text("\[[time_stamp()]\] Has fed [target.name]'s ([target.ckey]) hair into a [src].") + user.attack_log += text("\[[time_stamp()]\] Has fed [target.name]'s ([target.ckey]) hair into a [src].") target.attack_log += text("\[[time_stamp()]\] Has had their hair fed into [src] by [user.name] ([user.ckey])") msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(target)] in a [src]. (JMP)",ckey=key_name(user),ckey_target=key_name(target)) else diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 9fcd3371c14..78b09f19551 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -128,7 +128,7 @@ if(mix_message) var/list/seen = viewers(4, T) for(var/mob/M in seen) - M.show_message("\icon[container] [mix_message]", 1) + M.show_message("[icon2html(container, viewers(get_turf(src)))] [mix_message]", 1) if(reaction_sound) playsound(T, reaction_sound, 80, 1) @@ -1230,7 +1230,7 @@ var/obj/item/slime_extract/T = holder.my_atom T.uses-- if(T.uses <= 0) - T.visible_message("\icon[T]\The [T]'s power is consumed in the reaction.") + T.visible_message("[icon2html(T, viewers(get_turf(src)))]\The [T]'s power is consumed in the reaction.") T.name = "used slime extract" T.desc = "This extract has been used up." @@ -1575,7 +1575,7 @@ ..() for(var/mob/living/carbon/slime/slime in viewers(get_turf(holder.my_atom), null)) slime.rabid = TRUE - slime.visible_message(SPAN_WARNING("\icon[slime] \The [slime] is driven into a frenzy!")) + slime.visible_message(SPAN_WARNING("[icon2html(slime, viewers(get_turf(slime)))] \The [slime] is driven into a frenzy!")) //Pink /datum/chemical_reaction/slime/ppotion diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index a26fe73bce0..17dc4e326cd 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -165,7 +165,7 @@ var/temperature = reagents.get_temperature() var/temperature_text = "Temperature: ([temperature]K/[temperature]C)" target.attack_log += text("\[[time_stamp()]\] Has been splashed with [name] by [user.name] ([user.ckey]). Reagents: [contained] [temperature_text].") - user.attack_log += text("\[[time_stamp()]\] Used the [name] to splash [target.name] ([target.key]). Reagents: [contained] [temperature_text].") + user.attack_log += text("\[[time_stamp()]\] Used the [name] to splash [target.name] ([target.key]). Reagents: [contained] [temperature_text].") msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) user.visible_message("\The [target] has been splashed with something by \the [user]!", "You splash the solution onto \the [target].") @@ -252,7 +252,7 @@ var/contained = reagentlist() target.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [user.name] ([user.ckey]). Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Fed [name] by [target.name] ([target.ckey]). Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Fed [name] by [target.name] ([target.ckey]). Reagents: [contained]") msg_admin_attack("[key_name(user)] fed [key_name(target)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_INGEST) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index bc1cd9d67e6..440079499af 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -66,7 +66,7 @@ var/mob/living/M = target var/contained = reagentlist() M.attack_log += text("\[[time_stamp()]\] Has been squirted with [name] by [user.name] ([user.ckey]). Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]") msg_admin_attack("[key_name_admin(user)] squirted [key_name_admin(M)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) return diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 03c13ad0f26..f1c2ab6d008 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -122,7 +122,7 @@ var/contained = reagentlist() target.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(target)] Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(target)] Reagents: [contained]") msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(target)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) reagents.trans_to_mob(target, min(reagents.total_volume,bitesize), CHEM_INGEST) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 615021f8e06..066689140d5 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -50,7 +50,7 @@ var/contained = reagentlist() M.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(M)] Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(M)] Reagents: [contained]") msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) if(reagents.total_volume) @@ -69,7 +69,7 @@ return to_chat(user, SPAN_NOTICE("You dissolve \the [src] in [target].")) - user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagentlist()]") + user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagentlist()]") msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) reagents.trans_to(target, reagents.total_volume) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 1f660f32324..094fd6d4e0f 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -344,7 +344,7 @@ user.remove_from_mob(src) qdel(src) - user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM)." + user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM)." target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: HARM)." msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (JMP)",ckey=key_name(user),ckey_target=key_name(src)) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 3f6f236468e..02368dcd39b 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -338,7 +338,7 @@ found = 1 break if(!found) - to_chat(user, "\icon[src]The conveyor switch did not detect any linked conveyor belts in range.") + to_chat(user, "[icon2html(src, user)]The conveyor switch did not detect any linked conveyor belts in range.") return var/obj/machinery/conveyor_switch/NC = new/obj/machinery/conveyor_switch(A, id) transfer_fingerprints_to(NC) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 3a808ead0e6..11425fc3be3 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -195,7 +195,7 @@ for (var/mob/C in viewers(src)) C.show_message("[GM.name] has been placed in the [src] by [user].", 3) qdel(G) - usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals.") + usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals.") GM.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [usr.name] ([usr.ckey])") msg_admin_attack("[key_name_admin(usr)] placed [key_name_admin(GM)] in a disposals unit. (JMP)",ckey=key_name(usr),ckey_target=key_name(GM)) return @@ -247,7 +247,7 @@ msg = "[user.name] stuffs [target.name] into the [src]!" to_chat(user, "You stuff [target.name] into the [src]!") - user.attack_log += text("\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals.") + user.attack_log += text("\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals.") target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])") msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (JMP)",ckey=key_name(user),ckey_target=key_name(target)) else diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 805e06b5425..c8aa1aa545f 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -52,7 +52,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). update_icon() else if(busy) - visible_message("\icon [src] flashes: insufficient materials: [getLackingMaterials(D)].") + visible_message("[icon2html(src, viewers(get_turf(src)))] flashes: insufficient materials: [getLackingMaterials(D)].") busy = 0 update_icon() diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 94a76b024f0..a66130e2d8b 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -125,12 +125,12 @@ var/global/list/obj/machinery/message_server/message_servers = list() if(2) if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) - Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5) - Console.message_log += "High Priority message from [sender]
[authmsg]" + 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]" else if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) - Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'Message from [sender]'"),,4) + 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.set_light(2) diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 6f525da3bea..87388d74cd9 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -46,7 +46,7 @@ update_icon() else if(busy) - visible_message("\icon [src] flashes: insufficient materials: [getLackingMaterials(D)].") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] flashes: insufficient materials: [getLackingMaterials(D)].") busy = 0 update_icon() diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm index bb4ec60912b..fd6e67b93bc 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm @@ -63,7 +63,7 @@ var/obj/item/device/measuring_tape/P = W user.visible_message("[user] extends [P] towards [src].","You extend [P] towards [src].") if(do_after(user,40)) - to_chat(user, "\icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm.") + to_chat(user, "[icon2html(P, user)] [src] has been excavated to a depth of [2*src.excavation_level]cm.") return if (istype(W, /obj/item/pickaxe)) @@ -85,7 +85,7 @@ if(excavation_level > 100) //failure - user.visible_message("[src] suddenly crumbles away.",\ + user.visible_message("[src] suddenly crumbles away.",\ "[src] has disintegrated under your onslaught, any secrets it was holding are long gone.") qdel(src) return @@ -99,9 +99,9 @@ var/obj/machinery/artifact/X = O if(X.my_effect) X.my_effect.artifact_id = artifact_find.artifact_id - src.visible_message("[src] suddenly crumbles away.") + src.visible_message("[src] suddenly crumbles away.") else - user.visible_message("[src] suddenly crumbles away.",\ + user.visible_message("[src] suddenly crumbles away.",\ "[src] has been whittled away under your careful excavation, but there was nothing of interest inside.") qdel(src) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm b/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm index 98e7a782c72..592a9cf37a4 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm @@ -48,17 +48,17 @@ if(!previous_power_state) previous_power_state = 1 icon_state = "cellold1" - src.visible_message("\icon[src] [src] suddenly comes to life!") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] suddenly comes to life!") //slowly grow a mob if(prob(5)) - src.visible_message("\icon[src] [src] [pick("gloops","glugs","whirrs","whooshes","hisses","purrs","hums","gushes")].") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] [pick("gloops","glugs","whirrs","whooshes","hisses","purrs","hums","gushes")].") //if we've finished growing... if(time_spent_spawning >= time_per_spawn) time_spent_spawning = 0 use_power = 1 - src.visible_message("\icon[src] [src] pings!") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] pings!") icon_state = "cellold1" desc = "It's full of a bubbling viscous liquid, and is lit by a mysterious glow." if(spawn_type) @@ -79,7 +79,7 @@ if(previous_power_state) previous_power_state = 0 icon_state = "cellold0" - src.visible_message("\icon[src] [src] suddenly shuts down.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] suddenly shuts down.") //cloned mob slowly breaks down time_spent_spawning = max(time_spent_spawning + last_process - world.time, 0) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm index 55ce17c18a0..4ab315665a3 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm @@ -77,7 +77,7 @@ viables.Remove(type) construction[button_desc] = type - fail_message = "\icon[src] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \ + fail_message = "[icon2html(src, viewers(get_turf(src)))] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \ [pick("horn","beep","bing","bleep","blat","honk","hrumph","ding")] sounds and a \ [pick("yellow","purple","green","blue","red","orange","white")] \ [pick("light","dial","meter","window","protrusion","knob","antenna","swirly thing")] \ @@ -89,7 +89,7 @@ if(spawning_types.len && powered()) spawn_progress_time += world.time - last_process_time if(spawn_progress_time > max_spawn_time) - src.visible_message("\icon[src] [src] pings!") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] pings!") var/obj/source_material = pop(stored_materials) var/spawn_type = pop(spawning_types) @@ -112,7 +112,7 @@ icon_state = "borgcharger0(old)" else if(prob(5)) - src.visible_message("\icon[src] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].") last_process_time = world.time @@ -139,9 +139,9 @@ if(index > 0 && index <= construction.len) if(stored_materials.len > spawning_types.len) if(spawning_types.len) - src.visible_message("\icon[src] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].") else - src.visible_message("\icon[src] [src]'s front compartment slides shut.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src]'s front compartment slides shut.") spawning_types.Add(construction[construction[index]]) spawn_progress_time = 0 diff --git a/code/modules/research/xenoarchaeology/artifact/effect.dm b/code/modules/research/xenoarchaeology/artifact/effect.dm index e424ac65f39..c110db57d10 100644 --- a/code/modules/research/xenoarchaeology/artifact/effect.dm +++ b/code/modules/research/xenoarchaeology/artifact/effect.dm @@ -64,7 +64,7 @@ var/atom/toplevelholder = holder while(!istype(toplevelholder.loc, /turf)) toplevelholder = toplevelholder.loc - toplevelholder.visible_message("\icon[toplevelholder] [toplevelholder] [display_msg]") + toplevelholder.visible_message("[icon2html(toplevelholder, viewers(get_turf(toplevelholder)))] [toplevelholder] [display_msg]") /datum/artifact_effect/proc/DoEffectTouch(var/mob/user) /datum/artifact_effect/proc/DoEffectAura(var/atom/holder) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm index 16b25269cad..05c23baeee2 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm @@ -34,7 +34,7 @@ if(prob(75)) to_chat(H, "[pick(drastic_messages)]") else - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") if(prob(50)) H.dizziness += rand(3,5) @@ -45,7 +45,7 @@ for (var/mob/living/carbon/human/H in range(src.effectrange,T)) if(prob(5)) if(prob(75)) - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") else to_chat(H, "[pick(drastic_messages)]") @@ -61,7 +61,7 @@ if(prob(95)) to_chat(H, "[pick(drastic_messages)]") else - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") if(prob(50)) H.dizziness += rand(3,5) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm index 3eafeaf9180..a771dc0ff2b 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm @@ -32,7 +32,7 @@ if(prob(75)) to_chat(H, "[pick(drastic_messages)]") else - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") if(prob(50)) H.dizziness += rand(3,5) @@ -43,7 +43,7 @@ for (var/mob/living/carbon/human/H in range(src.effectrange,T)) if(prob(5)) if(prob(75)) - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") else to_chat(H, "[pick(drastic_messages)]") @@ -59,7 +59,7 @@ if(prob(95)) to_chat(H, "[pick(drastic_messages)]") else - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") if(prob(50)) H.dizziness += rand(3,5) diff --git a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm index ea6a8ab662e..cc548b8e00e 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm @@ -80,7 +80,7 @@ ..() else if(istype(W,/obj/item/pen)) plaque_contents = sanitize(input("What would you like to write on the plaque:","Skeleton plaque","")) - user.visible_message("[user] writes something on the base of [src].","You relabel the plaque on the base of \icon[src] [src].") + user.visible_message("[user] writes something on the base of [src].","You relabel the plaque on the base of [icon2html(src, user)] [src].") if(src.contents.Find(/obj/item/fossil/skull/horned)) src.desc = "A creature made of [src.contents.len-1] assorted bones and a horned skull. The plaque reads \'[plaque_contents]\'." else diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm index 328f72d8c65..066249f3677 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_special.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm @@ -115,7 +115,7 @@ if(charges >= 0.1) if(prob(5)) - src.visible_message("\icon[src] [src]'s eyes glow ruby red for a moment!") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src]'s eyes glow ruby red for a moment!") charges -= 0.1 //check on our shadow wights diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm index 3a5df576b4e..827d13fc6f0 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm @@ -60,7 +60,7 @@ var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\ "[holder_atom] seems to be focusing on [source]...",\ "[holder_atom] seems to turn it's attention to [source]...") - holder_atom.loc.visible_message("\icon[holder_atom] [pick(options)]") + holder_atom.loc.visible_message("[icon2html(holder_atom, viewers(get_turf(holder_atom)))] [pick(options)]") if(prob(20)) spawn(2) @@ -116,5 +116,5 @@ listening|=M for(var/mob/M in listening) - to_chat(M, "\icon[holder_atom] [holder_atom] reverberates, \"[msg]\"") + to_chat(M, "[icon2html(holder_atom, M)] [holder_atom] reverberates, \"[msg]\"") last_talk_time = world.time diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm index ef5840fcd6f..0789a2d12af 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm @@ -80,7 +80,7 @@ var/pname = "[src] report #[++report_num]" var/info = "[src] analysis report #[report_num]
" info += "
" - info += "\icon[scanned_object] [results]" + info += "[icon2html(scanned_object, viewers(get_turf(src)))] [results]" P.stamped = list(/obj/item/stamp) P.overlays = list("paper_stamped") P.set_content_unsafe(pname, info) diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index 774cf12054c..926312784e7 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -235,16 +235,16 @@ //emergency stop if seal integrity reaches 0 if(scanner_seal_integrity <= 0 || (scanner_temperature >= 1273 && !rad_shield)) stop_scanning() - visible_message("\icon[src] buzzes unhappily. It has failed mid-scan!", range = 2) + visible_message("[icon2html(src, viewers(get_turf(src)))] buzzes unhappily. It has failed mid-scan!", range = 2) if(prob(5)) - visible_message("\icon[src] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", range = 2) + visible_message("[icon2html(src, viewers(get_turf(src)))] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", range = 2) else //gradually cool down over time if(scanner_temperature > 0) scanner_temperature = max(scanner_temperature - 5 - 10 * rand(), 0) if(prob(0.75)) - visible_message("\icon[src] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", range = 2) + visible_message("[icon2html(src, viewers(get_turf(src)))] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", range = 2) last_process_worldtime = world.time /obj/machinery/radiocarbon_spectrometer/proc/stop_scanning() @@ -262,7 +262,7 @@ used_coolant = 0 /obj/machinery/radiocarbon_spectrometer/proc/complete_scan() - visible_message("\icon[src] makes an insistent chime.", range = 2) + visible_message("[icon2html(src, viewers(get_turf(src)))] makes an insistent chime.", range = 2) if(scanned_item) //create report diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm index d03c0ff31e3..157c5ef50d5 100644 --- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm +++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm @@ -103,9 +103,9 @@ if(interval > 0) //apply the touch effect to the holder if(holder) - to_chat(holder, "the \icon[src] [src] held by [holder] shudders in your grasp.") + to_chat(holder, "[icon2html(src, viewers(get_turf(src)))] [src] held by [holder] shudders in your grasp.") else - src.loc.visible_message("the \icon[src] [src] shudders.") + src.loc.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] shudders.") inserted_battery.battery_effect.DoEffectTouch(holder) //consume power @@ -131,13 +131,13 @@ //work out if we need to shutdown if(inserted_battery.stored_charge <= 0) - src.loc.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.") + src.loc.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] buzzes.", "You hear something buzz.") shutdown_emission() else if(world.time > time_end) - src.loc.visible_message("\icon[src] [src] chimes.", "\icon[src] You hear something chime.") + src.loc.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] chimes.", "You hear something chime.") shutdown_emission() else - src.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] buzzes.", "You hear something buzz.") shutdown_emission() last_process = world.time @@ -164,7 +164,7 @@ if(href_list["startup"]) if(inserted_battery && inserted_battery.battery_effect && (inserted_battery.stored_charge > 0) ) activated = 1 - src.visible_message("\icon[src] [src] whirrs.", "\icon[src]You hear something whirr.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] whirrs.", "You hear something whirr.") if(!inserted_battery.battery_effect.activated) inserted_battery.battery_effect.ToggleActivate(1) time_end = world.time + duration @@ -210,6 +210,6 @@ M.lastattacker = user if(inserted_battery.battery_effect) - user.attack_log += "\[[time_stamp()]\] Tapped [M.name] ([M.ckey]) with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" + user.attack_log += "\[[time_stamp()]\] Tapped [M.name] ([M.ckey]) with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" M.attack_log += "\[[time_stamp()]\] Tapped by [user.name] ([user.ckey]) with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" msg_admin_attack("[key_name_admin(user)] tapped [key_name_admin(M)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype]) (JMP)",ckey=key_name(user),ckey_target=key_name(M) ) diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index cd8b01b5cdd..b2965596bbc 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -101,7 +101,7 @@ dat += "
" dat += "
" dat += "
" - dat += "Always wear safety gear and consult a field manual before operation.
" + dat += "Always wear safety gear and consult a field manual before operation.
" if(!locked) dat += "Lock console
" else @@ -248,7 +248,7 @@ success = 1 for(var/mob/living/carbon/C in T) C.weakened += 5 - C.visible_message("\icon[C] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.") + C.visible_message("[icon2html(C, viewers(get_turf(C)))] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.") if("nitrogen") success = 1 // @@ -271,19 +271,19 @@ success = 1 for(var/mob/living/silicon/R in T) R.weakened += 5 - R.visible_message("\icon[R] [R] begins to float in the air!","You feel tingly and light, but it is difficult to move.") + R.visible_message("[icon2html(R, viewers(get_turf(R)))] [R] begins to float in the air!","You feel tingly and light, but it is difficult to move.") // //in case we have a bad field type if(!success) return for(var/mob/living/simple_animal/C in T) - C.visible_message("\icon[C] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.") + C.visible_message("[icon2html(C, viewers(get_turf(C)))] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.") C.weakened += 5 suspension_field = new(T) suspension_field.field_type = field_type - src.visible_message("\icon[src] [src] activates with a low hum.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] activates with a low hum.") icon_state = "suspension3" for(var/obj/item/I in T) @@ -293,7 +293,7 @@ if(collected) suspension_field.icon_state = "energynet" suspension_field.add_overlay("shield2") - src.visible_message("\icon[suspension_field] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].") + src.visible_message("[icon2html(suspension_field, viewers(get_turf(suspension_field)))] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].") else if(istype(T,/turf/simulated/mineral) || istype(T,/turf/simulated/wall)) suspension_field.icon_state = "shieldsparkles" @@ -308,7 +308,7 @@ to_chat(M, "You no longer feel like floating.") M.weakened = min(M.weakened, 3) - src.visible_message("\icon[src] [src] deactivates with a gentle shudder.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] deactivates with a gentle shudder.") qdel(suspension_field) suspension_field = null icon_state = "suspension2" diff --git a/code/modules/research/xenoarchaeology/tools/tools.dm b/code/modules/research/xenoarchaeology/tools/tools.dm index 9d4f482e577..fcf72400917 100644 --- a/code/modules/research/xenoarchaeology/tools/tools.dm +++ b/code/modules/research/xenoarchaeology/tools/tools.dm @@ -12,7 +12,7 @@ /obj/item/device/gps/attack_self(var/mob/user as mob) var/turf/T = get_turf(src) - to_chat(user, "\icon[src] [src] flashes [T.x].[rand(0,9)]:[T.y].[rand(0,9)]:[T.z].[rand(0,9)].") + to_chat(user, "[icon2html(src, user)] [src] flashes [T.x].[rand(0,9)]:[T.y].[rand(0,9)]:[T.z].[rand(0,9)].") /obj/item/device/measuring_tape name = "measuring tape" diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 309056a1b0f..9b3f06e7b3a 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -45,7 +45,7 @@ positive_locations.Add(D) for(var/mob/L in range(src, 1)) - to_chat(L, "\icon[src] [src] pings.") + to_chat(L, "[icon2html(src, L)] [src] pings.") else if(istype(A,/obj/structure/boulder)) var/obj/structure/boulder/B = A @@ -64,7 +64,7 @@ positive_locations.Add(D) for(var/mob/L in range(src, 1)) - to_chat(L, "\icon[src] [src] pings [pick("madly","wildly","excitedly","crazily")]!") + to_chat(L, "[icon2html(src, L)] [src] pings [pick("madly","wildly","excitedly","crazily")]!") /obj/item/device/depth_scanner/attack_self(var/mob/user as mob) return src.interact(user) diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm index 49a14ad13a8..8741691853f 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm @@ -52,9 +52,9 @@ scan_ticks = 0 var/turf/T = get_turf(src) if(target_radio) - T.visible_message("\icon[src] [src] [pick("chirps","chirrups","cheeps")] happily.") + T.visible_message("[icon2html(src, viewers(get_turf(T)))] [src] [pick("chirps","chirrups","cheeps")] happily.") else - T.visible_message("\icon[src] [src] [pick("chirps","chirrups","cheeps")] sadly.") + T.visible_message("[icon2html(src, viewers(get_turf(T)))] [src] [pick("chirps","chirrups","cheeps")] sadly.") else icon_state = "pinoff" diff --git a/code/modules/scripting/IDE.dm b/code/modules/scripting/IDE.dm index 2f80402d562..bafe624d111 100644 --- a/code/modules/scripting/IDE.dm +++ b/code/modules/scripting/IDE.dm @@ -13,16 +13,16 @@ client/verb/tcssave() log_misc(msg) message_admins("[mob.name] has uploaded a NTLS script to [Machine.SelectedServer] ([mob.x],[mob.y],[mob.z] - JMP)",0,1) Server.setcode( tcscode ) // this actually saves the code from input to the server - to_chat(src, output(null, "tcserror")) // clear the errors) + send_output(src, null, "tcserror") // clear the errors) else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to save: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to save: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to save: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to save: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to save: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to save: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") client/verb/tcscompile() @@ -39,42 +39,42 @@ client/verb/tcscompile() var/list/compileerrors = Server.compile() // then compile the code! // Output all the compile-time errors - to_chat(src, output(null, "tcserror")) + send_output(src, null, "tcserror") if(compileerrors.len) - to_chat(src, output("Compile Errors", "tcserror")) + to_chat(src, "Compile Errors", "tcserror") for(var/scriptError/e in compileerrors) - to_chat(src, output("\t>[e.message]", "tcserror")) - to_chat(src, output("([compileerrors.len] errors)", "tcserror")) + send_output(src, "\t>[e.message]", "tcserror") + send_output(src, "([compileerrors.len] errors)", "tcserror") // Output compile errors to all other people viewing the code too for(var/mob/M in Machine.viewingcode) if(M.client) - to_chat(M, output(null, "tcserror")) - to_chat(M, output("Compile Errors", "tcserror")) + send_output(M, null, "tcserror") + send_output(M, "Compile Errors", "tcserror") for(var/scriptError/e in compileerrors) - to_chat(M, output("\t>[e.message]", "tcserror")) - to_chat(M, output("([compileerrors.len] errors)", "tcserror")) + send_output(M, "\t>[e.message]", "tcserror") + send_output(M, "([compileerrors.len] errors)", "tcserror") else - to_chat(src, output("TCS compilation successful!", "tcserror")) - to_chat(src, output("(0 errors)", "tcserror")) + send_output(src, "TCS compilation successful!", "tcserror") + send_output(src, "(0 errors)", "tcserror") for(var/mob/M in Machine.viewingcode) if(M.client) - to_chat(M, output("TCS compilation successful!", "tcserror")) - to_chat(M, output("(0 errors)", "tcserror")) + send_output(M, "TCS compilation successful!", "tcserror") + send_output(M, "(0 errors)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to compile: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to compile: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to compile: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to compile: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to compile: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to compile: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") client/verb/tcsrun() set hidden = 1 @@ -90,32 +90,31 @@ client/verb/tcsrun() var/list/compileerrors = Server.compile() // then compile the code! // Output all the compile-time errors - to_chat(src, output(null, "tcserror")) + send_output(src, null, "tcserror") if(compileerrors.len) - to_chat(src, output("Compile Errors", "tcserror")) + send_output(src, "Compile Errors", "tcserror") for(var/scriptError/e in compileerrors) - to_chat(src, output("\t>[e.message]", "tcserror")) - to_chat(src, output("([compileerrors.len] errors)", "tcserror")) + send_output(src, "\t>[e.message]", "tcserror") + send_output(src, "([compileerrors.len] errors)", "tcserror") // Output compile errors to all other people viewing the code too for(var/mob/M in Machine.viewingcode) if(M.client) - to_chat(M, output(null, "tcserror")) - to_chat(M, output("Compile Errors", "tcserror")) + send_output(M, null, "tcserror") + send_output(M, "Compile Errors", "tcserror") for(var/scriptError/e in compileerrors) - to_chat(M, output("\t>[e.message]", "tcserror")) - to_chat(M, output("([compileerrors.len] errors)", "tcserror")) - + send_output(M, "\t>[e.message]", "tcserror") + send_output(M, "([compileerrors.len] errors)", "tcserror") else // Finally, we run the code! - to_chat(src, output("TCS compilation successful! Code executed.", "tcserror")) - to_chat(src, output("(0 errors)", "tcserror")) + send_output(src, "TCS compilation successful! Code executed.", "tcserror") + send_output(src, "(0 errors)", "tcserror") for(var/mob/M in Machine.viewingcode) if(M.client) - to_chat(M, output("TCS compilation successful!", "tcserror")) - to_chat(M, output("(0 errors)", "tcserror")) + send_output(M, "TCS compilation successful!", "tcserror") + send_output(M, "(0 errors)", "tcserror") var/datum/signal/signal = new() signal.data["message"] = "" @@ -132,14 +131,14 @@ client/verb/tcsrun() else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to run: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to run: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to run: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to run: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to run: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to run: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") client/verb/exittcs() @@ -171,16 +170,16 @@ client/verb/tcsrevert() winset(mob, "tcscode", "text=\"[showcode]\"") - to_chat(src, output(null, "tcserror")) // clear the errors) + send_output(src, null, "tcserror") // clear the errors else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to revert: Unable to locate server machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to revert: Unable to locate server machine.", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to revert: Unable to locate machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to revert: Unable to locate machine.", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to revert: Unable to locate machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to revert: Unable to locate machine.", "tcserror") client/verb/tcsclearmem() @@ -195,17 +194,17 @@ client/verb/tcsclearmem() var/obj/machinery/telecomms/server/Server = Machine.SelectedServer Server.memory = list() // clear the memory // Show results - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Server memory cleared!", "tcserror")) + to_chat(src, null, "tcserror") + to_chat(src, "Server memory cleared!", "tcserror") for(var/mob/M in Machine.viewingcode) if(M.client) - to_chat(M, output("Server memory cleared!", "tcserror")) + send_output(M, "Server memory cleared!", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to clear memory: Unable to locate server machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to clear memory: Unable to locate server machine.", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to clear memory: Unable to locate machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to clear memory: Unable to locate machine.", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to clear memory: Unable to locate machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to clear memory: Unable to locate machine.", "tcserror") diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index 80d3ce09fe6..c06a4c9b675 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -241,27 +241,27 @@ malfunction = TRUE checkhp() -/obj/machinery/shieldgen/attack_hand(mob/user as mob) +/obj/machinery/shieldgen/attack_hand(mob/user) if(locked) - to_chat(user, "The machine is locked, you are unable to use it.") + to_chat(user, SPAN_WARNING("The machine is locked!")) return if(is_open) - to_chat(user, "The panel must be closed before operating this machine.") + to_chat(user, SPAN_WARNING("The panel must be closed before operating this machine.")) return if (src.active) - user.visible_message("\icon[src] [user] deactivated the shield generator.", \ - "\icon[src] You deactivate the shield generator.", \ + user.visible_message("[icon2html(src, viewers(get_turf(src)))] [user] deactivates the shield generator.", \ + "[icon2html(src, viewers(get_turf(src)))] You deactivate the shield generator.", \ "You hear heavy droning fade out.") src.shields_down() else if(anchored) - user.visible_message("\icon[src] [user] activated the shield generator.", \ - "\icon[src] You activate the shield generator.", \ + user.visible_message("[icon2html(src, viewers(get_turf(src)))] [user] activate the shield generator.", \ + "[icon2html(src, viewers(get_turf(src)))] You activate the shield generator.", \ "You hear heavy droning.") src.shields_up() else - to_chat(user, "The device must first be secured to the floor.") + to_chat(user, SPAN_WARNING("The device must first be secured to the floor.")) return /obj/machinery/shieldgen/emag_act(var/remaining_charges, var/mob/user) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index 895af5dd1d4..285bb3e862d 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -216,14 +216,14 @@ covered_turfs = null for(var/mob/M in view(5,src)) - to_chat(M, "\icon[src] You hear heavy droning start up.") + to_chat(M, "[icon2html(src, M)] You hear heavy droning start up.") else for(var/obj/effect/energy_field/D in field) field.Remove(D) D.loc = null for(var/mob/M in view(5,src)) - to_chat(M, "\icon[src] You hear heavy droning fade out.") + to_chat(M, "[icon2html(src, M)] You hear heavy droning fade out.") /obj/machinery/shield_gen/update_icon() if(stat & BROKEN) diff --git a/code/modules/spell_system/spells/spell_code.dm b/code/modules/spell_system/spells/spell_code.dm index fd06835910b..18063d50837 100644 --- a/code/modules/spell_system/spells/spell_code.dm +++ b/code/modules/spell_system/spells/spell_code.dm @@ -103,7 +103,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now take_charge(user, skipcharge) before_cast(targets) //applies any overlays and effects - user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) cast the spell [name].") + user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) cast the spell [name].") if(prob(critfailchance)) critfail(targets, user) else diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index a7d55483496..94861b2c255 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -204,7 +204,7 @@ if(ishuman(AM)) var/mob/living/carbon/human/H = AM buckled_mob.attack_log += "\[[time_stamp()]\] Was rammed by [src]" - buckled_mob.attack_log += text("\[[time_stamp()]\] rammed[buckled_mob.name] ([buckled_mob.ckey]) rammed [H.name] ([H.ckey]) with the [src].") + buckled_mob.attack_log += text("\[[time_stamp()]\] rammed[buckled_mob.name] ([buckled_mob.ckey]) rammed [H.name] ([H.ckey]) with the [src].") msg_admin_attack("[src] crashed into [key_name(H)] at (JMP)" ) src.visible_message(SPAN_DANGER("\The [src] smashes into \the [H]!")) playsound(src, 'sound/weapons/punch4.ogg', 50, 1) @@ -265,7 +265,7 @@ return if(buckled_mob.a_intent == I_HURT) buckled_mob.attack_log += "\[[time_stamp()]\] Was rammed by [src]" - buckled_mob.attack_log += text("\[[time_stamp()]\] rammed[buckled_mob.name] ([buckled_mob.ckey]) rammed [H.name] ([H.ckey]) with the [src].") + buckled_mob.attack_log += text("\[[time_stamp()]\] rammed[buckled_mob.name] ([buckled_mob.ckey]) rammed [H.name] ([H.ckey]) with the [src].") msg_admin_attack("[src] crashed into [key_name(H)] at (JMP)" ) src.visible_message(SPAN_DANGER("\The [src] runs over \the [H]!")) H.apply_damage(30, BRUTE) diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 81a2bc899bd..4e220594ea9 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -155,7 +155,7 @@ /obj/vehicle/train/cargo/trolley/RunOver(var/mob/living/carbon/human/H) ..() - attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") + attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") /obj/vehicle/train/cargo/engine/RunOver(var/mob/living/carbon/human/H) ..() @@ -164,10 +164,10 @@ var/mob/living/carbon/human/D = load to_chat(D, "You ran over [H]!") visible_message("\The [src] ran over [H]!") - attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])") + attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])") msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (JMP)",ckey=key_name(D),ckey_target=key_name(H)) else - attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") + attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") //------------------------------------------- diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index fb36598d1b8..cd38d0b98b6 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -368,7 +368,7 @@ if(!damage) return visible_message("[user] [attack_message] the [src]!") - user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") + user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") user.do_attack_animation(src) src.health -= damage if(prob(10)) diff --git a/code/modules/vueui/ui.dm b/code/modules/vueui/ui.dm index 2267cd61ad3..13a16a128ce 100644 --- a/code/modules/vueui/ui.dm +++ b/code/modules/vueui/ui.dm @@ -281,7 +281,7 @@ main ui datum. /datum/vueui/proc/push_change(var/list/ndata) if(ndata && status > STATUS_DISABLED) src.data = ndata - to_chat(user, output(list2params(list(generate_data_json())),"[windowid].browser:receiveUIState")) + send_output(user, list2params(list(generate_data_json())),"[windowid].browser:receiveUIState") /** * Check for change and push that change of data diff --git a/code/modules/world_api/commands/admin.dm b/code/modules/world_api/commands/admin.dm index 2eb96841ad1..ee73bba4780 100644 --- a/code/modules/world_api/commands/admin.dm +++ b/code/modules/world_api/commands/admin.dm @@ -96,8 +96,8 @@ if(!rank) rank = "Admin" - var/message = "[rank] PM from [queryparams["senderkey"]]: [queryparams["msg"]]" - var/amessage = "[rank] PM from [queryparams["senderkey"]] to [key_name(C, highlight_special = 1)] : [queryparams["msg"]]" + var/message = "[rank] PM from [queryparams["senderkey"]]: [queryparams["msg"]]" + var/amessage = "[rank] PM from [queryparams["senderkey"]] to [key_name(C, highlight_special = 1)] : [queryparams["msg"]]" C.received_discord_pm = world.time C.discord_admin = queryparams["senderkey"] diff --git a/code/modules/world_api/commands/cciaa.dm b/code/modules/world_api/commands/cciaa.dm index 063a1b68af5..f9cf33d32a6 100644 --- a/code/modules/world_api/commands/cciaa.dm +++ b/code/modules/world_api/commands/cciaa.dm @@ -164,7 +164,7 @@ command_announcement.Announce(reportbody, reporttitle, new_sound = 'sound/AI/commandreport.ogg', do_newscast = 1, msg_sanitized = 1); if(reportannounce == 0) to_world("New NanoTrasen Update available at all communication consoles.") - to_world(sound('sound/AI/commandreport.ogg')) + sound_to(world, ('sound/AI/commandreport.ogg')) log_admin("[senderkey] has created a command report via the api: [reportbody]",admin_key=senderkey) diff --git a/code/stylesheet.dm b/code/stylesheet.dm index b87249ff437..40247629f9b 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -16,7 +16,7 @@ em {font-style: normal;font-weight: bold;} /* OOC */ .ooc {font-weight: bold;} -.ooc img.text_tag {width: 32px; height: 10px;} +.ooc img.text_tag {width: 32px; height: 10px; vertical-align: middle;} .ooc .everyone {color: #002eb8;} .ooc .looc {color: #6699CC;} diff --git a/code/world.dm b/code/world.dm index 4af70e14c56..2a94b756408 100644 --- a/code/world.dm +++ b/code/world.dm @@ -275,14 +275,6 @@ var/list/world_api_rate_limit = list() time_stamped = 1 -/hook/startup/proc/initialize_greeting() - world.initialize_greeting() - return 1 - -/world/proc/initialize_greeting() - server_greeting = new() - - /proc/load_configuration() config = new /datum/configuration() config.load("config/config.txt") diff --git a/html/archivedchangelog.html b/html/archivedchangelog.html index 36a117bb533..f92aaf6f73f 100644 --- a/html/archivedchangelog.html +++ b/html/archivedchangelog.html @@ -461,7 +461,7 @@ Stick old posts here to prevent cluttering of main changelog.
diff --git a/html/changelogs/mattatlas-goonchat.yml b/html/changelogs/mattatlas-goonchat.yml
new file mode 100644
index 00000000000..71fa707ea70
--- /dev/null
+++ b/html/changelogs/mattatlas-goonchat.yml
@@ -0,0 +1,45 @@
+################################
+# 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
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Ported a new chat system, Goonchat, that allows for cool things like changing font style, size, spacing, highlighting up to 5 strings in the chat, and DARK MODE."
+ - rscadd: "Repeated chat messages can now get compacted. You can disable this in goonchat settings."
+ - rscadd: "You can change icon style to any font on your system."
+ - tweak: "The game window has been altered a bit to adjust for this."
+ - rscdel: "Removed skin style prefs as they are no longer used."
\ No newline at end of file
diff --git a/html/font-awesome/README.MD b/html/font-awesome/README.MD
new file mode 100644
index 00000000000..7d693c36f03
--- /dev/null
+++ b/html/font-awesome/README.MD
@@ -0,0 +1,6 @@
+Due to the fact browse_rsc can't create subdirectories, every time you update font-awesome you'll need to change relative webfont references in all.min.css
+eg ../webfonts/fa-regular-400.ttf => fa-regular-400.ttf (or whatever you call it in asset datum)
+
+Second change is ripping out file types other than woff and eot(ie8) from the css
+
+Finally, removing brand related css.
\ No newline at end of file
diff --git a/html/font-awesome/css/all.min.css b/html/font-awesome/css/all.min.css
new file mode 100644
index 00000000000..e7cdfffe751
--- /dev/null
+++ b/html/font-awesome/css/all.min.css
@@ -0,0 +1,5 @@
+/*!
+ * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:fa-spin 2s infinite linear}.fa-pulse{animation:fa-spin 1s infinite steps(8)}@keyframes fa-spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-both,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-acquisitions-incorporated:before{content:"\f6af"}.fa-ad:before{content:"\f641"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adobe:before{content:"\f778"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-air-freshener:before{content:"\f5d0"}.fa-airbnb:before{content:"\f834"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-alipay:before{content:"\f642"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angry:before{content:"\f556"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-ankh:before{content:"\f644"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-alt:before{content:"\f5d1"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-archway:before{content:"\f557"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-artstation:before{content:"\f77a"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-atlas:before{content:"\f558"}.fa-atlassian:before{content:"\f77b"}.fa-atom:before{content:"\f5d2"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-award:before{content:"\f559"}.fa-aws:before{content:"\f375"}.fa-baby:before{content:"\f77c"}.fa-baby-carriage:before{content:"\f77d"}.fa-backspace:before{content:"\f55a"}.fa-backward:before{content:"\f04a"}.fa-bacon:before{content:"\f7e5"}.fa-balance-scale:before{content:"\f24e"}.fa-balance-scale-left:before{content:"\f515"}.fa-balance-scale-right:before{content:"\f516"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-battle-net:before{content:"\f835"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bible:before{content:"\f647"}.fa-bicycle:before{content:"\f206"}.fa-biking:before{content:"\f84a"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-biohazard:before{content:"\f780"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blender-phone:before{content:"\f6b6"}.fa-blind:before{content:"\f29d"}.fa-blog:before{content:"\f781"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-bone:before{content:"\f5d7"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-book-dead:before{content:"\f6b7"}.fa-book-medical:before{content:"\f7e6"}.fa-book-open:before{content:"\f518"}.fa-book-reader:before{content:"\f5da"}.fa-bookmark:before{content:"\f02e"}.fa-bootstrap:before{content:"\f836"}.fa-border-all:before{content:"\f84c"}.fa-border-none:before{content:"\f850"}.fa-border-style:before{content:"\f853"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-brain:before{content:"\f5dc"}.fa-bread-slice:before{content:"\f7ec"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-brush:before{content:"\f55d"}.fa-btc:before{content:"\f15a"}.fa-buffer:before{content:"\f837"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before{content:"\f55e"}.fa-business-time:before{content:"\f64a"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-day:before{content:"\f783"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-calendar-week:before{content:"\f784"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-campground:before{content:"\f6bb"}.fa-canadian-maple-leaf:before{content:"\f785"}.fa-candy-cane:before{content:"\f786"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-car-alt:before{content:"\f5de"}.fa-car-battery:before{content:"\f5df"}.fa-car-crash:before{content:"\f5e1"}.fa-car-side:before{content:"\f5e4"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-carrot:before{content:"\f787"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cash-register:before{content:"\f788"}.fa-cat:before{content:"\f6be"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-centos:before{content:"\f789"}.fa-certificate:before{content:"\f0a3"}.fa-chair:before{content:"\f6c0"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-charging-station:before{content:"\f5e7"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-double:before{content:"\f560"}.fa-check-square:before{content:"\f14a"}.fa-cheese:before{content:"\f7ef"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-chromecast:before{content:"\f838"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-city:before{content:"\f64f"}.fa-clinic-medical:before{content:"\f7f2"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-meatball:before{content:"\f73b"}.fa-cloud-moon:before{content:"\f6c3"}.fa-cloud-moon-rain:before{content:"\f73c"}.fa-cloud-rain:before{content:"\f73d"}.fa-cloud-showers-heavy:before{content:"\f740"}.fa-cloud-sun:before{content:"\f6c4"}.fa-cloud-sun-rain:before{content:"\f743"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cocktail:before{content:"\f561"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dollar:before{content:"\f651"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-medical:before{content:"\f7f5"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-comments-dollar:before{content:"\f653"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-compress-arrows-alt:before{content:"\f78c"}.fa-concierge-bell:before{content:"\f562"}.fa-confluence:before{content:"\f78d"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-creative-commons-zero:before{content:"\f4f3"}.fa-credit-card:before{content:"\f09d"}.fa-critical-role:before{content:"\f6c9"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before{content:"\f565"}.fa-cross:before{content:"\f654"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-crutch:before{content:"\f7f7"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-d-and-d-beyond:before{content:"\f6ca"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-democrat:before{content:"\f747"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-dev:before{content:"\f6cc"}.fa-deviantart:before{content:"\f1bd"}.fa-dharmachakra:before{content:"\f655"}.fa-dhl:before{content:"\f790"}.fa-diagnoses:before{content:"\f470"}.fa-diaspora:before{content:"\f791"}.fa-dice:before{content:"\f522"}.fa-dice-d20:before{content:"\f6cf"}.fa-dice-d6:before{content:"\f6d1"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-digital-tachograph:before{content:"\f566"}.fa-directions:before{content:"\f5eb"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-divide:before{content:"\f529"}.fa-dizzy:before{content:"\f567"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dog:before{content:"\f6d3"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-drafting-compass:before{content:"\f568"}.fa-dragon:before{content:"\f6d5"}.fa-draw-polygon:before{content:"\f5ee"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drumstick-bite:before{content:"\f6d7"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dumpster:before{content:"\f793"}.fa-dumpster-fire:before{content:"\f794"}.fa-dungeon:before{content:"\f6d9"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-egg:before{content:"\f7fb"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ello:before{content:"\f5f1"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-text:before{content:"\f658"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-ethernet:before{content:"\f796"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-evernote:before{content:"\f839"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fan:before{content:"\f863"}.fa-fantasy-flight-games:before{content:"\f6dc"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before{content:"\f56b"}.fa-fedex:before{content:"\f797"}.fa-fedora:before{content:"\f798"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-figma:before{content:"\f799"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-csv:before{content:"\f6dd"}.fa-file-download:before{content:"\f56d"}.fa-file-excel:before{content:"\f1c3"}.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-signature:before{content:"\f573"}.fa-file-upload:before{content:"\f574"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-alt:before{content:"\f7e4"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-fish:before{content:"\f578"}.fa-fist-raised:before{content:"\f6de"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flag-usa:before{content:"\f74d"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-flushed:before{content:"\f579"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-minus:before{content:"\f65d"}.fa-folder-open:before{content:"\f07c"}.fa-folder-plus:before{content:"\f65e"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-frown-open:before{content:"\f57a"}.fa-fulcrum:before{content:"\f50b"}.fa-funnel-dollar:before{content:"\f662"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-ghost:before{content:"\f6e2"}.fa-gift:before{content:"\f06b"}.fa-gifts:before{content:"\f79c"}.fa-git:before{content:"\f1d3"}.fa-git-alt:before{content:"\f841"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-cheers:before{content:"\f79f"}.fa-glass-martini:before{content:"\f000"}.fa-glass-martini-alt:before{content:"\f57b"}.fa-glass-whiskey:before{content:"\f7a0"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-globe-africa:before{content:"\f57c"}.fa-globe-americas:before{content:"\f57d"}.fa-globe-asia:before{content:"\f57e"}.fa-globe-europe:before{content:"\f7a2"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-gopuram:before{content:"\f664"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-grimace:before{content:"\f57f"}.fa-grin:before{content:"\f580"}.fa-grin-alt:before{content:"\f581"}.fa-grin-beam:before{content:"\f582"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-grin-hearts:before{content:"\f584"}.fa-grin-squint:before{content:"\f585"}.fa-grin-squint-tears:before{content:"\f586"}.fa-grin-stars:before{content:"\f587"}.fa-grin-tears:before{content:"\f588"}.fa-grin-tongue:before{content:"\f589"}.fa-grin-tongue-squint:before{content:"\f58a"}.fa-grin-tongue-wink:before{content:"\f58b"}.fa-grin-wink:before{content:"\f58c"}.fa-grip-horizontal:before{content:"\f58d"}.fa-grip-lines:before{content:"\f7a4"}.fa-grip-lines-vertical:before{content:"\f7a5"}.fa-grip-vertical:before{content:"\f58e"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-guitar:before{content:"\f7a6"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hackerrank:before{content:"\f5f7"}.fa-hamburger:before{content:"\f805"}.fa-hammer:before{content:"\f6e3"}.fa-hamsa:before{content:"\f665"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-middle-finger:before{content:"\f806"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-handshake:before{content:"\f2b5"}.fa-hanukiah:before{content:"\f6e6"}.fa-hard-hat:before{content:"\f807"}.fa-hashtag:before{content:"\f292"}.fa-hat-wizard:before{content:"\f6e8"}.fa-haykal:before{content:"\f666"}.fa-hdd:before{content:"\f0a0"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heart-broken:before{content:"\f7a9"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-highlighter:before{content:"\f591"}.fa-hiking:before{content:"\f6ec"}.fa-hippo:before{content:"\f6ed"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-holly-berry:before{content:"\f7aa"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-horse:before{content:"\f6f0"}.fa-horse-head:before{content:"\f7ab"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hot-tub:before{content:"\f593"}.fa-hotdog:before{content:"\f80f"}.fa-hotel:before{content:"\f594"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-house-damage:before{content:"\f6f1"}.fa-houzz:before{content:"\f27c"}.fa-hryvnia:before{content:"\f6f2"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-ice-cream:before{content:"\f810"}.fa-icicles:before{content:"\f7ad"}.fa-icons:before{content:"\f86d"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-igloo:before{content:"\f7ae"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-intercom:before{content:"\f7af"}.fa-internet-explorer:before{content:"\f26b"}.fa-invision:before{content:"\f7b0"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itch-io:before{content:"\f83a"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi:before{content:"\f669"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-jira:before{content:"\f7b1"}.fa-joget:before{content:"\f3b7"}.fa-joint:before{content:"\f595"}.fa-joomla:before{content:"\f1aa"}.fa-journal-whills:before{content:"\f66a"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-kaaba:before{content:"\f66b"}.fa-kaggle:before{content:"\f5fa"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-khanda:before{content:"\f66d"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiss:before{content:"\f596"}.fa-kiss-beam:before{content:"\f597"}.fa-kiss-wink-heart:before{content:"\f598"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-landmark:before{content:"\f66f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laptop-code:before{content:"\f5fc"}.fa-laptop-medical:before{content:"\f812"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-laugh:before{content:"\f599"}.fa-laugh-beam:before{content:"\f59a"}.fa-laugh-squint:before{content:"\f59b"}.fa-laugh-wink:before{content:"\f59c"}.fa-layer-group:before{content:"\f5fd"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-luggage-cart:before{content:"\f59d"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-mail-bulk:before{content:"\f674"}.fa-mailchimp:before{content:"\f59e"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marked:before{content:"\f59f"}.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-markdown:before{content:"\f60f"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mask:before{content:"\f6fa"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-medal:before{content:"\f5a2"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-meh:before{content:"\f11a"}.fa-meh-blank:before{content:"\f5a4"}.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-memory:before{content:"\f538"}.fa-mendeley:before{content:"\f7b3"}.fa-menorah:before{content:"\f676"}.fa-mercury:before{content:"\f223"}.fa-meteor:before{content:"\f753"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microscope:before{content:"\f610"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mitten:before{content:"\f7b5"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-mosque:before{content:"\f678"}.fa-motorcycle:before{content:"\f21c"}.fa-mountain:before{content:"\f6fc"}.fa-mouse-pointer:before{content:"\f245"}.fa-mug-hot:before{content:"\f7b6"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neos:before{content:"\f612"}.fa-network-wired:before{content:"\f6ff"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nimblr:before{content:"\f5a8"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-oil-can:before{content:"\f613"}.fa-old-republic:before{content:"\f510"}.fa-om:before{content:"\f679"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-osi:before{content:"\f41a"}.fa-otter:before{content:"\f700"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-pager:before{content:"\f815"}.fa-paint-brush:before{content:"\f1fc"}.fa-paint-roller:before{content:"\f5aa"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-passport:before{content:"\f5ab"}.fa-pastafarianism:before{content:"\f67b"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-peace:before{content:"\f67c"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-pencil-ruler:before{content:"\f5ae"}.fa-penny-arcade:before{content:"\f704"}.fa-people-carry:before{content:"\f4ce"}.fa-pepper-hot:before{content:"\f816"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-person-booth:before{content:"\f756"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-alt:before{content:"\f879"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-square-alt:before{content:"\f87b"}.fa-phone-volume:before{content:"\f2a0"}.fa-photo-video:before{content:"\f87c"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-pizza-slice:before{content:"\f818"}.fa-place-of-worship:before{content:"\f67f"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-departure:before{content:"\f5b0"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poll:before{content:"\f681"}.fa-poll-h:before{content:"\f682"}.fa-poo:before{content:"\f2fe"}.fa-poo-storm:before{content:"\f75a"}.fa-poop:before{content:"\f619"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-pray:before{content:"\f683"}.fa-praying-hands:before{content:"\f684"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-quran:before{content:"\f687"}.fa-r-project:before{content:"\f4f7"}.fa-radiation:before{content:"\f7b9"}.fa-radiation-alt:before{content:"\f7ba"}.fa-rainbow:before{content:"\f75b"}.fa-random:before{content:"\f074"}.fa-raspberry-pi:before{content:"\f7bb"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-reacteurope:before{content:"\f75d"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redhat:before{content:"\f7bc"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-remove-format:before{content:"\f87d"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-republican:before{content:"\f75e"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-restroom:before{content:"\f7bd"}.fa-retweet:before{content:"\f079"}.fa-rev:before{content:"\f5b2"}.fa-ribbon:before{content:"\f4d6"}.fa-ring:before{content:"\f70b"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-route:before{content:"\f4d7"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-running:before{content:"\f70c"}.fa-rupee-sign:before{content:"\f156"}.fa-sad-cry:before{content:"\f5b3"}.fa-sad-tear:before{content:"\f5b4"}.fa-safari:before{content:"\f267"}.fa-salesforce:before{content:"\f83b"}.fa-sass:before{content:"\f41e"}.fa-satellite:before{content:"\f7bf"}.fa-satellite-dish:before{content:"\f7c0"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-scroll:before{content:"\f70e"}.fa-sd-card:before{content:"\f7c2"}.fa-search:before{content:"\f002"}.fa-search-dollar:before{content:"\f688"}.fa-search-location:before{content:"\f689"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-shapes:before{content:"\f61f"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shopware:before{content:"\f5b5"}.fa-shower:before{content:"\f2cc"}.fa-shuttle-van:before{content:"\f5b6"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-sim-card:before{content:"\f7c4"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skating:before{content:"\f7c5"}.fa-sketch:before{content:"\f7c6"}.fa-skiing:before{content:"\f7c9"}.fa-skiing-nordic:before{content:"\f7ca"}.fa-skull:before{content:"\f54c"}.fa-skull-crossbones:before{content:"\f714"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-slash:before{content:"\f715"}.fa-sleigh:before{content:"\f7cc"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smile-beam:before{content:"\f5b8"}.fa-smile-wink:before{content:"\f4da"}.fa-smog:before{content:"\f75f"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-sms:before{content:"\f7cd"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowboarding:before{content:"\f7ce"}.fa-snowflake:before{content:"\f2dc"}.fa-snowman:before{content:"\f7d0"}.fa-snowplow:before{content:"\f7d2"}.fa-socks:before{content:"\f696"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-down-alt:before{content:"\f881"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-alpha-up-alt:before{content:"\f882"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-down-alt:before{content:"\f884"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-amount-up-alt:before{content:"\f885"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-down-alt:before{content:"\f886"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-numeric-up-alt:before{content:"\f887"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-sourcetree:before{content:"\f7d3"}.fa-spa:before{content:"\f5bb"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-speaker-deck:before{content:"\f83c"}.fa-spell-check:before{content:"\f891"}.fa-spider:before{content:"\f717"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spotify:before{content:"\f1bc"}.fa-spray-can:before{content:"\f5bd"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-square-root-alt:before{content:"\f698"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stackpath:before{content:"\f842"}.fa-stamp:before{content:"\f5bf"}.fa-star:before{content:"\f005"}.fa-star-and-crescent:before{content:"\f699"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before{content:"\f5c0"}.fa-star-of-david:before{content:"\f69a"}.fa-star-of-life:before{content:"\f621"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-surprise:before{content:"\f5c2"}.fa-suse:before{content:"\f7d6"}.fa-swatchbook:before{content:"\f5c3"}.fa-swimmer:before{content:"\f5c4"}.fa-swimming-pool:before{content:"\f5c5"}.fa-symfony:before{content:"\f83d"}.fa-synagogue:before{content:"\f69b"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-teeth:before{content:"\f62e"}.fa-teeth-open:before{content:"\f62f"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-temperature-high:before{content:"\f769"}.fa-temperature-low:before{content:"\f76b"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-tenge:before{content:"\f7d7"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-the-red-yeti:before{content:"\f69d"}.fa-theater-masks:before{content:"\f630"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-think-peaks:before{content:"\f731"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-tint-slash:before{content:"\f5c7"}.fa-tired:before{content:"\f5c8"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toilet:before{content:"\f7d8"}.fa-toilet-paper:before{content:"\f71e"}.fa-toolbox:before{content:"\f552"}.fa-tools:before{content:"\f7d9"}.fa-tooth:before{content:"\f5c9"}.fa-torah:before{content:"\f6a0"}.fa-torii-gate:before{content:"\f6a1"}.fa-tractor:before{content:"\f722"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-traffic-light:before{content:"\f637"}.fa-train:before{content:"\f238"}.fa-tram:before{content:"\f7da"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-trash-restore:before{content:"\f829"}.fa-trash-restore-alt:before{content:"\f82a"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-monster:before{content:"\f63b"}.fa-truck-moving:before{content:"\f4df"}.fa-truck-pickup:before{content:"\f63c"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-ubuntu:before{content:"\f7df"}.fa-uikit:before{content:"\f403"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-ups:before{content:"\f7e0"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-injured:before{content:"\f728"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-nurse:before{content:"\f82f"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-usps:before{content:"\f7e1"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vihara:before{content:"\f6a7"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-voicemail:before{content:"\f897"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-mute:before{content:"\f6a9"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vote-yea:before{content:"\f772"}.fa-vr-cardboard:before{content:"\f729"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-water:before{content:"\f773"}.fa-wave-square:before{content:"\f83e"}.fa-waze:before{content:"\f83f"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-wind:before{content:"\f72e"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-bottle:before{content:"\f72f"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before{content:"\f5ce"}.fa-wix:before{content:"\f5cf"}.fa-wizards-of-the-coast:before{content:"\f730"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wpressr:before{content:"\f3e4"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yammer:before{content:"\f840"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yarn:before{content:"\f7e3"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yin-yang:before{content:"\f6ad"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.fa-zhihu:before{content:"\f63f"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:400;font-display:auto;src:url(fa-regular-400.eot);src:url(fa-regular-400.eot?#iefix) format("embedded-opentype"),url(fa-regular-400.woff) format("woff")}.far{font-weight:400}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:900;font-display:auto;src:url(fa-solid-900.eot);src:url(fa-solid-900.eot?#iefix) format("embedded-opentype"),url(fa-solid-900.woff) format("woff")}.fa,.far,.fas{font-family:"Font Awesome 5 Free"}.fa,.fas{font-weight:900}
\ No newline at end of file
diff --git a/html/font-awesome/css/v4-shims.min.css b/html/font-awesome/css/v4-shims.min.css
new file mode 100644
index 00000000000..5f3fdc598c8
--- /dev/null
+++ b/html/font-awesome/css/v4-shims.min.css
@@ -0,0 +1,5 @@
+/*!
+ * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+.fa.fa-glass:before{content:"\f000"}.fa.fa-meetup{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-star-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-o:before{content:"\f005"}.fa.fa-close:before,.fa.fa-remove:before{content:"\f00d"}.fa.fa-gear:before{content:"\f013"}.fa.fa-trash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-trash-o:before{content:"\f2ed"}.fa.fa-file-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-o:before{content:"\f15b"}.fa.fa-clock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-clock-o:before{content:"\f017"}.fa.fa-arrow-circle-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-down:before{content:"\f358"}.fa.fa-arrow-circle-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-up:before{content:"\f35b"}.fa.fa-play-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-play-circle-o:before{content:"\f144"}.fa.fa-repeat:before,.fa.fa-rotate-right:before{content:"\f01e"}.fa.fa-refresh:before{content:"\f021"}.fa.fa-list-alt{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dedent:before{content:"\f03b"}.fa.fa-video-camera:before{content:"\f03d"}.fa.fa-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-picture-o:before{content:"\f03e"}.fa.fa-photo{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-photo:before{content:"\f03e"}.fa.fa-image{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-image:before{content:"\f03e"}.fa.fa-pencil:before{content:"\f303"}.fa.fa-map-marker:before{content:"\f3c5"}.fa.fa-pencil-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pencil-square-o:before{content:"\f044"}.fa.fa-share-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-share-square-o:before{content:"\f14d"}.fa.fa-check-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-square-o:before{content:"\f14a"}.fa.fa-arrows:before{content:"\f0b2"}.fa.fa-times-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-circle-o:before{content:"\f057"}.fa.fa-check-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-circle-o:before{content:"\f058"}.fa.fa-mail-forward:before{content:"\f064"}.fa.fa-eye,.fa.fa-eye-slash{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-warning:before{content:"\f071"}.fa.fa-calendar:before{content:"\f073"}.fa.fa-arrows-v:before{content:"\f338"}.fa.fa-arrows-h:before{content:"\f337"}.fa.fa-bar-chart{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart:before{content:"\f080"}.fa.fa-bar-chart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart-o:before{content:"\f080"}.fa.fa-facebook-square,.fa.fa-twitter-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gears:before{content:"\f085"}.fa.fa-thumbs-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-up:before{content:"\f164"}.fa.fa-thumbs-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-down:before{content:"\f165"}.fa.fa-heart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-heart-o:before{content:"\f004"}.fa.fa-sign-out:before{content:"\f2f5"}.fa.fa-linkedin-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin-square:before{content:"\f08c"}.fa.fa-thumb-tack:before{content:"\f08d"}.fa.fa-external-link:before{content:"\f35d"}.fa.fa-sign-in:before{content:"\f2f6"}.fa.fa-github-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-lemon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lemon-o:before{content:"\f094"}.fa.fa-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-square-o:before{content:"\f0c8"}.fa.fa-bookmark-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bookmark-o:before{content:"\f02e"}.fa.fa-facebook,.fa.fa-twitter{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook:before{content:"\f39e"}.fa.fa-facebook-f{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-f:before{content:"\f39e"}.fa.fa-github{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-feed:before{content:"\f09e"}.fa.fa-hdd-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hdd-o:before{content:"\f0a0"}.fa.fa-hand-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-right:before{content:"\f0a4"}.fa.fa-hand-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-left:before{content:"\f0a5"}.fa.fa-hand-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-up:before{content:"\f0a6"}.fa.fa-hand-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-down:before{content:"\f0a7"}.fa.fa-arrows-alt:before{content:"\f31e"}.fa.fa-group:before{content:"\f0c0"}.fa.fa-chain:before{content:"\f0c1"}.fa.fa-scissors:before{content:"\f0c4"}.fa.fa-files-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-files-o:before{content:"\f0c5"}.fa.fa-floppy-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-floppy-o:before{content:"\f0c7"}.fa.fa-navicon:before,.fa.fa-reorder:before{content:"\f0c9"}.fa.fa-google-plus,.fa.fa-google-plus-square,.fa.fa-pinterest,.fa.fa-pinterest-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus:before{content:"\f0d5"}.fa.fa-money{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-money:before{content:"\f3d1"}.fa.fa-unsorted:before{content:"\f0dc"}.fa.fa-sort-desc:before{content:"\f0dd"}.fa.fa-sort-asc:before{content:"\f0de"}.fa.fa-linkedin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin:before{content:"\f0e1"}.fa.fa-rotate-left:before{content:"\f0e2"}.fa.fa-legal:before{content:"\f0e3"}.fa.fa-dashboard:before,.fa.fa-tachometer:before{content:"\f3fd"}.fa.fa-comment-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comment-o:before{content:"\f075"}.fa.fa-comments-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comments-o:before{content:"\f086"}.fa.fa-flash:before{content:"\f0e7"}.fa.fa-clipboard,.fa.fa-paste{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paste:before{content:"\f328"}.fa.fa-lightbulb-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lightbulb-o:before{content:"\f0eb"}.fa.fa-exchange:before{content:"\f362"}.fa.fa-cloud-download:before{content:"\f381"}.fa.fa-cloud-upload:before{content:"\f382"}.fa.fa-bell-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-o:before{content:"\f0f3"}.fa.fa-cutlery:before{content:"\f2e7"}.fa.fa-file-text-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-text-o:before{content:"\f15c"}.fa.fa-building-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-building-o:before{content:"\f1ad"}.fa.fa-hospital-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hospital-o:before{content:"\f0f8"}.fa.fa-tablet:before{content:"\f3fa"}.fa.fa-mobile-phone:before,.fa.fa-mobile:before{content:"\f3cd"}.fa.fa-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-o:before{content:"\f111"}.fa.fa-mail-reply:before{content:"\f3e5"}.fa.fa-github-alt{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-folder-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-o:before{content:"\f07b"}.fa.fa-folder-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-open-o:before{content:"\f07c"}.fa.fa-smile-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-smile-o:before{content:"\f118"}.fa.fa-frown-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-frown-o:before{content:"\f119"}.fa.fa-meh-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-meh-o:before{content:"\f11a"}.fa.fa-keyboard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-keyboard-o:before{content:"\f11c"}.fa.fa-flag-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-flag-o:before{content:"\f024"}.fa.fa-mail-reply-all:before{content:"\f122"}.fa.fa-star-half-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-o:before{content:"\f089"}.fa.fa-star-half-empty{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-empty:before{content:"\f089"}.fa.fa-star-half-full{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-full:before{content:"\f089"}.fa.fa-code-fork:before{content:"\f126"}.fa.fa-chain-broken:before{content:"\f127"}.fa.fa-shield:before{content:"\f3ed"}.fa.fa-calendar-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-o:before{content:"\f133"}.fa.fa-css3,.fa.fa-html5,.fa.fa-maxcdn{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ticket:before{content:"\f3ff"}.fa.fa-minus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-minus-square-o:before{content:"\f146"}.fa.fa-level-up:before{content:"\f3bf"}.fa.fa-level-down:before{content:"\f3be"}.fa.fa-pencil-square:before{content:"\f14b"}.fa.fa-external-link-square:before{content:"\f360"}.fa.fa-compass{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down:before{content:"\f150"}.fa.fa-toggle-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-down:before{content:"\f150"}.fa.fa-caret-square-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-up:before{content:"\f151"}.fa.fa-toggle-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-up:before{content:"\f151"}.fa.fa-caret-square-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-right:before{content:"\f152"}.fa.fa-toggle-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-right:before{content:"\f152"}.fa.fa-eur:before,.fa.fa-euro:before{content:"\f153"}.fa.fa-gbp:before{content:"\f154"}.fa.fa-dollar:before,.fa.fa-usd:before{content:"\f155"}.fa.fa-inr:before,.fa.fa-rupee:before{content:"\f156"}.fa.fa-cny:before,.fa.fa-jpy:before,.fa.fa-rmb:before,.fa.fa-yen:before{content:"\f157"}.fa.fa-rouble:before,.fa.fa-rub:before,.fa.fa-ruble:before{content:"\f158"}.fa.fa-krw:before,.fa.fa-won:before{content:"\f159"}.fa.fa-bitcoin,.fa.fa-btc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitcoin:before{content:"\f15a"}.fa.fa-file-text:before{content:"\f15c"}.fa.fa-sort-alpha-asc:before{content:"\f15d"}.fa.fa-sort-alpha-desc:before{content:"\f15e"}.fa.fa-sort-amount-asc:before{content:"\f160"}.fa.fa-sort-amount-desc:before{content:"\f161"}.fa.fa-sort-numeric-asc:before{content:"\f162"}.fa.fa-sort-numeric-desc:before{content:"\f163"}.fa.fa-xing,.fa.fa-xing-square,.fa.fa-youtube,.fa.fa-youtube-play,.fa.fa-youtube-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-youtube-play:before{content:"\f167"}.fa.fa-adn,.fa.fa-bitbucket,.fa.fa-bitbucket-square,.fa.fa-dropbox,.fa.fa-flickr,.fa.fa-instagram,.fa.fa-stack-overflow{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitbucket-square:before{content:"\f171"}.fa.fa-tumblr,.fa.fa-tumblr-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-long-arrow-down:before{content:"\f309"}.fa.fa-long-arrow-up:before{content:"\f30c"}.fa.fa-long-arrow-left:before{content:"\f30a"}.fa.fa-long-arrow-right:before{content:"\f30b"}.fa.fa-android,.fa.fa-apple,.fa.fa-dribbble,.fa.fa-foursquare,.fa.fa-gittip,.fa.fa-gratipay,.fa.fa-linux,.fa.fa-skype,.fa.fa-trello,.fa.fa-windows{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gittip:before{content:"\f184"}.fa.fa-sun-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sun-o:before{content:"\f185"}.fa.fa-moon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-moon-o:before{content:"\f186"}.fa.fa-pagelines,.fa.fa-renren,.fa.fa-stack-exchange,.fa.fa-vk,.fa.fa-weibo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-arrow-circle-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-right:before{content:"\f35a"}.fa.fa-arrow-circle-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-left:before{content:"\f359"}.fa.fa-caret-square-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-left:before{content:"\f191"}.fa.fa-toggle-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-left:before{content:"\f191"}.fa.fa-dot-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dot-circle-o:before{content:"\f192"}.fa.fa-vimeo-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-try:before,.fa.fa-turkish-lira:before{content:"\f195"}.fa.fa-plus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-plus-square-o:before{content:"\f0fe"}.fa.fa-openid,.fa.fa-slack,.fa.fa-wordpress{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bank:before,.fa.fa-institution:before{content:"\f19c"}.fa.fa-mortar-board:before{content:"\f19d"}.fa.fa-delicious,.fa.fa-digg,.fa.fa-drupal,.fa.fa-google,.fa.fa-joomla,.fa.fa-pied-piper-alt,.fa.fa-pied-piper-pp,.fa.fa-reddit,.fa.fa-reddit-square,.fa.fa-stumbleupon,.fa.fa-stumbleupon-circle,.fa.fa-yahoo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-spoon:before{content:"\f2e5"}.fa.fa-behance,.fa.fa-behance-square,.fa.fa-steam,.fa.fa-steam-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-automobile:before{content:"\f1b9"}.fa.fa-cab:before{content:"\f1ba"}.fa.fa-envelope-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-o:before{content:"\f0e0"}.fa.fa-deviantart,.fa.fa-soundcloud{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-file-pdf-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-pdf-o:before{content:"\f1c1"}.fa.fa-file-word-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-word-o:before{content:"\f1c2"}.fa.fa-file-excel-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-excel-o:before{content:"\f1c3"}.fa.fa-file-powerpoint-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-powerpoint-o:before{content:"\f1c4"}.fa.fa-file-image-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-image-o:before{content:"\f1c5"}.fa.fa-file-photo-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-photo-o:before{content:"\f1c5"}.fa.fa-file-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-picture-o:before{content:"\f1c5"}.fa.fa-file-archive-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-archive-o:before{content:"\f1c6"}.fa.fa-file-zip-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-zip-o:before{content:"\f1c6"}.fa.fa-file-audio-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-audio-o:before{content:"\f1c7"}.fa.fa-file-sound-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-sound-o:before{content:"\f1c7"}.fa.fa-file-video-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-video-o:before{content:"\f1c8"}.fa.fa-file-movie-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-movie-o:before{content:"\f1c8"}.fa.fa-file-code-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-code-o:before{content:"\f1c9"}.fa.fa-codepen,.fa.fa-jsfiddle,.fa.fa-vine{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-life-bouy,.fa.fa-life-ring{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-bouy:before{content:"\f1cd"}.fa.fa-life-buoy{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-buoy:before{content:"\f1cd"}.fa.fa-life-saver{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-saver:before{content:"\f1cd"}.fa.fa-support{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-support:before{content:"\f1cd"}.fa.fa-circle-o-notch:before{content:"\f1ce"}.fa.fa-ra,.fa.fa-rebel{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ra:before{content:"\f1d0"}.fa.fa-resistance{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-resistance:before{content:"\f1d0"}.fa.fa-empire,.fa.fa-ge{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ge:before{content:"\f1d1"}.fa.fa-git,.fa.fa-git-square,.fa.fa-hacker-news,.fa.fa-y-combinator-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-y-combinator-square:before{content:"\f1d4"}.fa.fa-yc-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc-square:before{content:"\f1d4"}.fa.fa-qq,.fa.fa-tencent-weibo,.fa.fa-wechat,.fa.fa-weixin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wechat:before{content:"\f1d7"}.fa.fa-send:before{content:"\f1d8"}.fa.fa-paper-plane-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paper-plane-o:before{content:"\f1d8"}.fa.fa-send-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-send-o:before{content:"\f1d8"}.fa.fa-circle-thin{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-thin:before{content:"\f111"}.fa.fa-header:before{content:"\f1dc"}.fa.fa-sliders:before{content:"\f1de"}.fa.fa-futbol-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-futbol-o:before{content:"\f1e3"}.fa.fa-soccer-ball-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-soccer-ball-o:before{content:"\f1e3"}.fa.fa-slideshare,.fa.fa-twitch,.fa.fa-yelp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-newspaper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-newspaper-o:before{content:"\f1ea"}.fa.fa-cc-amex,.fa.fa-cc-discover,.fa.fa-cc-mastercard,.fa.fa-cc-paypal,.fa.fa-cc-stripe,.fa.fa-cc-visa,.fa.fa-google-wallet,.fa.fa-paypal{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bell-slash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-slash-o:before{content:"\f1f6"}.fa.fa-trash:before{content:"\f2ed"}.fa.fa-copyright{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-eyedropper:before{content:"\f1fb"}.fa.fa-area-chart:before{content:"\f1fe"}.fa.fa-pie-chart:before{content:"\f200"}.fa.fa-line-chart:before{content:"\f201"}.fa.fa-angellist,.fa.fa-ioxhost,.fa.fa-lastfm,.fa.fa-lastfm-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-cc{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-cc:before{content:"\f20a"}.fa.fa-ils:before,.fa.fa-shekel:before,.fa.fa-sheqel:before{content:"\f20b"}.fa.fa-meanpath{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-meanpath:before{content:"\f2b4"}.fa.fa-buysellads,.fa.fa-connectdevelop,.fa.fa-dashcube,.fa.fa-forumbee,.fa.fa-leanpub,.fa.fa-sellsy,.fa.fa-shirtsinbulk,.fa.fa-simplybuilt,.fa.fa-skyatlas{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-diamond{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-diamond:before{content:"\f3a5"}.fa.fa-intersex:before{content:"\f224"}.fa.fa-facebook-official{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-official:before{content:"\f09a"}.fa.fa-pinterest-p,.fa.fa-whatsapp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-hotel:before{content:"\f236"}.fa.fa-medium,.fa.fa-viacoin,.fa.fa-y-combinator,.fa.fa-yc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc:before{content:"\f23b"}.fa.fa-expeditedssl,.fa.fa-opencart,.fa.fa-optin-monster{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-battery-4:before,.fa.fa-battery:before{content:"\f240"}.fa.fa-battery-3:before{content:"\f241"}.fa.fa-battery-2:before{content:"\f242"}.fa.fa-battery-1:before{content:"\f243"}.fa.fa-battery-0:before{content:"\f244"}.fa.fa-object-group,.fa.fa-object-ungroup,.fa.fa-sticky-note-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sticky-note-o:before{content:"\f249"}.fa.fa-cc-diners-club,.fa.fa-cc-jcb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-clone,.fa.fa-hourglass-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hourglass-o:before{content:"\f254"}.fa.fa-hourglass-1:before{content:"\f251"}.fa.fa-hourglass-2:before{content:"\f252"}.fa.fa-hourglass-3:before{content:"\f253"}.fa.fa-hand-rock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-rock-o:before{content:"\f255"}.fa.fa-hand-grab-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-grab-o:before{content:"\f255"}.fa.fa-hand-paper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-paper-o:before{content:"\f256"}.fa.fa-hand-stop-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-stop-o:before{content:"\f256"}.fa.fa-hand-scissors-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-scissors-o:before{content:"\f257"}.fa.fa-hand-lizard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-lizard-o:before{content:"\f258"}.fa.fa-hand-spock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-spock-o:before{content:"\f259"}.fa.fa-hand-pointer-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-pointer-o:before{content:"\f25a"}.fa.fa-hand-peace-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-peace-o:before{content:"\f25b"}.fa.fa-registered{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-chrome,.fa.fa-creative-commons,.fa.fa-firefox,.fa.fa-get-pocket,.fa.fa-gg,.fa.fa-gg-circle,.fa.fa-internet-explorer,.fa.fa-odnoklassniki,.fa.fa-odnoklassniki-square,.fa.fa-opera,.fa.fa-safari,.fa.fa-tripadvisor,.fa.fa-wikipedia-w{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-television:before{content:"\f26c"}.fa.fa-500px,.fa.fa-amazon,.fa.fa-contao{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-calendar-plus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-plus-o:before{content:"\f271"}.fa.fa-calendar-minus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-minus-o:before{content:"\f272"}.fa.fa-calendar-times-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-times-o:before{content:"\f273"}.fa.fa-calendar-check-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-check-o:before{content:"\f274"}.fa.fa-map-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-map-o:before{content:"\f279"}.fa.fa-commenting:before{content:"\f4ad"}.fa.fa-commenting-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-commenting-o:before{content:"\f4ad"}.fa.fa-houzz,.fa.fa-vimeo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-vimeo:before{content:"\f27d"}.fa.fa-black-tie,.fa.fa-edge,.fa.fa-fonticons,.fa.fa-reddit-alien{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card-alt:before{content:"\f09d"}.fa.fa-codiepie,.fa.fa-fort-awesome,.fa.fa-mixcloud,.fa.fa-modx,.fa.fa-product-hunt,.fa.fa-scribd,.fa.fa-usb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-pause-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pause-circle-o:before{content:"\f28b"}.fa.fa-stop-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-stop-circle-o:before{content:"\f28d"}.fa.fa-bluetooth,.fa.fa-bluetooth-b,.fa.fa-envira,.fa.fa-gitlab,.fa.fa-wheelchair-alt,.fa.fa-wpbeginner,.fa.fa-wpforms{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wheelchair-alt:before{content:"\f368"}.fa.fa-question-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-question-circle-o:before{content:"\f059"}.fa.fa-volume-control-phone:before{content:"\f2a0"}.fa.fa-asl-interpreting:before{content:"\f2a3"}.fa.fa-deafness:before,.fa.fa-hard-of-hearing:before{content:"\f2a4"}.fa.fa-glide,.fa.fa-glide-g{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-signing:before{content:"\f2a7"}.fa.fa-first-order,.fa.fa-google-plus-official,.fa.fa-pied-piper,.fa.fa-snapchat,.fa.fa-snapchat-ghost,.fa.fa-snapchat-square,.fa.fa-themeisle,.fa.fa-viadeo,.fa.fa-viadeo-square,.fa.fa-yoast{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-official:before{content:"\f2b3"}.fa.fa-google-plus-circle{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-circle:before{content:"\f2b3"}.fa.fa-fa,.fa.fa-font-awesome{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-fa:before{content:"\f2b4"}.fa.fa-handshake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-handshake-o:before{content:"\f2b5"}.fa.fa-envelope-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-open-o:before{content:"\f2b6"}.fa.fa-linode{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-address-book-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-book-o:before{content:"\f2b9"}.fa.fa-vcard:before{content:"\f2bb"}.fa.fa-address-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-card-o:before{content:"\f2bb"}.fa.fa-vcard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-vcard-o:before{content:"\f2bb"}.fa.fa-user-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-circle-o:before{content:"\f2bd"}.fa.fa-user-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-o:before{content:"\f007"}.fa.fa-id-badge{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license:before{content:"\f2c2"}.fa.fa-id-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-id-card-o:before{content:"\f2c2"}.fa.fa-drivers-license-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license-o:before{content:"\f2c2"}.fa.fa-free-code-camp,.fa.fa-quora,.fa.fa-telegram{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-thermometer-4:before,.fa.fa-thermometer:before{content:"\f2c7"}.fa.fa-thermometer-3:before{content:"\f2c8"}.fa.fa-thermometer-2:before{content:"\f2c9"}.fa.fa-thermometer-1:before{content:"\f2ca"}.fa.fa-thermometer-0:before{content:"\f2cb"}.fa.fa-bathtub:before,.fa.fa-s15:before{content:"\f2cd"}.fa.fa-window-maximize,.fa.fa-window-restore{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle:before{content:"\f410"}.fa.fa-window-close-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-window-close-o:before{content:"\f410"}.fa.fa-times-rectangle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle-o:before{content:"\f410"}.fa.fa-bandcamp,.fa.fa-eercast,.fa.fa-etsy,.fa.fa-grav,.fa.fa-imdb,.fa.fa-ravelry{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-eercast:before{content:"\f2da"}.fa.fa-snowflake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-snowflake-o:before{content:"\f2dc"}.fa.fa-spotify,.fa.fa-superpowers,.fa.fa-wpexplorer{font-family:"Font Awesome 5 Brands";font-weight:400}
\ No newline at end of file
diff --git a/html/font-awesome/webfonts/fa-regular-400.eot b/html/font-awesome/webfonts/fa-regular-400.eot
new file mode 100644
index 00000000000..d62be2fad88
Binary files /dev/null and b/html/font-awesome/webfonts/fa-regular-400.eot differ
diff --git a/html/font-awesome/webfonts/fa-regular-400.woff b/html/font-awesome/webfonts/fa-regular-400.woff
new file mode 100644
index 00000000000..43b1a9ae49d
Binary files /dev/null and b/html/font-awesome/webfonts/fa-regular-400.woff differ
diff --git a/html/font-awesome/webfonts/fa-solid-900.eot b/html/font-awesome/webfonts/fa-solid-900.eot
new file mode 100644
index 00000000000..c77baa8d46a
Binary files /dev/null and b/html/font-awesome/webfonts/fa-solid-900.eot differ
diff --git a/html/font-awesome/webfonts/fa-solid-900.woff b/html/font-awesome/webfonts/fa-solid-900.woff
new file mode 100644
index 00000000000..77c1786227f
Binary files /dev/null and b/html/font-awesome/webfonts/fa-solid-900.woff differ
diff --git a/interface/README.md b/interface/README.md
deleted file mode 100644
index 535f684c4d6..00000000000
--- a/interface/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-## Modifying skin files
-All changes must be made on both `skin.dmf` and `dark.dmf` files. Then using [DMFTool](https://github.com/Karolis2011/DMFTool) you will need to make bidirectional difference ad save produced output to `skin.txt` for parts that are needed to switch to light skin and `dark.txt` for parts that ar needed to switch to dark skin.
\ No newline at end of file
diff --git a/interface/dark.dmf b/interface/dark.dmf
deleted file mode 100644
index ff55e2ee6b5..00000000000
--- a/interface/dark.dmf
+++ /dev/null
@@ -1,1415 +0,0 @@
-macro "borghotkeymode"
- elem
- name = "TAB"
- command = ".winset \"mainwindow.macro=borgmacro hotkey_toggle.is-checked=false input.focus=true input.background-color=#D3B5B5\""
- elem
- name = "CENTER+REP"
- command = ".center"
- elem
- name = "NORTHEAST"
- command = ".northeast"
- elem
- name = "SOUTHEAST"
- command = ".southeast"
- elem
- name = "SOUTHWEST"
- command = ".southwest"
- elem
- name = "NORTHWEST"
- command = ".northwest"
- elem
- name = "ALT+WEST"
- command = "westfaceperm"
- elem
- name = "CTRL+WEST"
- command = "westface"
- elem
- name = "WEST+REP"
- command = ".moveleft"
- elem
- name = "ALT+NORTH"
- command = "northfaceperm"
- elem
- name = "CTRL+NORTH"
- command = "northface"
- elem
- name = "NORTH+REP"
- command = ".moveup"
- elem
- name = "ALT+EAST"
- command = "eastfaceperm"
- elem
- name = "CTRL+EAST"
- command = "eastface"
- elem
- name = "EAST+REP"
- command = ".moveright"
- elem
- name = "ALT+SOUTH"
- command = "southfaceperm"
- elem
- name = "CTRL+SOUTH"
- command = "southface"
- elem
- name = "SOUTH+REP"
- command = ".movedown"
- elem
- name = "INSERT"
- command = "a-intent right"
- elem
- name = "DELETE"
- command = "delete-key-pressed"
- elem
- name = "1"
- command = "toggle-module 1"
- elem
- name = "CTRL+1"
- command = "toggle-module 1"
- elem
- name = "2"
- command = "toggle-module 2"
- elem
- name = "CTRL+2"
- command = "toggle-module 2"
- elem
- name = "3"
- command = "toggle-module 3"
- elem
- name = "CTRL+3"
- command = "toggle-module 3"
- elem
- name = "4"
- command = "a-intent left"
- elem
- name = "CTRL+4"
- command = "a-intent left"
- elem
- name = "5"
- command = ".me"
- elem
- name = "A+REP"
- command = ".moveleft"
- elem
- name = "CTRL+A+REP"
- command = ".moveleft"
- elem
- name = "D+REP"
- command = ".moveright"
- elem
- name = "CTRL+D+REP"
- command = ".moveright"
- elem
- name = "F"
- command = "a-intent left"
- elem
- name = "CTRL+F"
- command = "a-intent left"
- elem
- name = "G"
- command = "a-intent right"
- elem
- name = "CTRL+G"
- command = "a-intent right"
- elem
- name = "J"
- command = "toggle-gun-mode"
- elem
- name = "CTRL+J"
- command = "toggle-gun-mode"
- elem
- name = "Q"
- command = "unequip-module"
- elem
- name = "CTRL+Q"
- command = "unequip-module"
- elem
- name = "R"
- command = ".southwest"
- elem
- name = "CTRL+R"
- command = ".southwest"
- elem "s_key"
- name = "S+REP"
- command = ".movedown"
- elem
- name = "CTRL+S+REP"
- command = ".movedown"
- elem
- name = "T"
- command = ".say"
- elem "w_key"
- name = "W+REP"
- command = ".moveup"
- elem
- name = "CTRL+W+REP"
- command = ".moveup"
- elem
- name = "X"
- command = ".northeast"
- elem
- name = "CTRL+X"
- command = ".northeast"
- elem
- name = "Y"
- command = "Activate-Held-Object"
- elem
- name = "CTRL+Y"
- command = "Activate-Held-Object"
- elem
- name = "Z"
- command = "Activate-Held-Object"
- elem
- name = "CTRL+Z"
- command = "Activate-Held-Object"
- elem
- name = "F1"
- command = "adminhelp"
- elem
- name = "CTRL+SHIFT+F1+REP"
- command = ".options"
- elem
- name = "F2"
- command = "ooc"
- elem
- name = "F2+REP"
- command = ".screenshot auto"
- elem
- name = "SHIFT+F2+REP"
- command = ".screenshot"
- elem
- name = "F3"
- command = ".say"
- elem
- name = "F4"
- command = ".me"
- elem
- name = "F5"
- command = "asay"
- elem
- name = "F6"
- command = "Player-Panel"
- elem
- name = "F7"
- command = "Admin-PM"
- elem
- name = "F8"
- command = "Invisimin"
- elem
- name = "F12"
- command = "F12"
- elem
- name = "NUMPAD8"
- command = "body-toggle-head"
- elem
- name = "NUMPAD5"
- command = "body-chest"
- elem
- name = "NUMPAD4"
- command = "body-r-arm"
- elem
- name = "NUMPAD6"
- command = "body-l-arm"
- elem
- name = "NUMPAD2"
- command = "body-groin"
- elem
- name = "NUMPAD1"
- command = "body-r-leg"
- elem
- name = "NUMPAD3"
- command = "body-l-leg"
-
-macro "macro"
- elem
- name = "TAB"
- command = ".winset \"mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true\""
- elem
- name = "CENTER+REP"
- command = ".center"
- elem
- name = "NORTHEAST"
- command = ".northeast"
- elem
- name = "SOUTHEAST"
- command = ".southeast"
- elem
- name = "SOUTHWEST"
- command = ".southwest"
- elem
- name = "NORTHWEST"
- command = ".northwest"
- elem
- name = "ALT+WEST"
- command = "westfaceperm"
- elem
- name = "CTRL+WEST"
- command = "westface"
- elem
- name = "WEST+REP"
- command = ".moveleft"
- elem
- name = "ALT+NORTH"
- command = "northfaceperm"
- elem
- name = "CTRL+NORTH"
- command = "northface"
- elem
- name = "NORTH+REP"
- command = ".moveup"
- elem
- name = "ALT+EAST"
- command = "eastfaceperm"
- elem
- name = "CTRL+EAST"
- command = "eastface"
- elem
- name = "EAST+REP"
- command = ".moveright"
- elem
- name = "ALT+SOUTH"
- command = "southfaceperm"
- elem
- name = "CTRL+SOUTH"
- command = "southface"
- elem
- name = "SOUTH+REP"
- command = ".movedown"
- elem
- name = "INSERT"
- command = "a-intent right"
- elem
- name = "DELETE"
- command = "delete-key-pressed"
- elem
- name = "CTRL+1"
- command = "a-intent help"
- elem
- name = "CTRL+2"
- command = "a-intent disarm"
- elem
- name = "CTRL+3"
- command = "a-intent grab"
- elem
- name = "CTRL+4"
- command = "a-intent harm"
- elem
- name = "CTRL+A+REP"
- command = ".moveleft"
- elem
- name = "CTRL+D+REP"
- command = ".moveright"
- elem
- name = "CTRL+E"
- command = "quick-equip"
- elem
- name = "CTRL+F"
- command = "a-intent left"
- elem
- name = "CTRL+G"
- command = "a-intent right"
- elem
- name = "CTRL+SHIFT+G"
- command = ".configure graphics-hwmode on"
- elem
- name = "CTRL+Q"
- command = ".northwest"
- elem
- name = "CTRL+R"
- command = ".southwest"
- elem
- name = "CTRL+S+REP"
- command = ".movedown"
- elem
- name = "CTRL+W+REP"
- command = ".moveup"
- elem
- name = "CTRL+X"
- command = ".northeast"
- elem
- name = "CTRL+Y"
- command = "Activate-Held-Object"
- elem
- name = "CTRL+Z"
- command = "Activate-Held-Object"
- elem
- name = "F1"
- command = "adminhelp"
- elem
- name = "CTRL+SHIFT+F1+REP"
- command = ".options"
- elem
- name = "F2"
- command = "ooc"
- elem
- name = "F2+REP"
- command = ".screenshot auto"
- elem
- name = "SHIFT+F2+REP"
- command = ".screenshot"
- elem
- name = "F3"
- command = ".say"
- elem
- name = "F4"
- command = ".me"
- elem
- name = "F5"
- command = "asay"
- elem
- name = "F6"
- command = "Player-Panel"
- elem
- name = "F7"
- command = "Admin-PM"
- elem
- name = "F8"
- command = "Invisimin"
- elem
- name = "F12"
- command = "F12"
- elem
- name = "CTRL+NUMPAD8"
- command = "body-toggle-head"
- elem
- name = "CTRL+NUMPAD5"
- command = "body-chest"
- elem
- name = "CTRL+NUMPAD4"
- command = "body-r-arm"
- elem
- name = "CTRL+NUMPAD6"
- command = "body-l-arm"
- elem
- name = "CTRL+NUMPAD2"
- command = "body-groin"
- elem
- name = "CTRL+NUMPAD1"
- command = "body-r-leg"
- elem
- name = "CTRL+NUMPAD3"
- command = "body-l-leg"
-
-macro "hotkeymode"
- elem
- name = "TAB"
- command = ".winset \"mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true\""
- elem
- name = "CENTER+REP"
- command = ".center"
- elem
- name = "NORTHEAST"
- command = ".northeast"
- elem
- name = "SOUTHEAST"
- command = ".southeast"
- elem
- name = "SOUTHWEST"
- command = ".southwest"
- elem
- name = "NORTHWEST"
- command = ".northwest"
- elem
- name = "ALT+WEST"
- command = "westfaceperm"
- elem
- name = "CTRL+WEST"
- command = "westface"
- elem
- name = "WEST+REP"
- command = ".moveleft"
- elem
- name = "ALT+NORTH"
- command = "northfaceperm"
- elem
- name = "CTRL+NORTH"
- command = "northface"
- elem
- name = "NORTH+REP"
- command = ".moveup"
- elem
- name = "ALT+EAST"
- command = "eastfaceperm"
- elem
- name = "CTRL+EAST"
- command = "eastface"
- elem
- name = "EAST+REP"
- command = ".moveright"
- elem
- name = "ALT+SOUTH"
- command = "southfaceperm"
- elem
- name = "CTRL+SOUTH"
- command = "southface"
- elem
- name = "SOUTH+REP"
- command = ".movedown"
- elem
- name = "INSERT"
- command = "a-intent right"
- elem
- name = "DELETE"
- command = "delete-key-pressed"
- elem
- name = "1"
- command = "a-intent help"
- elem
- name = "CTRL+1"
- command = "a-intent help"
- elem
- name = "2"
- command = "a-intent disarm"
- elem
- name = "CTRL+2"
- command = "a-intent disarm"
- elem
- name = "3"
- command = "a-intent grab"
- elem
- name = "CTRL+3"
- command = "a-intent grab"
- elem
- name = "4"
- command = "a-intent harm"
- elem
- name = "CTRL+4"
- command = "a-intent harm"
- elem
- name = "5"
- command = ".me"
- elem
- name = "A+REP"
- command = ".moveleft"
- elem
- name = "CTRL+A+REP"
- command = ".moveleft"
- elem
- name = "D+REP"
- command = ".moveright"
- elem
- name = "CTRL+D+REP"
- command = ".moveright"
- elem
- name = "E"
- command = "quick-equip"
- elem
- name = "CTRL+E"
- command = "quick-equip"
- elem
- name = "F"
- command = "a-intent left"
- elem
- name = "CTRL+F"
- command = "a-intent left"
- elem
- name = "G"
- command = "a-intent right"
- elem
- name = "CTRL+G"
- command = "a-intent right"
- elem
- name = "H"
- command = "holster"
- elem
- name = "CTRL+H"
- command = "holster"
- elem
- name = "J"
- command = "toggle-gun-mode"
- elem
- name = "CTRL+J"
- command = "toggle-gun-mode"
- elem
- name = "Q"
- command = ".northwest"
- elem
- name = "CTRL+Q"
- command = ".northwest"
- elem
- name = "R"
- command = ".southwest"
- elem
- name = "CTRL+R"
- command = ".southwest"
- elem "s_key"
- name = "S+REP"
- command = ".movedown"
- elem
- name = "CTRL+S+REP"
- command = ".movedown"
- elem
- name = "T"
- command = ".say"
- elem "w_key"
- name = "W+REP"
- command = ".moveup"
- elem
- name = "CTRL+W+REP"
- command = ".moveup"
- elem
- name = "X"
- command = ".northeast"
- elem
- name = "CTRL+X"
- command = ".northeast"
- elem
- name = "Y"
- command = "Activate-Held-Object"
- elem
- name = "CTRL+Y"
- command = "Activate-Held-Object"
- elem
- name = "Z"
- command = "Activate-Held-Object"
- elem
- name = "CTRL+Z"
- command = "Activate-Held-Object"
- elem
- name = "F1"
- command = "adminhelp"
- elem
- name = "CTRL+SHIFT+F1+REP"
- command = ".options"
- elem
- name = "F2"
- command = "ooc"
- elem
- name = "F2+REP"
- command = ".screenshot auto"
- elem
- name = "SHIFT+F2+REP"
- command = ".screenshot"
- elem
- name = "F3"
- command = ".say"
- elem
- name = "F4"
- command = ".me"
- elem
- name = "F5"
- command = "asay"
- elem
- name = "F6"
- command = "Player-Panel"
- elem
- name = "F7"
- command = "Admin-PM"
- elem
- name = "F8"
- command = "Invisimin"
- elem
- name = "F12"
- command = "F12"
- elem
- name = "NUMPAD8"
- command = "body-toggle-head"
- elem
- name = "NUMPAD5"
- command = "body-chest"
- elem
- name = "NUMPAD4"
- command = "body-r-arm"
- elem
- name = "NUMPAD6"
- command = "body-l-arm"
- elem
- name = "NUMPAD2"
- command = "body-groin"
- elem
- name = "NUMPAD1"
- command = "body-r-leg"
- elem
- name = "NUMPAD3"
- command = "body-l-leg"
- elem
- name = ","
- command = "move-upwards"
- elem
- name = "."
- command = "move-down"
-
-macro "borgmacro"
- elem
- name = "TAB"
- command = ".winset \"mainwindow.macro=borghotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#F0F0F0\""
- elem
- name = "CENTER+REP"
- command = ".center"
- elem
- name = "NORTHEAST"
- command = ".northeast"
- elem
- name = "SOUTHEAST"
- command = ".southeast"
- elem
- name = "SOUTHWEST"
- command = ".southwest"
- elem
- name = "NORTHWEST"
- command = ".northwest"
- elem
- name = "ALT+WEST"
- command = "westfaceperm"
- elem
- name = "CTRL+WEST"
- command = "westface"
- elem
- name = "WEST+REP"
- command = ".moveleft"
- elem
- name = "ALT+NORTH"
- command = "northfaceperm"
- elem
- name = "CTRL+NORTH"
- command = "northface"
- elem
- name = "NORTH+REP"
- command = ".moveup"
- elem
- name = "ALT+EAST"
- command = "eastfaceperm"
- elem
- name = "CTRL+EAST"
- command = "eastface"
- elem
- name = "EAST+REP"
- command = ".moveright"
- elem
- name = "ALT+SOUTH"
- command = "southfaceperm"
- elem
- name = "CTRL+SOUTH"
- command = "southface"
- elem
- name = "SOUTH+REP"
- command = ".movedown"
- elem
- name = "INSERT"
- command = "a-intent right"
- elem
- name = "DELETE"
- command = "delete-key-pressed"
- elem
- name = "CTRL+1"
- command = "toggle-module 1"
- elem
- name = "CTRL+2"
- command = "toggle-module 2"
- elem
- name = "CTRL+3"
- command = "toggle-module 3"
- elem
- name = "CTRL+4"
- command = "a-intent left"
- elem
- name = "CTRL+A+REP"
- command = ".moveleft"
- elem
- name = "CTRL+D+REP"
- command = ".moveright"
- elem
- name = "CTRL+F"
- command = "a-intent left"
- elem
- name = "CTRL+G"
- command = "a-intent right"
- elem
- name = "CTRL+Q"
- command = ".northwest"
- elem
- name = "CTRL+R"
- command = ".southwest"
- elem
- name = "CTRL+S+REP"
- command = ".movedown"
- elem
- name = "CTRL+W+REP"
- command = ".moveup"
- elem
- name = "CTRL+X"
- command = ".northeast"
- elem
- name = "CTRL+Y"
- command = "Activate-Held-Object"
- elem
- name = "CTRL+Z"
- command = "Activate-Held-Object"
- elem
- name = "F1"
- command = "adminhelp"
- elem
- name = "CTRL+SHIFT+F1+REP"
- command = ".options"
- elem
- name = "F2"
- command = "ooc"
- elem
- name = "F2+REP"
- command = ".screenshot auto"
- elem
- name = "SHIFT+F2+REP"
- command = ".screenshot"
- elem
- name = "F3"
- command = ".say"
- elem
- name = "F4"
- command = ".me"
- elem
- name = "F5"
- command = "asay"
- elem
- name = "F6"
- command = "Player-Panel"
- elem
- name = "F7"
- command = "Admin-PM"
- elem
- name = "F8"
- command = "Invisimin"
- elem
- name = "F12"
- command = "F12"
- elem
- name = "CTRL+NUMPAD8"
- command = "body-toggle-head"
- elem
- name = "CTRL+NUMPAD5"
- command = "body-chest"
- elem
- name = "CTRL+NUMPAD4"
- command = "body-r-arm"
- elem
- name = "CTRL+NUMPAD6"
- command = "body-l-arm"
- elem
- name = "CTRL+NUMPAD2"
- command = "body-groin"
- elem
- name = "CTRL+NUMPAD1"
- command = "body-r-leg"
- elem
- name = "CTRL+NUMPAD3"
- command = "body-l-leg"
-
-
-menu "menu"
- elem
- name = "&File"
- command = ""
- saved-params = "is-checked"
- elem
- name = "&Quick screenshot\tF2"
- command = ".screenshot auto"
- category = "&File"
- saved-params = "is-checked"
- elem
- name = "&Save screenshot as...\tShift+F2"
- command = ".screenshot"
- category = "&File"
- saved-params = "is-checked"
- elem
- name = "&Quit"
- command = ".quit"
- category = "&File"
- saved-params = "is-checked"
- elem
- name = "&Icons"
- command = ""
- saved-params = "is-checked"
- elem "stretch"
- name = "&Stretch to fit"
- command = ".winset \"mapwindow.map.icon-size=0\""
- category = "&Icons"
- is-checked = true
- can-check = true
- group = "size"
- saved-params = "is-checked"
- elem "icon128"
- name = "&128x128"
- command = ".winset \"mapwindow.map.icon-size=128\""
- category = "&Icons"
- can-check = true
- group = "size"
- saved-params = "is-checked"
- elem "icon96"
- name = "&96x96"
- command = ".winset \"mapwindow.map.icon-size=96\""
- category = "&Icons"
- can-check = true
- group = "size"
- saved-params = "is-checked"
- elem "icon64"
- name = "&64x64"
- command = ".winset \"mapwindow.map.icon-size=64\""
- category = "&Icons"
- can-check = true
- group = "size"
- saved-params = "is-checked"
- elem "icon48"
- name = "&48x48"
- command = ".winset \"mapwindow.map.icon-size=48\""
- category = "&Icons"
- can-check = true
- group = "size"
- saved-params = "is-checked"
- elem "icon32"
- name = "&32x32"
- command = ".winset \"mapwindow.map.icon-size=32\""
- category = "&Icons"
- can-check = true
- group = "size"
- saved-params = "is-checked"
- elem
- name = "Icon &Stretching"
- command = ""
- saved-params = "is-checked"
- elem
- name = "&Normal"
- command = ".winset \"mapwindow.map.zoom-mode=normal\""
- category = "Icon &Stretching"
- is-checked = true
- can-check = true
- group = "stretching"
- saved-params = "is-checked"
- elem
- name = "&Blur"
- command = ".winset \"mapwindow.map.zoom-mode=blur\""
- category = "Icon &Stretching"
- can-check = true
- group = "stretching"
- saved-params = "is-checked"
- elem
- name = "&Distort"
- command = ".winset \"mapwindow.map.zoom-mode=distort\""
- category = "Icon &Stretching"
- can-check = true
- group = "stretching"
- saved-params = "is-checked"
- elem
- name = "&Help"
- command = ""
- saved-params = "is-checked"
- elem
- name = "&Admin help\tF1"
- command = "adminhelp"
- category = "&Help"
- saved-params = "is-checked"
- elem
- name = "&Hotkeys"
- command = "hotkeys-help"
- category = "&Help"
- saved-params = "is-checked"
- elem
- name = "&Resizing"
- command = ""
- saved-params = "is-checked"
- elem
- name = "Enable &vertical splitter"
- command = ".winset \"mainwindow.mainvsplit.show-splitter true\" "
- category = "&Resizing"
- is-checked = true
- can-check = true
- group = "splitter_vertical"
- saved-params = "is-checked"
- elem
- name = "Disable &vertical splitter"
- command = ".winset \"mainwindow.mainvsplit.show-splitter false\" "
- category = "&Resizing"
- can-check = true
- group = "splitter_vertical"
- saved-params = "is-checked"
- elem
- name = "Enable &horizontal splitter"
- command = ".winset \"rpane.rpanewindow.show-splitter true;\" "
- category = "&Resizing"
- is-checked = true
- can-check = true
- group = "splitter_horizontal"
- saved-params = "is-checked"
- elem
- name = "Disable &horizontal splitter"
- command = ".winset \"rpane.rpanewindow.show-splitter false;\" "
- category = "&Resizing"
- can-check = true
- group = "splitter_horizontal"
- saved-params = "is-checked"
-
-
-window "Telecomms IDE"
- elem "Telecomms IDE"
- type = MAIN
- pos = 281,0
- size = 569x582
- anchor1 = none
- anchor2 = none
- background-color = #ffffff
- is-visible = false
- saved-params = "pos;size;is-minimized;is-maximized"
- title = "TCS IDE"
- statusbar = false
- on-close = "exittcs"
- elem "button5"
- type = BUTTON
- pos = 209,464
- size = 70x20
- anchor1 = 37,80
- anchor2 = 49,83
- saved-params = "is-checked"
- text = "Clear Memory"
- command = "tcsclearmem"
- elem "button4"
- type = BUTTON
- pos = 157,464
- size = 52x20
- anchor1 = 28,80
- anchor2 = 37,83
- saved-params = "is-checked"
- text = "Revert"
- command = "tcsrevert"
- elem "button3"
- type = BUTTON
- pos = 105,464
- size = 52x20
- anchor1 = 18,80
- anchor2 = 28,83
- saved-params = "is-checked"
- text = "Execute"
- command = "tcsrun"
- elem "tcserror"
- type = OUTPUT
- pos = 0,488
- size = 566x94
- anchor1 = 0,84
- anchor2 = 99,100
- font-family = "sans-serif"
- font-size = 9
- saved-params = "max-lines"
- elem "button2"
- type = BUTTON
- pos = 53,464
- size = 52x20
- anchor1 = 9,80
- anchor2 = 18,83
- saved-params = "is-checked"
- text = "Compile"
- command = "tcscompile"
- elem "button1"
- type = BUTTON
- pos = 0,464
- size = 53x20
- anchor1 = 0,80
- anchor2 = 9,83
- saved-params = "is-checked"
- text = "Apply"
- command = "tcssave"
- elem "tcscode"
- type = INPUT
- pos = 0,0
- size = 569x464
- anchor1 = 0,0
- anchor2 = 100,80
- font-family = "Courier"
- font-size = 10
- saved-params = ""
- command = "cancel"
- multi-line = true
- no-command = true
-
-window "mainwindow"
- elem "mainwindow"
- type = MAIN
- pos = 372,0
- size = 640x480
- anchor1 = none
- anchor2 = none
- background-color = #3a3a3a
- is-default = true
- saved-params = "pos;size;is-minimized;is-maximized"
- icon = 'icons\\ss13_64.png'
- title = "Space Station 13 - Aurora Station"
- macro = "macro"
- menu = "menu"
- elem "hotkey_toggle"
- type = BUTTON
- pos = 560,462
- size = 80x20
- anchor1 = 100,100
- anchor2 = none
- text-color = #ffffff
- background-color = #653018
- saved-params = ""
- text = "Hotkey Toggle"
- command = ".winset \"mainwindow.macro!=macro ? mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true : mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true\""
- is-flat = true
- button-type = pushbox
- elem "mainvsplit"
- type = CHILD
- pos = 0,0
- size = 640x460
- anchor1 = 0,0
- anchor2 = 100,100
- background-color = #3a3a3a
- saved-params = "splitter"
- right = "rpane"
- is-vert = true
- elem "input"
- type = INPUT
- pos = 0,462
- size = 520x20
- anchor1 = 0,100
- anchor2 = 100,100
- font-family = "Calibri Light"
- font-size = 12
- text-color = #ffffff
- background-color = #577b4f
- is-default = true
- saved-params = "command"
- elem "saybutton"
- type = BUTTON
- pos = 520,462
- size = 40x20
- anchor1 = 100,100
- anchor2 = none
- text-color = #ffffff
- background-color = #2e726f
- saved-params = "is-checked"
- text = "Chat"
- command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\""
- is-flat = true
- button-type = pushbox
-
-window "mapwindow"
- elem "mapwindow"
- type = MAIN
- pos = 372,0
- size = 640x480
- anchor1 = none
- anchor2 = none
- background-color = #3a3a3a
- saved-params = "pos;size;is-minimized;is-maximized"
- titlebar = false
- statusbar = false
- can-close = false
- can-minimize = false
- can-resize = false
- is-pane = true
- elem "map"
- type = MAP
- pos = 0,0
- size = 640x480
- anchor1 = 0,0
- anchor2 = 100,100
- font-family = "Arial Rounded MT Bold,Arial Black,Arial,sans-serif"
- font-size = 7
- is-default = true
- saved-params = "icon-size"
- on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\""
- on-hide = ".winset\"mainwindow.mainvsplit.left=\""
-
-window "outputwindow"
- elem "outputwindow"
- type = MAIN
- pos = 372,0
- size = 640x480
- anchor1 = none
- anchor2 = none
- background-color = #3a3a3a
- saved-params = "pos;size;is-minimized;is-maximized"
- titlebar = false
- statusbar = false
- can-close = false
- can-minimize = false
- can-resize = false
- is-pane = true
- elem "output"
- type = OUTPUT
- pos = 0,0
- size = 640x480
- anchor1 = 0,0
- anchor2 = 100,100
- is-default = true
- saved-params = "max-lines"
- style = ".system {color:#ff0000;}"
- max-lines = 0
- elem "asset_cache_browser"
- type = BROWSER
- pos = 0,0
- size = 200x200
- anchor1 = none
- anchor2 = none
- background-color = none
- is-visible = false
- saved-params = ""
-
-window "rpane"
- elem "rpane"
- type = MAIN
- pos = 372,0
- size = 640x480
- anchor1 = none
- anchor2 = none
- background-color = #3a3a3a
- saved-params = "pos;size;is-minimized;is-maximized"
- titlebar = false
- statusbar = false
- can-close = false
- can-minimize = false
- can-resize = false
- is-pane = true
- elem "rpanewindow"
- type = CHILD
- pos = 0,0
- size = 638x474
- anchor1 = 0,0
- anchor2 = 100,100
- background-color = #3a3a3a
- saved-params = "splitter"
- right = "outputwindow"
- is-vert = false
- elem "rulesb"
- type = BUTTON
- pos = 278,0
- size = 60x16
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- saved-params = "is-checked"
- text = "Rules"
- command = "rules"
- group = "rpanemode"
- elem "changelog"
- type = BUTTON
- pos = 341,0
- size = 67x16
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- saved-params = "is-checked"
- text = "Changelog"
- command = "Changelog"
- group = "rpanemode"
- elem "reportbugb"
- type = BUTTON
- pos = 410,0
- size = 67x16
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- saved-params = "is-checked"
- text = "Report Bug"
- command = "reportbug"
- group = "rpanemode"
- elem "forumb"
- type = BUTTON
- pos = 215,0
- size = 60x16
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- saved-params = "is-checked"
- text = "Forum"
- command = "forum"
- group = "rpanemode"
- elem "wikib"
- type = BUTTON
- pos = 152,0
- size = 60x16
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- saved-params = "is-checked"
- text = "Wiki"
- command = "wiki"
- group = "rpanemode"
- elem "interfaceb"
- type = BUTTON
- pos = 480,0
- size = 60x16
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- saved-params = "is-checked"
- text = "WI Link"
- command = "open_webint"
- elem "discordb"
- type = BUTTON
- pos = 544,0
- size = 60x16
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- saved-params = "is-checked"
- text = "Discord"
- command = "open_discord"
- elem "textb"
- type = BUTTON
- pos = 0,0
- size = 60x16
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- is-visible = false
- saved-params = "is-checked"
- text = "Text"
- command = ".winset \"rpanewindow.left=;\""
- is-checked = true
- group = "rpanemode"
- button-type = pushbox
- elem "browseb"
- type = BUTTON
- pos = 0,560
- size = 60x16
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- is-visible = false
- saved-params = "is-checked"
- text = "Browser"
- command = ".winset \"rpanewindow.left=browserwindow\""
- group = "rpanemode"
- button-type = pushbox
- elem "infob"
- type = BUTTON
- pos = 64,0
- size = 60x16
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- is-visible = false
- saved-params = "is-checked"
- text = "Info"
- command = ".winset \"rpanewindow.left=infowindow\""
- group = "rpanemode"
- button-type = pushbox
-
-window "browserwindow"
- elem "browserwindow"
- type = MAIN
- pos = 372,0
- size = 640x480
- anchor1 = none
- anchor2 = none
- background-color = #3a3a3a
- saved-params = "pos;size;is-minimized;is-maximized"
- title = "Browser"
- titlebar = false
- statusbar = false
- can-close = false
- can-minimize = false
- can-resize = false
- is-pane = true
- elem "browser"
- type = BROWSER
- pos = 0,0
- size = 640x480
- anchor1 = 0,0
- anchor2 = 100,100
- background-color = #ffffff
- is-default = true
- saved-params = ""
- on-show = ".winset\"rpane.infob.is-visible=true?rpane.infob.pos=130,0;rpane.textb.is-visible=true;rpane.browseb.is-visible=true;rpane.browseb.is-checked=true;rpane.rpanewindow.pos=0,30;rpane.rpanewindow.size=0x0;rpane.rpanewindow.left=browserwindow\""
- on-hide = ".winset\"rpane.infob.is-visible=true?rpane.infob.is-checked=true rpane.infob.pos=65,0 rpane.rpanewindow.left=infowindow:rpane.rpanewindow.left=textwindow rpane.textb.is-visible=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0\""
-
-window "infowindow"
- elem "infowindow"
- type = MAIN
- pos = 372,0
- size = 640x480
- anchor1 = none
- anchor2 = none
- background-color = #3a3a3a
- saved-params = "pos;size;is-minimized;is-maximized"
- title = "Info"
- titlebar = false
- statusbar = false
- can-close = false
- can-minimize = false
- can-resize = false
- is-pane = true
- elem "info"
- type = INFO
- pos = 0,0
- size = 640x480
- anchor1 = 0,0
- anchor2 = 100,100
- text-color = #ffffff
- background-color = #515151
- is-default = true
- right-click = true
- saved-params = ""
- highlight-color = #bcb3e1
- tab-text-color = #ffffff
- tab-background-color = #3a3a3a
- on-show = ".winset\"rpane.infob.is-visible=true;rpane.browseb.is-visible=true?rpane.infob.pos=130,0:rpane.infob.pos=65,0 rpane.textb.is-visible=true rpane.infob.is-checked=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0 rpane.rpanewindow.left=infowindow\""
- on-hide = ".winset\"rpane.infob.is-visible=false;rpane.browseb.is-visible=true?rpane.browseb.is-checked=true rpane.rpanewindow.left=browserwindow:rpane.textb.is-visible=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0 rpane.rpanewindow.left=\""
-
-window "text_editor"
- elem "text_editor"
- type = MAIN
- pos = 372,0
- size = 360x488
- anchor1 = none
- anchor2 = none
- background-color = #3a3a3a
- is-visible = false
- border = sunken
- saved-params = "pos;size;is-minimized;is-maximized"
- title = "Text Editor"
- can-minimize = false
- can-resize = false
- elem "exit"
- type = BUTTON
- pos = 248,456
- size = 104x24
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- saved-params = "is-checked"
- text = "Exit without saving"
- command = ""
- elem "save"
- type = BUTTON
- pos = 128,456
- size = 104x24
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- saved-params = "is-checked"
- text = "Save"
- command = ""
- elem "saveexit"
- type = BUTTON
- pos = 8,456
- size = 104x24
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- saved-params = "is-checked"
- text = "Save + Exit"
- command = ""
- elem "textedit"
- type = INPUT
- pos = 0,0
- size = 360x448
- anchor1 = none
- anchor2 = none
- text-color = #ffffff
- background-color = #515151
- border = line
- saved-params = ""
- multi-line = true
-
diff --git a/interface/dark.txt b/interface/dark.txt
deleted file mode 100644
index 1c914ab4e16..00000000000
--- a/interface/dark.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-mainwindow background-color = #3a3a3a
-hotkey_toggle text-color = #ffffff
-hotkey_toggle background-color = #653018
-mainvsplit background-color = #3a3a3a
-input text-color = #ffffff
-input background-color = #577b4f
-saybutton text-color = #ffffff
-saybutton background-color = #2e726f
-mapwindow background-color = #3a3a3a
-outputwindow background-color = #3a3a3a
-rpane background-color = #3a3a3a
-rpanewindow background-color = #3a3a3a
-rulesb text-color = #ffffff
-rulesb background-color = #515151
-changelog text-color = #ffffff
-changelog background-color = #515151
-reportbugb text-color = #ffffff
-reportbugb background-color = #515151
-forumb text-color = #ffffff
-forumb background-color = #515151
-wikib text-color = #ffffff
-wikib background-color = #515151
-interfaceb text-color = #ffffff
-interfaceb background-color = #515151
-discordb text-color = #ffffff
-discordb background-color = #515151
-textb text-color = #ffffff
-textb background-color = #515151
-browseb text-color = #ffffff
-browseb background-color = #515151
-infob text-color = #ffffff
-infob background-color = #515151
-browserwindow background-color = #3a3a3a
-infowindow background-color = #3a3a3a
-info text-color = #ffffff
-info background-color = #515151
-info highlight-color = #bcb3e1
-info tab-text-color = #ffffff
-info tab-background-color = #3a3a3a
-text_editor background-color = #3a3a3a
-exit text-color = #ffffff
-exit background-color = #515151
-save text-color = #ffffff
-save background-color = #515151
-saveexit text-color = #ffffff
-saveexit background-color = #515151
-textedit text-color = #ffffff
-textedit background-color = #515151
\ No newline at end of file
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 5cd9c58feea..2bddf8f1810 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1016,75 +1016,6 @@ window "Telecomms IDE"
multi-line = true
no-command = true
-window "mainwindow"
- elem "mainwindow"
- type = MAIN
- pos = 281,0
- size = 640x480
- anchor1 = none
- anchor2 = none
- background-color = none
- is-default = true
- saved-params = "pos;size;is-minimized;is-maximized"
- icon = 'icons\\ss13_64.png'
- title = "Space Station 13 - Aurora Station"
- macro = "macro"
- menu = "menu"
- elem "hotkey_toggle"
- type = BUTTON
- pos = 560,462
- size = 80x20
- anchor1 = 100,100
- anchor2 = none
- background-color = #e6b099
- saved-params = ""
- text = "Hotkey Toggle"
- command = ".winset \"mainwindow.macro!=macro ? mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true : mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true\""
- is-flat = true
- button-type = pushbox
- elem "mainvsplit"
- type = CHILD
- pos = 0,0
- size = 640x460
- anchor1 = 0,0
- anchor2 = 100,100
- background-color = none
- saved-params = "splitter"
- right = "rpane"
- is-vert = true
- elem "input"
- type = INPUT
- pos = 0,462
- size = 520x20
- anchor1 = 0,100
- anchor2 = 100,100
- font-family = "Calibri Light"
- font-size = 12
- background-color = #d0e6e3
- is-default = true
- saved-params = "command"
- elem "saybutton"
- type = BUTTON
- pos = 520,462
- size = 40x20
- anchor1 = 100,100
- anchor2 = none
- background-color = #8cd0cd
- saved-params = "is-checked"
- text = "Chat"
- command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\""
- is-flat = true
- button-type = pushbox
- elem "tooltip"
- type = BROWSER
- pos = 0,0
- size = 999x999
- anchor1 = none
- anchor2 = none
- background-color = none
- is-visible = false
- saved-params = ""
-
window "mapwindow"
elem "mapwindow"
type = MAIN
@@ -1092,7 +1023,6 @@ window "mapwindow"
size = 640x480
anchor1 = none
anchor2 = none
- background-color = none
saved-params = "pos;size;is-minimized;is-maximized"
titlebar = false
statusbar = false
@@ -1113,6 +1043,87 @@ window "mapwindow"
on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\""
on-hide = ".winset\"mainwindow.mainvsplit.left=\""
+window "mainwindow"
+ elem "mainwindow"
+ type = MAIN
+ pos = 281,0
+ size = 640x440
+ anchor1 = none
+ anchor2 = none
+ background-color = none
+ is-default = true
+ saved-params = "pos;size;is-minimized;is-maximized"
+ title = "Space Station 13 - Aurora Station"
+ is-maximized = true
+ icon = 'icons\\ss13_64.png'
+ macro = "macro"
+ menu = "menu"
+ outer-size = 1936x1056
+ inner-size = 1920x997
+ elem "asset_cache_browser"
+ type = BROWSER
+ pos = 424,208
+ size = 1x1
+ anchor1 = none
+ anchor2 = none
+ background-color = none
+ is-visible = false
+ saved-params = ""
+ elem "hotkey_toggle"
+ type = BUTTON
+ pos = 560,420
+ size = 80x20
+ anchor1 = 100,100
+ anchor2 = none
+ background-color = none
+ saved-params = ""
+ text = "Hotkey Toggle"
+ command = ".winset \"mainwindow.macro!=macro ? mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true : mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true\""
+ is-flat = true
+ button-type = pushbox
+ elem "mainvsplit"
+ type = CHILD
+ pos = 0,0
+ size = 634x416
+ anchor1 = 0,0
+ anchor2 = 100,100
+ background-color = none
+ saved-params = "splitter"
+ right = "rpane"
+ is-vert = true
+ elem "input"
+ type = INPUT
+ pos = 0,420
+ size = 517x20
+ anchor1 = 0,100
+ anchor2 = 100,100
+ font-family = "Calibri Light"
+ font-size = 12
+ background-color = #d0e6e3
+ is-default = true
+ saved-params = "command"
+ elem "saybutton"
+ type = BUTTON
+ pos = 520,420
+ size = 40x20
+ anchor1 = 100,100
+ anchor2 = none
+ background-color = #8cd0cd
+ saved-params = "is-checked"
+ text = "Chat"
+ command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\""
+ is-flat = true
+ button-type = pushbox
+ elem "tooltip"
+ type = BROWSER
+ pos = 0,0
+ size = 999x999
+ anchor1 = none
+ anchor2 = none
+ background-color = none
+ is-visible = false
+ saved-params = ""
+
window "outputwindow"
elem "outputwindow"
type = MAIN
@@ -1128,6 +1139,16 @@ window "outputwindow"
can-minimize = false
can-resize = false
is-pane = true
+ outer-size = 654x494
+ elem "browseroutput"
+ type = BROWSER
+ pos = 0,0
+ size = 640x480
+ anchor1 = 0,0
+ anchor2 = 100,100
+ background-color = #ffffff
+ is-visible = false
+ saved-params = ""
elem "output"
type = OUTPUT
pos = 0,0
@@ -1135,17 +1156,6 @@ window "outputwindow"
anchor1 = 0,0
anchor2 = 100,100
is-default = true
- saved-params = "max-lines"
- style = ".system {color:#ff0000;}"
- max-lines = 0
- elem "asset_cache_browser"
- type = BROWSER
- pos = 0,0
- size = 200x200
- anchor1 = none
- anchor2 = none
- background-color = none
- is-visible = false
saved-params = ""
window "rpane"
@@ -1163,6 +1173,7 @@ window "rpane"
can-minimize = false
can-resize = false
is-pane = true
+ outer-size = 654x494
elem "rpanewindow"
type = CHILD
pos = 0,0
@@ -1296,6 +1307,7 @@ window "browserwindow"
size = 640x480
anchor1 = none
anchor2 = none
+ background-color = none
saved-params = "pos;size;is-minimized;is-maximized"
title = "Browser"
titlebar = false
@@ -1304,6 +1316,7 @@ window "browserwindow"
can-minimize = false
can-resize = false
is-pane = true
+ outer-size = 654x494
elem "browser"
type = BROWSER
pos = 0,0
@@ -1351,18 +1364,22 @@ window "text_editor"
size = 360x488
anchor1 = none
anchor2 = none
+ background-color = none
is-visible = false
border = sunken
saved-params = "pos;size;is-minimized;is-maximized"
title = "Text Editor"
can-minimize = false
can-resize = false
+ outer-size = 376x546
+ inner-size = 360x507
elem "exit"
type = BUTTON
pos = 248,456
size = 104x24
anchor1 = none
anchor2 = none
+ background-color = none
saved-params = "is-checked"
text = "Exit without saving"
command = ""
@@ -1372,6 +1389,7 @@ window "text_editor"
size = 104x24
anchor1 = none
anchor2 = none
+ background-color = none
saved-params = "is-checked"
text = "Save"
command = ""
@@ -1381,6 +1399,7 @@ window "text_editor"
size = 104x24
anchor1 = none
anchor2 = none
+ background-color = none
saved-params = "is-checked"
text = "Save + Exit"
command = ""
@@ -1401,15 +1420,19 @@ window "preferences_window"
size = 1200x800
anchor1 = none
anchor2 = none
+ background-color = none
is-visible = false
saved-params = "pos;size;is-minimized;is-maximized"
statusbar = false
+ outer-size = 1216x839
+ inner-size = 1200x800
elem "preferences_browser"
type = BROWSER
pos = 0,0
size = 1000x800
anchor1 = 0,0
anchor2 = 80,100
+ background-color = none
saved-params = ""
elem "character_preview_map"
type = MAP
@@ -1417,4 +1440,5 @@ window "preferences_window"
size = 200x800
anchor1 = 80,0
anchor2 = 100,100
- right-click = false
\ No newline at end of file
+ saved-params = "zoom;letterbox;zoom-mode"
+
diff --git a/interface/skin.txt b/interface/skin.txt
deleted file mode 100644
index e47dc0cbbb5..00000000000
--- a/interface/skin.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-mainwindow background-color = none
-hotkey_toggle text-color = #000
-hotkey_toggle background-color = #e6b099
-mainvsplit background-color = none
-input text-color = #000
-input background-color = #d0e6e3
-saybutton text-color = #000
-saybutton background-color = #8cd0cd
-mapwindow background-color = none
-outputwindow background-color = none
-rpane background-color = none
-rpanewindow background-color = none
-rulesb text-color = #000
-rulesb background-color = none
-changelog text-color = #000
-changelog background-color = none
-reportbugb text-color = #000
-reportbugb background-color = none
-forumb text-color = #000
-forumb background-color = none
-wikib text-color = #000
-wikib background-color = none
-interfaceb text-color = #000
-interfaceb background-color = none
-discordb text-color = #000
-discordb background-color = none
-textb text-color = #000
-textb background-color = none
-browseb text-color = #000
-browseb background-color = none
-infob text-color = #000
-infob background-color = none
-browserwindow background-color = #fff
-infowindow background-color = #fff
-info text-color = #000
-info background-color = #fff
-info highlight-color = #00aa00
-info tab-text-color = none
-info tab-background-color = none
-text_editor background-color = #fff
-exit text-color = #000
-exit background-color = #fff
-save text-color = #000
-save background-color = #fff
-saveexit text-color = #000
-saveexit background-color = #fff
-textedit text-color = #000
-textedit background-color = #fff
\ No newline at end of file
diff --git a/nano/templates/communication.tmpl b/nano/templates/communication.tmpl
index ab618a2e117..492b90450c3 100644
--- a/nano/templates/communication.tmpl
+++ b/nano/templates/communication.tmpl
@@ -58,7 +58,7 @@
{{else data.state === 5}}
Current Alert level is {{:data.current_security_level_title}}
{{if data.current_security_level === data.def_SEC_LEVEL_DELTA}}
-
{{else}}
{{if data.newmessagepriority == 1}}
- "
\ No newline at end of file
diff --git a/code/modules/hallucinations/mob.dm b/code/modules/hallucinations/mob.dm
index cddd9f3c4b4..dde2d03a4a1 100644
--- a/code/modules/hallucinations/mob.dm
+++ b/code/modules/hallucinations/mob.dm
@@ -10,7 +10,7 @@
log_say("Hallucination level changed [orig_message] by [speaker] to [message] for [key_name(src)].", ckey=key_name(src))
return ..()
-/mob/living/carbon/hear_radio(var/message, var/verb="says", var/datum/language/language, var/part_a, var/part_b, var/mob/speaker, var/hard_to_hear = 0, var/vname ="")
+/mob/living/carbon/hear_radio(var/message, var/verb="says", var/datum/language/language, var/part_a, var/part_b, var/part_c, var/mob/speaker, var/hard_to_hear = 0, var/vname ="")
if(hallucination >= 60 && prob(1))
var/orig_message = message
message = pick(SShallucinations.hallucinated_phrases)
diff --git a/code/modules/hallucinations/types/basic.dm b/code/modules/hallucinations/types/basic.dm
index 0e132ef0c9b..cf80265d084 100644
--- a/code/modules/hallucinations/types/basic.dm
+++ b/code/modules/hallucinations/types/basic.dm
@@ -51,7 +51,7 @@
if(9)
sound_to(holder, 'sound/effects/nuclearsiren.ogg')
- to_chat(holder, "Supermatter Monitor states, \"WARNING: SUPERMATTER CRYSTAL DELAMINATION IMMINENT.\"")
+ to_chat(holder, "Supermatter Monitor states, \"WARNING: SUPERMATTER CRYSTAL DELAMINATION IMMINENT.\"")
addtimer(CALLBACK(src, .proc/delam_call), 20)
addtimer(CALLBACK(src, .proc/delam_call), 35)
@@ -82,9 +82,9 @@
return
var/radio_exclaim = pick("Oh SHIT!", "Oh fuck.", "Uhhh!", "That's not good!", "FUCK.", "Engineering?", "It's under control!", "We're fucked!", "Ohhhh boy.", "What?!", "Um, what?!")
var/mob/living/caller = pick(people)
- var/caller_accent = get_hallucinated_accent(caller)
+ var/caller_accent = get_hallucinated_accent(caller, holder)
- to_chat(holder, "[caller_accent] [pick(people)] says, \"[radio_exclaim]\"")
+ to_chat(holder, "[caller_accent] [pick(people)] says, \"[radio_exclaim]\"")
/datum/hallucination/pda //fake PDA messages. this only plays the beep and sends something to chat; it won't show up in the PDA.
@@ -269,7 +269,7 @@
"[pal] will keep you safe.",
"You feel captivated by [pal]'s charisma.",
"[pal] might as well be family to you.")
- to_chat(holder, "[pick(halpal_emotes)]")
+ to_chat(holder, "[pick(halpal_emotes)]")
/datum/hallucination/passive
duration = 600 //minute fallback
@@ -419,7 +419,7 @@
var/mob/living/talker = pick(candidates) //Who is talking to us?
var/message //What will they say?
- var/accent_tag = get_hallucinated_accent(talker) //Can't forget the accent
+ var/accent_tag = get_hallucinated_accent(talker, holder) //Can't forget the accent
//Name selection. This gives us variety. Sometimes it will be your last name, sometimes your first.
var/list/names = list()
@@ -478,7 +478,7 @@
whisper_candidates += M
if(whisper_candidates.len)
var/mob/living/whisperer = pick(whisper_candidates)
- var/whisper_accent = get_hallucinated_accent(whisperer)
+ var/whisper_accent = get_hallucinated_accent(whisperer, holder)
if(prob(70))
to_chat(holder, "[whisper_accent] [whisperer] whispers, \"[pick(SShallucinations.hallucinated_phrases)]\"")
else
diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm
index dce73c0a2da..21e84e03f27 100644
--- a/code/modules/heavy_vehicle/mech_interaction.dm
+++ b/code/modules/heavy_vehicle/mech_interaction.dm
@@ -157,8 +157,8 @@
playsound(src.loc, arms.punch_sound, 45 + 25 * (arms.melee_damage / 50), -1 )
if(ismob(A))
var/mob/target = A
- user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])"
- src.attack_log += "\[[time_stamp()]\] [user] ([user.ckey]) attacked [target.name] ([target.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])"
+ user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])"
+ src.attack_log += "\[[time_stamp()]\] [user] ([user.ckey]) attacked [target.name] ([target.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])"
target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)])"
msg_admin_attack("[key_name(user, highlight_special = 1)] attacked [key_name(target, highlight_special = 1)] with [arms] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(arms.damagetype)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target) )
return A.attack_generic(src, arms.melee_damage, "attacked")
@@ -543,7 +543,7 @@
var/mob/living/carbon/human/D = H
if(D.lying)
D.attack_log += "\[[time_stamp()]\] Was trampled by [src]"
- attack_log += text("\[[time_stamp()]\] trampled [D.name] ([D.ckey]) with \the [src].")
+ attack_log += text("\[[time_stamp()]\] trampled [D.name] ([D.ckey]) with \the [src].")
msg_admin_attack("[src] trampled [key_name(D)] at (JMP)" )
src.visible_message("\The [src] runs over \the [D]!")
D.apply_damage(legs.trample_damage, BRUTE)
diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm
index df73bcedc8a..ae10342c3f1 100644
--- a/code/modules/hydroponics/seed_machines.dm
+++ b/code/modules/hydroponics/seed_machines.dm
@@ -68,15 +68,15 @@
active = 0
if(failed_task)
failed_task = 0
- visible_message("\icon[src] [src] pings unhappily, flashing a red warning light.")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] pings unhappily, flashing a red warning light.")
else
- visible_message("\icon[src] [src] pings happily.")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] pings happily.")
if(eject_disk)
eject_disk = 0
if(loaded_disk)
loaded_disk.forceMove(get_turf(src))
- visible_message("\icon[src] [src] beeps and spits out [loaded_disk].")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps and spits out [loaded_disk].")
loaded_disk = null
/obj/machinery/botany/attackby(obj/item/W as obj, mob/user as mob)
@@ -190,14 +190,14 @@
SSplants.seeds[seed.seed.name] = seed.seed
seed.update_seed()
- visible_message("\icon[src] [src] beeps and spits out [seed].")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps and spits out [seed].")
seed = null
if(href_list["eject_disk"])
if(!loaded_disk) return
loaded_disk.forceMove(get_turf(src))
- visible_message("\icon[src] [src] beeps and spits out [loaded_disk].")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps and spits out [loaded_disk].")
loaded_disk = null
usr.set_machine(src)
diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm
index 0a5e4a608ae..ecf9a57994d 100644
--- a/code/modules/hydroponics/seed_storage.dm
+++ b/code/modules/hydroponics/seed_storage.dm
@@ -172,7 +172,7 @@
var/dat = "Seed storage contents
| Name | " dat += "Variety | " @@ -227,12 +227,12 @@ if(1) dat += "CARN " if(2) - dat += "CARN " + dat += "CARN " switch(seed.get_trait(TRAIT_SPREAD)) if(1) dat += "VINE " if(2) - dat += "VINE " + dat += "VINE " if ("pressure" in scanner) if(seed.get_trait(TRAIT_LOWKPA_TOLERANCE) < 20) dat += "LP " diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 7f96ad86076..959664a907d 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -143,7 +143,7 @@ if(nymph.nutrition > 100 && nutrilevel < 10) nymph.adjustNutritionLoss((10-nutrilevel)*5) nutrilevel = 10 - nymph.visible_message("[nymph] secretes a trickle of green liquid, refilling [src].","You secrete a trickle of green liquid, refilling [src].") + nymph.visible_message("[nymph] secretes a trickle of green liquid, refilling [src].","You secrete a trickle of green liquid, refilling [src].") return//Nymphs cant open and close lids if(mechanical && !usr.incapacitated() && Adjacent(usr)) close_lid(usr) @@ -177,18 +177,18 @@ if(weedlevel > 0) nymph.ingested.add_reagent(/datum/reagent/nutriment, weedlevel/6) weedlevel = 0 - nymph.visible_message("[nymph] roots through [src], ripping out weeds and eating them noisily.","You root through [src], ripping out weeds and eating them noisily.") + nymph.visible_message("[nymph] roots through [src], ripping out weeds and eating them noisily.","You root through [src], ripping out weeds and eating them noisily.") return if (dead)//Let nymphs eat dead plants nymph.ingested.add_reagent(/datum/reagent/nutriment, 1) - nymph.visible_message("[nymph] rips out the dead plants from [src], and loudly munches them.","You root out the dead plants in [src], eating them with loud chewing sounds.") + nymph.visible_message("[nymph] rips out the dead plants from [src], and loudly munches them.","You root out the dead plants in [src], eating them with loud chewing sounds.") remove_dead(user) return if (harvest) harvest(user) return else - nymph.visible_message("[nymph] rolls around in [src] for a bit.","You roll around in [src] for a bit.") + nymph.visible_message("[nymph] rolls around in [src] for a bit.","You roll around in [src] for a bit.") return /obj/machinery/portable_atmospherics/hydroponics/New() diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index c067dae10a5..108dd11e6ae 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -399,7 +399,7 @@ activate_pin(3) for(var/mob/O in hearers(1, get_turf(src))) - O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) + O.show_message(text("[icon2html(src, viewers(get_turf(src)))] *beep* *beep*"), 3, "*beep* *beep*", 2) //This circuit gives information on where the machine is. /obj/item/integrated_circuit/input/gps diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index f0f9fae1ce6..3940656aa1c 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -43,7 +43,7 @@ var/list/nearby_things = range(0, get_turf(src)) for(var/mob/M in nearby_things) var/obj/O = assembly ? assembly : src - to_chat(M, "\icon[O] [stuff_to_display]") + to_chat(M, "[icon2html(O, viewers(get_turf(src)))] [stuff_to_display]") /obj/item/integrated_circuit/output/screen/large name = "large screen" @@ -54,7 +54,7 @@ /obj/item/integrated_circuit/output/screen/large/do_work() ..() var/obj/O = assembly ? loc : assembly - O.visible_message("\icon[O] [stuff_to_display]") + O.visible_message("[icon2html(O, viewers(get_turf(src)))] [stuff_to_display]") /obj/item/integrated_circuit/output/light name = "light" @@ -153,7 +153,7 @@ text = get_pin_data(IC_INPUT, 1) if(!isnull(text)) var/obj/O = assembly ? loc : assembly - audible_message("\icon[O] \The [O.name] states, \"[text]\"") + audible_message("[icon2html(O, viewers(get_turf(O)))] \The [O.name] states, \"[text]\"") /obj/item/integrated_circuit/output/sound/Initialize() . = ..() diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 057e4642231..db00e67e8b3 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -359,6 +359,6 @@ if(src.computer) to_chat(user, "Computer has been associated with this unit.") else - to_chat(user, "No associated computer found. Only local scans will function properly.") + to_chat(user, "No associated computer found. Only local scans will function properly.") to_chat(user, "\n") diff --git a/code/modules/maps/swapmaps.dm b/code/modules/maps/swapmaps.dm index df639ef3c49..52a67c64443 100644 --- a/code/modules/maps/swapmaps.dm +++ b/code/modules/maps/swapmaps.dm @@ -490,8 +490,8 @@ atom // set this up (at runtime) as follows: // list(\ -// 'player.dmi'="player",\ -// 'monster.dmi'="monster",\ +// 'player.dmi'="player", +// 'monster.dmi'="monster", // ... // 'item.dmi'="item") var/list/swapmaps_iconcache diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index f0aa66dbef1..5dade9c042c 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -89,7 +89,7 @@ D.visible_message("[attack_message]") playsound(D.loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) - A.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [D.name] ([D.ckey])") + A.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [D.name] ([D.ckey])") D.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Was missed by" : "Has blocked") : "Has Been [pick(attack.attack_verb)]"] by [A.name] ([A.ckey])") msg_admin_attack("[key_name(A)] [miss_type ? (miss_type == 1 ? "has missed" : "was blocked by") : "has [pick(attack.attack_verb)]"] [key_name(D)] (JMP)",ckey=key_name(A),ckey_target=key_name(D)) diff --git a/code/modules/martial_arts/sol_combat.dm b/code/modules/martial_arts/sol_combat.dm index ae7f0d34508..0f915031e84 100644 --- a/code/modules/martial_arts/sol_combat.dm +++ b/code/modules/martial_arts/sol_combat.dm @@ -71,7 +71,7 @@ datum/martial_art/sol_combat/grab_act(var/mob/living/carbon/human/A, var/mob/liv playsound(get_turf(D), /decl/sound_category/punch_sound, 50, 1, -1) A.visible_message("[A] [picked_hit_type] [D]!") - A.attack_log += text("\[[time_stamp()]\] ["[picked_hit_type]"] [D.name] ([D.ckey])") + A.attack_log += text("\[[time_stamp()]\] ["[picked_hit_type]"] [D.name] ([D.ckey])") D.attack_log += text("\[[time_stamp()]\] ["Has Been [picked_hit_type]"] by [A.name] ([A.ckey])") msg_admin_attack("[key_name(A)] ["has [picked_hit_type]"] [key_name(D)] (JMP)",ckey=key_name(A),ckey_target=key_name(D)) @@ -83,7 +83,7 @@ datum/martial_art/sol_combat/grab_act(var/mob/living/carbon/human/A, var/mob/liv if(check_streak(A,D)) return 1 - A.attack_log += text("\[[time_stamp()]\] Disarmed [D.name] ([D.ckey])") + A.attack_log += text("\[[time_stamp()]\] Disarmed [D.name] ([D.ckey])") D.attack_log += text("\[[time_stamp()]\] Has been disarmed by [A.name] ([A.ckey])") msg_admin_attack("[key_name(A)] disarmed [D.name] ([D.ckey]) (JMP)",ckey=key_name(D),ckey_target=key_name(A)) diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 46cd409422d..79308c170c6 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -339,9 +339,9 @@ system_error("Unbraced drill error.") sleep(30) if(!supported) //if you can resolve it manually in three seconds then power to you good-sir. - visible_message(SPAN_NOTICE("\icon[src] [src.name] beeps, \"Unbraced drill error automatically corrected. Please brace your drill.\"")) + visible_message(SPAN_NOTICE("[icon2html(src, viewers(get_turf(src)))] [src.name] beeps, \"Unbraced drill error automatically corrected. Please brace your drill.\"")) else - visible_message(SPAN_NOTICE("\icon[src] [src.name] beeps, \"Unbraced drill error manually resolved. Operations may resume normally.\"")) + visible_message(SPAN_NOTICE("[icon2html(src, viewers(get_turf(src)))] [src.name] beeps, \"Unbraced drill error manually resolved. Operations may resume normally.\"")) if(supported && panel_open) if(cell) system_error("Unsealed cell fitting error. Volatile cell discharge may occur if not immediately corrected.") @@ -362,7 +362,7 @@ component_parts -= cell cell = null else - visible_message(SPAN_NOTICE("\icon[src] [src.name] beeps, \"Unsealed cell fitting error manually resolved. Operations may resume normally.\"")) + visible_message(SPAN_NOTICE("[icon2html(src, viewers(get_turf(src)))] [src.name] beeps, \"Unsealed cell fitting error manually resolved. Operations may resume normally.\"")) else to_chat(user, SPAN_NOTICE("\The [src] is unpowered.")) update_icon() @@ -412,7 +412,7 @@ /obj/machinery/mining/drill/proc/system_error(var/error) if(error) - visible_message(SPAN_WARNING("\icon[src] [capitalize_first_letters(src.name)] flashes a system warning: \"[error]\".")) + visible_message(SPAN_WARNING("[icon2html(src, viewers(get_turf(src)))] [capitalize_first_letters(src.name)] flashes a system warning: \"[error]\".")) current_error = error playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 100, 1) need_player_check = TRUE @@ -519,7 +519,7 @@ connected.system_error("Unbraced drill error.") sleep(30) if(connected?.active) //if you can resolve it manually in three seconds then power to you good-sir. - visible_message(SPAN_NOTICE("\icon[src] [src.name] beeps, \"Unbraced drill error automatically corrected. Please brace your drill.\"")) + visible_message(SPAN_NOTICE("[icon2html(src, viewers(get_turf(src)))] [src.name] beeps, \"Unbraced drill error automatically corrected. Please brace your drill.\"")) else connected.system_error("Unexpected user interface error.") return diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm index 95e036fc566..0d968d82729 100644 --- a/code/modules/mining/drilling/scanner.dm +++ b/code/modules/mining/drilling/scanner.dm @@ -40,7 +40,7 @@ if(ore_type) metals[ore_type] += T.resources[metal] - to_chat(user, "\icon[src] [SPAN_NOTICE("The scanner beeps and displays a readout:")]") + to_chat(user, "[icon2html(src, user)] [SPAN_NOTICE("The scanner beeps and displays a readout:")]") for(var/ore_type in metals) var/result = "no sign" diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 4134261ab56..83b9fe9b0ee 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -95,15 +95,15 @@ if(machine.ores_processing[ore]) switch(machine.ores_processing[ore]) if(0) - dat += "not processing" + dat += "not processing" if(1) dat += "smelting" if(2) - dat += "compressing" + dat += "compressing" if(3) dat += "alloying" else - dat += "not processing" + dat += "not processing" dat += ".\[change\] |
" diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 7e98156a6f3..da107f30ddf 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -257,7 +257,7 @@ var/list/mineral_can_smooth_with = list( if(do_after(user,25)) if(!istype(src, /turf/simulated/mineral)) return - to_chat(user, SPAN_NOTICE("\icon[P] \The [src] has been excavated to a depth of [2 * excavation_level]cm.")) + to_chat(user, SPAN_NOTICE("[icon2html(P, user)] \The [src] has been excavated to a depth of [2 * excavation_level]cm.")) return if(istype(W, /obj/item/pickaxe) && W.simulated) // Pickaxe offhand is not simulated. diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 269aec73d82..e36928542a1 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -61,10 +61,10 @@ if(!input) dat += text("input connection status: ") - dat += text("NOT CONNECTED
") + dat += text("NOT CONNECTED
") if(!output) dat += text("
output connection status: ") - dat += text("NOT CONNECTED
") + dat += text("NOT CONNECTED
") dat += text("
Gold inserted: [amt_gold] ") if(chosen == "gold") diff --git a/code/modules/mob/abstract/new_player/login.dm b/code/modules/mob/abstract/new_player/login.dm index 7f75440b574..e68316ac69b 100644 --- a/code/modules/mob/abstract/new_player/login.dm +++ b/code/modules/mob/abstract/new_player/login.dm @@ -19,6 +19,4 @@ sight |= SEE_TURFS player_list |= src - spawn(40) - if(client) - client.playtitlemusic() \ No newline at end of file + client.playtitlemusic() diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm index 6e0d40fb5c7..93a5da830a7 100644 --- a/code/modules/mob/abstract/new_player/new_player.dm +++ b/code/modules/mob/abstract/new_player/new_player.dm @@ -304,12 +304,12 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles. if(emergency_shuttle.going_to_centcom()) //Shuttle is going to centcomm, not recalled - dat += "The station has been evacuated.
" + dat += "The station has been evacuated.
" if(emergency_shuttle.online()) if (emergency_shuttle.evac) // Emergency shuttle is past the point of no recall - dat += "The station is currently undergoing evacuation procedures.
" + dat += "The station is currently undergoing evacuation procedures.
" else // Crew transfer initiated - dat += "The station is currently undergoing crew transfer procedures.
" + dat += "The station is currently undergoing crew transfer procedures.
" var/unique_role_available = FALSE for(var/ghost_role in SSghostroles.spawners) @@ -456,7 +456,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) /mob/abstract/new_player/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "",var/italics = 0, var/mob/speaker = null) return -/mob/abstract/new_player/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0) +/mob/abstract/new_player/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/part_c, var/mob/speaker = null, var/hard_to_hear = 0) return /mob/abstract/new_player/MayRespawn() diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 1f2d5b635b1..bdfc789d98a 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -41,7 +41,7 @@ else message = stars(message) - var/accent_icon = speaker.get_accent_icon(language) + var/accent_icon = speaker.get_accent_icon(language, src) var/speaker_name = speaker.name if(ishuman(speaker)) var/mob/living/carbon/human/H = speaker @@ -87,7 +87,7 @@ if(vr_mob) to_chat(vr_mob, "[time] [message]") -/mob/proc/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="") +/mob/proc/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/part_c, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="") if(!client && !vr_mob) return @@ -197,6 +197,7 @@ formatted = language.format_message_radio(message, verb) else formatted = "[verb], \"[message]\"" + formatted += part_c if(isdeaf(src)) if(prob(20)) to_chat(src, "You feel your headset vibrate but can hear nothing from it!") @@ -209,7 +210,7 @@ /mob/proc/on_hear_radio(part_a, speaker_name, track, part_b, formatted, accent_icon) var/accent_tag if(accent_icon) - accent_tag = "
"
to_chat(src, "[part_a][speaker_name][part_b][formatted]")
if(vr_mob)
to_chat(vr_mob, "[part_a][accent_tag][speaker_name][part_b][formatted]")
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 45058c4a09c..844b1276503 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -365,7 +365,7 @@ var/list/slot_equipment_priority = list( \
var/end_T_descriptor = "tile at [end_T.x], [end_T.y], [end_T.z] in area [get_area(end_T)]"
M.attack_log += text("\[[time_stamp()]\] Has been thrown by [usr.name] ([usr.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
- usr.attack_log += text("\[[time_stamp()]\] Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
+ usr.attack_log += text("\[[time_stamp()]\] Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
msg_admin_attack("[usr.name] ([usr.ckey]) has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor] (JMP)",ckey=key_name(usr),ckey_target=key_name(M))
qdel(G)
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 881ee044acc..e10ad82a21e 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -54,7 +54,7 @@
if(!..(user))
return
- var/msg = "*---------*\nThis is \icon[src] \a [src]!\n[desc]\n"
+ var/msg = "*---------*\nThis is [icon2html(src, user)] \a [src]!\n[desc]\n"
msg += ""
if(brainmob?.key)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 6554778e28c..81de9ccfe1b 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -184,7 +184,7 @@
G.last_action = world.time
flick(G.hud.icon_state, G.hud)
- user.attack_log += "\[[time_stamp()]\] Knifed [name] ([ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])"
+ user.attack_log += "\[[time_stamp()]\] Knifed [name] ([ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])"
src.attack_log += "\[[time_stamp()]\] Got knifed by [user.name] ([user.ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])"
msg_admin_attack("[key_name_admin(user)] knifed [key_name_admin(src)] with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])",ckey=key_name(user),ckey_target=key_name(src) )
return 1
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 25a5e8b8902..2f357333804 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -29,7 +29,7 @@
var/list/msg = list("*---------*\nThis is ")
if(icon)
- msg += "\icon[icon] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated
+ msg += icon2html(icon, user)
msg += "[src.name]"
@@ -49,9 +49,9 @@
tie_msg_warn += "! Attached to it is [lowertext(english_list(U.accessories))]"
if(w_uniform.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] [fluid_color_type_map(w_uniform.blood_color)]-stained [w_uniform.name][tie_msg_warn].\n"
+ msg += "[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 \icon[w_uniform] \a [w_uniform][tie_msg].\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] \a [w_uniform][tie_msg].\n"
//when the player is winded by an admin
if(paralysis > 6000)
@@ -60,9 +60,9 @@
//head
if(head)
if(head.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[head] [head.gender==PLURAL?"some":"a"] [fluid_color_type_map(head.blood_color)]-stained [head.name] on [get_pronoun("his")] head!\n"
+ msg += "[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] on [get_pronoun("his")] head!\n"
else
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[head] \a [head] on [get_pronoun("his")] head.\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] \a [head] on [get_pronoun("his")] head.\n"
//suit/armor
if(wear_suit)
@@ -75,42 +75,42 @@
tie_msg_warn += "! Attached to it is [lowertext(english_list(U.accessories))]"
if(wear_suit.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[wear_suit] [wear_suit.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_suit.blood_color)]-stained [wear_suit.name][tie_msg_warn].\n"
+ msg += "[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 \icon[wear_suit] \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 += "[get_pronoun("He")] [get_pronoun("is")] carrying \icon[s_store] [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 += "[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 \icon[s_store] \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 += "[get_pronoun("He")] [get_pronoun("is")] carrying \icon[s_store] [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 += "[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 \icon[s_store] \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 += "[get_pronoun("He")] [get_pronoun("has")] \icon[back] [fluid_color_type_map(back.blood_color)]-stained [back] on [get_pronoun("his")] back.\n"
+ msg += "[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")] \icon[back] \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 += "[get_pronoun("He")] [get_pronoun("is")] holding \icon[l_hand] [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 += "[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 \icon[l_hand] \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 += "[get_pronoun("He")] [get_pronoun("is")] holding \icon[r_hand] [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 += "[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 \icon[r_hand] \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)
@@ -121,60 +121,60 @@
if(ID)
gloves_name = "[C.name] ([ID.registered_name] ([ID.assignment]))"
if(gloves.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("has")] \icon[gloves] [gloves.gender==PLURAL?"some":"a"] [fluid_color_type_map(gloves.blood_color)]-stained [gloves_name] on [get_pronoun("his")] hands!\n"
+ msg += "[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")] \icon[gloves] \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 += "[get_pronoun("He")] [get_pronoun("has")] [fluid_color_type_map(hand_blood_color)]-stained hands!\n"
//handcuffed?
if(handcuffed)
if(istype(handcuffed, /obj/item/handcuffs/cable))
- msg += "[get_pronoun("He")] [get_pronoun("is")] \icon[handcuffed] restrained with cable!\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] [icon2html(handcuffed, user)] restrained with cable!\n"
else
- msg += "[get_pronoun("He")] [get_pronoun("is")] \icon[handcuffed] handcuffed!\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] [icon2html(handcuffed, user)] handcuffed!\n"
//buckled
if(buckled)
- msg += "[get_pronoun("He")] [get_pronoun("is")] \icon[buckled] buckled to [buckled]!\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] [icon2html(buckled, user)] buckled to [buckled]!\n"
//belt
if(belt)
if(belt.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("has")] \icon[belt] [belt.gender==PLURAL?"some":"a"] [fluid_color_type_map(belt.blood_color)]-stained [belt.name] about [get_pronoun("his")] waist!\n"
+ msg += "[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")] \icon[belt] \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 += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[shoes] [shoes.gender==PLURAL?"some":"a"] [fluid_color_type_map(shoes.blood_color)]-stained [shoes.name] on [get_pronoun("his")] feet!\n"
+ msg += "[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 \icon[shoes] \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 += "[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 += "[get_pronoun("He")] [get_pronoun("has")] \icon[wear_mask] [wear_mask.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_mask.blood_color)]-stained [wear_mask.name] on [get_pronoun("his")] face!\n"
+ msg += "[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] on [get_pronoun("his")] face!\n"
else
- msg += "[get_pronoun("He")] [get_pronoun("has")] \icon[wear_mask] \a [wear_mask] on [get_pronoun("his")] face.\n"
+ msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] \a [wear_mask] on [get_pronoun("his")] face.\n"
//eyes
if(glasses && !skipeyes)
if(glasses.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("has")] \icon[glasses] [glasses.gender==PLURAL?"some":"a"] [fluid_color_type_map(glasses.blood_color)]-stained [glasses] covering [get_pronoun("his")] eyes!\n"
+ msg += "[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")] \icon[glasses] \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")] \icon[l_ear] \a [l_ear] on [get_pronoun("his")] left ear.\n"
+ msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(l_ear, user)] \a [l_ear] on [get_pronoun("his")] left ear.\n"
//right ear
if(r_ear && !skipears)
- msg += "[get_pronoun("He")] [get_pronoun("has")] \icon[r_ear] \a [r_ear] on [get_pronoun("his")] right ear.\n"
+ msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(r_ear, user)] \a [r_ear] on [get_pronoun("his")] right ear.\n"
//ID
if(wear_id)
@@ -184,7 +184,7 @@
var/obj/item/card/id/ID = C.GetID()
if(ID)
id_name = "[C.name] ([ID.registered_name] ([ID.assignment]))"
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing \icon[wear_id] \a [id_name].\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_id, user)] \a [id_name].\n"
//Jitters
if(is_jittery)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 5731d577c2b..60ac3f24989 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -2021,7 +2021,7 @@
randmutg(src) // Applies good mutation
domutcheck(src,null,MUTCHK_FORCED)
-/mob/living/carbon/human/get_accent_icon(var/datum/language/speaking = null)
+/mob/living/carbon/human/get_accent_icon(var/datum/language/speaking, var/mob/hearer, var/force_accent)
var/used_accent = accent //starts with the mob's default accent
if(mind?.changeling)
@@ -2038,7 +2038,7 @@
if(changer && changer.active && changer.current_accent)
used_accent = changer.current_accent
- return ..(speaking, used_accent)
+ return ..(speaking, hearer, used_accent)
/mob/living/carbon/human/proc/generate_valid_accent()
var/list/valid_accents = new()
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 16319810fc5..8e45c536c9d 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -47,7 +47,7 @@
if(G.cell.charge >= 2500)
G.cell.use(G.cell.charge) //So it drains the cell.
visible_message("[src] has been touched with the stun gloves by [M]!")
- M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])")
+ M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] Has been stungloved by [M.name] ([M.ckey])")
msg_admin_attack("[key_name_admin(M)] stungloved [src.name] ([src.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src))
@@ -296,7 +296,7 @@
H.visible_message("[attack_message]")
playsound(loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1)
- H.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [src.name] ([src.ckey])")
+ H.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Was missed by" : "Has blocked") : "Has Been [pick(attack.attack_verb)]"] by [H.name] ([H.ckey])")
msg_admin_attack("[key_name(H)] [miss_type ? (miss_type == 1 ? "has missed" : "was blocked by") : "has [pick(attack.attack_verb)]"] [key_name(src)] (JMP)",ckey=key_name(H),ckey_target=key_name(src))
@@ -368,7 +368,7 @@
if(attacker_style && attacker_style.disarm_act(H, src))
return TRUE
- M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])")
+ M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [M.name] ([M.ckey])")
msg_admin_attack("[key_name(M)] disarmed [src.name] ([src.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src))
@@ -467,7 +467,7 @@
if(!damage)
return
- user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])")
+ user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] was attacked by [user.name] ([user.ckey])")
src.visible_message("[user] has [attack_message] [src]!")
user.do_attack_animation(src)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 4b5d4172579..c9df5c36e57 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -409,7 +409,7 @@ emp_act
var/client/assailant = M.client
if(assailant)
src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])")
- M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]")
+ M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]")
if(!istype(src,/mob/living/simple_animal/rat))
msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src))
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index c625d02508e..19c7ce69de9 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -727,7 +727,7 @@ mob/living/carbon/human/proc/change_monitor()
if (brokesomething)
playsound(get_turf(target), 'sound/weapons/heavysmash.ogg', 100, 1)
- attack_log += "\[[time_stamp()]\]crashed into [brokesomething] objects at ([target.x];[target.y];[target.z]) "
+ attack_log += "\[[time_stamp()]\]crashed into [brokesomething] objects at ([target.x];[target.y];[target.z]) "
msg_admin_attack("[key_name(src)] crashed into [brokesomething] objects at (JMP)" )
if (!done && target.Enter(src, null))
@@ -752,7 +752,7 @@ mob/living/carbon/human/proc/change_monitor()
if (istype(A, /mob/living))
var/mob/living/M = A
- attack_log += "\[[time_stamp()]\] Crashed into [key_name(M)]"
+ attack_log += "\[[time_stamp()]\] Crashed into [key_name(M)]"
M.attack_log += "\[[time_stamp()]\] Was rammed by [key_name(src)]"
msg_admin_attack("[key_name(src)] crashed into [key_name(M)] at (JMP)" )
diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm
index ddd92724851..76094b14c7c 100644
--- a/code/modules/mob/living/carbon/human/stripping.dm
+++ b/code/modules/mob/living/carbon/human/stripping.dm
@@ -61,7 +61,7 @@
if(istype(A, /obj/item/clothing/accessory/badge) || istype(A, /obj/item/clothing/accessory/medal))
user.visible_message("\The [user] tears off \the [A] from [src]'s [suit.name]!")
attack_log += "\[[time_stamp()]\] Has had \the [A] removed by [user.name] ([user.ckey])"
- user.attack_log += "\[[time_stamp()]\] Attempted to remove [name]'s ([ckey]) [A.name]"
+ user.attack_log += "\[[time_stamp()]\] Attempted to remove [name]'s ([ckey]) [A.name]"
suit.remove_accessory(user, A)
return 1
@@ -116,7 +116,7 @@
to_chat(user, "\The [src]'s suit sensor controls are locked.")
return
attack_log += text("\[[time_stamp()]\] Has had their sensors toggled by [user.name] ([user.ckey])")
- user.attack_log += text("\[[time_stamp()]\] Attempted to toggle [name]'s ([ckey]) sensors")
+ user.attack_log += text("\[[time_stamp()]\] Attempted to toggle [name]'s ([ckey]) sensors")
suit.set_sensors(user)
// Remove all splints.
diff --git a/code/modules/mob/living/carbon/slime/say.dm b/code/modules/mob/living/carbon/slime/say.dm
index 509f77e4a4b..f157628f525 100644
--- a/code/modules/mob/living/carbon/slime/say.dm
+++ b/code/modules/mob/living/carbon/slime/say.dm
@@ -31,7 +31,7 @@
speech_buffer.Add(lowertext(html_decode(message)))
return ..()
-/mob/living/carbon/slime/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="")
+/mob/living/carbon/slime/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/part_c, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="")
if(is_friend(speaker))
speech_buffer = list()
speech_buffer.Add(speaker)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index ba95239fc52..7f8c14e7729 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -216,7 +216,7 @@
var/client/assailant = M.client
if(assailant)
src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])")
- M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]")
+ M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]")
if(!istype(src,/mob/living/simple_animal/rat))
msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src))
@@ -278,7 +278,7 @@
return
adjustBruteLoss(damage)
- user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])")
+ user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] was attacked by [user.name] ([user.ckey])")
if (attack_message)
src.visible_message("[user] has [attack_message] [src]!")
diff --git a/code/modules/mob/living/parasite/meme.dm b/code/modules/mob/living/parasite/meme.dm
index 2ea11f5e812..039edc0df1d 100644
--- a/code/modules/mob/living/parasite/meme.dm
+++ b/code/modules/mob/living/parasite/meme.dm
@@ -204,30 +204,7 @@ var/controlling
to_chat(M, "[message]")
to_chat(src, "You said: \"[message]\" to [M]")
return
-/*
- var/list/candidates = indoctrinated.Copy()
- if(!(src.host in candidates))
- candidates.Add(src.host)
- var/mob/target = select_indoctrinated("Thought", "Select a target which will hear your thought.")
-
- if(!target) return
-
- var/speaker = input("Select the voice in which you would like to make yourself heard.", "Voice") as text
- //if(!speaker) return
-
- var/message = input("What would you like to say?", "Message") as text
- if(!message) return
-
- // Use the points at the end rather than the beginning, because the user might cancel
- if(!use_points(150)) return
-
- message = say_quote(message)
- var/rendered = "[speaker] "
- target.show_message(rendered)
-
- to_chat(usr, "You make [target] hear: [rendered]")
-*/
// Mutes the host
/mob/living/parasite/meme/verb/Mute()
set category = "Meme"
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 87f417d45c9..ef8cae1099c 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -249,7 +249,7 @@ proc/get_radio_key_from_channel(var/channel)
message_range = speaking.get_talkinto_msg_range(message)
var/msg
if(!speaking || !(speaking.flags & NO_TALK_MSG))
- msg = "\The [src] talks into \the [used_radios[1]]"
+ msg = "\The [src] talks into \the [used_radios[1]]."
for(var/mob/living/M in hearers(5, src))
if((M != src) && msg)
M.show_message(msg)
diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm
index 4f4dd1f9887..3f61e306c34 100644
--- a/code/modules/mob/living/silicon/robot/analyzer.dm
+++ b/code/modules/mob/living/silicon/robot/analyzer.dm
@@ -44,8 +44,8 @@
to_chat(user, SPAN_NOTICE("Analyzing Results for [M]:"))
to_chat(user, SPAN_NOTICE("Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.getHalLoss()]% functional"]"))
- to_chat(user, "Key: Electronics/Brute")
- to_chat(user, "Damage Specifics: [BU] - [BR]")
+ to_chat(user, "Key: Electronics/Brute")
+ to_chat(user, "Damage Specifics: [BU] - [BR]")
if(M.tod && M.stat == DEAD)
to_chat(user, SPAN_NOTICE("Time of Disable: [M.tod]"))
var/mob/living/silicon/robot/H = M
@@ -55,11 +55,11 @@
for(var/datum/robot_component/org in damaged)
user.show_message(text("\t []: [][] - [] - [] - []", \
capitalize(org.name), \
- (org.installed == -1) ? "DESTROYED " :"",\
+ (org.installed == -1) ? "DESTROYED " :"",\
(org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \
- (org.brute_damage > 0) ? "[org.brute_damage]" :0, \
- (org.toggled) ? "Toggled ON" : "Toggled OFF",\
- (org.powered) ? "Power ON" : "Power OFF"),1)
+ (org.brute_damage > 0) ? "[org.brute_damage]" :0, \
+ (org.toggled) ? "Toggled ON" : "Toggled OFF",\
+ (org.powered) ? "Power ON" : "Power OFF"),1)
else
to_chat(user, SPAN_NOTICE("Components are OK."))
if(H.emagged && prob(5))
@@ -68,7 +68,7 @@
if("prosthetics")
var/mob/living/carbon/human/H = M
to_chat(user, SPAN_NOTICE("Analyzing Results for \the [H]:"))
- to_chat(user, "Key: Electronics/Brute")
+ to_chat(user, "Key: Electronics/Brute")
to_chat(user, SPAN_NOTICE("External prosthetics:"))
var/organ_found
@@ -77,7 +77,7 @@
if(!(E.status & ORGAN_ROBOT))
continue
organ_found = TRUE
- to_chat(user, "[E.name]: [E.brute_dam] [E.burn_dam]")
+ to_chat(user, "[E.name]: [E.brute_dam] [E.burn_dam]")
if(!organ_found)
to_chat(user, SPAN_NOTICE("No prosthetics located."))
to_chat(user, "") @@ -94,7 +94,7 @@ if(!show_tag && istype(O, /obj/item/organ/internal/ipc_tag)) continue organ_found = TRUE - to_chat(user, "[O.name]: [O.damage]") + to_chat(user, "[O.name]: [O.damage]") if(!organ_found) to_chat(user, SPAN_NOTICE("No prosthetics located.")) 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 8c2e1002e98..f052d542cdf 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -32,7 +32,7 @@ continue else if (isNotStationLevel(src.z) && src.z != D.z) //If the console is not on the station, only list drones on the current level continue - dat += "
[D.real_name] ([D.stat == 2 ? "INACTIVE" : "ACTIVE"])" + dat += "
[D.real_name] ([D.stat == 2 ? "INACTIVE" : "ACTIVE"])" dat += "
Cell charge: [D.cell.charge]/[D.cell.maxcharge]." dat += "
Currently located in: [get_area(D)]." dat += "
Resync | Shutdown" @@ -113,4 +113,4 @@ dronefab.produce_drones = !dronefab.produce_drones to_chat(usr, SPAN_NOTICE("You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.")) - src.updateUsrDialog() \ No newline at end of file + src.updateUsrDialog() diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 70404df4487..ba65665237c 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -284,7 +284,7 @@ /mob/living/silicon/robot/proc/describe_module(var/slot) var/list/index_module = list(module_state_1,module_state_2,module_state_3) var/result = " Hardpoint [slot] holds " - result += (index_module[slot]) ? "\icon[index_module[slot]] [index_module[slot]]." : "nothing." + result += (index_module[slot]) ? "[icon2html(index_module[slot], viewers(get_turf(src)))] [index_module[slot]]." : "nothing." result += "\n" return result diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm index f48d08dfc13..6719a427162 100644 --- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm +++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm @@ -27,7 +27,7 @@ return..() M.attack_log += text("\[[time_stamp()]\] Has had their soul captured with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to capture the soul of [M.name] ([M.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to capture the soul of [M.name] ([M.ckey])") msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to capture the soul of [M.name] ([M.ckey]) (JMP)",ckey=key_name(src),ckey_target=key_name(M)) transfer_soul("VICTIM", M, user) diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index 09d5d06a63b..a406032b306 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -222,7 +222,7 @@ if( ishuman(AM) ) if(!stat) var/mob/M = AM - to_chat(M, "\icon[src] Squeek!") + to_chat(M, "[icon2html(src, M)] Squeek!") poke(1) //Wake up if stepped on if (prob(95)) squeak(0) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index ff8540a04f3..ea945dc7144 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -285,7 +285,7 @@ /mob/living/simple_animal/spiderbot/examine(mob/user) ..(user) if(src.held_item) - to_chat(user, "It is carrying \icon[src.held_item] \a [src.held_item].") + to_chat(user, "It is carrying [icon2html(src.held_item, user)] \a [src.held_item].") /mob/living/simple_animal/spiderbot/cannot_use_vents() return diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index efe01611d42..484117b99af 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -95,7 +95,7 @@ //repair a bit of damage if(prob(1)) - src.visible_message(SPAN_ALERT("\The [src] shudders and shakes as some of its damaged systems come back online.")) + src.visible_message(SPAN_WARNING("\The [src] shudders and shakes as some of its damaged systems come back online.")) spark(src, 3, alldirs) health += rand(25,100) @@ -109,7 +109,7 @@ src.visible_message(SPAN_NOTICE("\The [src] retracts several targetting vanes, and dulls its running lights.")) hostile_drone = 0 else - src.visible_message(SPAN_ALERT("\The [src] suddenly lights up, and additional targetting vanes slide into place.")) + src.visible_message(SPAN_WARNING("\The [src] suddenly lights up, and additional targetting vanes slide into place.")) hostile_drone = 1 if(health / maxHealth > 0.9) @@ -138,9 +138,9 @@ if(exploding && prob(20)) if(prob(50)) - src.visible_message(SPAN_ALERT("\The [src] begins to spark and shake violenty!")) + src.visible_message(SPAN_WARNING("\The [src] begins to spark and shake violenty!")) else - src.visible_message(SPAN_ALERT("\The [src] sparks and shakes like it's about to explode!")) + src.visible_message(SPAN_WARNING("\The [src] sparks and shakes like it's about to explode!")) spark(src, 3, alldirs) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 063bfeb3bea..c21ffda5793 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -734,7 +734,7 @@ -/mob/living/simple_animal/parrot/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0) +/mob/living/simple_animal/parrot/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/part_c, var/mob/speaker = null, var/hard_to_hear = 0) if(prob(50)) parrot_hear("[pick(available_channels)] [message]") ..(message,verb,language,part_a,part_b,speaker,hard_to_hear) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 8b1a8a3fecb..f06303a22bf 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -17,10 +17,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("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) + message_admins("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)].",ckey=key_name(src)) else - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) + message_admins("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).",ckey=key_name(src)) /** @@ -89,3 +89,5 @@ // Check code/modules/admin/verbs/antag-ooc.dm for definition client.add_aooc_if_necessary() + + simple_asset_ensure_is_sent(client, /datum/asset/simple/accents) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index e1cdc17474e..bc050800907 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -440,16 +440,9 @@ if (flavor_text && flavor_text != "") var/msg = replacetext(flavor_text, "\n", " ") if(length(msg) <= 40) - return "[msg]" + return "" else - return "[copytext_preserve_html(msg, 1, 37)]... More..." - -/* -/mob/verb/help() - set name = "Help" - src << browse('html/help.html', "window=help") - return -*/ + return " More..." /mob/verb/abandon_mob() set name = "Respawn" @@ -502,6 +495,78 @@ M.mind.reset() return +/client/verb/fix_chat() + set name = "Fix Chat" + set category = "OOC" + if (!chatOutput || !istype(chatOutput)) + var/action = alert(src, "Invalid Chat Output data found!\nRecreate data?", "Wot?", "Recreate Chat Output data", "Cancel") + if (action != "Recreate Chat Output data") + return + chatOutput = new /datum/chatOutput(src) + chatOutput.start() + action = alert(src, "Goon chat reloading, wait a bit and tell me if it's fixed", "", "Fixed", "Nope") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by re-creating the chatOutput datum") + else + chatOutput.load() + action = alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by re-creating the chatOutput datum and forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.\nWe could also disable fancy chat and re-enable oldchat", "", "Thanks anyways", "Switch to old chat") + if (action == "Switch to old chat") + winset(src, "output", "is-visible=true;is-disabled=false") + winset(src, "browseroutput", "is-visible=false") + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window after recreating the chatOutput and forcing a load()") + + else if (chatOutput.loaded) + var/action = alert(src, "ChatOutput seems to be loaded\nDo you want me to force a reload, wiping the chat log or just refresh the chat window because it broke/went away?", "Hmmm", "Force Reload", "Refresh", "Cancel") + switch (action) + if ("Force Reload") + chatOutput.loaded = FALSE + chatOutput.start() //this is likely to fail since it asks , but we should try it anyways so we know. + action = alert(src, "Goon chat reloading, wait a bit and tell me if it's fixed", "", "Fixed", "Nope") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a start()") + else + chatOutput.load() + action = alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.", "", "Thanks anyways",) + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window forcing a start() and forcing a load()") + + if ("Refresh") + chatOutput.showChat() + action = alert(src, "Goon chat refreshing, wait a bit and tell me if it's fixed", "", "Fixed", "Nope, force a reload") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a show()") + else + chatOutput.loaded = FALSE + chatOutput.load() + action = alert(src, "How about now? (give it a moment)", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.", "", "Thanks anyways") + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window forcing a show() and forcing a load()") + return + + else + chatOutput.start() + var/action = alert(src, "Manually loading Chat, wait a bit and tell me if it's fixed", "", "Fixed", "Nope") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by manually calling start()") + else + chatOutput.load() + alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by manually calling start() and forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.", "", "Thanks anyways") + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window after manually calling start() and forcing a load()") + /client/verb/changes() set name = "Changelog" set category = "OOC" @@ -1296,7 +1361,7 @@ return SetWeakened(200) - visible_message("OOC Information: [src] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.", "You have been winded by a member of staff! Please stand by until they contact you!") + visible_message("OOC Information: [src] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.", "You have been winded by a member of staff! Please stand by until they contact you!") log_admin("[key_name(admin)] winded [key_name(src)]!",admin_key=key_name(admin),ckey=key_name(src)) message_admins("[key_name_admin(admin)] winded [key_name_admin(src)]!", 1) @@ -1312,7 +1377,7 @@ return SetWeakened(0) - visible_message("OOC Information: [src] has been unwinded by a member of staff!", "You have been unwinded by a member of staff!") + visible_message("OOC Information: [src] has been unwinded by a member of staff!", "You have been unwinded by a member of staff!") log_admin("[key_name(admin)] unwinded [key_name(src)]!",admin_key=key_name(admin),ckey=key_name(src)) message_admins("[key_name_admin(admin)] unwinded [key_name_admin(src)]!", 1) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index dcd4b42b76a..830da5fa297 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -287,7 +287,7 @@ state = GRAB_NECK icon_state = "grabbed+1" affecting.attack_log += "\[[time_stamp()]\] Has had their neck grabbed by [assailant.name] ([assailant.ckey])" - assailant.attack_log += "\[[time_stamp()]\] Grabbed the neck of [affecting.name] ([affecting.ckey])" + assailant.attack_log += "\[[time_stamp()]\] Grabbed the neck of [affecting.name] ([affecting.ckey])" msg_admin_attack("[key_name_admin(assailant)] grabbed the neck of [key_name_admin(affecting)]",ckey=key_name(assailant),ckey_target=key_name(affecting)) hud.icon_state = "kill" hud.name = "kill" @@ -305,7 +305,7 @@ assailant.visible_message(SPAN_DANGER("[assailant] starts strangling [affecting]!"), SPAN_DANGER("You start strangling [affecting]!")) affecting.attack_log += "\[[time_stamp()]\] is being strangled by [assailant.name] ([assailant.ckey])" - assailant.attack_log += "\[[time_stamp()]\] is strangling [affecting.name] ([affecting.ckey])" + assailant.attack_log += "\[[time_stamp()]\] is strangling [affecting.name] ([affecting.ckey])" msg_admin_attack("[key_name_admin(assailant)] is strangling [key_name_admin(affecting)]",ckey=key_name(assailant),ckey_target=key_name(affecting)) affecting.setClickCooldown(10) diff --git a/code/modules/mob/mob_grab_specials.dm b/code/modules/mob/mob_grab_specials.dm index 0a5a0c7ce44..25bba3d9308 100644 --- a/code/modules/mob/mob_grab_specials.dm +++ b/code/modules/mob/mob_grab_specials.dm @@ -109,7 +109,7 @@ target.visible_message("[target] [target.species.knockout_message]") playsound(attacker.loc, /decl/sound_category/swing_hit_sound, 25, 1, -1) - attacker.attack_log += text("\[[time_stamp()]\] Headbutted [target.name] ([target.ckey])") + attacker.attack_log += text("\[[time_stamp()]\] Headbutted [target.name] ([target.ckey])") target.attack_log += text("\[[time_stamp()]\] Headbutted by [attacker.name] ([attacker.ckey])") msg_admin_attack("[key_name(attacker)] has headbutted [key_name(target)]",ckey=key_name(attacker),ckey_target=key_name(target)) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 31490caad2e..5b36001f5f2 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -494,7 +494,7 @@ proc/is_blind(A) for(var/mob/M in targets) var/turf/targetturf = get_turf(M) if(targetturf && (targetturf.z == sourceturf.z)) - M.show_message("\icon[icon] [message]", 1) + M.show_message("[icon2html(icon, M)] [message]", 1) /proc/mobs_in_area(var/area/A) var/list/mobs = new @@ -546,7 +546,7 @@ proc/is_blind(A) else // Everyone else (dead people who didn't ghost yet, etc.) lname = name lname = "[lname] " - to_chat(M, "[follow] " + create_text_tag("dead", "DEAD:", M.client) + " [lname][message]") + to_chat(M, "[follow] " + create_text_tag("DEAD", M.client) + " [lname][message]") //Announces that a ghost has joined/left, mainly for use with wizards /proc/announce_ghost_joinleave(O, var/joined_ghosts = 1, var/message = "") @@ -1178,10 +1178,10 @@ proc/is_blind(A) /mob/proc/set_intent(var/set_intent) a_intent = set_intent -/mob/proc/get_accent_icon(var/datum/language/speaking = null, var/force_accent) +/mob/proc/get_accent_icon(var/datum/language/speaking, var/mob/hearer, var/force_accent) SHOULD_CALL_PARENT(TRUE) var/used_accent = force_accent ? force_accent : accent if(used_accent && speaking?.allow_accents) var/datum/accent/a = SSrecords.accents[used_accent] var/final_icon = a.tag_icon - return "
"
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 8b201834dce..8d82b1689fd 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -68,7 +68,7 @@
message = process_chat_markup(message, list("~", "_"))
- say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], ", src)
+ say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], ", src)
/mob/proc/say_understands(var/mob/other,var/datum/language/speaking = null)
diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm
index 621c1bdb6e4..e60f94e9c49 100644
--- a/code/modules/modular_computers/computers/modular_computer/interaction.dm
+++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm
@@ -146,7 +146,7 @@
return
enrolled = 0
hard_drive.reset_drive()
- visible_message("\icon[src.icon] [src] pings, \"Enrollment status reset! Have a NanoTrasen day.\"")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] pings, \"Enrollment status reset! Have a NanoTrasen day.\"")
if(istype(W, /obj/item/card/id)) // ID Card, try to insert it.
var/obj/item/card/id/I = W
if(!card_slot)
diff --git a/code/modules/modular_computers/file_system/programs/pai/signaler.dm b/code/modules/modular_computers/file_system/programs/pai/signaler.dm
index f4159b3556b..d98d37e3631 100644
--- a/code/modules/modular_computers/file_system/programs/pai/signaler.dm
+++ b/code/modules/modular_computers/file_system/programs/pai/signaler.dm
@@ -51,7 +51,7 @@
if(href_list["send"])
host.sradio.send_signal("ACTIVATE")
for(var/mob/O in hearers(1, host.loc))
- O.show_message(text("\icon[] *beep* *beep*", host), 3, "*beep* *beep*", 2)
+ O.show_message(text("[icon2html(host, viewers(get_turf(src)))] *beep* *beep*"), 3, "*beep* *beep*", 2)
return 1
else if(href_list["freq"])
diff --git a/code/modules/modular_computers/file_system/programs/system/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/system/ntdownloader.dm
index 1737ac34f4f..a5e3d0a7e7e 100644
--- a/code/modules/modular_computers/file_system/programs/system/ntdownloader.dm
+++ b/code/modules/modular_computers/file_system/programs/system/ntdownloader.dm
@@ -226,7 +226,7 @@
finish_from_queue(active_download)
active_download = null
playsound(get_turf(computer), 'sound/machines/ping.ogg', 40, 0)
- computer.output_message("\icon[computer] [capitalize_first_letters(computer)] pings, \"Software download completed successfully!\"", 1)
+ computer.output_message("[icon2html(computer, viewers(get_turf(computer)))] [capitalize_first_letters(computer)] pings, \"Software download completed successfully!\"", 1)
SSvueui.check_uis_for_change(src)
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
index 808e3e82a8d..0cbd1a1c20a 100644
--- a/code/modules/nano/nanoui.dm
+++ b/code/modules/nano/nanoui.dm
@@ -471,7 +471,7 @@ nanoui is used to open and update nano browser uis
var/list/send_data = get_send_data(data)
//to_chat(user, list2json(data) // used for debugging)
- to_chat(user, output(list2params(list(json_encode(send_data))),"[window_id].browser:receiveUpdateData"))
+ send_output(user, list2params(list(json_encode(send_data))),"[window_id].browser:receiveUpdateData")
/**
* This Topic() proc is called whenever a user clicks on a link within a Nano UI
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index db3d066e045..2882be85ee6 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -367,7 +367,7 @@
if(owner && vital)
if(user)
- user.attack_log += "\[[time_stamp()]\] removed a vital organ ([src]) from [owner.name] ([owner.ckey]) [user ? "(INTENT: [uppertext(user.a_intent)])" : ""]"
+ user.attack_log += "\[[time_stamp()]\] removed a vital organ ([src]) from [owner.name] ([owner.ckey]) [user ? "(INTENT: [uppertext(user.a_intent)])" : ""]"
owner.attack_log += "\[[time_stamp()]\] had a vital organ ([src]) removed by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])"
msg_admin_attack("[user.name] ([user.ckey]) removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(owner))
owner.death()
diff --git a/code/modules/organs/subtypes/vaurca.dm b/code/modules/organs/subtypes/vaurca.dm
index 88ae78d9862..ec52c25e689 100644
--- a/code/modules/organs/subtypes/vaurca.dm
+++ b/code/modules/organs/subtypes/vaurca.dm
@@ -158,13 +158,13 @@ obj/item/organ/vaurca/neuralsocket/process()
var/obj/icon = src
if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
- user.visible_message("[user] has used [W] on \icon[icon] [src]")
+ user.visible_message("[user] has used [W] on [icon2html(icon, viewers(get_turf(user)))] [src].")
var/pressure = air_contents.return_pressure()
manipulated_by = user.real_name //This person is aware of the contents of the tank.
var/total_moles = air_contents.total_moles
- to_chat(user, "Results of analysis of \icon[icon]")
+ to_chat(user, "Results of analysis of [icon2html(icon, user)]")
if (total_moles>0)
to_chat(user, "Pressure: [round(pressure,0.1)] kPa")
for(var/g in air_contents.gas)
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 2569aa590b5..d744ea3d7ba 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -314,4 +314,4 @@ var/list/admin_departments
continue
var/message = "New fax has arrived at [src.department] fax machine."
- pda.new_info(pda.message_silent, pda.ttone, "\icon[pda] [message]")
\ No newline at end of file
+ pda.new_info(pda.message_silent, pda.ttone, "[icon2html(pda, viewers(get_turf(pda)))] [message]")
\ No newline at end of file
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index fa9b544f05f..fa05753fa2c 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -127,7 +127,7 @@
user << browse(dat, "window=[name]")
else if(istype(pages[page], /obj/item/photo))
var/obj/item/photo/P = W
- to_chat(user, browse_rsc(P.img, "tmp_photo.png"))
+ send_rsc(user, P.img, "tmp_photo.png")
user << browse(dat + " Written on the back:[P.scribble]" : null]" + "", "window=[name]") /obj/item/paper_bundle/attack_self(mob/user as mob) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index e6030cf08db..227fc1eb27b 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -121,7 +121,7 @@ Pen exclusive commands to_chat(user, "You stab [M] with \the [src].") // to_chat(M, "\red You feel a tiny prick!" //That's a whole lot of meta!) M.attack_log += text("\[[time_stamp()]\] Has been stabbed with [name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [name] to stab [M.name] ([M.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [name] to stab [M.name] ([M.ckey])") msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) return diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 0b3bcf12c71..cbb9ec6c465 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -59,7 +59,7 @@ var/global/photo_count = 0 to_chat(user, "It is too far away.") /obj/item/photo/proc/show(mob/user as mob) - to_chat(user, browse_rsc(img, "tmp_photo_[id].png")) + send_rsc(user, img, "tmp_photo_[id].png") user << browse("
" + "[scribble ? "Written on the back:
[scribble]" : ""]" + "", "window=book;size=[64*photo_size]x[scribble ? 400 : 64*photo_size]") onclose(user, "[name]") return diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 26d453481e1..a74a1749076 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -238,7 +238,7 @@ proc/cardinalrange(var/center) /obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user) if(I.ismultitool() && isturf(loc)) if(locate(/obj/machinery/am_shielding/) in loc) - to_chat(user, "\icon[src]There is already an antimatter reactor section there.") + to_chat(user, "[icon2html(src, user)]There is already an antimatter reactor section there.") return //Search for shielding first @@ -254,7 +254,7 @@ proc/cardinalrange(var/center) new/obj/machinery/am_shielding(src.loc, AMC) qdel(src) else //Stranded & Alone - to_chat(user, "\icon[src]Couldn't connect to an Antimatter Control Unit.") + to_chat(user, "[icon2html(src, user)]Couldn't connect to an Antimatter Control Unit.") return ..() diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 3ceeb329244..675f58568fa 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -281,7 +281,7 @@ if(href_list["gentoggle"]) breaker = !breaker - investigate_log("was toggled [breaker ? "ON" : "OFF"] by [usr.key].", "gravity") + investigate_log("was toggled [breaker ? "ON" : "OFF"] by [usr.key].", "gravity") set_power() src.updateUsrDialog() else if(href_list["eshutoff"]) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index c821deb483d..4baf609e02e 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -33,7 +33,7 @@ var/global/list/rad_collectors = list() if(P) if(P.air_contents.gas[GAS_PHORON] == 0) - investigate_log("out of fuel.","singulo") + investigate_log("out of fuel.","singulo") eject() else P.air_contents.adjust_gas(GAS_PHORON, -0.001*drainratio) @@ -46,7 +46,7 @@ var/global/list/rad_collectors = list() toggle_power() user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \ "You turn the [src.name] [active? "on":"off"].") - investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas[GAS_PHORON]/0.29)]%":"It is empty"].","singulo") + investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas[GAS_PHORON]/0.29)]%":"It is empty"].","singulo") return else to_chat(user, "The controls are locked!") diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 0a986ec3291..648722a65b3 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -51,7 +51,7 @@ if(special_emitter) message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) log_game("Emitter deleted at ([x],[y],[z])") - investigate_log("deleted at ([x],[y],[z])","singulo") + investigate_log("deleted at ([x],[y],[z])","singulo") QDEL_NULL(wifi_receiver) QDEL_NULL(spark_system) QDEL_NULL(signaler) @@ -89,7 +89,7 @@ if(special_emitter) 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])",ckey=key_name(user)) - investigate_log("turned off by [user.key]","singulo") + investigate_log("turned off by [user.key]","singulo") else active = TRUE shot_number = 0 @@ -134,7 +134,7 @@ powered = FALSE update_icon() if(special_emitter) - investigate_log("lost power and turned off","singulo") + investigate_log("lost power and turned off","singulo") return last_shot = world.time @@ -269,4 +269,4 @@ if(!locked) activate(null) else - visible_message("\icon[src] [src] whines, \"Access denied!\"") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] whines, \"Access denied!\"") \ No newline at end of file diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index ccee0921984..03e68453556 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -199,7 +199,7 @@ field_generator power level display else visible_message(SPAN_ALERT("\The [src] shuts down!")) turn_off() - investigate_log("ran out of power and deactivated","singulo") + investigate_log("ran out of power and deactivated","singulo") src.power = 0 return 0 @@ -317,5 +317,5 @@ field_generator power level display if((world.time - O.last_warning) > 50) //to stop message-spam temp = 0 message_admins("A singulo exists and a containment field has failed.",1) - investigate_log("has failed whilst a singulo exists.","singulo") + investigate_log("has failed whilst a singulo exists.","singulo") O.last_warning = world.time diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index feb073d61c0..3d581bb3f12 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -110,7 +110,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin ..() if(master && master.active) master.toggle_power() - investigate_log("was moved whilst active; it powered down.","singulo") + investigate_log("was moved whilst active; it powered down.","singulo") /obj/structure/particle_accelerator/ex_act(severity) switch(severity) diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 567cfca0ac2..e6b1b47ce05 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -124,7 +124,7 @@ else 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])",ckey=key_name(usr)) - investigate_log("increased to [strength] by [usr.key]","singulo") + investigate_log("increased to [strength] by [usr.key]","singulo") strength_change() /obj/machinery/particle_accelerator/control_box/proc/remove_strength(var/s) @@ -152,7 +152,7 @@ if(src.active) //a part is missing! if(length(connected_parts) < 6) - investigate_log("lost a connected part; It powered down.","singulo") + investigate_log("lost a connected part; It powered down.","singulo") src.toggle_power() return //emit some particles @@ -213,7 +213,7 @@ /obj/machinery/particle_accelerator/control_box/proc/toggle_power(mob/user) src.active = !src.active - investigate_log("turned [active?"ON":"OFF"] by [user ? user.key : "outside forces"]","singulo") + investigate_log("turned [active?"ON":"OFF"] by [user ? user.key : "outside forces"]","singulo") message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user, TRUE, highlight_special = TRUE)] in ([x],[y],[z] - JMP)",0,1) log_game("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user)] in ([x],[y],[z])",ckey=key_name(user)) if(src.active) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 72d4eaab405..c4408b161df 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -112,7 +112,7 @@ log_and_message_admins("A singulo has been created without containment fields active.", location = get_turf(src)) - investigate_log("was created.[count ? "" : " No containment fields were active."]. usr=[usr ? key_name(usr) : "null"]", I_SINGULO) + investigate_log("was created.[count ? "" : " No containment fields were active."]. usr=[usr ? key_name(usr) : "null"]", I_SINGULO) /obj/singularity/proc/dissipate() if (!dissipate) @@ -248,7 +248,7 @@ visible_message("You witness the creation of a destructive force that cannot possibly be stopped by human hands.") if (current_size == allowed_size) - investigate_log("grew to size [current_size].", I_SINGULO) + investigate_log("grew to size [current_size].", I_SINGULO) return 1 else if (current_size < (--temp_allowed_size) && current_size != STAGE_SUPER) expand(temp_allowed_size) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index f2059675168..f7a8ef9c7de 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -429,7 +429,7 @@ output_level = input(usr, "Enter new output level (0-[output_level_max])", "SMES Output Power Control", output_level) as num output_level = max(0, min(output_level_max, output_level)) // clamp to range - investigate_log("input/output; on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [usr.key]","singulo") + investigate_log("input/output; on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [usr.key]","singulo") return 1 diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index 6eba0c75d33..66511d394c2 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -142,7 +142,7 @@ if (check_beaker_mixing(B)) dat += text("Mixing ") else - dat += text("Not mixing ") + dat += text("Not mixing ") else dat += "nothing." dat += " \[Eject\]
" @@ -154,7 +154,7 @@ if(ammo_magazine.stored_ammo && ammo_magazine.stored_ammo.len) dat += "The dart cartridge has [ammo_magazine.stored_ammo.len] shots remaining." else - dat += "The dart cartridge is empty!" + dat += "The dart cartridge is empty!" dat += " \[Eject\]" user << browse(dat, "window=dartgun") diff --git a/code/modules/psionics/events/mini_spasm.dm b/code/modules/psionics/events/mini_spasm.dm index 55ecc9f33af..6792a1e82cc 100644 --- a/code/modules/psionics/events/mini_spasm.dm +++ b/code/modules/psionics/events/mini_spasm.dm @@ -41,12 +41,12 @@ return if(victim.psi) - to_chat(victim, SPAN_DANGER("A hauntingly familiar sound hisses from \icon[source] \the [source], and your vision flickers!")) + to_chat(victim, SPAN_DANGER("A hauntingly familiar sound hisses from [icon2html(source, victim)] \the [source], and your vision flickers!")) victim.psi.backblast(rand(5,15)) victim.Paralyse(5) victim.make_jittery(100) else - to_chat(victim, SPAN_DANGER("An indescribable, brain-tearing sound hisses from \icon[source] \the [source], and you collapse in a seizure!")) + to_chat(victim, SPAN_DANGER("An indescribable, brain-tearing sound hisses from [icon2html(source, victim)] \the [source], and you collapse in a seizure!")) victim.seizure() var/new_latencies = rand(2,4) var/list/faculties = list(PSI_COERCION, PSI_REDACTION, PSI_ENERGISTICS, PSI_PSYCHOKINESIS) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index ced1e279e2a..9e795b5e836 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -548,7 +548,7 @@ target.apply_damage(25, PAIN) target.say("*scream") - user.attack_log += text("\[[time_stamp()]\] Has fed [target.name]'s ([target.ckey]) hair into a [src].") + user.attack_log += text("\[[time_stamp()]\] Has fed [target.name]'s ([target.ckey]) hair into a [src].") target.attack_log += text("\[[time_stamp()]\] Has had their hair fed into [src] by [user.name] ([user.ckey])") msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(target)] in a [src]. (JMP)",ckey=key_name(user),ckey_target=key_name(target)) else diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 9fcd3371c14..78b09f19551 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -128,7 +128,7 @@ if(mix_message) var/list/seen = viewers(4, T) for(var/mob/M in seen) - M.show_message("\icon[container] [mix_message]", 1) + M.show_message("[icon2html(container, viewers(get_turf(src)))] [mix_message]", 1) if(reaction_sound) playsound(T, reaction_sound, 80, 1) @@ -1230,7 +1230,7 @@ var/obj/item/slime_extract/T = holder.my_atom T.uses-- if(T.uses <= 0) - T.visible_message("\icon[T]\The [T]'s power is consumed in the reaction.") + T.visible_message("[icon2html(T, viewers(get_turf(src)))]\The [T]'s power is consumed in the reaction.") T.name = "used slime extract" T.desc = "This extract has been used up." @@ -1575,7 +1575,7 @@ ..() for(var/mob/living/carbon/slime/slime in viewers(get_turf(holder.my_atom), null)) slime.rabid = TRUE - slime.visible_message(SPAN_WARNING("\icon[slime] \The [slime] is driven into a frenzy!")) + slime.visible_message(SPAN_WARNING("[icon2html(slime, viewers(get_turf(slime)))] \The [slime] is driven into a frenzy!")) //Pink /datum/chemical_reaction/slime/ppotion diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index a26fe73bce0..17dc4e326cd 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -165,7 +165,7 @@ var/temperature = reagents.get_temperature() var/temperature_text = "Temperature: ([temperature]K/[temperature]C)" target.attack_log += text("\[[time_stamp()]\] Has been splashed with [name] by [user.name] ([user.ckey]). Reagents: [contained] [temperature_text].") - user.attack_log += text("\[[time_stamp()]\] Used the [name] to splash [target.name] ([target.key]). Reagents: [contained] [temperature_text].") + user.attack_log += text("\[[time_stamp()]\] Used the [name] to splash [target.name] ([target.key]). Reagents: [contained] [temperature_text].") msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) user.visible_message("\The [target] has been splashed with something by \the [user]!", "You splash the solution onto \the [target].") @@ -252,7 +252,7 @@ var/contained = reagentlist() target.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [user.name] ([user.ckey]). Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Fed [name] by [target.name] ([target.ckey]). Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Fed [name] by [target.name] ([target.ckey]). Reagents: [contained]") msg_admin_attack("[key_name(user)] fed [key_name(target)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_INGEST) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index bc1cd9d67e6..440079499af 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -66,7 +66,7 @@ var/mob/living/M = target var/contained = reagentlist() M.attack_log += text("\[[time_stamp()]\] Has been squirted with [name] by [user.name] ([user.ckey]). Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]") msg_admin_attack("[key_name_admin(user)] squirted [key_name_admin(M)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) return diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 03c13ad0f26..f1c2ab6d008 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -122,7 +122,7 @@ var/contained = reagentlist() target.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(target)] Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(target)] Reagents: [contained]") msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(target)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) reagents.trans_to_mob(target, min(reagents.total_volume,bitesize), CHEM_INGEST) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 615021f8e06..066689140d5 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -50,7 +50,7 @@ var/contained = reagentlist() M.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]") - user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(M)] Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(M)] Reagents: [contained]") msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(M)) if(reagents.total_volume) @@ -69,7 +69,7 @@ return to_chat(user, SPAN_NOTICE("You dissolve \the [src] in [target].")) - user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagentlist()]") + user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagentlist()]") msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) reagents.trans_to(target, reagents.total_volume) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 1f660f32324..094fd6d4e0f 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -344,7 +344,7 @@ user.remove_from_mob(src) qdel(src) - user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM)." + user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM)." target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: HARM)." msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (JMP)",ckey=key_name(user),ckey_target=key_name(src)) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 3f6f236468e..02368dcd39b 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -338,7 +338,7 @@ found = 1 break if(!found) - to_chat(user, "\icon[src]The conveyor switch did not detect any linked conveyor belts in range.") + to_chat(user, "[icon2html(src, user)]The conveyor switch did not detect any linked conveyor belts in range.") return var/obj/machinery/conveyor_switch/NC = new/obj/machinery/conveyor_switch(A, id) transfer_fingerprints_to(NC) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 3a808ead0e6..11425fc3be3 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -195,7 +195,7 @@ for (var/mob/C in viewers(src)) C.show_message("[GM.name] has been placed in the [src] by [user].", 3) qdel(G) - usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals.") + usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals.") GM.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [usr.name] ([usr.ckey])") msg_admin_attack("[key_name_admin(usr)] placed [key_name_admin(GM)] in a disposals unit. (JMP)",ckey=key_name(usr),ckey_target=key_name(GM)) return @@ -247,7 +247,7 @@ msg = "[user.name] stuffs [target.name] into the [src]!" to_chat(user, "You stuff [target.name] into the [src]!") - user.attack_log += text("\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals.") + user.attack_log += text("\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals.") target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])") msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (JMP)",ckey=key_name(user),ckey_target=key_name(target)) else diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 805e06b5425..c8aa1aa545f 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -52,7 +52,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). update_icon() else if(busy) - visible_message("\icon [src] flashes: insufficient materials: [getLackingMaterials(D)].") + visible_message("[icon2html(src, viewers(get_turf(src)))] flashes: insufficient materials: [getLackingMaterials(D)].") busy = 0 update_icon() diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 94a76b024f0..a66130e2d8b 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -125,12 +125,12 @@ var/global/list/obj/machinery/message_server/message_servers = list() if(2) if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) - Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5) - Console.message_log += "High Priority message from [sender]
[authmsg]" + 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]" else if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) - Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'Message from [sender]'"),,4) + 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.set_light(2) diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 6f525da3bea..87388d74cd9 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -46,7 +46,7 @@ update_icon() else if(busy) - visible_message("\icon [src] flashes: insufficient materials: [getLackingMaterials(D)].") + visible_message("[icon2html(src, viewers(get_turf(src)))] [src] flashes: insufficient materials: [getLackingMaterials(D)].") busy = 0 update_icon() diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm index bb4ec60912b..fd6e67b93bc 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm @@ -63,7 +63,7 @@ var/obj/item/device/measuring_tape/P = W user.visible_message("[user] extends [P] towards [src].","You extend [P] towards [src].") if(do_after(user,40)) - to_chat(user, "\icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm.") + to_chat(user, "[icon2html(P, user)] [src] has been excavated to a depth of [2*src.excavation_level]cm.") return if (istype(W, /obj/item/pickaxe)) @@ -85,7 +85,7 @@ if(excavation_level > 100) //failure - user.visible_message("[src] suddenly crumbles away.",\ + user.visible_message("[src] suddenly crumbles away.",\ "[src] has disintegrated under your onslaught, any secrets it was holding are long gone.") qdel(src) return @@ -99,9 +99,9 @@ var/obj/machinery/artifact/X = O if(X.my_effect) X.my_effect.artifact_id = artifact_find.artifact_id - src.visible_message("[src] suddenly crumbles away.") + src.visible_message("[src] suddenly crumbles away.") else - user.visible_message("[src] suddenly crumbles away.",\ + user.visible_message("[src] suddenly crumbles away.",\ "[src] has been whittled away under your careful excavation, but there was nothing of interest inside.") qdel(src) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm b/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm index 98e7a782c72..592a9cf37a4 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm @@ -48,17 +48,17 @@ if(!previous_power_state) previous_power_state = 1 icon_state = "cellold1" - src.visible_message("\icon[src] [src] suddenly comes to life!") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] suddenly comes to life!") //slowly grow a mob if(prob(5)) - src.visible_message("\icon[src] [src] [pick("gloops","glugs","whirrs","whooshes","hisses","purrs","hums","gushes")].") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] [pick("gloops","glugs","whirrs","whooshes","hisses","purrs","hums","gushes")].") //if we've finished growing... if(time_spent_spawning >= time_per_spawn) time_spent_spawning = 0 use_power = 1 - src.visible_message("\icon[src] [src] pings!") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] pings!") icon_state = "cellold1" desc = "It's full of a bubbling viscous liquid, and is lit by a mysterious glow." if(spawn_type) @@ -79,7 +79,7 @@ if(previous_power_state) previous_power_state = 0 icon_state = "cellold0" - src.visible_message("\icon[src] [src] suddenly shuts down.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] suddenly shuts down.") //cloned mob slowly breaks down time_spent_spawning = max(time_spent_spawning + last_process - world.time, 0) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm index 55ce17c18a0..4ab315665a3 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm @@ -77,7 +77,7 @@ viables.Remove(type) construction[button_desc] = type - fail_message = "\icon[src] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \ + fail_message = "[icon2html(src, viewers(get_turf(src)))] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \ [pick("horn","beep","bing","bleep","blat","honk","hrumph","ding")] sounds and a \ [pick("yellow","purple","green","blue","red","orange","white")] \ [pick("light","dial","meter","window","protrusion","knob","antenna","swirly thing")] \ @@ -89,7 +89,7 @@ if(spawning_types.len && powered()) spawn_progress_time += world.time - last_process_time if(spawn_progress_time > max_spawn_time) - src.visible_message("\icon[src] [src] pings!") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] pings!") var/obj/source_material = pop(stored_materials) var/spawn_type = pop(spawning_types) @@ -112,7 +112,7 @@ icon_state = "borgcharger0(old)" else if(prob(5)) - src.visible_message("\icon[src] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].") last_process_time = world.time @@ -139,9 +139,9 @@ if(index > 0 && index <= construction.len) if(stored_materials.len > spawning_types.len) if(spawning_types.len) - src.visible_message("\icon[src] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].") else - src.visible_message("\icon[src] [src]'s front compartment slides shut.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src]'s front compartment slides shut.") spawning_types.Add(construction[construction[index]]) spawn_progress_time = 0 diff --git a/code/modules/research/xenoarchaeology/artifact/effect.dm b/code/modules/research/xenoarchaeology/artifact/effect.dm index e424ac65f39..c110db57d10 100644 --- a/code/modules/research/xenoarchaeology/artifact/effect.dm +++ b/code/modules/research/xenoarchaeology/artifact/effect.dm @@ -64,7 +64,7 @@ var/atom/toplevelholder = holder while(!istype(toplevelholder.loc, /turf)) toplevelholder = toplevelholder.loc - toplevelholder.visible_message("\icon[toplevelholder] [toplevelholder] [display_msg]") + toplevelholder.visible_message("[icon2html(toplevelholder, viewers(get_turf(toplevelholder)))] [toplevelholder] [display_msg]") /datum/artifact_effect/proc/DoEffectTouch(var/mob/user) /datum/artifact_effect/proc/DoEffectAura(var/atom/holder) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm index 16b25269cad..05c23baeee2 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm @@ -34,7 +34,7 @@ if(prob(75)) to_chat(H, "[pick(drastic_messages)]") else - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") if(prob(50)) H.dizziness += rand(3,5) @@ -45,7 +45,7 @@ for (var/mob/living/carbon/human/H in range(src.effectrange,T)) if(prob(5)) if(prob(75)) - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") else to_chat(H, "[pick(drastic_messages)]") @@ -61,7 +61,7 @@ if(prob(95)) to_chat(H, "[pick(drastic_messages)]") else - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") if(prob(50)) H.dizziness += rand(3,5) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm index 3eafeaf9180..a771dc0ff2b 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm @@ -32,7 +32,7 @@ if(prob(75)) to_chat(H, "[pick(drastic_messages)]") else - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") if(prob(50)) H.dizziness += rand(3,5) @@ -43,7 +43,7 @@ for (var/mob/living/carbon/human/H in range(src.effectrange,T)) if(prob(5)) if(prob(75)) - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") else to_chat(H, "[pick(drastic_messages)]") @@ -59,7 +59,7 @@ if(prob(95)) to_chat(H, "[pick(drastic_messages)]") else - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") if(prob(50)) H.dizziness += rand(3,5) diff --git a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm index ea6a8ab662e..cc548b8e00e 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm @@ -80,7 +80,7 @@ ..() else if(istype(W,/obj/item/pen)) plaque_contents = sanitize(input("What would you like to write on the plaque:","Skeleton plaque","")) - user.visible_message("[user] writes something on the base of [src].","You relabel the plaque on the base of \icon[src] [src].") + user.visible_message("[user] writes something on the base of [src].","You relabel the plaque on the base of [icon2html(src, user)] [src].") if(src.contents.Find(/obj/item/fossil/skull/horned)) src.desc = "A creature made of [src.contents.len-1] assorted bones and a horned skull. The plaque reads \'[plaque_contents]\'." else diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm index 328f72d8c65..066249f3677 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_special.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm @@ -115,7 +115,7 @@ if(charges >= 0.1) if(prob(5)) - src.visible_message("\icon[src] [src]'s eyes glow ruby red for a moment!") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src]'s eyes glow ruby red for a moment!") charges -= 0.1 //check on our shadow wights diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm index 3a5df576b4e..827d13fc6f0 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm @@ -60,7 +60,7 @@ var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\ "[holder_atom] seems to be focusing on [source]...",\ "[holder_atom] seems to turn it's attention to [source]...") - holder_atom.loc.visible_message("\icon[holder_atom] [pick(options)]") + holder_atom.loc.visible_message("[icon2html(holder_atom, viewers(get_turf(holder_atom)))] [pick(options)]") if(prob(20)) spawn(2) @@ -116,5 +116,5 @@ listening|=M for(var/mob/M in listening) - to_chat(M, "\icon[holder_atom] [holder_atom] reverberates, \"[msg]\"") + to_chat(M, "[icon2html(holder_atom, M)] [holder_atom] reverberates, \"[msg]\"") last_talk_time = world.time diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm index ef5840fcd6f..0789a2d12af 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm @@ -80,7 +80,7 @@ var/pname = "[src] report #[++report_num]" var/info = "[src] analysis report #[report_num]
" info += "
" - info += "\icon[scanned_object] [results]" + info += "[icon2html(scanned_object, viewers(get_turf(src)))] [results]" P.stamped = list(/obj/item/stamp) P.overlays = list("paper_stamped") P.set_content_unsafe(pname, info) diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index 774cf12054c..926312784e7 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -235,16 +235,16 @@ //emergency stop if seal integrity reaches 0 if(scanner_seal_integrity <= 0 || (scanner_temperature >= 1273 && !rad_shield)) stop_scanning() - visible_message("\icon[src] buzzes unhappily. It has failed mid-scan!", range = 2) + visible_message("[icon2html(src, viewers(get_turf(src)))] buzzes unhappily. It has failed mid-scan!", range = 2) if(prob(5)) - visible_message("\icon[src] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", range = 2) + visible_message("[icon2html(src, viewers(get_turf(src)))] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", range = 2) else //gradually cool down over time if(scanner_temperature > 0) scanner_temperature = max(scanner_temperature - 5 - 10 * rand(), 0) if(prob(0.75)) - visible_message("\icon[src] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", range = 2) + visible_message("[icon2html(src, viewers(get_turf(src)))] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", range = 2) last_process_worldtime = world.time /obj/machinery/radiocarbon_spectrometer/proc/stop_scanning() @@ -262,7 +262,7 @@ used_coolant = 0 /obj/machinery/radiocarbon_spectrometer/proc/complete_scan() - visible_message("\icon[src] makes an insistent chime.", range = 2) + visible_message("[icon2html(src, viewers(get_turf(src)))] makes an insistent chime.", range = 2) if(scanned_item) //create report diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm index d03c0ff31e3..157c5ef50d5 100644 --- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm +++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm @@ -103,9 +103,9 @@ if(interval > 0) //apply the touch effect to the holder if(holder) - to_chat(holder, "the \icon[src] [src] held by [holder] shudders in your grasp.") + to_chat(holder, "[icon2html(src, viewers(get_turf(src)))] [src] held by [holder] shudders in your grasp.") else - src.loc.visible_message("the \icon[src] [src] shudders.") + src.loc.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] shudders.") inserted_battery.battery_effect.DoEffectTouch(holder) //consume power @@ -131,13 +131,13 @@ //work out if we need to shutdown if(inserted_battery.stored_charge <= 0) - src.loc.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.") + src.loc.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] buzzes.", "You hear something buzz.") shutdown_emission() else if(world.time > time_end) - src.loc.visible_message("\icon[src] [src] chimes.", "\icon[src] You hear something chime.") + src.loc.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] chimes.", "You hear something chime.") shutdown_emission() else - src.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] buzzes.", "You hear something buzz.") shutdown_emission() last_process = world.time @@ -164,7 +164,7 @@ if(href_list["startup"]) if(inserted_battery && inserted_battery.battery_effect && (inserted_battery.stored_charge > 0) ) activated = 1 - src.visible_message("\icon[src] [src] whirrs.", "\icon[src]You hear something whirr.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] whirrs.", "You hear something whirr.") if(!inserted_battery.battery_effect.activated) inserted_battery.battery_effect.ToggleActivate(1) time_end = world.time + duration @@ -210,6 +210,6 @@ M.lastattacker = user if(inserted_battery.battery_effect) - user.attack_log += "\[[time_stamp()]\] Tapped [M.name] ([M.ckey]) with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" + user.attack_log += "\[[time_stamp()]\] Tapped [M.name] ([M.ckey]) with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" M.attack_log += "\[[time_stamp()]\] Tapped by [user.name] ([user.ckey]) with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" msg_admin_attack("[key_name_admin(user)] tapped [key_name_admin(M)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype]) (JMP)",ckey=key_name(user),ckey_target=key_name(M) ) diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index cd8b01b5cdd..b2965596bbc 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -101,7 +101,7 @@ dat += "
" dat += "
" dat += "
" - dat += "Always wear safety gear and consult a field manual before operation.
" + dat += "Always wear safety gear and consult a field manual before operation.
" if(!locked) dat += "Lock console
" else @@ -248,7 +248,7 @@ success = 1 for(var/mob/living/carbon/C in T) C.weakened += 5 - C.visible_message("\icon[C] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.") + C.visible_message("[icon2html(C, viewers(get_turf(C)))] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.") if("nitrogen") success = 1 // @@ -271,19 +271,19 @@ success = 1 for(var/mob/living/silicon/R in T) R.weakened += 5 - R.visible_message("\icon[R] [R] begins to float in the air!","You feel tingly and light, but it is difficult to move.") + R.visible_message("[icon2html(R, viewers(get_turf(R)))] [R] begins to float in the air!","You feel tingly and light, but it is difficult to move.") // //in case we have a bad field type if(!success) return for(var/mob/living/simple_animal/C in T) - C.visible_message("\icon[C] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.") + C.visible_message("[icon2html(C, viewers(get_turf(C)))] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.") C.weakened += 5 suspension_field = new(T) suspension_field.field_type = field_type - src.visible_message("\icon[src] [src] activates with a low hum.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] activates with a low hum.") icon_state = "suspension3" for(var/obj/item/I in T) @@ -293,7 +293,7 @@ if(collected) suspension_field.icon_state = "energynet" suspension_field.add_overlay("shield2") - src.visible_message("\icon[suspension_field] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].") + src.visible_message("[icon2html(suspension_field, viewers(get_turf(suspension_field)))] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].") else if(istype(T,/turf/simulated/mineral) || istype(T,/turf/simulated/wall)) suspension_field.icon_state = "shieldsparkles" @@ -308,7 +308,7 @@ to_chat(M, "You no longer feel like floating.") M.weakened = min(M.weakened, 3) - src.visible_message("\icon[src] [src] deactivates with a gentle shudder.") + src.visible_message("[icon2html(src, viewers(get_turf(src)))] [src] deactivates with a gentle shudder.") qdel(suspension_field) suspension_field = null icon_state = "suspension2" diff --git a/code/modules/research/xenoarchaeology/tools/tools.dm b/code/modules/research/xenoarchaeology/tools/tools.dm index 9d4f482e577..fcf72400917 100644 --- a/code/modules/research/xenoarchaeology/tools/tools.dm +++ b/code/modules/research/xenoarchaeology/tools/tools.dm @@ -12,7 +12,7 @@ /obj/item/device/gps/attack_self(var/mob/user as mob) var/turf/T = get_turf(src) - to_chat(user, "\icon[src] [src] flashes [T.x].[rand(0,9)]:[T.y].[rand(0,9)]:[T.z].[rand(0,9)].") + to_chat(user, "[icon2html(src, user)] [src] flashes [T.x].[rand(0,9)]:[T.y].[rand(0,9)]:[T.z].[rand(0,9)].") /obj/item/device/measuring_tape name = "measuring tape" diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 309056a1b0f..9b3f06e7b3a 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -45,7 +45,7 @@ positive_locations.Add(D) for(var/mob/L in range(src, 1)) - to_chat(L, "\icon[src] [src] pings.") + to_chat(L, "[icon2html(src, L)] [src] pings.") else if(istype(A,/obj/structure/boulder)) var/obj/structure/boulder/B = A @@ -64,7 +64,7 @@ positive_locations.Add(D) for(var/mob/L in range(src, 1)) - to_chat(L, "\icon[src] [src] pings [pick("madly","wildly","excitedly","crazily")]!") + to_chat(L, "[icon2html(src, L)] [src] pings [pick("madly","wildly","excitedly","crazily")]!") /obj/item/device/depth_scanner/attack_self(var/mob/user as mob) return src.interact(user) diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm index 49a14ad13a8..8741691853f 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm @@ -52,9 +52,9 @@ scan_ticks = 0 var/turf/T = get_turf(src) if(target_radio) - T.visible_message("\icon[src] [src] [pick("chirps","chirrups","cheeps")] happily.") + T.visible_message("[icon2html(src, viewers(get_turf(T)))] [src] [pick("chirps","chirrups","cheeps")] happily.") else - T.visible_message("\icon[src] [src] [pick("chirps","chirrups","cheeps")] sadly.") + T.visible_message("[icon2html(src, viewers(get_turf(T)))] [src] [pick("chirps","chirrups","cheeps")] sadly.") else icon_state = "pinoff" diff --git a/code/modules/scripting/IDE.dm b/code/modules/scripting/IDE.dm index 2f80402d562..bafe624d111 100644 --- a/code/modules/scripting/IDE.dm +++ b/code/modules/scripting/IDE.dm @@ -13,16 +13,16 @@ client/verb/tcssave() log_misc(msg) message_admins("[mob.name] has uploaded a NTLS script to [Machine.SelectedServer] ([mob.x],[mob.y],[mob.z] - JMP)",0,1) Server.setcode( tcscode ) // this actually saves the code from input to the server - to_chat(src, output(null, "tcserror")) // clear the errors) + send_output(src, null, "tcserror") // clear the errors) else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to save: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to save: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to save: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to save: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to save: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to save: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") client/verb/tcscompile() @@ -39,42 +39,42 @@ client/verb/tcscompile() var/list/compileerrors = Server.compile() // then compile the code! // Output all the compile-time errors - to_chat(src, output(null, "tcserror")) + send_output(src, null, "tcserror") if(compileerrors.len) - to_chat(src, output("Compile Errors", "tcserror")) + to_chat(src, "Compile Errors", "tcserror") for(var/scriptError/e in compileerrors) - to_chat(src, output("\t>[e.message]", "tcserror")) - to_chat(src, output("([compileerrors.len] errors)", "tcserror")) + send_output(src, "\t>[e.message]", "tcserror") + send_output(src, "([compileerrors.len] errors)", "tcserror") // Output compile errors to all other people viewing the code too for(var/mob/M in Machine.viewingcode) if(M.client) - to_chat(M, output(null, "tcserror")) - to_chat(M, output("Compile Errors", "tcserror")) + send_output(M, null, "tcserror") + send_output(M, "Compile Errors", "tcserror") for(var/scriptError/e in compileerrors) - to_chat(M, output("\t>[e.message]", "tcserror")) - to_chat(M, output("([compileerrors.len] errors)", "tcserror")) + send_output(M, "\t>[e.message]", "tcserror") + send_output(M, "([compileerrors.len] errors)", "tcserror") else - to_chat(src, output("TCS compilation successful!", "tcserror")) - to_chat(src, output("(0 errors)", "tcserror")) + send_output(src, "TCS compilation successful!", "tcserror") + send_output(src, "(0 errors)", "tcserror") for(var/mob/M in Machine.viewingcode) if(M.client) - to_chat(M, output("TCS compilation successful!", "tcserror")) - to_chat(M, output("(0 errors)", "tcserror")) + send_output(M, "TCS compilation successful!", "tcserror") + send_output(M, "(0 errors)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to compile: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to compile: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to compile: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to compile: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to compile: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to compile: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") client/verb/tcsrun() set hidden = 1 @@ -90,32 +90,31 @@ client/verb/tcsrun() var/list/compileerrors = Server.compile() // then compile the code! // Output all the compile-time errors - to_chat(src, output(null, "tcserror")) + send_output(src, null, "tcserror") if(compileerrors.len) - to_chat(src, output("Compile Errors", "tcserror")) + send_output(src, "Compile Errors", "tcserror") for(var/scriptError/e in compileerrors) - to_chat(src, output("\t>[e.message]", "tcserror")) - to_chat(src, output("([compileerrors.len] errors)", "tcserror")) + send_output(src, "\t>[e.message]", "tcserror") + send_output(src, "([compileerrors.len] errors)", "tcserror") // Output compile errors to all other people viewing the code too for(var/mob/M in Machine.viewingcode) if(M.client) - to_chat(M, output(null, "tcserror")) - to_chat(M, output("Compile Errors", "tcserror")) + send_output(M, null, "tcserror") + send_output(M, "Compile Errors", "tcserror") for(var/scriptError/e in compileerrors) - to_chat(M, output("\t>[e.message]", "tcserror")) - to_chat(M, output("([compileerrors.len] errors)", "tcserror")) - + send_output(M, "\t>[e.message]", "tcserror") + send_output(M, "([compileerrors.len] errors)", "tcserror") else // Finally, we run the code! - to_chat(src, output("TCS compilation successful! Code executed.", "tcserror")) - to_chat(src, output("(0 errors)", "tcserror")) + send_output(src, "TCS compilation successful! Code executed.", "tcserror") + send_output(src, "(0 errors)", "tcserror") for(var/mob/M in Machine.viewingcode) if(M.client) - to_chat(M, output("TCS compilation successful!", "tcserror")) - to_chat(M, output("(0 errors)", "tcserror")) + send_output(M, "TCS compilation successful!", "tcserror") + send_output(M, "(0 errors)", "tcserror") var/datum/signal/signal = new() signal.data["message"] = "" @@ -132,14 +131,14 @@ client/verb/tcsrun() else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to run: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to run: Unable to locate server machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to run: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to run: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to run: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to run: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") client/verb/exittcs() @@ -171,16 +170,16 @@ client/verb/tcsrevert() winset(mob, "tcscode", "text=\"[showcode]\"") - to_chat(src, output(null, "tcserror")) // clear the errors) + send_output(src, null, "tcserror") // clear the errors else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to revert: Unable to locate server machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to revert: Unable to locate server machine.", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to revert: Unable to locate machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to revert: Unable to locate machine.", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to revert: Unable to locate machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to revert: Unable to locate machine.", "tcserror") client/verb/tcsclearmem() @@ -195,17 +194,17 @@ client/verb/tcsclearmem() var/obj/machinery/telecomms/server/Server = Machine.SelectedServer Server.memory = list() // clear the memory // Show results - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Server memory cleared!", "tcserror")) + to_chat(src, null, "tcserror") + to_chat(src, "Server memory cleared!", "tcserror") for(var/mob/M in Machine.viewingcode) if(M.client) - to_chat(M, output("Server memory cleared!", "tcserror")) + send_output(M, "Server memory cleared!", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to clear memory: Unable to locate server machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to clear memory: Unable to locate server machine.", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to clear memory: Unable to locate machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to clear memory: Unable to locate machine.", "tcserror") else - to_chat(src, output(null, "tcserror")) - to_chat(src, output("Failed to clear memory: Unable to locate machine.", "tcserror")) + send_output(src, null, "tcserror") + send_output(src, "Failed to clear memory: Unable to locate machine.", "tcserror") diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index 80d3ce09fe6..c06a4c9b675 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -241,27 +241,27 @@ malfunction = TRUE checkhp() -/obj/machinery/shieldgen/attack_hand(mob/user as mob) +/obj/machinery/shieldgen/attack_hand(mob/user) if(locked) - to_chat(user, "The machine is locked, you are unable to use it.") + to_chat(user, SPAN_WARNING("The machine is locked!")) return if(is_open) - to_chat(user, "The panel must be closed before operating this machine.") + to_chat(user, SPAN_WARNING("The panel must be closed before operating this machine.")) return if (src.active) - user.visible_message("\icon[src] [user] deactivated the shield generator.", \ - "\icon[src] You deactivate the shield generator.", \ + user.visible_message("[icon2html(src, viewers(get_turf(src)))] [user] deactivates the shield generator.", \ + "[icon2html(src, viewers(get_turf(src)))] You deactivate the shield generator.", \ "You hear heavy droning fade out.") src.shields_down() else if(anchored) - user.visible_message("\icon[src] [user] activated the shield generator.", \ - "\icon[src] You activate the shield generator.", \ + user.visible_message("[icon2html(src, viewers(get_turf(src)))] [user] activate the shield generator.", \ + "[icon2html(src, viewers(get_turf(src)))] You activate the shield generator.", \ "You hear heavy droning.") src.shields_up() else - to_chat(user, "The device must first be secured to the floor.") + to_chat(user, SPAN_WARNING("The device must first be secured to the floor.")) return /obj/machinery/shieldgen/emag_act(var/remaining_charges, var/mob/user) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index 895af5dd1d4..285bb3e862d 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -216,14 +216,14 @@ covered_turfs = null for(var/mob/M in view(5,src)) - to_chat(M, "\icon[src] You hear heavy droning start up.") + to_chat(M, "[icon2html(src, M)] You hear heavy droning start up.") else for(var/obj/effect/energy_field/D in field) field.Remove(D) D.loc = null for(var/mob/M in view(5,src)) - to_chat(M, "\icon[src] You hear heavy droning fade out.") + to_chat(M, "[icon2html(src, M)] You hear heavy droning fade out.") /obj/machinery/shield_gen/update_icon() if(stat & BROKEN) diff --git a/code/modules/spell_system/spells/spell_code.dm b/code/modules/spell_system/spells/spell_code.dm index fd06835910b..18063d50837 100644 --- a/code/modules/spell_system/spells/spell_code.dm +++ b/code/modules/spell_system/spells/spell_code.dm @@ -103,7 +103,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now take_charge(user, skipcharge) before_cast(targets) //applies any overlays and effects - user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) cast the spell [name].") + user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) cast the spell [name].") if(prob(critfailchance)) critfail(targets, user) else diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index a7d55483496..94861b2c255 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -204,7 +204,7 @@ if(ishuman(AM)) var/mob/living/carbon/human/H = AM buckled_mob.attack_log += "\[[time_stamp()]\] Was rammed by [src]" - buckled_mob.attack_log += text("\[[time_stamp()]\] rammed[buckled_mob.name] ([buckled_mob.ckey]) rammed [H.name] ([H.ckey]) with the [src].") + buckled_mob.attack_log += text("\[[time_stamp()]\] rammed[buckled_mob.name] ([buckled_mob.ckey]) rammed [H.name] ([H.ckey]) with the [src].") msg_admin_attack("[src] crashed into [key_name(H)] at (JMP)" ) src.visible_message(SPAN_DANGER("\The [src] smashes into \the [H]!")) playsound(src, 'sound/weapons/punch4.ogg', 50, 1) @@ -265,7 +265,7 @@ return if(buckled_mob.a_intent == I_HURT) buckled_mob.attack_log += "\[[time_stamp()]\] Was rammed by [src]" - buckled_mob.attack_log += text("\[[time_stamp()]\] rammed[buckled_mob.name] ([buckled_mob.ckey]) rammed [H.name] ([H.ckey]) with the [src].") + buckled_mob.attack_log += text("\[[time_stamp()]\] rammed[buckled_mob.name] ([buckled_mob.ckey]) rammed [H.name] ([H.ckey]) with the [src].") msg_admin_attack("[src] crashed into [key_name(H)] at (JMP)" ) src.visible_message(SPAN_DANGER("\The [src] runs over \the [H]!")) H.apply_damage(30, BRUTE) diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 81a2bc899bd..4e220594ea9 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -155,7 +155,7 @@ /obj/vehicle/train/cargo/trolley/RunOver(var/mob/living/carbon/human/H) ..() - attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") + attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") /obj/vehicle/train/cargo/engine/RunOver(var/mob/living/carbon/human/H) ..() @@ -164,10 +164,10 @@ var/mob/living/carbon/human/D = load to_chat(D, "You ran over [H]!") visible_message("\The [src] ran over [H]!") - attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])") + attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])") msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (JMP)",ckey=key_name(D),ckey_target=key_name(H)) else - attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") + attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") //------------------------------------------- diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index fb36598d1b8..cd38d0b98b6 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -368,7 +368,7 @@ if(!damage) return visible_message("[user] [attack_message] the [src]!") - user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") + user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") user.do_attack_animation(src) src.health -= damage if(prob(10)) diff --git a/code/modules/vueui/ui.dm b/code/modules/vueui/ui.dm index 2267cd61ad3..13a16a128ce 100644 --- a/code/modules/vueui/ui.dm +++ b/code/modules/vueui/ui.dm @@ -281,7 +281,7 @@ main ui datum. /datum/vueui/proc/push_change(var/list/ndata) if(ndata && status > STATUS_DISABLED) src.data = ndata - to_chat(user, output(list2params(list(generate_data_json())),"[windowid].browser:receiveUIState")) + send_output(user, list2params(list(generate_data_json())),"[windowid].browser:receiveUIState") /** * Check for change and push that change of data diff --git a/code/modules/world_api/commands/admin.dm b/code/modules/world_api/commands/admin.dm index 2eb96841ad1..ee73bba4780 100644 --- a/code/modules/world_api/commands/admin.dm +++ b/code/modules/world_api/commands/admin.dm @@ -96,8 +96,8 @@ if(!rank) rank = "Admin" - var/message = "[rank] PM from [queryparams["senderkey"]]: [queryparams["msg"]]" - var/amessage = "[rank] PM from [queryparams["senderkey"]] to [key_name(C, highlight_special = 1)] : [queryparams["msg"]]" + var/message = "[rank] PM from [queryparams["senderkey"]]: [queryparams["msg"]]" + var/amessage = "[rank] PM from [queryparams["senderkey"]] to [key_name(C, highlight_special = 1)] : [queryparams["msg"]]" C.received_discord_pm = world.time C.discord_admin = queryparams["senderkey"] diff --git a/code/modules/world_api/commands/cciaa.dm b/code/modules/world_api/commands/cciaa.dm index 063a1b68af5..f9cf33d32a6 100644 --- a/code/modules/world_api/commands/cciaa.dm +++ b/code/modules/world_api/commands/cciaa.dm @@ -164,7 +164,7 @@ command_announcement.Announce(reportbody, reporttitle, new_sound = 'sound/AI/commandreport.ogg', do_newscast = 1, msg_sanitized = 1); if(reportannounce == 0) to_world("New NanoTrasen Update available at all communication consoles.") - to_world(sound('sound/AI/commandreport.ogg')) + sound_to(world, ('sound/AI/commandreport.ogg')) log_admin("[senderkey] has created a command report via the api: [reportbody]",admin_key=senderkey) diff --git a/code/stylesheet.dm b/code/stylesheet.dm index b87249ff437..40247629f9b 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -16,7 +16,7 @@ em {font-style: normal;font-weight: bold;} /* OOC */ .ooc {font-weight: bold;} -.ooc img.text_tag {width: 32px; height: 10px;} +.ooc img.text_tag {width: 32px; height: 10px; vertical-align: middle;} .ooc .everyone {color: #002eb8;} .ooc .looc {color: #6699CC;} diff --git a/code/world.dm b/code/world.dm index 4af70e14c56..2a94b756408 100644 --- a/code/world.dm +++ b/code/world.dm @@ -275,14 +275,6 @@ var/list/world_api_rate_limit = list() time_stamped = 1 -/hook/startup/proc/initialize_greeting() - world.initialize_greeting() - return 1 - -/world/proc/initialize_greeting() - server_greeting = new() - - /proc/load_configuration() config = new /datum/configuration() config.load("config/config.txt") diff --git a/html/archivedchangelog.html b/html/archivedchangelog.html index 36a117bb533..f92aaf6f73f 100644 --- a/html/archivedchangelog.html +++ b/html/archivedchangelog.html @@ -461,7 +461,7 @@ Stick old posts here to prevent cluttering of main changelog.
SkyMarshal updated:
- ZAS now works properly. No perpetually leaking doors, no walls that hold air like a seive. -
- ZAS airflow is now enabled, and will move objects (AND PEOPLE!) when air moves with enough force. AIRLOCKS ARE NOW DEADLY DANGEROUS! +
- ZAS airflow is now enabled, and will move objects (AND PEOPLE!) when air moves with enough force. AIRLOCKS ARE NOW DEADLY DANGEROUS!
- Packages will now reflect the size of what they contain
The self-destruct mechanism is active. Find a way to deactivate the mechanism to lower the alert level or evacuate.
+ The self-destruct mechanism is active. Find a way to deactivate the mechanism to lower the alert level or evacuate.
{{else}}
Set status:
{{:helper.link('Yellow', null, {'action' : 'setalert', 'target' : data.def_SEC_LEVEL_YELLOW}, data.current_security_level === data.def_SEC_LEVEL_YELLOW || data.isAI ? 'disabled' : null)}}
diff --git a/nano/templates/requests_console.tmpl b/nano/templates/requests_console.tmpl
index cd31b66294d..fdd96ecf599 100644
--- a/nano/templates/requests_console.tmpl
+++ b/nano/templates/requests_console.tmpl
@@ -134,9 +134,9 @@ Used In File(s): \code\game\machinery\requests_console.dm
There are new messages
+ There are new messages
{{else data.newmessagepriority == 2}}
- NEW PRIORITY MESSAGES
+ NEW PRIORITY MESSAGES
{{/if}}
{{:helper.link('View Messages', data.newmessagepriority ? 'mail-closed' : 'mail-open', { 'setScreen' : 6 })}}
diff --git a/tools/SS13SmoothingCutter/Cutter.dm b/tools/SS13SmoothingCutter/Cutter.dm index 696f503c783..92adb9c95ba 100644 --- a/tools/SS13SmoothingCutter/Cutter.dm +++ b/tools/SS13SmoothingCutter/Cutter.dm @@ -65,7 +65,7 @@ corner4i.DrawBox(null, 17, 17, 32, 32) outputIcon.Insert(corner4i, "4-i") - world << "Box: \icon[box] -> \icon[corner1i] \icon[corner2i] \icon[corner3i] \icon[corner4i]" + world << "Box: [icon2html(box, usr)] -> [icon2html(corner1i, usr)] [icon2html(corner2i, usr)] [icon2html(corner3i, usr)] [icon2html(corner4i, usr)]" if("line") var/icon/line = icon(sourceIcon, state) @@ -108,7 +108,7 @@ line4e.Turn(90) outputIcon.Insert(line4e, "4-e") - world << "Line: \icon[line] -> \icon[line1n] \icon[line2n] \icon[line3s] \icon[line4s] \icon[line1w] \icon[line2e] \icon[line3w] \icon[line4e]" + world << "Line: [icon2html(line, usr)] -> [icon2html(line1n, usr)] [icon2html(line2n, usr)] [icon2html(line3s, usr)] [icon2html(line4s, usr)] [icon2html(line1w, usr)] [icon2html(line2e, usr)] [icon2html(line3w, usr)] [icon2html(line4e, usr)]" if("center_4") var/icon/center4 = icon(sourceIcon, state) @@ -133,7 +133,7 @@ corner4se.DrawBox(null, 17, 17, 32, 32) outputIcon.Insert(corner4se, "4-se") - world << "Center4: \icon[center4] -> \icon[corner1nw] \icon[corner2ne] \icon[corner3sw] \icon[corner4se]" + world << "Center4: [icon2html(center4, usr)] -> [icon2html(corner1nw, usr)] [icon2html(corner2ne, usr)] [icon2html(corner3sw, usr)] [icon2html(corner4se, usr)]" if("center_8") var/icon/center8 = icon(sourceIcon, state) @@ -158,7 +158,7 @@ corner4f.DrawBox(null, 17, 17, 32, 32) outputIcon.Insert(corner4f, "4-f") - world << "Center8: \icon[center8] -> \icon[corner1f] \icon[corner2f] \icon[corner3f] \icon[corner4f]" + world << "Center8: [icon2html(center8, usr)] -> [icon2html(corner1f, usr)] [icon2html(corner2f, usr)] [icon2html(corner3f, usr)] [icon2html(corner4f, usr)]" if("diag") var/icon/diag = icon(sourceIcon, state) @@ -178,7 +178,7 @@ diagnw.Turn(180) outputIcon.Insert(diagnw, "d-nw") - world << "Diag: \icon[diag] -> \icon[diagse] \icon[diagsw] \icon[diagne] \icon[diagnw]" + world << "Diag: [icon2html(diag, usr)] -> [icon2html(diagse, usr)] [icon2html(diagsw, usr)] [icon2html(diagne, usr)] [icon2html(diagnw, usr)]" if("diag_corner_a") var/icon/diag_corner_a = icon(sourceIcon, state) @@ -198,7 +198,7 @@ diagnw0.Turn(180) outputIcon.Insert(diagnw0, "d-nw-0") - world << "Diag_Corner_A: \icon[diag_corner_a] -> \icon[diagse0] \icon[diagsw0] \icon[diagne0] \icon[diagnw0]" + world << "Diag_Corner_A: [icon2html(diag_corner_a, usr)] -> [icon2html(diagse0, usr)] [icon2html(diagsw0, usr)] [icon2html(diagne0, usr)] [icon2html(diagnw0, usr)]" if("diag_corner_b") var/icon/diag_corner_b = icon(sourceIcon, state) @@ -218,7 +218,7 @@ diagnw1.Turn(180) outputIcon.Insert(diagnw1, "d-nw-0") - world << "Diag_Corner_B: \icon[diag_corner_b] -> \icon[diagse1] \icon[diagsw1] \icon[diagne1] \icon[diagnw1]" + world << "Diag_Corner_B: [icon2html(diag_corner_b, usr)] -> [icon2html(diagse1, usr)] [icon2html(diagsw1, usr)] [icon2html(diagne1, usr)] [icon2html(diagnw1, usr)]"