RCD Rework.

RCDs now work on a system of schematics, with an RPD style UI.

RPD, RCD, RSF and tile painters all implemented into this new system. (reverted from commit ccb9ceb811) (reverted from commit 1d9a328ba6)
This commit is contained in:
PJB3005
2015-08-16 22:44:15 +02:00
committed by Ren
parent b96ab050f4
commit 83598d6e50
44 changed files with 2284 additions and 1611 deletions

View File

@@ -24,13 +24,13 @@
var/baseicon=""
available_colors = list(
"grey"=PIPE_COLOR_GREY,
"red"=PIPE_COLOR_RED,
"blue"=PIPE_COLOR_BLUE,
"cyan"=PIPE_COLOR_CYAN,
"green"=PIPE_COLOR_GREEN,
"yellow"=PIPE_COLOR_YELLOW,
"purple"=PIPE_COLOR_PURPLE
"grey" = PIPE_COLOR_GREY,
"red" = PIPE_COLOR_RED,
"blue" = PIPE_COLOR_BLUE,
"cyan" = PIPE_COLOR_CYAN,
"green" = PIPE_COLOR_GREEN,
"yellow" = PIPE_COLOR_YELLOW,
"purple" = PIPE_COLOR_PURPLE
)
/obj/machinery/atmospherics/pipe/singularity_pull(/obj/machinery/singularity/S, size)
@@ -407,7 +407,7 @@
level = 1
alpha=128
/obj/machinery/atmospherics/pipe/simple/insulated
name = "Insulated pipe"
name = "\improper Insulated pipe"
//icon = 'icons/obj/atmospherics/red_pipe.dmi'
icon = 'icons/obj/atmospherics/insulated.dmi'
minimum_temperature_difference = 10000
@@ -418,8 +418,12 @@
alert_pressure = 900000
available_colors = list(
"red"=IPIPE_COLOR_RED,
"blue"=IPIPE_COLOR_BLUE
"red" = IPIPE_COLOR_RED,
"blue" = IPIPE_COLOR_BLUE,
"cyan" = PIPE_COLOR_CYAN,
"green" = PIPE_COLOR_GREEN,
"yellow" = PIPE_COLOR_YELLOW,
"purple" = PIPE_COLOR_PURPLE
)
_color = "red"
/obj/machinery/atmospherics/pipe/simple/insulated/visible
@@ -595,35 +599,35 @@
update_icon()
/obj/machinery/atmospherics/pipe/manifold/scrubbers
name = "Scrubbers pipe"
name = "\improper Scrubbers pipe"
_color = "red"
color=PIPE_COLOR_RED
/obj/machinery/atmospherics/pipe/manifold/supply
name = "Air supply pipe"
name = "\improper Air supply pipe"
_color = "blue"
color=PIPE_COLOR_BLUE
/obj/machinery/atmospherics/pipe/manifold/supplymain
name = "Main air supply pipe"
name = "\improper Main air supply pipe"
_color = "purple"
color=PIPE_COLOR_PURPLE
/obj/machinery/atmospherics/pipe/manifold/general
name = "Gas pipe"
name = "\improper Gas pipe"
_color = "gray"
color=PIPE_COLOR_GREY
/obj/machinery/atmospherics/pipe/manifold/yellow
name = "Air supply pipe"
name = "\improper Air supply pipe"
_color = "yellow"
color=PIPE_COLOR_YELLOW
/obj/machinery/atmospherics/pipe/manifold/cyan
name = "Air supply pipe"
name = "\improper Air supply pipe"
_color = "cyan"
color=PIPE_COLOR_CYAN
/obj/machinery/atmospherics/pipe/manifold/filtering
name = "Air filtering pipe"
name = "\improper Air filtering pipe"
_color = "green"
color=PIPE_COLOR_GREEN
/obj/machinery/atmospherics/pipe/manifold/insulated
name = "Insulated pipe"
name = "\improper Insulated pipe"
//icon = 'icons/obj/atmospherics/red_pipe.dmi'
icon = 'icons/obj/atmospherics/insulated.dmi'
icon_state = "manifold"
@@ -631,10 +635,16 @@
_color = "red"
color=IPIPE_COLOR_RED
level = 2
available_colors = list(
"red"=IPIPE_COLOR_RED,
"blue"=IPIPE_COLOR_BLUE
"red" = IPIPE_COLOR_RED,
"blue" = IPIPE_COLOR_BLUE,
"cyan" = PIPE_COLOR_CYAN,
"green" = PIPE_COLOR_GREEN,
"yellow" = PIPE_COLOR_YELLOW,
"purple" = PIPE_COLOR_PURPLE
)
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible
level = 2
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden
@@ -841,40 +851,46 @@
update_icon()
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers
name = "Scrubbers pipe"
name = "\improper Scrubbers pipe"
_color = "red"
color=PIPE_COLOR_RED
/obj/machinery/atmospherics/pipe/manifold4w/supply
name = "Air supply pipe"
name = "\improper Air supply pipe"
_color = "blue"
color=PIPE_COLOR_BLUE
/obj/machinery/atmospherics/pipe/manifold4w/supplymain
name = "Main air supply pipe"
name = "\improper Main air supply pipe"
_color = "purple"
color=PIPE_COLOR_PURPLE
/obj/machinery/atmospherics/pipe/manifold4w/general
name = "Air supply pipe"
name = "\improper Air supply pipe"
_color = "gray"
color=PIPE_COLOR_GREY
/obj/machinery/atmospherics/pipe/manifold4w/yellow
name = "Air supply pipe"
name = "\improper Air supply pipe"
_color = "yellow"
color=PIPE_COLOR_YELLOW
/obj/machinery/atmospherics/pipe/manifold4w/filtering
name = "Air filtering pipe"
name = "\improper Air filtering pipe"
_color = "green"
color=PIPE_COLOR_GREEN
/obj/machinery/atmospherics/pipe/manifold4w/insulated
icon = 'icons/obj/atmospherics/insulated.dmi'
name = "Insulated pipe"
name = "\improper Insulated pipe"
_color = "red"
alert_pressure = 900*ONE_ATMOSPHERE
color=IPIPE_COLOR_RED
level = 2
available_colors = list(
"red"=IPIPE_COLOR_RED,
"blue"=IPIPE_COLOR_BLUE
"red" = IPIPE_COLOR_RED,
"blue" = IPIPE_COLOR_BLUE,
"cyan" = PIPE_COLOR_CYAN,
"green" = PIPE_COLOR_GREEN,
"yellow" = PIPE_COLOR_YELLOW,
"purple" = PIPE_COLOR_PURPLE
)
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/visible
level = 2
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden
@@ -919,7 +935,7 @@
/obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if(istype(W, /obj/item/weapon/pipe_dispenser) || istype(W, /obj/item/device/pipe_painter))
if(istype(W, /obj/item/device/rcd/rpd) || istype(W, /obj/item/device/pipe_painter))
return // Coloring pipes.
if(istype(W, /obj/item/weapon/reagent_containers/glass/paint/red))