cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
duncathan
2015-07-16 04:54:11 -06:00
parent ae417d2a03
commit 8c2519e115
10 changed files with 31 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
-1
View File
@@ -32,7 +32,6 @@ Housekeeping and pipe network stuff
var/node2_connect = dir
var/node1_connect = turn(dir, 180)
/obj/machinery/atmospherics/binary/unsafe_pressure_release(mob/user,pressures)
var/list/node_connects = new/list()
node_connects.Add(node1_connect, node2_connect)
..(node_connects)
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+4 -2
View File
@@ -145,7 +145,8 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/attack_hand(mob/user) if(..())
/obj/machinery/atmospherics/components/binary/passive_gate/attack_hand(mob/user)
if(..())
return
src.add_fingerprint(usr)
if(!src.allowed(user))
@@ -178,7 +179,8 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench))
/obj/machinery/atmospherics/components/binary/passive_gate/attackby(obj/item/weapon/W, mob/user, params)
if (!istype(W, /obj/item/weapon/wrench))
return ..()
if (on)
user << "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>"
code/ATMOSPHERICS/components/binary_devices/pump.dm
+6 -3
View File
@@ -97,7 +97,8 @@ Thus, the two variables affect pump operation are set in New():
return 1
/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER))
/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null)
if(stat & (BROKEN|NOPOWER))
return
ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_gas_pump.tmpl", name, 400, 120, 0)
@@ -147,7 +148,8 @@ Thus, the two variables affect pump operation are set in New():
return
/obj/machinery/atmospherics/components/binary/pump/attack_hand(mod/user) if(..())
/obj/machinery/atmospherics/components/binary/pump/attack_hand(mob/user)
if(..())
return
src.add_fingerprint(usr)
if(!src.allowed(user))
@@ -178,7 +180,8 @@ Thus, the two variables affect pump operation are set in New():
..()
update_icon()
/obj/machinery/atmospherics/binary/pump/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench))
/obj/machinery/atmospherics/components/binary/pump/attackby(obj/item/weapon/W, mob/user, params)
if (!istype(W, /obj/item/weapon/wrench))
return ..()
if (!(stat & NOPOWER) && on)
user << "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>"
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+6 -3
View File
@@ -94,7 +94,8 @@ Thus, the two variables affect pump operation are set in New():
return 1
/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui = null) if(stat & (BROKEN|NOPOWER))
/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null)
if(stat & (BROKEN|NOPOWER))
return
ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_gas_pump.tmpl", name, 400, 120, 0)
@@ -144,7 +145,8 @@ Thus, the two variables affect pump operation are set in New():
update_icon()
/obj/machinery/atmospherics/components/binary/volume_pump/attack_hand(mob/user) if(..())
/obj/machinery/atmospherics/components/binary/volume_pump/attack_hand(mob/user)
if(..())
return
src.add_fingerprint(usr)
if(!src.allowed(user))
@@ -177,7 +179,8 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench))
/obj/machinery/atmospherics/components/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params)
if (!istype(W, /obj/item/weapon/wrench))
return ..()
if (!(stat & NOPOWER) && on)
user << "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>"