diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm
index e27d70153bb..c3a7d5ceacd 100644
--- a/code/datums/spells/construct_spells.dm
+++ b/code/datums/spells/construct_spells.dm
@@ -52,7 +52,7 @@
/obj/effect/proc_holder/spell/aoe/conjure/build/soulstone
name = "Summon Soulstone"
- desc = "This spell reaches into Redspace, summoning one of the legendary fragments across time and space"
+ desc = "This spell uses vile sorcery to create a spirit-trapping soulstone."
action_icon_state = "summonsoulstone"
action_background_icon_state = "bg_cult"
school = "conjuration"
@@ -71,7 +71,7 @@
/obj/effect/proc_holder/spell/aoe/conjure/build/pylon
name = "Cult Pylon"
- desc = "This spell conjures a fragile crystal from Redspace. Makes for a convenient light source."
+ desc = "This spell uses dark magic to craft an unholy beacon. Heals cultists, and makes a handy light source."
action_icon_state = "pylon"
action_background_icon_state = "bg_cult"
school = "conjuration"
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index e969adfac29..7db14947e37 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -70,7 +70,7 @@
to_chat(user, "[heathen_message]")
return
if(invisibility)
- to_chat(user, "The magic in [src] is being channeled into Redspace, reveal the structure first!")
+ to_chat(user, "The magic in [src] is being suppressed, reveal the structure first!")
return
if(HAS_TRAIT(user, TRAIT_HULK))
to_chat(user, "You cannot seem to manipulate this structure with your bulky hands!")
diff --git a/code/game/machinery/computer/depot_consoles.dm b/code/game/machinery/computer/depot_consoles.dm
index 4e32428c9d7..6c5f0916bb9 100644
--- a/code/game/machinery/computer/depot_consoles.dm
+++ b/code/game/machinery/computer/depot_consoles.dm
@@ -394,8 +394,8 @@
window_height = 300
req_access = list(ACCESS_SYNDICATE_LEADER)
var/obj/machinery/bluespace_beacon/syndicate/mybeacon
- var/obj/effect/portal/redspace/myportal
- var/obj/effect/portal/redspace/myportal2
+ var/obj/effect/portal/advanced/myportal
+ var/obj/effect/portal/advanced/myportal2
var/portal_enabled = FALSE
var/portaldir = WEST
@@ -457,11 +457,11 @@
if(!tele_target)
return
var/turf/portal_turf = get_step(src, portaldir)
- var/obj/effect/portal/redspace/P = new(portal_turf, tele_target, src, 0)
+ var/obj/effect/portal/advanced/P = new(portal_turf, tele_target, src, 0)
myportal = P
var/area/A = get_area(tele_target)
P.name = "[A] portal"
- var/obj/effect/portal/redspace/P2 = new(get_turf(tele_target), portal_turf, src, 0)
+ var/obj/effect/portal/advanced/P2 = new(get_turf(tele_target), portal_turf, src, 0)
myportal2 = P2
P2.name = "mysterious portal"
else if(!portal_enabled && myportal)
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index f8b45da7c42..bc80f56dbbb 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -24,7 +24,7 @@
var/effect_cooldown = 0
///Whether or not portal use will cause sparks
var/create_sparks = TRUE
-
+
/obj/effect/portal/New(loc, turf/_target, obj/creation_object = null, lifespan = 300, mob/creation_mob = null, create_sparks = TRUE)
..()
@@ -187,8 +187,8 @@
#undef UNSTABLE_TIME_DELAY
-/obj/effect/portal/redspace
- name = "redspace portal"
+/obj/effect/portal/advanced
+ name = "advanced portal"
desc = "A portal capable of bypassing bluespace interference."
icon_state = "portal1"
failchance = 0
diff --git a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
index 032518e4eba..4c49db7c3da 100644
--- a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
@@ -57,7 +57,7 @@
/// The flare indicating the extraction point.
var/obj/effect/contractor_flare/extraction_flare = null
/// The extraction portal.
- var/obj/effect/portal/redspace/contractor/extraction_portal = null
+ var/obj/effect/portal/advanced/contractor/extraction_portal = null
/// The world.time at which the current extraction fulton will vanish and another extraction can be requested.
var/extraction_deadline = -1
/// Name of the target to display on the UI.
@@ -285,7 +285,7 @@
U.message_holder("Extraction signal received, agent. [SSmapping.map_datum.fluff_name]'s bluespace transport jamming systems have been sabotaged. "\
+ "We have opened a temporary portal at your flare location - proceed to the target's extraction by inserting them into the portal.", 'sound/effects/confirmdropoff.ogg')
// Open a portal
- var/obj/effect/portal/redspace/contractor/P = new(get_turf(F), pick(GLOB.syndieprisonwarp), F, 0, M)
+ var/obj/effect/portal/advanced/contractor/P = new(get_turf(F), pick(GLOB.syndieprisonwarp), F, 0, M)
P.contract = src
P.contractor_mind = M.mind
P.target_mind = contract.target
@@ -299,7 +299,7 @@
* * M - The target mob.
* * P - The extraction portal.
*/
-/datum/syndicate_contract/proc/target_received(mob/living/M, obj/effect/portal/redspace/contractor/P)
+/datum/syndicate_contract/proc/target_received(mob/living/M, obj/effect/portal/advanced/contractor/P)
INVOKE_ASYNC(src, PROC_REF(clean_up))
add_attack_logs(owning_hub.owner.current, M, "extracted to Syndicate Jail")
complete(M.stat == DEAD)
@@ -327,7 +327,7 @@
* * M - The target mob.
* * P - The extraction portal.
*/
-/datum/syndicate_contract/proc/handle_target_experience(mob/living/M, obj/effect/portal/redspace/contractor/P)
+/datum/syndicate_contract/proc/handle_target_experience(mob/living/M, obj/effect/portal/advanced/contractor/P)
var/turf/T = get_turf(P)
var/mob/living/carbon/human/H = M
diff --git a/code/modules/antagonists/traitor/contractor/items/extraction_items.dm b/code/modules/antagonists/traitor/contractor/items/extraction_items.dm
index 9b8f056792b..8f08c7bcf19 100644
--- a/code/modules/antagonists/traitor/contractor/items/extraction_items.dm
+++ b/code/modules/antagonists/traitor/contractor/items/extraction_items.dm
@@ -1,7 +1,7 @@
/**
* # Contractor Extraction Flare
*
- * Used to designate where the [/obj/effect/portal/redspace/contractor] should spawn during the extraction process.
+ * Used to designate where the [/obj/effect/portal/advanced/contractor] should spawn during the extraction process.
*/
/obj/effect/contractor_flare
name = "contractor extraction flare"
@@ -22,7 +22,7 @@
*
* Used to extract contract targets and send them to the Syndicate jail for a few minutes.
*/
-/obj/effect/portal/redspace/contractor
+/obj/effect/portal/advanced/contractor
name = "suspicious portal"
icon_state = "portal-syndicate"
/// The contract associated with this portal.
@@ -32,7 +32,7 @@
/// The mind of the kidnapping target. Prevents non-targets from taking the portal.
var/datum/mind/target_mind = null
-/obj/effect/portal/redspace/contractor/can_teleport(atom/movable/A)
+/obj/effect/portal/advanced/contractor/can_teleport(atom/movable/A)
var/mob/living/M = A
if(!istype(M))
return FALSE
@@ -49,7 +49,7 @@
return FALSE
return ..()
-/obj/effect/portal/redspace/contractor/teleport(atom/movable/M)
+/obj/effect/portal/advanced/contractor/teleport(atom/movable/M)
. = ..()
if(.)
contract.target_received(M, src)
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 5365d90f81f..451353bfc28 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -146,7 +146,7 @@
/obj/item/wormhole_jaunter/contractor/proc/create_portal(turf/destination)
new /obj/effect/decal/cleanable/ash(get_turf(src))
- new /obj/effect/portal/redspace/getaway(get_turf(src), get_turf(destination), src, 100)
+ new /obj/effect/portal/advanced/getaway(get_turf(src), get_turf(destination), src, 100)
qdel(src)
/obj/item/wormhole_jaunter/contractor/emag_act(mob/user)
@@ -162,7 +162,7 @@
new /obj/item/wormhole_jaunter/contractor(src)
new /obj/item/radio/beacon/emagged(src)
-/obj/effect/portal/redspace/getaway
+/obj/effect/portal/advanced/getaway
one_use = TRUE
/obj/effect/temp_visual/getaway_flare // Because the original contractor flare is not a temp visual, for some reason.
@@ -210,7 +210,7 @@
playsound(src, 'sound/magic/lightningbolt.ogg', 100, TRUE)
qdel(src)
return
-
+
var/list/portal_turfs = list()
for(var/turf/PT in circleviewturfs(T, 3))
if(!PT.density)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index bf87953eec0..978f0d19b10 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -63,7 +63,7 @@ Difficulty: Hard
/// Is it on its enraged exclusive second life?
var/second_life = FALSE
/// Does it have a portal to the funny second life arena created?
- var/obj/effect/portal/redspace/second_life_portal
+ var/obj/effect/portal/advanced/second_life_portal
/// Enraged healing recived
var/enraged_healing = 0
internal_gps = /obj/item/gps/internal/bubblegum
@@ -649,7 +649,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/round_2/Initialize(mapload)
. = ..()
for(var/obj/effect/landmark/spawner/bubblegum_exit/E in GLOB.landmarks_list)
- second_life_portal = new /obj/effect/portal/redspace(get_turf(E), get_turf(src), null, 2 HOURS, src, FALSE)
+ second_life_portal = new /obj/effect/portal/advanced(get_turf(E), get_turf(src), null, 2 HOURS, src, FALSE)
break
RegisterSignal(src, COMSIG_HOSTILE_FOUND_TARGET, PROC_REF(i_see_you))
for(var/mob/living/carbon/human/H in range(20))
diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm
index 404a4e91a70..a4887697fca 100644
--- a/code/modules/station_goals/bluespace_tap.dm
+++ b/code/modules/station_goals/bluespace_tap.dm
@@ -260,7 +260,7 @@
. = ..()
if(length(active_nether_portals))
- icon_state = "redspace_tap"
+ icon_state = "cascade_tap"
return
if(get_available_power() <= 0)
@@ -275,7 +275,7 @@
underlays.Cut()
if(length(active_nether_portals))
- . += "redspace"
+ . += "cascade"
set_light(15, 5, "#ff0000")
return
diff --git a/icons/obj/machines/bluespace_tap.dmi b/icons/obj/machines/bluespace_tap.dmi
index 7d53d84fc22..d271f9eb2cf 100644
Binary files a/icons/obj/machines/bluespace_tap.dmi and b/icons/obj/machines/bluespace_tap.dmi differ