Ports #6039 with Virgo Fixes

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)

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

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."