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

Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2

Browse Source 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
This commit is contained in:
duncathan
2015-07-16 04:27:25 -06:00
parent 280373489b 009a53271e
commit ae417d2a03
862 changed files with 4474 additions and 4054 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
+2 -1
View File
@@ -18,7 +18,7 @@
/*
Iconnery
*/
/obj/machinery/atmospherics/components/binary/hide(var/intact)
/obj/machinery/atmospherics/components/binary/hide(intact)
showpipe = !intact
update_icon()
@@ -32,6 +32,7 @@ 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
+2 -4
View File
@@ -145,8 +145,7 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/attack_hand(user as mob)
if(..())
/obj/machinery/atmospherics/components/binary/passive_gate/attack_hand(mob/user) if(..())
return
src.add_fingerprint(usr)
if(!src.allowed(user))
@@ -179,8 +178,7 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, 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
+3 -6
View File
@@ -97,8 +97,7 @@ 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", var/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)
@@ -148,8 +147,7 @@ Thus, the two variables affect pump operation are set in New():
return
/obj/machinery/atmospherics/components/binary/pump/attack_hand(user as mob)
if(..())
/obj/machinery/atmospherics/components/binary/pump/attack_hand(mod/user) if(..())
return
src.add_fingerprint(usr)
if(!src.allowed(user))
@@ -180,8 +178,7 @@ Thus, the two variables affect pump operation are set in New():
..()
update_icon()
/obj/machinery/atmospherics/components/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
if (!istype(W, /obj/item/weapon/wrench))
/obj/machinery/atmospherics/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
+3 -6
View File
@@ -94,8 +94,7 @@ 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", var/datum/nanoui/ui = null)
if(stat & (BROKEN|NOPOWER))
/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui = 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)
@@ -145,8 +144,7 @@ Thus, the two variables affect pump operation are set in New():
update_icon()
/obj/machinery/atmospherics/components/binary/volume_pump/attack_hand(user as mob)
if(..())
/obj/machinery/atmospherics/components/binary/volume_pump/attack_hand(mob/user) if(..())
return
src.add_fingerprint(usr)
if(!src.allowed(user))
@@ -179,8 +177,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/volume_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, 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>"