mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 13:47:33 +01:00
Refactors code to work with BYOND 500.
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals. /obj/item/color is now item_color /obj/atmospherics/color is now pipe_color simple_animals color is now body_color Removes transformer.dm since it conflicted with transform() and was never used. Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
@@ -20,7 +20,7 @@ obj/machinery/atmospherics
|
||||
|
||||
|
||||
obj/machinery/atmospherics/var/initialize_directions = 0
|
||||
obj/machinery/atmospherics/var/color
|
||||
obj/machinery/atmospherics/var/pipe_color
|
||||
|
||||
obj/machinery/atmospherics/process()
|
||||
build_network()
|
||||
|
||||
+17
-17
@@ -186,7 +186,7 @@ obj/machinery/atmospherics/pipe
|
||||
update_icon()
|
||||
if(node1&&node2)
|
||||
var/C = ""
|
||||
switch(color)
|
||||
switch(pipe_color)
|
||||
if ("red") C = "-r"
|
||||
if ("blue") C = "-b"
|
||||
if ("cyan") C = "-c"
|
||||
@@ -252,22 +252,22 @@ obj/machinery/atmospherics/pipe
|
||||
|
||||
simple/scrubbers
|
||||
name="Scrubbers pipe"
|
||||
color="red"
|
||||
pipe_color="red"
|
||||
icon_state = ""
|
||||
|
||||
simple/supply
|
||||
name="Air supply pipe"
|
||||
color="blue"
|
||||
pipe_color="blue"
|
||||
icon_state = ""
|
||||
|
||||
simple/supplymain
|
||||
name="Main air supply pipe"
|
||||
color="purple"
|
||||
pipe_color="purple"
|
||||
icon_state = ""
|
||||
|
||||
simple/general
|
||||
name="Pipe"
|
||||
color=""
|
||||
pipe_color=""
|
||||
icon_state = ""
|
||||
|
||||
simple/scrubbers/visible
|
||||
@@ -304,7 +304,7 @@ obj/machinery/atmospherics/pipe
|
||||
|
||||
simple/yellow
|
||||
name="Pipe"
|
||||
color="yellow"
|
||||
pipe_color="yellow"
|
||||
icon_state = ""
|
||||
|
||||
simple/yellow/visible
|
||||
@@ -697,7 +697,7 @@ obj/machinery/atmospherics/pipe
|
||||
update_icon()
|
||||
if(node1&&node2&&node3)
|
||||
var/C = ""
|
||||
switch(color)
|
||||
switch(pipe_color)
|
||||
if ("red") C = "-r"
|
||||
if ("blue") C = "-b"
|
||||
if ("cyan") C = "-c"
|
||||
@@ -769,27 +769,27 @@ obj/machinery/atmospherics/pipe
|
||||
|
||||
manifold/scrubbers
|
||||
name="Scrubbers pipe"
|
||||
color="red"
|
||||
pipe_color="red"
|
||||
icon_state = ""
|
||||
|
||||
manifold/supply
|
||||
name="Air supply pipe"
|
||||
color="blue"
|
||||
pipe_color="blue"
|
||||
icon_state = ""
|
||||
|
||||
manifold/supplymain
|
||||
name="Main air supply pipe"
|
||||
color="purple"
|
||||
pipe_color="purple"
|
||||
icon_state = ""
|
||||
|
||||
manifold/general
|
||||
name="Air supply pipe"
|
||||
color="gray"
|
||||
pipe_color="gray"
|
||||
icon_state = ""
|
||||
|
||||
manifold/yellow
|
||||
name="Air supply pipe"
|
||||
color="yellow"
|
||||
pipe_color="yellow"
|
||||
icon_state = ""
|
||||
|
||||
manifold/scrubbers/visible
|
||||
@@ -925,7 +925,7 @@ obj/machinery/atmospherics/pipe
|
||||
overlays.Cut()
|
||||
if(node1&&node2&&node3&&node4)
|
||||
var/C = ""
|
||||
switch(color)
|
||||
switch(pipe_color)
|
||||
if ("red") C = "-r"
|
||||
if ("blue") C = "-b"
|
||||
if ("cyan") C = "-c"
|
||||
@@ -980,22 +980,22 @@ obj/machinery/atmospherics/pipe
|
||||
|
||||
manifold4w/scrubbers
|
||||
name="Scrubbers pipe"
|
||||
color="red"
|
||||
pipe_color="red"
|
||||
icon_state = ""
|
||||
|
||||
manifold4w/supply
|
||||
name="Air supply pipe"
|
||||
color="blue"
|
||||
pipe_color="blue"
|
||||
icon_state = ""
|
||||
|
||||
manifold4w/supplymain
|
||||
name="Main air supply pipe"
|
||||
color="purple"
|
||||
pipe_color="purple"
|
||||
icon_state = ""
|
||||
|
||||
manifold4w/general
|
||||
name="Air supply pipe"
|
||||
color="gray"
|
||||
pipe_color="gray"
|
||||
icon_state = ""
|
||||
|
||||
manifold4w/scrubbers/visible
|
||||
|
||||
Reference in New Issue
Block a user