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

July 5th TG sync (#1883)

Browse Source 
July 5th TG sync
This commit is contained in:
Poojawa
2017-07-05 22:14:19 -05:00
committed by GitHub
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/card.dm
+1 -2
View File
@@ -41,11 +41,10 @@
/datum/computer_file/program/card_mod/New()
..()
change_position_cooldown = config.id_console_jobslot_delay
addtimer(CALLBACK(src, .proc/SetConfigCooldown), 0)
/datum/computer_file/program/card_mod/proc/SetConfigCooldown()
change_position_cooldown = config.id_console_jobslot_delay
/datum/computer_file/program/card_mod/event_idremoved(background, slot)
if(!slot || slot == 2)// slot being false means both are removed
code/modules/modular_computers/file_system/programs/sm_monitor.dm
+5 -6
View File
@@ -70,7 +70,7 @@
refresh()
return
var/datum/gas_mixture/air = T.return_air()
if(!istype(air))
if(!air)
active = null
return
@@ -81,19 +81,18 @@
data["SM_ambientpressure"] = air.return_pressure()
//data["SM_EPR"] = round((air.total_moles / air.group_multiplier) / 23.1, 0.01)
var/list/gasdata = list()
var/list/gaseslist = list("o2","co2","n2","plasma","n2o")
if(air.total_moles())
for(var/gasid in gaseslist)
for(var/gasid in air.gases)
gasdata.Add(list(list(
"name"= gasid,
"name"= air.gases[gasid][GAS_META][META_GAS_NAME],
"amount" = round(100*air.gases[gasid][MOLES]/air.total_moles(),0.01))))
else
for(var/gasid in gaseslist)
for(var/gasid in air.gases)
gasdata.Add(list(list(
"name"= gasid,
"name"= air.gases[gasid][GAS_META][META_GAS_NAME],
"amount" = 0)))
data["gases"] = gasdata
code/modules/modular_computers/file_system/programs/sm_monitor.dm.rej
-36
View File
@@ -1,36 +0,0 @@
diff a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm (rejected hunks)
@@ -70,32 +70,27 @@
refresh()
return
var/datum/gas_mixture/air = T.return_air()
- if(!istype(air))
+ if(!air)
active = null
return
- data["active"] = 1
+ data["active"] = TRUE
data["SM_integrity"] = active.get_integrity()
data["SM_power"] = active.power
data["SM_ambienttemp"] = air.temperature
data["SM_ambientpressure"] = air.return_pressure()
//data["SM_EPR"] = round((air.total_moles / air.group_multiplier) / 23.1, 0.01)
var/list/gasdata = list()
- var/list/relevantgas = list("o2","co2","n2","plasma","n2o","freon")
if(air.total_moles())
for(var/gasid in air.gases)
- if(!gasid in relevantgas)
- continue
gasdata.Add(list(list(
"name"= air.gases[gasid][GAS_META][META_GAS_NAME],
"amount" = round(100*air.gases[gasid][MOLES]/air.total_moles(),0.01))))
else
for(var/gasid in air.gases)
- if(!gasid in relevantgas)
- continue
gasdata.Add(list(list(
"name"= air.gases[gasid][GAS_META][META_GAS_NAME],
"amount" = 0)))