diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm
index 6651f68556..cf57668e21 100644
--- a/code/game/gamemodes/cult/cult_comms.dm
+++ b/code/game/gamemodes/cult/cult_comms.dm
@@ -236,7 +236,7 @@
return FALSE
if(cooldown > world.time)
if(!CM.active)
- owner << "You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target! You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target! [bicon(src)] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly. It is ready to be used again. ")
+ to_chat(M, "[bicon(src)] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly. It is ready to be used again. ")
diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm
index 22fc4208c5..7c7f75a22a 100644
--- a/code/game/gamemodes/gang/recaller.dm
+++ b/code/game/gamemodes/gang/recaller.dm
@@ -179,35 +179,35 @@
gang.message_gangtools("[usr] is attempting to recall the emergency shuttle.")
recalling = 1
- to_chat(loc, "\icon[src]Generating shuttle recall order with codes retrieved from last call signal... ")
+ to_chat(loc, "[bicon(src)]Generating shuttle recall order with codes retrieved from last call signal... ")
sleep(rand(100,300))
if(SSshuttle.emergency.mode != SHUTTLE_CALL) //Shuttle can only be recalled when it's moving to the station
- to_chat(user, "\icon[src]Emergency shuttle cannot be recalled at this time. ")
+ to_chat(user, "[bicon(src)]Emergency shuttle cannot be recalled at this time. ")
recalling = 0
return 0
- to_chat(loc, "\icon[src]Shuttle recall order generated. Accessing station long-range communication arrays... ")
+ to_chat(loc, "[bicon(src)]Shuttle recall order generated. Accessing station long-range communication arrays... ")
sleep(rand(100,300))
if(!gang.dom_attempts)
- to_chat(user, "\icon[src]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts. ")
+ to_chat(user, "[bicon(src)]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts. ")
recalling = 0
return 0
var/turf/userturf = get_turf(user)
if(userturf.z != ZLEVEL_STATION) //Shuttle can only be recalled while on station
- to_chat(user, "\icon[src]Error: Device out of range of station communication arrays. ")
+ to_chat(user, "[\bicon(src)]Error: Device out of range of station communication arrays. ")
recalling = 0
return 0
var/datum/station_state/end_state = new /datum/station_state()
end_state.count()
if((100 * GLOB.start_state.score(end_state)) < 80) //Shuttle cannot be recalled if the station is too damaged
- to_chat(user, "\icon[src]Error: Station communication systems compromised. Unable to establish connection. ")
+ to_chat(user, "[bicon(src)]Error: Station communication systems compromised. Unable to establish connection. ")
recalling = 0
return 0
- to_chat(loc, "\icon[src]Comm arrays accessed. Broadcasting recall signal... ")
+ to_chat(loc, "[bicon(src)]Comm arrays accessed. Broadcasting recall signal... ")
sleep(rand(100,300))
@@ -220,7 +220,7 @@
gang.recalls -= 1
return 1
- to_chat(loc, "\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time. ")
+ to_chat(loc, "[bicon(src)]No response recieved. Emergency shuttle cannot be recalled at this time. ")
return 0
/obj/item/device/gangtool/proc/can_use(mob/living/carbon/human/user)
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index 7f8eb32648..41b2fb3cf2 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -413,26 +413,26 @@
customrecepient.tnote += "← From [customsender] ([customjob]): Message from [customsender] ([customjob]), \"[custommessage]\" (Reply )")
+ to_chat(H, "[bicon(customrecepient)] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply )")
log_pda("[usr]/([usr.ckey]) (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]")
customrecepient.cut_overlays()
- customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r"))
+ customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r"))
//Sender is faking as someone who exists
else
src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]")
customrecepient.tnote += "← From [PDARec.owner] ([customjob]): Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply )")
+ to_chat(H, "[bicon(customrecepient)] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply )")
log_pda("[usr]/([usr.ckey]) (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]")
customrecepient.cut_overlays()
- customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r"))
+ customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r"))
//Finally..
ResetMessage()
@@ -455,16 +455,16 @@
name = "monitor decryption key"
var/obj/machinery/message_server/server = null
-/obj/item/weapon/paper/monitorkey/Initialize()
+/obj/item/weapon/paper/monitorkey/Initialize()
..()
- return INITIALIZE_HINT_LATELOAD
-
-/obj/item/weapon/paper/monitorkey/LateInitialize()
- if(GLOB.message_servers)
- for(var/obj/machinery/message_server/server in GLOB.message_servers)
- if(!isnull(server))
- if(!isnull(server.decryptkey))
- info = "Daily Key Reset Daily Key Reset "
- hrefend = " "
-
- to_chat(L, "\icon[src.icon] Message from [hrefstart][source.owner] ([source.ownjob])[hrefend], \"[msg.message]\"[msg.get_photo_ref()] (Reply )")
+
+ var/hrefstart
+ var/hrefend
+ if (isAI(L))
+ hrefstart = ""
+ hrefend = " "
+
+ to_chat(L, "[\bicon(src)] Message from [hrefstart][source.owner] ([source.ownjob])[hrefend], \"[msg.message]\"[msg.get_photo_ref()] (Reply )")
update_icon()
- add_overlay(icon_alert)
+ add_overlay(icon_alert)
/obj/item/device/pda/proc/show_to_ghosts(mob/living/user, datum/data_pda_msg/msg,multiple = 0)
for(var/mob/M in GLOB.player_list)
@@ -897,9 +897,9 @@ GLOBAL_LIST_EMPTY(PDAs)
if(T)
T.hotspot_expose(700,125)
if(istype(cartridge, /obj/item/weapon/cartridge/syndicate))
- explosion(T, -1, 1, 3, 4)
+ explosion(T, -1, 1, 3, 4)
else
- explosion(T, -1, -1, 2, 3)
+ explosion(T, -1, -1, 2, 3)
qdel(src)
return
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 143e6dabbe..d5eead74f0 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -92,15 +92,15 @@
if(mapload && access_txt)
access = text2access(access_txt)
-/obj/item/weapon/card/id/vv_edit_var(var_name, var_value)
- . = ..()
- if(.)
- switch(var_name)
- if("assignment","registered_name")
- update_label()
-
+/obj/item/weapon/card/id/vv_edit_var(var_name, var_value)
+ . = ..()
+ if(.)
+ switch(var_name)
+ if("assignment","registered_name")
+ update_label()
+
/obj/item/weapon/card/id/attack_self(mob/user)
- user.visible_message("[user] shows you: \icon[src] [src.name]. ", \
+ user.visible_message("[user] shows you: [bicon(src)] [src.name]. ", \
"You show \the [src.name]. ")
src.add_fingerprint(user)
return
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 5a1caafc43..d083624909 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -17,23 +17,23 @@
if(src.client.handle_spam_prevention(msg,MUTE_PRAY))
return
- var/mutable_appearance/cross = mutable_appearance('icons/obj/storage.dmi', "bible")
+ var/mutable_appearance/cross = mutable_appearance('icons/obj/storage.dmi', "bible")
var/font_color = "purple"
var/prayer_type = "PRAYER"
var/deity
if(usr.job == "Chaplain")
- cross.icon_state = "kingyellow"
+ cross.icon_state = "kingyellow"
font_color = "blue"
prayer_type = "CHAPLAIN PRAYER"
if(SSreligion.deity)
deity = SSreligion.deity
else if(iscultist(usr))
- cross.icon_state = "tome"
+ cross.icon_state = "tome"
font_color = "red"
prayer_type = "CULTIST PRAYER"
deity = "Nar-Sie"
- msg = "\icon[cross][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]: "
+ msg = "[bicon(cross)][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]: "
for(var/client/C in GLOB.admins)
if(C.prefs.chat_toggles & CHAT_PRAYER)
@@ -43,7 +43,7 @@
C << 'sound/effects/pray.ogg'
to_chat(usr, "Your prayers have been received by the gods.")
- SSblackbox.add_details("admin_verb","Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
//log_admin("HELP: [key_name(src)]: [msg]")
/proc/Centcomm_announce(text , mob/Sender)
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 2073645e73..932be0abba 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -244,6 +244,8 @@ GLOBAL_LIST(external_rsc_urls)
. = ..() //calls mob.Login()
+ chatOutput.start() // Starts the chat
+
if(alert_mob_dupe_login)
set waitfor = FALSE
alert(mob, "You have logged in already with another key this round, please log out of this one NOW or risk being banned!")
diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm
new file mode 100644
index 0000000000..d928397728
--- /dev/null
+++ b/code/modules/goonchat/browserOutput.dm
@@ -0,0 +1,289 @@
+/*********************************
+For the main html chat area
+*********************************/
+
+//Precaching a bunch of shit
+GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of icons for the browser output
+
+//On client, created on login
+/datum/chatOutput
+ var/client/owner //client ref
+ 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/list/connectionHistory //Contains the connection history passed from chat cookie
+ var/broken = FALSE
+
+/datum/chatOutput/New(client/C)
+ owner = C
+ messageQueue = list()
+ connectionHistory = list()
+ // log_world("chatOutput: New()")
+
+/datum/chatOutput/proc/start()
+ //Check for existing chat
+ if(!owner)
+ return FALSE
+
+ if(!winexists(owner, "browseroutput")) // Oh goddamnit.
+ alert(owner.mob, "Updated chat window does not exist. If you are using a custom skin file please allow the game to update.")
+ broken = TRUE
+ return FALSE
+
+ if(winget(owner, "browseroutput", "is-disabled") == "false") //Already setup
+ doneLoading()
+
+ else //Not setup
+ load()
+
+ return TRUE
+
+/datum/chatOutput/proc/load()
+ set waitfor = FALSE
+ if(!owner)
+ return
+
+ var/static/list/chatResources = list(
+ "code/modules/html_interface/js/jquery.min.js",
+ "goon/browserassets/js/json2.min.js",
+ "goon/browserassets/js/browserOutput.js",
+ "tgui/assets/fonts/fontawesome-webfont.eot",
+ "tgui/assets/fonts/fontawesome-webfont.svg",
+ "tgui/assets/fonts/fontawesome-webfont.ttf",
+ "tgui/assets/fonts/fontawesome-webfont.woff",
+ "goon/browserassets/css/font-awesome.css",
+ "goon/browserassets/css/browserOutput.css"
+ )
+
+ // to_chat(world.log, "chatOutput: load()")
+ for(var/attempts in 1 to 5)
+ for(var/asset in chatResources)
+ owner << browse_rsc(file(asset))
+
+ //log_world("Sending main chat window to client [owner.ckey]")
+ owner << browse(file("goon/browserassets/html/browserOutput.html"), "window=browseroutput")
+ sleep(14 + (chatResources.len * 7))
+ if(!owner || loaded)
+ break
+
+ if(owner && !loaded)
+ doneLoading() // try doing this manually
+ CRASH("[owner] failed to load chat. Attempting doneLoading() manually")
+ // log_world("chatOutput: [owner.ckey] load() completed")
+
+/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(data)
+ ehjax_send(data = data)
+
+//Called on chat output done-loading by JS.
+/datum/chatOutput/proc/doneLoading()
+ if(loaded)
+ return
+
+ loaded = TRUE
+ winset(owner, "browseroutput", "is-disabled=false")
+ for(var/message in messageQueue)
+ to_chat(owner, message)
+
+ messageQueue = null
+ sendClientData()
+
+ pingLoop()
+
+/datum/chatOutput/proc/pingLoop()
+ set waitfor = FALSE
+
+ while (owner)
+ ehjax_send(data = owner.is_afk(29) ? "softPang" : "pang") // SoftPang isn't handled anywhere but it'll always reset the opts.lastPang.
+ sleep(30)
+
+/datum/chatOutput/proc/ehjax_send(client/C = owner, window = "browseroutput", data)
+ if(islist(data))
+ data = json_encode(data)
+ C << output("[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 = "")
+ 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()
+ for(var/i in connectionHistory.len to 1 step -1)
+ 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["compid"], row["ip"]))
+ found = row
+ break
+
+ //Uh oh this fucker has a history of playing on a banned account!!
+ if (found.len > 0)
+ //TODO: add a new evasion ban for the CURRENT client details, using the matched row details
+ message_admins("[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])")
+ log_admin("[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])")
+
+ 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_world("\[[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]\] Client: [(src.owner.key ? src.owner.key : src.owner)] triggered JS error: [error]")
+
+#ifdef TESTING
+/client/verb/debug_chat()
+ set hidden = TRUE
+ chatOutput.ehjax_send(data = list("firebug" = TRUE))
+#endif
+//Global chat procs
+
+GLOBAL_LIST_EMPTY(bicon_cache)
+
+//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
+ GLOB.iconCache[iconKey] << icon
+ var/iconData = GLOB.iconCache.ExportText(iconKey)
+ var/list/partial = splittext(iconData, "{")
+ return replacetext(copytext(partial[2], 3, -5), "\n", "")
+
+/proc/bicon(obj)
+ if (!obj)
+ return
+
+ if (isicon(obj))
+ //Icons get pooled constantly, references are no good here.
+ /*if (!bicon_cache["\ref[obj]"]) // Doesn't exist yet, make it.
+ bicon_cache["\ref[obj]"] = icon2base64(obj)
+ return "'+$0+'';
+ }
+ else {
+ return $1 ? $0: ''+$0+' ';
+ }
+ });
+}
+
+//Actually turns the highlight term match into appropriate html
+function addHighlightMarkup(match) {
+ var extra = '';
+ if (opts.highlightColor) {
+ extra += ' style="background-color: '+opts.highlightColor+'"';
+ }
+ return ''+match+' ';
+}
+
+//Highlights words based on user settings
+function highlightTerms(el) {
+ if (el.children.length > 0) {
+ for(var h = 0; h < el.children.length; h++){
+ highlightTerms(el.children[h]);
+ }
+ }
+
+ var hasTextNode = false;
+ for (var node = 0; node < el.childNodes.length; node++)
+ {
+ if (el.childNodes[node].nodeType === 3)
+ {
+ hasTextNode = true;
+ break;
+ }
+ }
+
+ if (hasTextNode) { //If element actually has text
+ var newText = '';
+ for (var c = 0; c < el.childNodes.length; c++) { //Each child element
+ if (el.childNodes[c].nodeType === 3) { //Is it text only?
+ var words = el.childNodes[c].data.split(' ');
+ for (var w = 0; w < words.length; w++) { //Each word in the text
+ var newWord = null;
+ for (var i = 0; i < opts.highlightTerms.length; i++) { //Each highlight term
+ if (opts.highlightTerms[i] && words[w].toLowerCase().indexOf(opts.highlightTerms[i].toLowerCase()) > -1) { //If a match is found
+ newWord = words[w].replace("<", "<").replace(new RegExp(opts.highlightTerms[i], 'gi'), addHighlightMarkup);
+ break;
+ }
+ console.log(newWord)
+ }
+ newText += newWord || words[w].replace("<", "<");
+ newText += w >= words.length ? '' : ' ';
+ }
+ } else { //Every other type of element
+ newText += outerHTML(el.childNodes[c]);
+ }
+ }
+ el.innerHTML = newText;
+ }
+}
+//Send a message to the client
+function output(message, flag) {
+ if (typeof message === 'undefined') {
+ return;
+ }
+ if (typeof flag === 'undefined') {
+ flag = '';
+ }
+
+ if (flag !== 'internal')
+ opts.lastPang = Date.now();
+
+ // Basically we url_encode twice server side so we can manually read the encoded version and actually do UTF-8.
+ // The replace for + is because FOR SOME REASON, BYOND replaces spaces with a + instead of %20, and a plus with %2b.
+ // Marvelous.
+ message = message.replace(/\+/g, "%20")
+ message = decoder(message)
+
+ //The behemoth of filter-code (for Admin message filters)
+ //Note: This is proooobably hella inefficient
+ var filteredOut = false;
+ if (opts.hasOwnProperty('showMessagesFilters') && !opts.showMessagesFilters['All'].show) {
+ //Get this filter type (defined by class on message)
+ var messageHtml = $.parseHTML(message),
+ messageClasses;
+ if (opts.hasOwnProperty('filterHideAll') && opts.filterHideAll) {
+ var internal = false;
+ messageClasses = (!!$(messageHtml).attr('class') ? $(messageHtml).attr('class').split(/\s+/) : false);
+ if (messageClasses) {
+ for (var i = 0; i < messageClasses.length; i++) { //Every class
+ if (messageClasses[i] == 'internal') {
+ internal = true;
+ break;
+ }
+ }
+ }
+ if (!internal) {
+ filteredOut = 'All';
+ }
+ } else {
+ //If the element or it's child have any classes
+ if (!!$(messageHtml).attr('class') || !!$(messageHtml).children().attr('class')) {
+ messageClasses = $(messageHtml).attr('class').split(/\s+/);
+ if (!!$(messageHtml).children().attr('class')) {
+ messageClasses = messageClasses.concat($(messageHtml).children().attr('class').split(/\s+/));
+ }
+ var tempCount = 0;
+ for (var i = 0; i < messageClasses.length; i++) { //Every class
+ var thisClass = messageClasses[i];
+ $.each(opts.showMessagesFilters, function(key, val) { //Every filter
+ if (key !== 'All' && val.show === false && typeof val.match != 'undefined') {
+ for (var i = 0; i < val.match.length; i++) {
+ var matchClass = val.match[i];
+ if (matchClass == thisClass) {
+ filteredOut = key;
+ break;
+ }
+ }
+ }
+ if (filteredOut) return false;
+ });
+ if (filteredOut) break;
+ tempCount++;
+ }
+ } else {
+ if (!opts.showMessagesFilters['Misc'].show) {
+ filteredOut = 'Misc';
+ }
+ }
+ }
+ }
+
+ //Stuff we do along with appending a message
+ var atBottom = false;
+ if (!filteredOut) {
+ var bodyHeight = $('body').height();
+ var messagesHeight = $messages.outerHeight();
+ var scrollPos = $('body,html').scrollTop();
+
+ //Should we snap the output to the bottom?
+ if (bodyHeight + scrollPos >= messagesHeight - opts.scrollSnapTolerance) {
+ atBottom = true;
+ if ($('#newMessages').length) {
+ $('#newMessages').remove();
+ }
+ //If not, put the new messages box in
+ } else {
+ if ($('#newMessages').length) {
+ var messages = $('#newMessages .number').text();
+ messages = parseInt(messages);
+ messages++;
+ $('#newMessages .number').text(messages);
+ if (messages == 2) {
+ $('#newMessages .messageWord').append('s');
+ }
+ } else {
+ $messages.after('1 new message The connection has been closed because the server is restarting. Please wait while you automatically reconnect.
', 'internal');
+ } else if (data == 'stopaudio') {
+ $('.dectalk').remove();
+ } 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.modeChange) {
+ changeMode(data.modeChange);
+ } else if (data.firebug) {
+ if (data.trigger) {
+ internalOutput('Loading firebug console, triggered by '+data.trigger+'... ', 'internal');
+ } else {
+ internalOutput('Loading firebug console... ', 'internal');
+ }
+ var firebugEl = document.createElement('script');
+ firebugEl.src = 'https://getfirebug.com/firebug-lite-debug.js';
+ document.body.appendChild(firebugEl);
+ } else if (data.dectalk) {
+ var message = 'You hear a strange robotic voice... ' + message;
+ }
+ internalOutput(message, 'preventLink');
+ }
+ }
+}
+
+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);
+}
+
+/*****************************************
+*
+* DOM READY
+*
+******************************************/
+
+if (typeof $ === 'undefined') {
+ var div = document.getElementById('loading').childNodes[1];
+ div += '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 = {
+ 'sfontSize': getCookie('fontsize'),
+ 'spingDisabled': getCookie('pingdisabled'),
+ 'shighlightTerms': getCookie('highlightterms'),
+ 'shighlightColor': getCookie('highlightcolor'),
+ };
+
+ if (savedConfig.sfontSize) {
+ $messages.css('font-size', savedConfig.sfontSize);
+ internalOutput('Loaded font size setting of: '+savedConfig.sfontSize+' ', 'internal');
+ }
+ 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);
+ var actualTerms = '';
+ for (var i = 0; i < savedTerms.length; i++) {
+ if (savedTerms[i]) {
+ actualTerms += savedTerms[i] + ', ';
+ }
+ }
+ if (actualTerms) {
+ actualTerms = actualTerms.substring(0, actualTerms.length - 2);
+ 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');
+ }
+
+ (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 ($subOptions && $subOptions.is(':visible')) {
+ $subOptions.slideUp('fast', function() {
+ $(this).removeClass('scroll');
+ $(this).css('height', '');
+ });
+ clearInterval(opts.subOptionsLoop);
+ }
+ });
+
+ $('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);
+ }
+ });
+
+ //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;
+ }
+
+ e.preventDefault()
+
+ var k = e.which;
+ var command; // Command to execute through winset.
+
+ // Hardcoded because else there would be no feedback message.
+ if (k == 113) { // F2
+ runByond('byond://winset?screenshot=auto');
+ internalOutput('Screenshot taken', 'internal');
+ }
+
+ var c = "";
+ switch (k) {
+ case 8:
+ c = 'BACK';
+ case 9:
+ c = 'TAB';
+ case 13:
+ c = 'ENTER';
+ case 19:
+ c = 'PAUSE';
+ case 27:
+ c = 'ESCAPE';
+ case 33: // Page up
+ c = 'NORTHEAST';
+ case 34: // Page down
+ c = 'SOUTHEAST';
+ case 35: // End
+ c = 'SOUTHWEST';
+ case 36: // Home
+ c = 'NORTHWEST';
+ case 37:
+ c = 'WEST';
+ case 38:
+ c = 'NORTH';
+ case 39:
+ c = 'EAST';
+ case 40:
+ c = 'SOUTH';
+ case 45:
+ c = 'INSERT';
+ case 46:
+ c = 'DELETE';
+ case 93: // That weird thing to the right of alt gr.
+ c = 'APPS';
+
+ default:
+ c = String.fromCharCode(k);
+ }
+
+// if(opts.macros.hasOwnProperty(c.toUpperCase()))
+ // command = opts.macros[c];
+
+ if (command) {
+ runByond('byond://winset?mapwindow.map.focus=true;command='+command);
+ return false;
+ }
+ else if (c.length == 0) {
+ if (!e.shiftKey) {
+ c = c.toLowerCase();
+ }
+ runByond('byond://winset?mapwindow.map.focus=true;mainwindow.input.text='+c);
+ return false;
+ } else {
+ runByond('byond://winset?mapwindow.map.focus=true');
+ return false;
+ }
+ });
+
+ //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();
+ }
+ });
+
+ //Audio sound prevention
+ $messages.on('click', '.stopAudio', function() {
+ var $audio = $(this).parent().children('audio');
+ if ($audio) {
+ $audio.remove();
+ }
+ });
+
+
+ /*****************************************
+ *
+ * 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) {
+ if ($subOptions.is(':visible')) {
+ $subOptions.slideUp('fast', function() {
+ $(this).removeClass('scroll');
+ $(this).css('height', '');
+ });
+ clearInterval(opts.subOptionsLoop);
+ } else {
+ $subOptions.slideDown('fast', function() {
+ var windowHeight = $(window).height();
+ var toggleHeight = $('#toggleOptions').outerHeight();
+ var priorSubHeight = $subOptions.outerHeight();
+ var newSubHeight = windowHeight - toggleHeight;
+ $(this).height(newSubHeight);
+ if (priorSubHeight > (windowHeight - toggleHeight)) {
+ $(this).addClass('scroll');
+ }
+ });
+ opts.subOptionsLoop = setInterval(function() {
+ if (!opts.suppressOptionsClose && $('#subOptions').is(':visible')) {
+ $subOptions.slideUp('fast', function() {
+ $(this).removeClass('scroll');
+ $(this).css('height', '');
+ });
+ clearInterval(opts.subOptionsLoop);
+ }
+ }, 5000); //Every 5 seconds
+ }
+ });
+
+ $('#subOptions, #toggleOptions').mouseenter(function() {
+ opts.suppressOptionsClose = true;
+ });
+
+ $('#subOptions, #toggleOptions').mouseleave(function() {
+ opts.suppressOptionsClose = false;
+ });
+
+ $('#decreaseFont').click(function(e) {
+ var fontSize = parseInt($messages.css('font-size'));
+ fontSize = fontSize - 1 + 'px';
+ $messages.css({'font-size': fontSize});
+ setCookie('fontsize', fontSize, 365);
+ internalOutput('Font size set to '+fontSize+' ', 'internal');
+ });
+
+ $('#increaseFont').click(function(e) {
+ var fontSize = parseInt($messages.css('font-size'));
+ fontSize = fontSize + 1 + 'px';
+ $messages.css({'font-size': fontSize});
+ setCookie('fontsize', fontSize, 365);
+ internalOutput('Font size set to '+fontSize+' ', '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) {
+ $.ajax({
+ type: 'GET',
+ url: 'browserOutput.css',
+ success: function(styleData) {
+ var win;
+
+ try {
+ win = window.open('', 'Chat Log', 'toolbar=no, location=no, directories=no, status=no, menubar=yes, scrollbars=yes, resizable=yes, width=780, height=600, top=' + (screen.height/2 - 635/2) + ', left=' + (screen.width/2 - 780/2));
+ } catch (e) {
+ return;
+ }
+
+ if (win) {
+ win.document.head.innerHTML = 'Chat Log ';
+ win.document.head.innerHTML += '';
+ win.document.body.innerHTML = $messages.html();
+ }
+ }
+ });
+ });
+
+ $('#highlightTerm').click(function(e) {
+ if ($('.popup .highlightTerm').is(':visible')) {return;}
+ var termInputs = '';
+ for (var i = 0; i < opts.highlightLimit; i++) {
+ termInputs += '
';
+ }
+ var popupContent = '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();
+
+ var count = 0;
+ while (count < opts.highlightLimit) {
+ var term = $('#highlightTermInput'+count).val();
+ if (term) {
+ term = term.trim();
+ if (term === '') {
+ opts.highlightTerms[count] = null;
+ } else {
+ opts.highlightTerms[count] = term.toLowerCase();
+ }
+ } else {
+ opts.highlightTerms[count] = null;
+ }
+ count++;
+ }
+
+ 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;
+ });
+
+
+ /*****************************************
+ *
+ * KICK EVERYTHING OFF
+ *
+ ******************************************/
+
+ runByond('?_src_=chat&proc=doneLoading');
+ if ($('#loading').is(':visible')) {
+ $('#loading').remove();
+ }
+ $('#userBar').show();
+ opts.priorChatHeight = $(window).height();
+});
\ No newline at end of file
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 0000000000..e69de29bb2
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 18fa2e8c60..38e15db5a0 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -40,13 +40,13 @@
if(spec_return)
return spec_return
- if(mind)
- if(mind.martial_art && mind.martial_art.deflection_chance) //Some martial arts users can deflect projectiles!
- if(prob(mind.martial_art.deflection_chance))
- if(!lying && dna && !dna.check_mutation(HULK)) //But only if they're not lying down, and hulks can't do it
- visible_message("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons! ", "You deflect the projectile! ")
- playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1)
- return 0
+ if(mind)
+ if(mind.martial_art && mind.martial_art.deflection_chance) //Some martial arts users can deflect projectiles!
+ if(prob(mind.martial_art.deflection_chance))
+ if(!lying && dna && !dna.check_mutation(HULK)) //But only if they're not lying down, and hulks can't do it
+ visible_message("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons! ", "You deflect the projectile! ")
+ playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1)
+ return 0
if(!(P.original == src && P.firer == src)) //can't block or reflect when shooting yourself
if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
@@ -104,11 +104,11 @@
return 0
/mob/living/carbon/human/proc/check_block()
- if(mind)
- if(mind.martial_art && mind.martial_art.block_chance \
- && prob(mind.martial_art.block_chance) && in_throw_mode \
- && !stat && !weakened && !stunned)
- return TRUE
+ if(mind)
+ if(mind.martial_art && mind.martial_art.block_chance \
+ && prob(mind.martial_art.block_chance) && in_throw_mode \
+ && !stat && !weakened && !stunned)
+ return TRUE
return FALSE
/mob/living/carbon/human/hitby(atom/movable/AM, skipcatch = 0, hitpush = 1, blocked = 0)
@@ -136,7 +136,7 @@
I.add_mob_blood(src)//it embedded itself in you, of course it's bloody!
I.loc = src
L.receive_damage(I.w_class*I.embedded_impact_pain_multiplier)
- visible_message("[I] embeds itself in [src]'s [L.name]! ","[I] embeds itself in your [L.name]! ")
+ visible_message("[I] embeds itself in [src]'s [L.name]! ","[I] embeds itself in your [L.name]! ")
hitpush = 0
skipcatch = 1 //can't catch the now embedded item
@@ -160,8 +160,8 @@
var/obj/item/bodypart/affecting = get_bodypart(ran_zone(user.zone_selected)) //what we're actually ending up trying to hit.
var/target_area = parse_zone(check_zone(user.zone_selected)) //our intended target
- SSblackbox.add_details("item_used_for_combat","[I.type]|[I.force]")
- SSblackbox.add_details("zone_targeted","[target_area]")
+ SSblackbox.add_details("item_used_for_combat","[I.type]|[I.force]")
+ SSblackbox.add_details("zone_targeted","[target_area]")
// the attacked_by code varies among species
return dna.species.spec_attacked_by(I, user, affecting, a_intent, src)
@@ -439,7 +439,7 @@
else if(S.siemens_coefficient == (-1))
total_coeff -= 1
siemens_coeff = total_coeff
- if(HAS_SECONDARY_FLAG(src, TESLA_IGNORE))
+ if(HAS_SECONDARY_FLAG(src, TESLA_IGNORE))
siemens_coeff = 0
else if(!safety)
var/gloves_siemens_coeff = 1
@@ -622,7 +622,7 @@
gain = 100
if(mind.assigned_role == "Clown")
gain = rand(-300, 300)
- investigate_log("([key_name(src)]) has been consumed by the singularity.", INVESTIGATE_SINGULO) //Oh that's where the clown ended up!
+ investigate_log("([key_name(src)]) has been consumed by the singularity.", INVESTIGATE_SINGULO) //Oh that's where the clown ended up!
gib()
return(gain)
@@ -665,10 +665,10 @@
status += "numb"
if(status == "")
status = "OK"
- to_chat(src, "\t [status == "OK" ? "\blue" : "\red"] Your [LB.name] is [status].")
+ to_chat(src, "\t Your [LB.name] is [status]. ")
for(var/obj/item/I in LB.embedded_objects)
- to_chat(src, "\t There is \a [I] embedded in your [LB.name]! ")
+ to_chat(src, "\t There is \a [I] embedded in your [LB.name]! ")
for(var/t in missing)
to_chat(src, "Your [parse_zone(t)] is missing! ")
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index db72e94a86..b19e866378 100644
--- a/code/modules/mob/living/silicon/ai/examine.dm
+++ b/code/modules/mob/living/silicon/ai/examine.dm
@@ -1,5 +1,5 @@
/mob/living/silicon/ai/examine(mob/user)
- var/msg = "*---------*\nThis is \icon[src] [src] !\n"
+ var/msg = "*---------*\nThis is [bicon(src)] [src] !\n"
if (stat == DEAD)
msg += "It appears to be powered-down. \n"
else
diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm
index 63b01483ef..bd7ba03dc5 100644
--- a/code/modules/uplink/uplink_item.dm
+++ b/code/modules/uplink/uplink_item.dm
@@ -1370,7 +1370,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
continue
crate_value -= I.cost
new I.item(C)
- U.purchase_log += "\icon[I.item] "
+ U.purchase_log += "[bicon(I.item)] "
SSblackbox.add_details("traitor_uplink_items_bought", "[name]|[cost]")
return C
diff --git a/tgstation.dme b/tgstation.dme
index 06fc7182cc..4aa6207ec5 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1496,8 +1496,8 @@
#include "code\modules\mining\equipment\lazarus_injector.dm"
#include "code\modules\mining\equipment\marker_beacons.dm"
#include "code\modules\mining\equipment\mineral_scanner.dm"
-#include "code\modules\mining\equipment\regenerative_core.dm"
#include "code\modules\mining\equipment\mining_tools.dm"
+#include "code\modules\mining\equipment\regenerative_core.dm"
#include "code\modules\mining\equipment\resonator.dm"
#include "code\modules\mining\equipment\survival_pod.dm"
#include "code\modules\mining\equipment\vendor_items.dm"
![](data:image/png;base64,[bicon_cache["\ref[obj]"]])
"*/
+ return "])
"
+
+ // Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with.
+ var/atom/A = obj
+ var/key = "[istype(A.icon, /icon) ? "\ref[A.icon]" : A.icon]:[A.icon_state]"
+ if (!GLOB.bicon_cache[key]) // Doesn't exist, make it.
+ var/icon/I = icon(A.icon, A.icon_state, SOUTH, 1)
+ if (ishuman(obj)) // Shitty workaround for a BYOND issue.
+ var/icon/temp = I
+ I = icon()
+ I.Insert(temp, dir = SOUTH)
+ GLOB.bicon_cache[key] = icon2base64(I, key)
+
+ return "
"
+
+//Costlier version of bicon() that uses getFlatIcon() to account for overlays, underlays, etc. Use with extreme moderation, ESPECIALLY on mobs.
+/proc/costly_bicon(obj)
+ if (!obj)
+ return
+
+ if (isicon(obj))
+ return bicon(obj)
+
+ var/icon/I = getFlatIcon(obj)
+ return bicon(I)
+
+/proc/to_chat(target, message)
+ if(isnull(target))
+ return
+ //Ok so I did my best but I accept that some calls to this will be for shit like sound and images
+ //It stands that we PROBABLY don't want to output those to the browser output so just handle them here
+ if (istype(message, /image) || istype(message, /sound) || istype(target, /savefile) || !(ismob(target) || islist(target) || istype(target, /client) || istype(target, /datum/log) || target == world))
+ target << message
+ if (!istype(target, /atom)) // Really easy to mix these up, and not having to make sure things are mobs makes the code cleaner.
+ CRASH("DEBUG: Boutput called with invalid message")
+ return
+
+ //Otherwise, we're good to throw it at the user
+ else if (istext(message))
+ if (istext(target))
+ return
+
+ //Some macros remain in the string even after parsing and fuck up the eventual output
+ if (findtext(message, "\improper"))
+ message = replacetext(message, "\improper", "")
+ if (findtext(message, "\proper"))
+ message = replacetext(message, "\proper", "")
+
+ //Grab us a client if possible
+ var/client/C = grab_client(target)
+
+ if (C && C.chatOutput)
+ if(C.chatOutput.broken) // A player who hasn't updated his skin file.
+ to_chat(C, message)
+ return TRUE
+ if(!C.chatOutput.loaded && C.chatOutput.messageQueue && islist(C.chatOutput.messageQueue))
+ //Client sucks at loading things, put their messages in a queue
+ C.chatOutput.messageQueue.Add(message)
+ return
+
+ if(istype(target, /datum/log))
+ var/datum/log/L = target
+ L.log += (message + "\n")
+ return
+
+ message = replacetext(message, "\n", "