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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

Browse Source 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
This commit is contained in:
LetterJay
2018-01-02 05:16:13 -06:00
parent 30d4b25aee b49009d481
commit f2f6d9d910
74 changed files with 370 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/generator.dm
+6 -6
View File
@@ -99,11 +99,11 @@
// update icon overlays only if displayed level has changed
if(hot_air)
var/datum/gas_mixture/hot_circ_air1 = hot_circ.AIR1
var/datum/gas_mixture/hot_circ_air1 = hot_circ.airs[1]
hot_circ_air1.merge(hot_air)
if(cold_air)
var/datum/gas_mixture/cold_circ_air1 = cold_circ.AIR1
var/datum/gas_mixture/cold_circ_air1 = cold_circ.airs[1]
cold_circ_air1.merge(cold_air)
update_icon()
@@ -134,10 +134,10 @@
if(!powernet)
t += "<span class='bad'>Unable to connect to the power network!</span>"
else if(cold_circ && hot_circ)
var/datum/gas_mixture/cold_circ_air1 = cold_circ.AIR1
var/datum/gas_mixture/cold_circ_air2 = cold_circ.AIR2
var/datum/gas_mixture/hot_circ_air1 = hot_circ.AIR1
var/datum/gas_mixture/hot_circ_air2 = hot_circ.AIR2
var/datum/gas_mixture/cold_circ_air1 = cold_circ.airs[1]
var/datum/gas_mixture/cold_circ_air2 = cold_circ.airs[2]
var/datum/gas_mixture/hot_circ_air1 = hot_circ.airs[1]
var/datum/gas_mixture/hot_circ_air2 = hot_circ.airs[2]
t += "<div class='statusDisplay'>"