Merge branch 'master' into upstream-merge-32504

2017-11-12 23:11:53 -06:00
parent b0439afd08 3ea8808201
commit 7e6283a3f0
599 changed files with 15855 additions and 19219 deletions
@@ -3,11 +3,8 @@
    var/list/active_timers  //for SStimer
    var/list/datum_components //for /datum/components
    var/ui_screen = "home"  //for tgui
-<<<<<<< HEAD
-=======
    var/use_tag = FALSE
    var/datum/weakref/weak_reference
->>>>>>> 4edd802... Weak references + Cameras now use them (#32504)

 #ifdef TESTING
    var/running_find_references