April sync (#360)
* Maps and things no code/icons * helpers defines globalvars * Onclick world.dm orphaned_procs * subsystems Round vote and shuttle autocall done here too * datums * Game folder * Admin - chatter modules * clothing - mining * modular computers - zambies * client * mob level 1 * mob stage 2 + simple_animal * silicons n brains * mob stage 3 + Alien/Monkey * human mobs * icons updated * some sounds * emitter y u no commit * update tgstation.dme * compile fixes * travis fixes Also removes Fast digest mode, because reasons. * tweaks for travis Mentors are broke again Also fixes Sizeray guns * oxygen loss fix for vore code. * removes unused code * some code updates * bulk fixes * further fixes * outside things * whoops. * Maint bar ported * GLOBs.
This commit is contained in:
@@ -22,7 +22,7 @@ Buildable meters
|
||||
var/flipped = 0
|
||||
var/is_bent = 0
|
||||
|
||||
var/global/list/pipe_types = list(
|
||||
var/static/list/pipe_types = list(
|
||||
PIPE_SIMPLE, \
|
||||
PIPE_MANIFOLD, \
|
||||
PIPE_4WAYMANIFOLD, \
|
||||
@@ -73,7 +73,7 @@ Buildable meters
|
||||
src.pipe_type = pipe_type
|
||||
src.setDir(dir)
|
||||
|
||||
if(src.dir in diagonals)
|
||||
if(src.dir in GLOB.diagonals)
|
||||
is_bent = 1
|
||||
|
||||
update()
|
||||
@@ -81,7 +81,7 @@ Buildable meters
|
||||
src.pixel_y = rand(-5, 5)
|
||||
|
||||
//update the name and icon of the pipe item depending on the type
|
||||
var/global/list/pipeID2State = list(
|
||||
GLOBAL_LIST_INIT(pipeID2State, list(
|
||||
"[PIPE_SIMPLE]" = "simple", \
|
||||
"[PIPE_MANIFOLD]" = "manifold", \
|
||||
"[PIPE_4WAYMANIFOLD]" = "manifold4w", \
|
||||
@@ -103,7 +103,7 @@ var/global/list/pipeID2State = list(
|
||||
\
|
||||
"[PIPE_GAS_FILTER]" = "filter", \
|
||||
"[PIPE_GAS_MIXER]" = "mixer", \
|
||||
)
|
||||
))
|
||||
|
||||
/obj/item/pipe/proc/update()
|
||||
var/list/nlist = list(\
|
||||
@@ -133,7 +133,7 @@ var/global/list/pipeID2State = list(
|
||||
)
|
||||
//fix_pipe_type()
|
||||
name = nlist["[pipe_type][is_bent ? "_b" : ""]"] + " fitting"
|
||||
icon_state = pipeID2State["[pipe_type]"]
|
||||
icon_state = GLOB.pipeID2State["[pipe_type]"]
|
||||
|
||||
// rotate the pipe item clockwise
|
||||
|
||||
@@ -186,7 +186,7 @@ var/global/list/pipeID2State = list(
|
||||
setDir(old_dir )//pipes changing direction when moved is just annoying and buggy
|
||||
|
||||
/obj/item/pipe/proc/unflip(direction)
|
||||
if(direction in diagonals)
|
||||
if(direction in GLOB.diagonals)
|
||||
return turn(direction, 45)
|
||||
|
||||
return direction
|
||||
|
||||
Reference in New Issue
Block a user