From a3e566e38015c1ade2a16955e335ff53e6ed73ad Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 31 May 2013 12:43:03 +0300 Subject: [PATCH 1/4] Moving code to portable_atmospherics.dm. --- code/game/machinery/atmoalter/canister.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 5fdfc357490..d43f7657f2c 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/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" From e7c5ac39d9d7e52941cdaae09345261ff8a9d256 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 31 May 2013 12:46:58 +0300 Subject: [PATCH 2/4] Using connect() in initialize(). Fix for issue #2884. --- code/game/machinery/atmoalter/portable_atmospherics.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index f929cc0d5eb..dbfd5b62e6a 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/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 \ No newline at end of file + return From 45264b9a436ddf8c583b5d0d8a97e8d2cb791bf9 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 31 May 2013 12:47:53 +0300 Subject: [PATCH 3/4] Fixing twice defined attackby(). --- code/game/machinery/atmoalter/meter.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 939e1c94f32..d29b1f065c0 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/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 \ No newline at end of file +/obj/machinery/meter/turf/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + return From 046433502c1d108ee083364a2ba236cbf725fdb6 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 31 May 2013 12:48:45 +0300 Subject: [PATCH 4/4] Update changelog.html --- html/changelog.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index bb6795c889d..b0b1f002a55 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -59,6 +59,15 @@ should be listed in the changelog upon commit though. Thanks. -->
+
+

31.05.2013

+

Segrain updated:

+
    +
  • Portable canisters now properly connect to ports beneath them on map load.
  • +
  • Fixed unfastening gas meters.
  • +
+
+

30th May 2013

proliberate updated: