cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge Conflict Fix

Browse Source
This commit is contained in:
Firecage
2016-01-20 14:07:14 +02:00
parent d1327d4076 02a6c6cdef
commit d2bd6871d5
65 changed files with 1590 additions and 1531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/shuttles/assault_pod.dm
+3 -2
View File
@@ -37,8 +37,9 @@
if(!src || qdeleted(src))
return
var/turf/T = pick(get_area_turfs(picked_area))
var/turf/T = safepick(get_area_turfs(picked_area))
if(!T)
return
var/obj/docking_port/stationary/landing_zone = new /obj/docking_port/stationary(T)
landing_zone.id = "assault_pod(\ref[src])"
landing_zone.name = "Landing Zone"