From a1a8555a45830579b276f83c3b8eb9d0537b5908 Mon Sep 17 00:00:00 2001 From: Menshin Date: Wed, 4 Feb 2015 21:56:07 +0100 Subject: [PATCH] * Fixes the air stored inside atmos machinery not updating on construction * Fixes filters and mixers switching off on icon update * Fixes the RPD not properly setting the flipped variable for flipped mixers/filters * Fixes using the atmos analyzer on a pipe making you attack it --- .../binary_devices/binary_atmos_base.dm | 5 ++ .../components/trinary_devices/filter.dm | 3 +- .../components/trinary_devices/mixer.dm | 3 +- .../trinary_devices/trinary_base.dm | 6 ++ .../components/unary/unary_base.dm | 4 ++ code/ATMOSPHERICS/pipes.dm | 1 + code/game/objects/items/weapons/RPD.dm | 61 ++++++++++--------- 7 files changed, 52 insertions(+), 31 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index 4a9b4e3f650..a869677a1c4 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -94,6 +94,11 @@ update_icon() +/obj/machinery/atmospherics/binary/construction() + ..() + parent1.update = 1 + parent2.update = 1 + /obj/machinery/atmospherics/binary/build_network() if(!parent1) parent1 = new /datum/pipeline() diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index afa56656c98..839d3ecde24 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -52,12 +52,13 @@ Filter types: icon_state = "filter_on[flipped?"_f":""]" return - on = 0 icon_state = "filter_off[flipped?"_f":""]" /obj/machinery/atmospherics/trinary/filter/power_change() var/old_stat = stat ..() + if(stat & NOPOWER) + on = 0 if(old_stat != stat) update_icon() diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index a919ee2ea3b..c70dce74cf9 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -26,12 +26,13 @@ icon_state = "mixer_on[flipped?"_f":""]" return - on = 0 icon_state = "mixer_off[flipped?"_f":""]" /obj/machinery/atmospherics/trinary/mixer/power_change() var/old_stat = stat ..() + if(stat & NOPOWER) + on = 0 if(old_stat != stat) update_icon() diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index d687da775df..0db4482b153 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -132,6 +132,12 @@ Housekeeping and pipe network stuff below update_icon() +/obj/machinery/atmospherics/trinary/construction() + ..() + parent1.update = 1 + parent2.update = 1 + parent3.update = 1 + /obj/machinery/atmospherics/trinary/build_network() if(!parent1) parent1 = new /datum/pipeline() diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm index b0574071ee8..5c3286df0cf 100644 --- a/code/ATMOSPHERICS/components/unary/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary/unary_base.dm @@ -69,6 +69,10 @@ Housekeeping and pipe network stuff below showpipe = 1 update_icon() +/obj/machinery/atmospherics/unary/construction() + ..() + parent.update = 1 + /obj/machinery/atmospherics/unary/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W) if(..()) initialize_directions = dir diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 0725136d201..404387a84f1 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -38,6 +38,7 @@ /obj/machinery/atmospherics/pipe/attackby(obj/item/weapon/W, mob/user) if(istype(W, /obj/item/device/analyzer)) atmosanalyzer_scan(parent.air, user) + return if(istype(W,/obj/item/device/pipe_painter) || istype(W,/obj/item/weapon/pipe_dispenser)) return diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index b601edeeb0d..64185d5d5a0 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -139,6 +139,7 @@ var/global/list/RPD_recipes=list( var/p_type = 0 var/p_conntype = 0 var/p_dir = 1 + var/p_flipped = 0 var/p_class = ATMOS_MODE var/p_disposal = 0 var/list/paint_colors = list( @@ -161,11 +162,11 @@ var/global/list/RPD_recipes=list( /obj/item/weapon/pipe_dispenser/attack_self(mob/user as mob) show_menu(user) -/obj/item/weapon/pipe_dispenser/proc/render_dir_img(var/_dir,var/pic,var/title) +/obj/item/weapon/pipe_dispenser/proc/render_dir_img(var/_dir,var/pic,var/title,var/flipped=0) var/selected="" if(_dir == p_dir) selected=" class=\"selected\"" - return "" + return "" /obj/item/weapon/pipe_dispenser/proc/show_menu(mob/user as mob) if(!user || !src) return 0 @@ -230,8 +231,8 @@ var/global/list/RPD_recipes=list( else dirsel+={"

- ↕ - ↔ + ↕ + ↔

"} if(PIPE_BENT) // Bent, N-W, N-E etc @@ -251,11 +252,11 @@ var/global/list/RPD_recipes=list( else dirsel+={"

- ╝ - ╚ + ╝ + ╚
- ╗ - ╔ + ╗ + ╔

"} if(PIPE_TRINARY) // Manifold @@ -275,11 +276,11 @@ var/global/list/RPD_recipes=list( else dirsel+={"

- ╦ - ╣ + ╦ + ╣
- ╩ - ╠ + ╩ + ╠

"} if(PIPE_TRIN_M) // Mirrored ones @@ -300,26 +301,26 @@ var/global/list/RPD_recipes=list( dirsel += render_dir_img(2,"n.png","East North West") dirsel += render_dir_img(8,"e.png","South East North") dirsel += "
" - dirsel += render_dir_img(6,"sm.png","West South East") - dirsel += render_dir_img(5,"wm.png","North West South") + dirsel += render_dir_img(6,"sm.png","West South East", 1) + dirsel += render_dir_img(5,"wm.png","North West South", 1) dirsel += "
" - dirsel += render_dir_img(9,"nm.png","East North West") - dirsel += render_dir_img(10,"em.png","South East North") + dirsel += render_dir_img(9,"nm.png","East North West", 1) + dirsel += render_dir_img(10,"em.png","South East North", 1) dirsel += "

" else dirsel+={"

- ╦ - ╣ + ╦ + ╣
- ╩ - ╠ + ╩ + ╠
- ╦ - ╣ + ╦ + ╣
- ╩ - ╠ + ╩ + ╠

"} if(PIPE_UNARY) // Unary @@ -338,10 +339,10 @@ var/global/list/RPD_recipes=list( else dirsel+={"

- ↑ - → - ↓ - ← + ↑ + → + ↓ + ←

"} if(PIPE_QUAD) // Single icon_state (eg 4-way manifolds) @@ -354,7 +355,7 @@ var/global/list/RPD_recipes=list( else dirsel+={"

- ↕ + ↕

"} @@ -409,6 +410,7 @@ var/global/list/RPD_recipes=list( src.add_fingerprint(usr) if(href_list["setdir"]) p_dir= text2num(href_list["setdir"]) + p_flipped = text2num(href_list["flipped"]) show_menu(usr) if(href_list["eatpipes"]) @@ -509,6 +511,7 @@ var/global/list/RPD_recipes=list( if(do_after(user, 20)) activate() var/obj/item/pipe/P = new (A, pipe_type=p_type, dir=p_dir) + P.flipped = p_flipped P.update() P.add_fingerprint(usr) return 1