Merge branch 'master' into corporate-comms

code/controllers/subsystem/air.dm

@@ -39,6 +39,9 @@ SUBSYSTEM_DEF(air)
 	var/list/active_super_conductivity = list()
 	var/list/high_pressure_delta = list()
 
+	/// Pipe overlay/underlay icon manager
+	var/datum/pipe_icon_manager/icon_manager
+
 
 	var/list/currentrun = list()
 	var/currentpart = SSAIR_DEFERREDPIPENETS
@@ -66,6 +69,7 @@ SUBSYSTEM_DEF(air)
 
 /datum/controller/subsystem/air/Initialize(timeofday)
 	setup_overlays() // Assign icons and such for gas-turf-overlays
+	icon_manager = new() // Sets up icon manager for pipes
 	setup_allturfs()
 	setup_atmos_machinery(GLOB.machines)
 	setup_pipenets(GLOB.machines)

code/controllers/subsystem/changelog.dm

@@ -245,7 +245,7 @@ SUBSYSTEM_DEF(changelog)
 				if(config.wikiurl)
 					if(alert("This will open the wiki in your browser. Are you sure?",,"Yes","No")=="No")
 						return
-					usr.client.wiki("") // Blank arg is important here
+					usr.client.wiki()
 				else
 					to_chat(usr, "<span class='danger'>The Wiki URL is not set in the server configuration. Please inform the server host.</span>")