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

This commit is contained in:
Crazylemon64
2016-07-02 15:37:58 -07:00
215 changed files with 5542 additions and 3288 deletions
+3
View File
@@ -94,6 +94,9 @@
if("voxstart")
raider_spawn += loc
if("ERT Director")
ertdirector += loc
landmarks_list += src
return 1
+6 -1
View File
@@ -10,6 +10,7 @@
var/creator = null
anchored = 1.0
var/precision = 1 // how close to the portal you will teleport. 0 = on the portal, 1 = adjacent
var/can_multitool_to_remove = 0
/obj/effect/portal/Bumped(mob/M as mob|obj)
src.teleport(M)
@@ -47,4 +48,8 @@
src.icon_state = "portal1"
do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0)
else
do_teleport(M, target, precision) ///You will appear adjacent to the beacon
do_teleport(M, target, precision) ///You will appear adjacent to the beacon
/obj/effect/portal/attackby(obj/item/A, mob/user)
if(istype(A, /obj/item/device/multitool) && can_multitool_to_remove)
qdel(src)