shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6853 from Citadel-Station-13/upstream-merge-37969

Browse Source 
[MIRROR] Fixes digital valves not working for silicons
This commit is contained in:
LetterJay
2018-05-23 06:45:24 -05:00
committed by GitHub
parent b515e87f1e f17ca4de1a
commit ad61d9927e
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/atmospherics/machinery/components/binary_devices/valve.dm
View File

@@ -8,6 +8,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
desc = "A pipe with a valve that can be used to disable flow of gas through it."
can_unwrench = TRUE
interaction_flags_machine = INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_OPEN //Intentionally no allow_silicon flag
var/frequency = 0
var/id = null
@@ -68,13 +69,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
else if(dir==WEST)
setDir(EAST)
/obj/machinery/atmospherics/components/binary/valve/attack_ai(mob/user)
return
/obj/machinery/atmospherics/components/binary/valve/attack_hand(mob/user)
. = ..()
if(.)
return
/obj/machinery/atmospherics/components/binary/valve/interact(mob/user)
add_fingerprint(usr)
update_icon_nopipes(1)
if(switching)
@@ -97,6 +92,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
icon_state = "dvalve_map"
valve_type = "d"
pipe_state = "dvalve"
interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_OPEN | INTERACT_MACHINE_OPEN_SILICON
/obj/machinery/atmospherics/components/binary/valve/digital/layer1
piping_layer = PIPING_LAYER_MIN
@@ -108,9 +104,6 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
pixel_x = PIPING_LAYER_P_X
pixel_y = PIPING_LAYER_P_Y
/obj/machinery/atmospherics/components/binary/valve/digital/attack_ai(mob/user)
return attack_hand(user)
/obj/machinery/atmospherics/components/binary/valve/digital/update_icon_nopipes(animation)
if(!is_operational())
normalize_dir()