cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mergey Merge Polaris VChat

Browse Source
This commit is contained in:
Aronai Sieyes
2020-03-29 15:37:24 -04:00
parent 8a33afaff6
commit b2605300f2
9 changed files with 0 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/__defines/misc.dm
View File

@@ -78,12 +78,7 @@
#define COLOR_RED_LIGHT "#FF3333" #define COLOR_RED_LIGHT "#FF3333"
#define COLOR_DEEP_SKY_BLUE "#00e1ff" #define COLOR_DEEP_SKY_BLUE "#00e1ff"
<<<<<<< HEAD
#define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (istype(I, /client) ? I : null))
=======
#define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (isclient(I) ? I : null)) #define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (isclient(I) ? I : null))
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
// Shuttles. // Shuttles.

35
code/defines/procs/announce.dm
View File

@@ -49,7 +49,6 @@
Log(message, message_title) Log(message, message_title)
datum/announcement/proc/Message(message as text, message_title as text) datum/announcement/proc/Message(message as text, message_title as text)
<<<<<<< HEAD
global_announcer.autosay("<span class='alert'>[message_title]:</span> [message]", announcer ? announcer : ANNOUNCER_NAME) global_announcer.autosay("<span class='alert'>[message_title]:</span> [message]", announcer ? announcer : ANNOUNCER_NAME)
datum/announcement/minor/Message(message as text, message_title as text) datum/announcement/minor/Message(message as text, message_title as text)
@@ -63,40 +62,6 @@ datum/announcement/priority/command/Message(message as text, message_title as te
datum/announcement/priority/security/Message(message as text, message_title as text) datum/announcement/priority/security/Message(message as text, message_title as text)
global_announcer.autosay("<span class='alert'>[message_title]:</span> [message]", ANNOUNCER_NAME) global_announcer.autosay("<span class='alert'>[message_title]:</span> [message]", ANNOUNCER_NAME)
=======
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player) && !isdeaf(M))
to_chat(M, "<h2 class='alert'>[title]</h2>")
to_chat(M, "<span class='alert'>[message]</span>")
if (announcer)
to_chat(M, "<span class='alert'> -[html_encode(announcer)]</span>")
datum/announcement/minor/Message(message as text, message_title as text)
to_world("<b>[message]</b>")
datum/announcement/priority/Message(message as text, message_title as text)
to_world("<h1 class='alert'>[message_title]</h1>")
to_world("<span class='alert'>[message]</span>")
if(announcer)
to_world("<span class='alert'> -[html_encode(announcer)]</span>")
to_world("<br>")
datum/announcement/priority/command/Message(message as text, message_title as text)
var/command
command += "<h1 class='alert'>[command_name()] Update</h1>"
if (message_title)
command += "<br><h2 class='alert'>[message_title]</h2>"
command += "<br><span class='alert'>[message]</span><br>"
command += "<br>"
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player) && !isdeaf(M))
to_chat(M, command)
datum/announcement/priority/security/Message(message as text, message_title as text)
to_world("<font size=4 color='red'>[message_title]</font>")
to_world("<font color='red'>[message]</font>")
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
datum/announcement/proc/NewsCast(message as text, message_title as text) datum/announcement/proc/NewsCast(message as text, message_title as text)
if(!newscast) if(!newscast)

3
code/game/machinery/requests_console.dm
View File

@@ -177,7 +177,6 @@ var/list/obj/machinery/requests_console/allConsoles = list()
message_log += "<B>Message sent to [recipient]</B><BR>[message]" message_log += "<B>Message sent to [recipient]</B><BR>[message]"
else else
audible_message(text("[bicon(src)] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4) audible_message(text("[bicon(src)] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4)
<<<<<<< HEAD
//Handle printing //Handle printing
if (href_list["print"]) if (href_list["print"])
@@ -188,8 +187,6 @@ var/list/obj/machinery/requests_console/allConsoles = list()
var/obj/item/weapon/paper/R = new(src.loc) var/obj/item/weapon/paper/R = new(src.loc)
R.name = "[department] Message" R.name = "[department] Message"
R.info = "<H3>[department] Requests Console</H3><div>[msg]</div>" R.info = "<H3>[department] Requests Console</H3><div>[msg]</div>"
=======
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
//Handle screen switching //Handle screen switching
if(href_list["setScreen"]) if(href_list["setScreen"])

28
code/modules/client/asset_cache.dm
View File

@@ -29,23 +29,9 @@ You can set verify to TRUE if you want send() to sleep until the client has the
//This proc sends the asset to the client, but only if it needs it. //This proc sends the asset to the client, but only if it needs it.
//This proc blocks(sleeps) unless verify is set to false //This proc blocks(sleeps) unless verify is set to false
/proc/send_asset(var/client/client, var/asset_name, var/verify = TRUE) /proc/send_asset(var/client/client, var/asset_name, var/verify = TRUE)
<<<<<<< HEAD
if(!istype(client))
if(ismob(client))
var/mob/M = client
if(M.client)
client = M.client
else
return 0
else
return 0
=======
client = CLIENT_FROM_VAR(client) // Will get client from a mob, or accept a client, or return null client = CLIENT_FROM_VAR(client) // Will get client from a mob, or accept a client, or return null
if(!istype(client)) if(!istype(client))
return 0 return 0
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
if(client.cache.Find(asset_name) || client.sending.Find(asset_name)) if(client.cache.Find(asset_name) || client.sending.Find(asset_name))
return 0 return 0
@@ -79,23 +65,9 @@ You can set verify to TRUE if you want send() to sleep until the client has the
//This proc blocks(sleeps) unless verify is set to false //This proc blocks(sleeps) unless verify is set to false
/proc/send_asset_list(var/client/client, var/list/asset_list, var/verify = TRUE) /proc/send_asset_list(var/client/client, var/list/asset_list, var/verify = TRUE)
<<<<<<< HEAD
if(!istype(client))
if(ismob(client))
var/mob/M = client
if(M.client)
client = M.client
else
return 0
else
return 0
=======
client = CLIENT_FROM_VAR(client) // Will get client from a mob, or accept a client, or return null client = CLIENT_FROM_VAR(client) // Will get client from a mob, or accept a client, or return null
if(!istype(client)) if(!istype(client))
return 0 return 0
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
var/list/unreceived = asset_list - (client.cache + client.sending) var/list/unreceived = asset_list - (client.cache + client.sending)
if(!unreceived || !unreceived.len) if(!unreceived || !unreceived.len)

7
code/modules/vchat/css/ss13styles.css
View File

@@ -124,10 +124,7 @@ body.inverted {
.emote {} .emote {}
.alert {color: #ff0000;} .alert {color: #ff0000;}
h1.alert, h2.alert {color: #000000;} h1.alert, h2.alert {color: #000000;}
<<<<<<< HEAD
.nif {} /* VOREStation Add */ .nif {} /* VOREStation Add */
=======
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
/* Game Messages */ /* Game Messages */
@@ -160,11 +157,7 @@ h1.alert, h2.alert {color: #000000;}
.soghun {color: #228B22;} .soghun {color: #228B22;}
.solcom {color: #22228B;} .solcom {color: #22228B;}
.changeling {color: #800080;} .changeling {color: #800080;}
<<<<<<< HEAD
.sergal {color: #0077FF;} .sergal {color: #0077FF;}
=======
.sergal {color: #0077FF; font-family: "Comic Sans MS";}
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
.birdsongc {color: #CC9900;} .birdsongc {color: #CC9900;}
.vulpkanin {color: #B97A57;} .vulpkanin {color: #B97A57;}
.enochian {color: #848A33; letter-spacing:-1pt; word-spacing:4pt; font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;} .enochian {color: #848A33; letter-spacing:-1pt; word-spacing:4pt; font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;}

15
code/modules/vchat/js/vchat.js
View File

@@ -152,11 +152,7 @@ function start_vue() {
admin: false admin: false
}, },
{ {
<<<<<<< HEAD
matches: ".notice, .adminnotice, .info, .sinister, .cult",
=======
matches: ".notice:not(.pm), .adminnotice, .info, .sinister, .cult", matches: ".notice:not(.pm), .adminnotice, .info, .sinister, .cult",
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
becomes: "vc_info", becomes: "vc_info",
pretty: "Notices", pretty: "Notices",
tooltip: "Non-urgent messages from the game and items", tooltip: "Non-urgent messages from the game and items",
@@ -164,11 +160,7 @@ function start_vue() {
admin: false admin: false
}, },
{ {
<<<<<<< HEAD
matches: ".critical, .danger, .userdanger, .warning, .italics",
=======
matches: ".critical, .danger, .userdanger, .warning:not(.pm), .italics", matches: ".critical, .danger, .userdanger, .warning:not(.pm), .italics",
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
becomes: "vc_warnings", becomes: "vc_warnings",
pretty: "Warnings", pretty: "Warnings",
tooltip: "Urgent messages from the game and items", tooltip: "Urgent messages from the game and items",
@@ -191,7 +183,6 @@ function start_vue() {
required: false, required: false,
admin: false admin: false
}, },
<<<<<<< HEAD
//VOREStation Add Start //VOREStation Add Start
{ {
matches: ".nif", matches: ".nif",
@@ -202,8 +193,6 @@ function start_vue() {
admin: false admin: false
}, },
//VOREStation Add End //VOREStation Add End
=======
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
{ {
matches: ".pm", matches: ".pm",
becomes: "vc_adminpm", becomes: "vc_adminpm",
@@ -685,11 +674,7 @@ function start_vue() {
hiddenElement.target = '_blank'; hiddenElement.target = '_blank';
hiddenElement.download = filename; hiddenElement.download = filename;
hiddenElement.click(); hiddenElement.click();
<<<<<<< HEAD
//Probably what will end up getting used //Probably what will end up getting used
=======
//Probably what will end up getting used
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
} else { } else {
var blob = new Blob([textToSave], {type: 'text/html;charset=utf8;'}); var blob = new Blob([textToSave], {type: 'text/html;charset=utf8;'});
saved = window.navigator.msSaveOrOpenBlob(blob, filename); saved = window.navigator.msSaveOrOpenBlob(blob, filename);

7
code/modules/vchat/vchat_client.dm
View File

@@ -103,11 +103,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
owner << browse(file2text("code/modules/vchat/html/vchat.html"), "window=htmloutput") owner << browse(file2text("code/modules/vchat/html/vchat.html"), "window=htmloutput")
//Check back later //Check back later
<<<<<<< HEAD
spawn(15 SECONDS) spawn(15 SECONDS)
=======
spawn(60 SECONDS)
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
if(!src) if(!src)
return return
if(!src.loaded) if(!src.loaded)
@@ -144,13 +140,10 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
/datum/chatOutput/proc/become_broken() /datum/chatOutput/proc/become_broken()
broken = TRUE broken = TRUE
loaded = FALSE loaded = FALSE
<<<<<<< HEAD
=======
if(!owner) if(!owner)
qdel(src) qdel(src)
return return
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
update_vis() update_vis()

10
interface/skin.dmf
View File

@@ -474,12 +474,9 @@ macro "hotkeymode"
elem elem
name = "5" name = "5"
command = ".me" command = ".me"
<<<<<<< HEAD
elem elem
name = "6" name = "6"
command = "subtle" command = "subtle"
=======
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
elem elem
name = "A+REP" name = "A+REP"
command = ".moveleft" command = ".moveleft"
@@ -1254,10 +1251,7 @@ window "outputwindow"
style = ".system {color:#FF0000;}" style = ".system {color:#FF0000;}"
max-lines = 0 max-lines = 0
saved-params = "" saved-params = ""
<<<<<<< HEAD
=======
enable-http-images = true enable-http-images = true
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
window "rpane" window "rpane"
elem "rpane" elem "rpane"
@@ -1424,10 +1418,6 @@ window "infowindow"
is-default = true is-default = true
saved-params = "" saved-params = ""
highlight-color = #00aa00 highlight-color = #00aa00
<<<<<<< HEAD
=======
allow-html = true
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761)
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-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=\"" 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=\""

3
vorestation.dme
View File

@@ -1654,10 +1654,7 @@
#include "code\modules\catalogue\catalogue_data_vr.dm" #include "code\modules\catalogue\catalogue_data_vr.dm"
#include "code\modules\catalogue\cataloguer.dm" #include "code\modules\catalogue\cataloguer.dm"
#include "code\modules\catalogue\cataloguer_visuals.dm" #include "code\modules\catalogue\cataloguer_visuals.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\catalogue\cataloguer_vr.dm" #include "code\modules\catalogue\cataloguer_vr.dm"
=======
>>>>>>> 715de43... VChat: Redone chat output done in Vue.js (#6761):polaris.dme
#include "code\modules\client\asset_cache.dm" #include "code\modules\client\asset_cache.dm"
#include "code\modules\client\client defines.dm" #include "code\modules\client\client defines.dm"
#include "code\modules\client\client procs.dm" #include "code\modules\client\client procs.dm"