cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

Browse Source 
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
This commit is contained in:
Leshana
2018-01-27 22:14:54 -05:00
parent 8f2756ef63 1f80c3336d
commit 27c3272821
106 changed files with 16929 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ATMOSPHERICS/components/omni_devices/mixer.dm
View File

@@ -52,7 +52,7 @@
/obj/machinery/atmospherics/omni/mixer/Destroy()
inputs.Cut()
output = null
..()
. = ..()
/obj/machinery/atmospherics/omni/mixer/sort_ports()
for(var/datum/omni_port/P in ports)

2
code/ATMOSPHERICS/components/omni_devices/omni_base.dm
View File

@@ -244,7 +244,7 @@
P.node.disconnect(src)
qdel(P.network)
P.node = null
ports = null
. = ..()
/obj/machinery/atmospherics/omni/atmos_init()