From f3f8340a3d4b7a1475c81539c36a88b4d855d1b4 Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Sun, 30 Sep 2012 18:51:23 +0000 Subject: [PATCH] Experimental tweak, I'll revert this if everyone hates it but for now I want to see how things will be if airlocks use the environmental power channel. -Changed airlocks to use the environmental power channel. -Changed all airlock controlling devices to use the environmental power channel. -Changed shutters to use the environmental power channel. -Changed pipe meters to use the environmental power channel. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4784 316c924e-a436-60f5-8080-3fe189b3f50e --- code/ATMOSPHERICS/components/unary/vent_pump.dm | 1 - code/ATMOSPHERICS/components/unary/vent_scrubber.dm | 2 +- code/defines/obj/machinery.dm | 2 ++ code/game/machinery/airlock_control.dm | 2 ++ code/game/machinery/doors/airlock.dm | 1 + code/game/machinery/doors/firedoor.dm | 3 ++- code/game/machinery/doors/shutters.dm | 1 + .../machinery/embedded_controller/access_controller.dm | 1 + .../machinery/embedded_controller/airlock_controller.dm | 1 + html/changelog.html | 8 ++++++++ 10 files changed, 19 insertions(+), 3 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 191f8d37d1a0..284d5a25ccdf 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -8,7 +8,6 @@ level = 1 var/area_uid var/id_tag = null - power_channel = ENVIRON var/on = 0 var/pump_direction = 1 //0 = siphoning, 1 = releasing diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 012ee2cc96cd..6b14c0cd149f 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -226,7 +226,7 @@ return power_change() - if(powered(ENVIRON)) + if(powered(power_channel)) stat &= ~NOPOWER else stat |= NOPOWER diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index e431debaf829..fafebd471354 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -151,6 +151,7 @@ icon_state = "meterX" var/obj/machinery/atmospherics/pipe/target = null anchored = 1.0 + power_channel = ENVIRON var/frequency = 0 var/id use_power = 1 @@ -198,6 +199,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "doorctrl0" desc = "A remote control-switch for a door." + power_channel = ENVIRON var/id = null var/range = 10 var/normaldoorcontrol = 0 diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index f62c78ccbcb4..e9af711662f2 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -94,6 +94,7 @@ obj/machinery/airlock_sensor name = "Airlock Sensor" anchored = 1 + power_channel = ENVIRON var/id_tag var/master_tag @@ -160,6 +161,7 @@ obj/machinery/access_button name = "Access Button" anchored = 1 + power_channel = ENVIRON var/master_tag var/frequency = 1449 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index db7a6e4dbee0..eee188fe0b63 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -67,6 +67,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }. name = "Airlock" icon = 'icons/obj/doors/Doorint.dmi' icon_state = "door_closed" + power_channel = ENVIRON var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in. var/hackProof = 0 // if 1, this door can't be hacked by the AI diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 0d61bd6861ee..6a6ed9842054 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -8,6 +8,7 @@ icon_state = "door_open" opacity = 0 density = 0 + power_channel = ENVIRON var/blocked = 0 var/nextstate = null @@ -19,7 +20,7 @@ power_change() - if(powered(ENVIRON)) + if(powered(power_channel)) stat &= ~NOPOWER else stat |= NOPOWER diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 821ad835d07d..b2f30208795e 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -2,6 +2,7 @@ name = "Shutters" icon = 'icons/obj/doors/rapid_pdoor.dmi' icon_state = "shutter1" + power_channel = ENVIRON /obj/machinery/door/poddoor/shutters/New() ..() diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 0f75999f6c78..fb5cc1575af3 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -152,6 +152,7 @@ obj/machinery/embedded_controller/radio/access_controller name = "Access Console" density = 0 + power_channel = ENVIRON frequency = 1449 diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 77ae9843a5d0..1a2c6f70317d 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -209,6 +209,7 @@ obj/machinery/embedded_controller/radio/airlock_controller density = 0 frequency = 1449 + power_channel = ENVIRON // Setup parameters only var/id_tag diff --git a/html/changelog.html b/html/changelog.html index ffb79a1b3f57..81b3d9f3e2b1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -48,6 +48,14 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +
+

30 September 2012

+

Giacom updated:

+ +
+

26 September 2012

Carnwennan updated: