From 8e5d67ef2cad285d60caae6f1f6e7e2cb503c116 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:23:36 +0100 Subject: [PATCH] Removes bump teleporters (#27848) --- code/game/objects/effects/bump_teleporter.dm | 39 -------------------- paradise.dme | 1 - 2 files changed, 40 deletions(-) delete mode 100644 code/game/objects/effects/bump_teleporter.dm diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm deleted file mode 100644 index f2359f6d94b..00000000000 --- a/code/game/objects/effects/bump_teleporter.dm +++ /dev/null @@ -1,39 +0,0 @@ -GLOBAL_LIST_EMPTY(bump_teleporters) - -/obj/effect/bump_teleporter - name = "bump-teleporter" - icon = 'icons/mob/screen_gen.dmi' - icon_state = "x2" - var/id = null //id of this bump_teleporter. - var/id_target = null //id of bump_teleporter which this moves you to. - invisibility = 101 //nope, can't see this - density = TRUE - opacity = FALSE - -/obj/effect/bump_teleporter/New() - ..() - GLOB.bump_teleporters += src - -/obj/effect/bump_teleporter/Destroy() - GLOB.bump_teleporters -= src - return ..() - -/obj/effect/bump_teleporter/singularity_act() - return - -/obj/effect/bump_teleporter/singularity_pull() - return - -/obj/effect/bump_teleporter/Bumped(atom/user) - if(!ismob(user)) - //user.loc = src.loc //Stop at teleporter location - return - - if(!id_target) - //user.loc = src.loc //Stop at teleporter location, there is nowhere to teleport to. - return - - for(var/obj/effect/bump_teleporter/BT in GLOB.bump_teleporters) - if(BT.id == src.id_target) - usr.loc = BT.loc //Teleport to location with correct id. - return diff --git a/paradise.dme b/paradise.dme index 00410929ad3..7370256726e 100644 --- a/paradise.dme +++ b/paradise.dme @@ -999,7 +999,6 @@ #include "code\game\objects\structures.dm" #include "code\game\objects\effects\alien_acid.dm" #include "code\game\objects\effects\anomalies.dm" -#include "code\game\objects\effects\bump_teleporter.dm" #include "code\game\objects\effects\effects.dm" #include "code\game\objects\effects\forcefields.dm" #include "code\game\objects\effects\gibs.dm"