cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-31 20:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into span_class=notice

Browse Source 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm
This commit is contained in:
GinjaNinja32
2015-06-02 17:33:20 +01:00
parent 94e19592cf b144a00ddc
commit 314a28fa75
162 changed files with 2537 additions and 1124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/TriDimension/controller.dm
View File

@@ -92,16 +92,6 @@
turf += src
c.add(turf,3,1)
/turf/space/New()
..()
var/turf/controller = locate(1, 1, z)
for(var/obj/effect/landmark/zcontroller/c in controller)
if(c.initialized)
var/list/turf = list()
turf += src
c.add(turf,3,1)
atom/movable/Move() //Hackish
. = ..()