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

Merge pull request #11296 from VOREStation/Arokha/randomfixes

Browse Source 
Two random map fixes
This commit is contained in:
Aronai Sieyes
2021-07-29 20:09:10 +00:00
committed by Chompstation Bot
parent 9ea5d5f3d8
commit 7aec486d70
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/step_triggers.dm
+4 -1
View File
@@ -105,6 +105,8 @@
/obj/effect/step_trigger/teleporter/proc/move_object(atom/movable/AM, turf/T)
if(!T)
return
if(AM.anchored && !istype(AM, /obj/mecha))
return
@@ -160,7 +162,8 @@
if(teleport_x && teleport_y && teleport_z)
if(teleport_x_offset && teleport_y_offset && teleport_z_offset)
var/turf/T = locate(rand(teleport_x, teleport_x_offset), rand(teleport_y, teleport_y_offset), rand(teleport_z, teleport_z_offset))
A.forceMove(T)
if(T)
A.forceMove(T)
/* Teleporter that sends objects stepping on it to a specific landmark. */