Revert "more water pipes stuff"

This reverts commit 2d639d053b.
This commit is contained in:
Albert Iordache
2012-01-27 10:05:50 +02:00
parent 1a5d71faea
commit 4d5ecd09b6
8 changed files with 26 additions and 146 deletions
@@ -1,15 +1,12 @@
/obj/machinery/water/binary/fixture
name = "water fixture connection"
icon = 'water_fixtures.dmi'
icon_state = "fixture-f"
icon_state = "fixture"
level = 1
layer = 2.9
var/obj/parent
update_icon()
icon_state = "intact[invisibility ? "-f" : "" ]"
hide(var/i)
if(level == 1 && istype(loc, /turf/simulated))
invisibility = i ? 101 : 0
@@ -78,7 +75,3 @@
"You hear ratchet.")
new /obj/item/water_pipe(loc, make_from=src)
del(src)
visible
icon_state = "fixture"
level = 2
@@ -97,16 +97,9 @@ obj/machinery/water/trinary/filter
return 1
hide(var/i)
if(level == 1 && istype(loc, /turf/simulated))
invisibility = i ? 101 : 0
update_icon()
initialize()
set_frequency(frequency)
..()
var/turf/T = src.loc // hide if turf is not intact
hide(T.intact)
attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if (!istype(W, /obj/item/weapon/wrench))
@@ -8,9 +8,8 @@
initialize_directions = SOUTH
density = 1
var/icon_type = ""
var/obj/item/weapon/reagent_containers/glass/connected_device
var/obj/machinery/water/node
var/datum/water/pipe_network/network
@@ -20,14 +19,14 @@
update_icon()
if(node)
icon_state = "[node.level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact[icon_type]"
icon_state = "[node.level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact"
dir = get_dir(src, node)
else
icon_state = "exposed[icon_type]"
icon_state = "exposed"
overlays = new()
if(connected_device)
overlays += "inserted[icon_type]"
overlays += "inserted"
if(connected_device.reagents.total_volume)
var/obj/effect/overlay = new/obj
@@ -205,8 +204,4 @@
update_icon()
user << "\blue You add \the [W] to \the [src]."
else
return ..()
/obj/machinery/water/glass_connector/wall
icon_state = "intact-w"
icon_type = "-w"
return ..()
@@ -32,6 +32,13 @@
return
hide(var/i) //to make the little pipe section invisible, the icon changes.
if(node)
icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact"
dir = get_dir(src, node)
else
icon_state = "exposed"
process()
..()
if(!on)