Merge branch 'fake-master' into development

# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm
This commit is contained in:
skull132
2017-12-09 00:08:21 +02:00
35 changed files with 9515 additions and 9309 deletions
+4
View File
@@ -45,6 +45,10 @@ Pipelines + Other Objects -> Pipe network
if (mapload)
return INITIALIZE_HINT_LATELOAD
/obj/machinery/atmospherics/Destroy()
..()
return QDEL_HINT_HARDDEL // fuck it
/obj/machinery/atmospherics/proc/atmos_init()
// atmos_init() and Initialize() must be separate, as atmos_init() can be called multiple times after the machine has been initialized.