From 2c761ec367b779de588e5b867c01cb53e9f23c8c Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Fri, 27 Mar 2020 17:25:16 -0400
Subject: [PATCH] Extra overmaps for adminbuse and bluespace rifts

---
 code/modules/overmap/bluespace_rift_vr.dm |  44 ++
 icons/obj/overmap_vr.dmi                  | Bin 0 -> 2179 bytes
 maps/tether/submaps/tether_misc.dmm       | 488 +++++++++++-----------
 vorestation.dme                           |   1 +
 4 files changed, 291 insertions(+), 242 deletions(-)
 create mode 100644 code/modules/overmap/bluespace_rift_vr.dm
 create mode 100644 icons/obj/overmap_vr.dmi

diff --git a/code/modules/overmap/bluespace_rift_vr.dm b/code/modules/overmap/bluespace_rift_vr.dm
new file mode 100644
index 0000000000..198ccc2277
--- /dev/null
+++ b/code/modules/overmap/bluespace_rift_vr.dm
@@ -0,0 +1,44 @@
+/obj/effect/overmap/bluespace_rift
+	name = "bluespace rift"
+	desc = "Some sort of bluespace rift. Who knows where it leads?"
+	icon = 'icons/obj/overmap_vr.dmi'
+	icon_state = "portal"
+	color = "#2288FF"
+
+	known = 0			//shows up on nav computers automatically
+	scannable = TRUE       //if set to TRUE will show up on ship sensors for detailed scans
+
+	var/obj/effect/overmap/bluespace_rift/partner
+	var/paused
+
+/obj/effect/overmap/bluespace_rift/Initialize(var/mapload, var/new_partner)
+	. = ..()
+	if(new_partner)
+		pair(new_partner)
+	
+/obj/effect/overmap/bluespace_rift/proc/pair(var/obj/effect/overmap/bluespace_rift/new_partner)
+	if(istype(new_partner))
+		partner = new_partner
+		new_partner.partner = src
+
+/obj/effect/overmap/bluespace_rift/proc/take_this(var/atom/movable/AM)
+	paused = TRUE
+	AM.forceMove(get_turf(src))
+	paused = FALSE
+
+/obj/effect/overmap/bluespace_rift/Crossed(var/atom/movable/AM)
+	if(istype(AM, /obj/effect/overmap/visitable/ship) && !paused && partner)
+		partner.take_this(AM)
+	else
+		return ..()
+
+/obj/effect/overmap/bluespace_rift/attack_ghost(var/mob/observer/dead/user)
+	if(!partner && user?.client?.holder)
+		var/response = alert(user, "You appear to be staff. This rift has no exit point. If you want to make one, move to where you want it to go, and click 'Make Here', otherwise click 'Cancel'","Rift Exit","Cancel","Make Here")
+		if(response == "Make Here")
+			new type(get_turf(user), src)
+	else if(partner)
+		user.forceMove(get_turf(partner))
+		to_chat(user, "<span class='notice'>Your ghostly form is pulled through the rift!</span>")
+	else
+		return ..()
diff --git a/icons/obj/overmap_vr.dmi b/icons/obj/overmap_vr.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..4b910514830f2a2481af0038e4ae83a3d6d18a1b
GIT binary patch
literal 2179
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
FV1jH7LF@nk

literal 0
HcmV?d00001

diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm
index f76802ac1b..df968bb577 100644
--- a/maps/tether/submaps/tether_misc.dmm
+++ b/maps/tether/submaps/tether_misc.dmm
@@ -1813,6 +1813,10 @@
 /obj/machinery/telecomms/bus/preset_cent,
 /turf/unsimulated/floor/steel,
 /area/centcom/control)
+"sF" = (
+/obj/effect/overmap/bluespace_rift,
+/turf/unsimulated/map,
+/area/overmap)
 "uc" = (
 /turf/unsimulated/wall,
 /area/centcom/suppy)
@@ -4653,17 +4657,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
 ap
 ap
 Xl
@@ -4795,17 +4799,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -4937,17 +4941,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -5079,17 +5083,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -5221,17 +5225,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -5363,17 +5367,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+sF
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -5505,17 +5509,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -5647,17 +5651,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -5789,17 +5793,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -5931,17 +5935,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -6073,17 +6077,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
 ap
 ap
 Xl
@@ -6499,17 +6503,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
 ap
 ap
 Xl
@@ -6641,17 +6645,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -6783,17 +6787,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -6925,17 +6929,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -7067,17 +7071,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -7209,17 +7213,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+sF
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -7351,17 +7355,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -7493,17 +7497,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -7635,17 +7639,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -7777,17 +7781,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
 ap
 ap
 Xl
@@ -7919,17 +7923,17 @@ ap
 ap
 ap
 ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
 ap
 ap
 Xl
diff --git a/vorestation.dme b/vorestation.dme
index c8b0c2b916..2d484d458e 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2879,6 +2879,7 @@
 #include "code\modules\organs\subtypes\vox.dm"
 #include "code\modules\organs\subtypes\vox_vr.dm"
 #include "code\modules\organs\subtypes\xenos.dm"
+#include "code\modules\overmap\bluespace_rift_vr.dm"
 #include "code\modules\overmap\overmap_object.dm"
 #include "code\modules\overmap\overmap_shuttle.dm"
 #include "code\modules\overmap\sectors.dm"