From fa97d4e97ba9a7086769e99fe21875efcadcd0e5 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Thu, 9 Jul 2020 11:12:33 +0200
Subject: [PATCH] Teleporting Suit Cyclers Fix (#9314)

---
 code/game/machinery/suit_cycler.dm             | 10 ++++++++--
 html/changelogs/geeves-suit_cycler_exploit.yml |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/geeves-suit_cycler_exploit.yml

diff --git a/code/game/machinery/suit_cycler.dm b/code/game/machinery/suit_cycler.dm
index 8bdfc5b67ef..12e9ba0fc55 100644
--- a/code/game/machinery/suit_cycler.dm
+++ b/code/game/machinery/suit_cycler.dm
@@ -368,11 +368,16 @@
 	return
 
 /obj/machinery/suit_cycler/Topic(href, href_list)
+	if(!Adjacent(usr) && !issilicon(usr))
+		to_chat(usr, SPAN_WARNING("\The [src] is out of your reach."))
+		return
+
 	if(href_list["eject_suit"])
 		if(!suit)
 			return
 		suit.forceMove(get_turf(src))
-		usr.put_in_hands(suit)
+		if(Adjacent(usr))
+			usr.put_in_hands(suit)
 		suit = null
 		update_icon()
 
@@ -380,7 +385,8 @@
 		if(!helmet)
 			return
 		helmet.forceMove(get_turf(src))
-		usr.put_in_hands(helmet)
+		if(Adjacent(usr))
+			usr.put_in_hands(helmet)
 		helmet = null
 		update_icon()
 
diff --git a/html/changelogs/geeves-suit_cycler_exploit.yml b/html/changelogs/geeves-suit_cycler_exploit.yml
new file mode 100644
index 00000000000..932755e946c
--- /dev/null
+++ b/html/changelogs/geeves-suit_cycler_exploit.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - bugfix: "Suit Cyclers will now only put ejected contents in your hands if you're adjacent to it. No more bluespace cyclers."
\ No newline at end of file