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

Update nanoui.dm

Browse Source
This commit is contained in:
Novacat
2019-05-05 14:17:36 -04:00
committed by GitHub
parent 1757c30075
commit 909a44ff4c
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/subsystems/nanoui.dm
View File

@@ -25,15 +25,9 @@ SUBSYSTEM_DEF(nanoui)
if(copytext(filename, length(filename)) != "/") // filenames which end in "/" are actually directories, which we want to ignore if(copytext(filename, length(filename)) != "/") // filenames which end in "/" are actually directories, which we want to ignore
if(fexists(path + filename)) if(fexists(path + filename))
asset_files.Add(fcopy_rsc(path + filename)) // add this file to asset_files for sending to clients when they connect asset_files.Add(fcopy_rsc(path + filename)) // add this file to asset_files for sending to clients when they connect
<<<<<<< HEAD
.=..() //VOREStation Edit start: fixing some kevinzing
for(var/i in GLOB.clients)
send_resources(i) //VOREStation Edit end: fixing some kevinzing
=======
.=..() .=..()
for(var/i in GLOB.clients) for(var/i in GLOB.clients)
send_resources(i) send_resources(i)
>>>>>>> 2358af9... Merge pull request #6151 from Novacat/nova-runtimes
/datum/controller/subsystem/nanoui/Recover() /datum/controller/subsystem/nanoui/Recover()
if(SSnanoui.open_uis) if(SSnanoui.open_uis)
@@ -56,4 +50,4 @@ SUBSYSTEM_DEF(nanoui)
if(!subsystem_initialized) if(!subsystem_initialized)
return return
for(var/file in asset_files) for(var/file in asset_files)
client << browse_rsc(file) // send the file to the client client << browse_rsc(file) // send the file to the client