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

Fixing conflict and allowing export chatlog

Browse Source
This commit is contained in:
Cadyn
2020-10-21 13:28:59 -07:00
parent 19517fcede
commit 0c96b58f3f
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -383,9 +383,6 @@ var/to_chat_src
set name = "Export chatlog"
set category = "OOC"
to_chat(usr, "<span class='warning'>This verb is temporarily disabled due to performance issues.</span>") //CHOMPEdit
return //CHOMPEdit
if(chatOutput.broken)
to_chat(src, "<span class='warning'>Error: VChat isn't processing your messages!</span>")
return

15
code/modules/vore/eating/vore_vr.dm
View File

@@ -207,23 +207,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
return FALSE
//Write it out
<<<<<<< HEAD
if(fexists(path))
fdel(path) //Byond only supports APPENDING to files, not replacing.
text2file(json_to_file, path)
||||||| parent of b4fb235ba3... Merge pull request #9246 from ShadowLarkens/vchat_export_optimization
#ifdef RUST_G
call(RUST_G, "file_write")(json_to_file, path)
#else
// Fall back to using old format if we are not using rust-g
if(fexists(path))
fdel(path) //Byond only supports APPENDING to files, not replacing.
text2file(json_to_file, path)
#endif
=======
rustg_file_write(json_to_file, path)
>>>>>>> b4fb235ba3... Merge pull request #9246 from ShadowLarkens/vchat_export_optimization
if(!fexists(path))
log_debug("Saving: [path] failed file write")
return FALSE