Merge pull request #2925 from Segrain/master

Atmospheric machinery bugfix.

code/game/machinery/atmoalter/canister.dm

@@ -18,14 +18,6 @@
 	use_power = 0
 	var/release_log = ""
 
-/obj/machinery/portable_atmospherics/initialize()
-	. = ..()
-	spawn()
-		var/obj/machinery/atmospherics/portables_connector/connector = locate() in loc
-		if(connector)
-			connected_port = connector
-			update_icon()
-
 /obj/machinery/portable_atmospherics/canister/sleeping_agent
 	name = "Canister: \[N2O\]"
 	icon_state = "redws"

code/game/machinery/atmoalter/meter.dm

@@ -129,5 +129,5 @@
 	if (!target)
 		src.target = loc
 
-/obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	return
+/obj/machinery/meter/turf/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+	return

code/game/machinery/atmoalter/portable_atmospherics.dm

@@ -19,6 +19,14 @@
 
 		return 1
 
+	initialize()
+		. = ..()
+		spawn()
+			var/obj/machinery/atmospherics/portables_connector/port = locate() in loc
+			if(port)
+				connect(port)
+				update_icon()
+	
 	process()
 		if(!connected_port) //only react when pipe_network will ont it do it for you
 			//Allow for reactions
@@ -135,4 +143,4 @@
 			user << "\blue Tank is empty!"
 		return
 
-	return
+	return

html/changelog.html

@@ -59,6 +59,15 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here --><div class="commit sansserif">
 
+<div class="commit sansserif">
+	<h2 class="date">31.05.2013</h2>
+	<h3 class="author">Segrain updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Portable canisters now properly connect to ports beneath them on map load.</li>
+		<li class="bugfix">Fixed unfastening gas meters.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">30th May 2013</h2>
 	<h3 class="author">proliberate updated:</h3>