mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-30 08:39:12 +01:00
Merge pull request #11296 from VOREStation/Arokha/randomfixes
Two random map fixes
This commit is contained in:
committed by
Chompstation Bot
parent
9ea5d5f3d8
commit
7aec486d70
@@ -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. */
|
||||
|
||||
|
||||
@@ -67,13 +67,13 @@
|
||||
/turf/simulated/floor,
|
||||
/area/submap/virgo2/DecoupledEngine)
|
||||
"ar" = (
|
||||
/obj/structure/sign/poi/engineright{
|
||||
/obj/structure/sign/scenery/engineright{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/submap/virgo2/DecoupledEngine)
|
||||
"as" = (
|
||||
/obj/structure/sign/poi/engineleft{
|
||||
/obj/structure/sign/scenery/engineleft{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/wall/r_wall,
|
||||
@@ -474,11 +474,11 @@
|
||||
/turf/simulated/floor,
|
||||
/area/submap/virgo2/DecoupledEngine)
|
||||
"bv" = (
|
||||
/obj/structure/sign/poi/engineleft,
|
||||
/obj/structure/sign/scenery/engineleft,
|
||||
/turf/simulated/wall/durasteel,
|
||||
/area/submap/virgo2/DecoupledEngine)
|
||||
"bw" = (
|
||||
/obj/structure/sign/poi/engineright,
|
||||
/obj/structure/sign/scenery/engineright,
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/submap/virgo2/DecoupledEngine)
|
||||
"bx" = (
|
||||
|
||||
Reference in New Issue
Block a user