Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals

# Conflicts:
#	_maps/map_files/cyberiad/z2.dmm
#	code/__DEFINES/is_helpers.dm
#	code/__DEFINES/misc.dm
#	code/_globalvars/lists/objects.dm
#	code/modules/mob/living/living_defines.dm
#	icons/effects/beam.dmi
This commit is contained in:
Markolie
2017-02-05 20:12:51 +01:00
530 changed files with 17239 additions and 11419 deletions
+1
View File
@@ -2173,6 +2173,7 @@
else
var/atom/O = new path(target)
if(O)
O.admin_spawned = TRUE
O.dir = obj_dir
if(obj_name)
O.name = obj_name