mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 07:33:34 +01:00
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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user