From 1757c3007522a87dc7d7be737fc9a04a694d39c7 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 5 May 2019 10:14:25 -0800 Subject: [PATCH 1/3] Ports #6039 with Virgo Fixes --- code/controllers/subsystems/nanoui.dm | 8 ++++- code/modules/reagents/Chemistry-Holder.dm | 5 +++ html/changelogs/Novacat - nanochemistry.yml | 37 +++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Novacat - nanochemistry.yml diff --git a/code/controllers/subsystems/nanoui.dm b/code/controllers/subsystems/nanoui.dm index 3c999cb5e2a..4aab9a5f258 100644 --- a/code/controllers/subsystems/nanoui.dm +++ b/code/controllers/subsystems/nanoui.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(nanoui) "nano/css/",\ "nano/images/",\ "nano/images/status_icons/",\ - "nano/images/modular_computers/", + "nano/images/modular_computers/",\ "nano/js/",\ "nano/templates/"\ ) @@ -25,9 +25,15 @@ SUBSYSTEM_DEF(nanoui) if(copytext(filename, length(filename)) != "/") // filenames which end in "/" are actually directories, which we want to ignore if(fexists(path + filename)) 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) + send_resources(i) +>>>>>>> 2358af9... Merge pull request #6151 from Novacat/nova-runtimes /datum/controller/subsystem/nanoui/Recover() if(SSnanoui.open_uis) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 4d12abddfe0..e8dd20a33ff 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -88,8 +88,13 @@ reaction_occurred = FALSE for(var/i in reagent_list) var/datum/reagent/R = i +<<<<<<< HEAD if(SSchemistry.chemical_reactions_by_reagent[R.id]) //VOREStation Edit: unruntiming chems eligible_reactions |= SSchemistry.chemical_reactions_by_reagent[R.id] //VOREStation Edit: unruntiming chems +======= + if(SSchemistry.chemical_reactions_by_reagent[R.id]) + eligible_reactions |= SSchemistry.chemical_reactions_by_reagent[R.id] +>>>>>>> 2358af9... Merge pull request #6151 from Novacat/nova-runtimes for(var/i in eligible_reactions) var/datum/chemical_reaction/C = i diff --git a/html/changelogs/Novacat - nanochemistry.yml b/html/changelogs/Novacat - nanochemistry.yml new file mode 100644 index 00000000000..dab2b228619 --- /dev/null +++ b/html/changelogs/Novacat - nanochemistry.yml @@ -0,0 +1,37 @@ +################################ +# 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 +################################# + +# Your name. +author: Novacat + +# 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: + - tweak: "Chemistry processes instantly again." + - tweak: "Nanoui sends stuff even after client connect." From 909a44ff4c2a008fc27650abdb8b861f2943e03c Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 5 May 2019 14:17:36 -0400 Subject: [PATCH 2/3] Update nanoui.dm --- code/controllers/subsystems/nanoui.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/controllers/subsystems/nanoui.dm b/code/controllers/subsystems/nanoui.dm index 4aab9a5f258..520973514dd 100644 --- a/code/controllers/subsystems/nanoui.dm +++ b/code/controllers/subsystems/nanoui.dm @@ -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(fexists(path + filename)) 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) send_resources(i) ->>>>>>> 2358af9... Merge pull request #6151 from Novacat/nova-runtimes /datum/controller/subsystem/nanoui/Recover() if(SSnanoui.open_uis) @@ -56,4 +50,4 @@ SUBSYSTEM_DEF(nanoui) if(!subsystem_initialized) return for(var/file in asset_files) - client << browse_rsc(file) // send the file to the client \ No newline at end of file + client << browse_rsc(file) // send the file to the client From 048760f2ea5ca8f3ec8985839291ab32e10105d2 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 5 May 2019 14:17:53 -0400 Subject: [PATCH 3/3] Update Chemistry-Holder.dm --- code/modules/reagents/Chemistry-Holder.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index e8dd20a33ff..467d7c37a92 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -88,13 +88,8 @@ reaction_occurred = FALSE for(var/i in reagent_list) var/datum/reagent/R = i -<<<<<<< HEAD - if(SSchemistry.chemical_reactions_by_reagent[R.id]) //VOREStation Edit: unruntiming chems - eligible_reactions |= SSchemistry.chemical_reactions_by_reagent[R.id] //VOREStation Edit: unruntiming chems -======= if(SSchemistry.chemical_reactions_by_reagent[R.id]) eligible_reactions |= SSchemistry.chemical_reactions_by_reagent[R.id] ->>>>>>> 2358af9... Merge pull request #6151 from Novacat/nova-runtimes for(var/i in eligible_reactions) var/datum/chemical_reaction/C = i