Merge branch 'master' into ERT-changes

This commit is contained in:
Birdtalon
2018-10-07 19:22:10 +01:00
257 changed files with 20916 additions and 9006 deletions
+3
View File
@@ -23,6 +23,9 @@
processing_objects.Remove(src)
return ..()
/obj/item/gun/medbeam/handle_suicide()
return
/obj/item/gun/medbeam/dropped(mob/user)
..()
LoseTarget()