cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes pipe construction. (#15978)

Browse Source 
Co-authored-by: Andrew Cooper <mikomyazaki@gmail.com>
This commit is contained in:
mikomyazaki
2023-03-08 02:59:19 +00:00
committed by GitHub
co-authored by Andrew Cooper
parent 173684e0c7
commit 9fbe22d262
5 changed files with 125 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/RFD.dm
+34 -34
View File
@@ -609,44 +609,44 @@
// The numbers below refer to the numberized designator for each pipe, which is used in obj/item/pipe's new
// Take a look at code\game\machinery\pipe\construction.dm line 69 for more information. - Geeves
var/list/standard_pipes = list(
"Pipe" = 0,
"Bent Pipe" = 1,
"Manifold" = 5,
"Manual Valve" = 8,
"4-Way Manifold" = 19,
"Manual T-Valve" = 18,
"Upward Pipe" = 21,
"Downward Pipe" = 22
"Pipe" = PIPE_SIMPLE_STRAIGHT,
"Bent Pipe" = PIPE_SIMPLE_BENT,
"Manifold" = PIPE_MANIFOLD,
"Manual Valve" = PIPE_MVALVE,
"4-Way Manifold" = PIPE_MANIFOLD4W,
"Manual T-Valve" = PIPE_MTVALVE,
"Upward Pipe" = PIPE_UP,
"Downward Pipe" = PIPE_DOWN
)
var/list/supply_pipes = list(
"Pipe" = 29,
"Bent Pipe" = 30,
"Manifold" = 33,
"4-Way Manifold" = 35,
"Upward Pipe" = 37,
"Downward Pipe" = 39
"Pipe" = PIPE_SUPPLY_STRAIGHT,
"Bent Pipe" = PIPE_SUPPLY_BENT,
"Manifold" = PIPE_SUPPLY_MANIFOLD,
"4-Way Manifold" = PIPE_SUPPLY_MANIFOLD4W,
"Upward Pipe" = PIPE_SUPPLY_UP,
"Downward Pipe" = PIPE_SUPPLY_DOWN
)
var/list/scrubber_pipes = list(
"Pipe" = 31,
"Bent Pipe" = 32,
"Manifold" = 34,
"4-Way Manifold" = 36,
"Upward Pipe" = 38,
"Downward Pipe" = 40
"Pipe" = PIPE_SCRUBBERS_STRAIGHT,
"Bent Pipe" = PIPE_SCRUBBERS_BENT,
"Manifold" = PIPE_SCRUBBERS_MANIFOLD,
"4-Way Manifold" = PIPE_SCRUBBERS_MANIFOLD4W,
"Upward Pipe" = PIPE_SCRUBBERS_UP,
"Downward Pipe" = PIPE_SCRUBBERS_DOWN
)
var/list/devices = list(
"Universal Pipe Adapter" = 28,
"Connector" = 4,
"Unary Vent" = 7,
"Scrubber" = 10,
"Gas Pump" = 9,
"Pressure Regulator" = 15,
"High Power Gas Pump" = 16,
"Gas Filter" = 13,
"Omni Gas Filter" = 27
"Universal Pipe Adapter" = PIPE_UNIVERSAL,
"Connector" = PIPE_CONNECTOR,
"Unary Vent" = PIPE_UVENT,
"Scrubber" = PIPE_SCRUBBER,
"Gas Pump" = PIPE_PUMP,
"Pressure Regulator" = PIPE_PASSIVE_GATE,
"High Power Gas Pump" = PIPE_VOLUME_PUMP,
"Gas Filter" = PIPE_GAS_FILTER_M,
"Omni Gas Filter" = PIPE_OMNI_FILTER
)
/obj/item/rfd/piping/examine(mob/user)
@@ -692,7 +692,7 @@
// Special case handling for bent pipes. They require a non-cardinal direction
var/pipe_dir = NORTH
if(selected_pipe in list(1, 30, 32))
if(selected_pipe in list(PIPE_SIMPLE_BENT, PIPE_SUPPLY_BENT, PIPE_SCRUBBERS_BENT))
pipe_dir = NORTHEAST
new /obj/item/pipe(T, selected_pipe, pipe_dir)
@@ -720,16 +720,16 @@
switch(selected_mode)
if(STANDARD_PIPE)
pipe_examine = "Pipe"
selected_pipe = 0
selected_pipe = PIPE_SIMPLE_STRAIGHT
if(SUPPLY_PIPE)
pipe_examine = "Pipe"
selected_pipe = 29
selected_pipe = PIPE_SUPPLY_STRAIGHT
if(SCRUBBER_PIPE)
pipe_examine = "Pipe"
selected_pipe = 31
selected_pipe = PIPE_SCRUBBERS_STRAIGHT
if(DEVICES)
pipe_examine = "Universal Pipe Adapter"
selected_pipe = 28
selected_pipe = PIPE_UNIVERSAL
/obj/item/rfd/piping/borg/useResource(var/amount, var/mob/user)
if(isrobot(user))