From beb56c17a7b91ad5b0035e5aff660f92958b464f Mon Sep 17 00:00:00 2001 From: Geeves Date: Fri, 26 Mar 2021 00:53:22 +0200 Subject: [PATCH] Closet Teleporter Cooldown (#11506) --- code/game/objects/structures/crates_lockers/closets.dm | 5 ++++- html/changelogs/geeves-closet_teleporter_sanity.yml | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/geeves-closet_teleporter_sanity.yml diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index e9e9bd2e142..9258989753d 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -155,9 +155,12 @@ if(linked_teleporter) if(linked_teleporter.last_use + 600 > world.time) return + var/did_teleport = FALSE for(var/mob/M in contents) + did_teleport = TRUE linked_teleporter.do_teleport(M) - linked_teleporter.last_use = world.time + if(did_teleport) + linked_teleporter.last_use = world.time playsound(get_turf(src), close_sound, 25, 0, -3) density = initial(density) diff --git a/html/changelogs/geeves-closet_teleporter_sanity.yml b/html/changelogs/geeves-closet_teleporter_sanity.yml new file mode 100644 index 00000000000..b8eef17e018 --- /dev/null +++ b/html/changelogs/geeves-closet_teleporter_sanity.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - tweak: "Closet Teleporters now only go on cooldown if they successfully teleported a mob." \ No newline at end of file