cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fake-master' into development

Browse Source 
# 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
parent e0ce06ddaf abde5f29c0
commit d536d9f4aa
35 changed files with 9515 additions and 9309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/garbage.dm
+4
View File
@@ -255,3 +255,7 @@ var/datum/controller/subsystem/garbage_collector/SSgarbage
/client/Destroy()
..()
return QDEL_HINT_HARDDEL_NOW
/image/Destroy()
..()
return QDEL_HINT_HARDDEL