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

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

Browse Source 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
This commit is contained in:
duncathan
2016-01-13 20:07:21 -06:00
parent d5086b27b4 8ad0baae70
commit 9066bc7c4f
398 changed files with 7356 additions and 6636 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+4 -3
View File
@@ -97,10 +97,11 @@ Passive gate is similar to the regular pump except:
if(stat & (BROKEN|NOPOWER)) return
ui_interact(user)
/obj/machinery/atmospherics/components/binary/passive_gate/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
/obj/machinery/atmospherics/components/binary/passive_gate/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
ui = new(user, src, ui_key, "atmos_pump", name, 335, 115)
ui = new(user, src, ui_key, "atmos_pump", name, 335, 115, master_ui, state)
ui.open()
/obj/machinery/atmospherics/components/binary/passive_gate/get_ui_data()
code/ATMOSPHERICS/components/binary_devices/pump.dm
+4 -3
View File
@@ -105,10 +105,11 @@ Thus, the two variables affect pump operation are set in New():
return
ui_interact(user)
/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
ui = new(user, src, ui_key, "atmos_pump", name, 335, 115)
ui = new(user, src, ui_key, "atmos_pump", name, 335, 115, master_ui, state)
ui.open()
/obj/machinery/atmospherics/components/binary/pump/get_ui_data()
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+4 -3
View File
@@ -102,10 +102,11 @@ Thus, the two variables affect pump operation are set in New():
return
ui_interact(user)
/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
ui = new(user, src, ui_key, "atmos_pump", name, 310, 115)
ui = new(user, src, ui_key, "atmos_pump", name, 310, 115, master_ui, state)
ui.open()
/obj/machinery/atmospherics/components/binary/volume_pump/get_ui_data()
code/ATMOSPHERICS/components/trinary_devices/filter.dm
+4 -3
View File
@@ -145,10 +145,11 @@ Filter types:
return
ui_interact(user)
/obj/machinery/atmospherics/components/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
/obj/machinery/atmospherics/components/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
ui = new(user, src, ui_key, "atmos_filter", name, 430, 140)
ui = new(user, src, ui_key, "atmos_filter", name, 430, 140, master_ui, state)
ui.open()
/obj/machinery/atmospherics/components/trinary/filter/get_ui_data()
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+4 -3
View File
@@ -129,10 +129,11 @@
return
ui_interact(user)
/obj/machinery/atmospherics/components/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
/obj/machinery/atmospherics/components/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
ui = new(user, src, ui_key, "atmos_mixer", name, 330, 165)
ui = new(user, src, ui_key, "atmos_mixer", name, 330, 165, master_ui, state)
ui.open()
/obj/machinery/atmospherics/components/trinary/mixer/get_ui_data()
code/ATMOSPHERICS/components/unary_devices/cryo.dm
+4 -3
View File
@@ -110,10 +110,11 @@
return
ui_interact(user)
/obj/machinery/atmospherics/components/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
/obj/machinery/atmospherics/components/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = notcontained_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
ui = new(user, src, ui_key, "cryo", name, 400, 550, state = notcontained_state)
ui = new(user, src, ui_key, "cryo", name, 400, 550, master_ui, state)
ui.open()
/obj/machinery/atmospherics/components/unary/cryo_cell/get_ui_data()
code/ATMOSPHERICS/components/unary_devices/portables_connector.dm
+6
View File
@@ -8,6 +8,12 @@
use_power = 0
level = 0
/obj/machinery/atmospherics/components/unary/portables_connector/New()
..()
var/datum/gas_mixture/air_contents = AIR1
air_contents.volume = 0
/obj/machinery/atmospherics/components/unary/portables_connector/visible
level = 2
code/ATMOSPHERICS/gas_types.dm
+1
View File
@@ -74,6 +74,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
icon = 'icons/effects/tile_effects.dmi'
mouse_opacity = 0
layer = 5
appearance_flags = RESET_COLOR
/obj/effect/overlay/gas/New(state)
. = ..()