From bf7377b3b847ba8427df0b91d32771173b95bf53 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Sat, 28 Jan 2023 13:06:18 +0200
Subject: [PATCH] Unapologetic Teleporter Buffs (#15628)

---
 code/game/machinery/Beacon.dm                 |  36 +---
 .../objects/items/devices/radio/beacon.dm     |  39 +++-
 .../game/objects/items/devices/radio/radio.dm |   4 +-
 html/changelogs/geeves-teleporter_beacons.yml |   8 +
 maps/sccv_horizon/sccv_horizon-1_deck_1.dmm   | 172 +++++++++---------
 maps/sccv_horizon/sccv_horizon-2_deck_2.dmm   | 133 +++++++-------
 maps/sccv_horizon/sccv_horizon-3_deck_3.dmm   |  54 +++---
 7 files changed, 234 insertions(+), 212 deletions(-)
 create mode 100644 html/changelogs/geeves-teleporter_beacons.yml

diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm
index 98528a6de07..6ff95c20c47 100644
--- a/code/game/machinery/Beacon.dm
+++ b/code/game/machinery/Beacon.dm
@@ -1,32 +1,28 @@
 /obj/machinery/bluespace_beacon
+	name = "bluespace beacon"
+	desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "floor_beaconf"
-	name = "Bluespace Gigabeacon"
-	desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
 	level = 1		// underfloor
 	layer = 2.5
-	anchored = 1
+	anchored = TRUE
 	idle_power_usage = 0
-	var/obj/item/device/radio/beacon/Beacon
+	var/obj/item/device/radio/beacon/beacon
 
-/obj/machinery/bluespace_beacon/New()
-	..()
+/obj/machinery/bluespace_beacon/Initialize(mapload, d, populate_components, is_internal)
+	. = ..()
 	var/turf/T = loc
-	Beacon = new /obj/item/device/radio/beacon
-	Beacon.invisibility = INVISIBILITY_MAXIMUM
-	Beacon.forceMove(T)
-
+	beacon = new /obj/item/device/radio/beacon/fixed(T)
 	hide(!T.is_plating())
 
 /obj/machinery/bluespace_beacon/Destroy()
-	if(Beacon)
-		qdel(Beacon)
+	QDEL_NULL(beacon)
 	return ..()
 
 	// update the invisibility and icon
 /obj/machinery/bluespace_beacon/hide(var/intact)
-		invisibility = intact ? 101 : 0
-		update_icon()
+	invisibility = intact ? 101 : 0
+	update_icon()
 
 	// update the icon_state
 /obj/machinery/bluespace_beacon/update_icon()
@@ -36,15 +32,3 @@
 		icon_state = "[state]f"
 	else
 		icon_state = "[state]"
-
-/obj/machinery/bluespace_beacon/process()
-	if(!Beacon)
-		var/turf/T = loc
-		Beacon = new /obj/item/device/radio/beacon
-		Beacon.invisibility = INVISIBILITY_MAXIMUM
-		Beacon.forceMove(T)
-	if(Beacon)
-		if(Beacon.loc != loc)
-			Beacon.forceMove(loc)
-
-	update_icon()
diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index 42ef7d9e6de..c017a43e138 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -2,27 +2,43 @@ var/global/list/teleportbeacons = list()
 
 /obj/item/device/radio/beacon
 	name = "tracking beacon"
-	desc = "A beacon used by a teleporter."
+	desc = "A sophisticated beacon with integrated bluespace circuitry, capable of being targetted by a teleportation hub for localized jumps."
 	icon_state = "beacon"
 	item_state = "signaler"
+	show_modify_on_examine = FALSE
 	var/code = "electronic"
 	origin_tech = list(TECH_BLUESPACE = 1)
 
-/obj/item/device/radio/beacon/New()
-	..()
+/obj/item/device/radio/beacon/Initialize()
+	. = ..()
 	teleportbeacons += src
 
 /obj/item/device/radio/beacon/Destroy()
-	teleportbeacons.Remove(src)
+	teleportbeacons -= src
+	return ..()
+
+/obj/item/device/radio/beacon/examine(mob/user)
+	. = ..()
+	if(anchored)
+		to_chat(user, SPAN_NOTICE("It's been secured to the ground with anchoring screws."))
+
+/obj/item/device/radio/beacon/attack_hand(mob/user)
+	if(anchored)
+		return
 	return ..()
 
 /obj/item/device/radio/beacon/hear_talk()
 	return
 
-
 /obj/item/device/radio/beacon/send_hear()
 	return null
 
+/obj/item/device/radio/beacon/attackby(obj/item/W, mob/user)
+	if(isturf(loc) && W.isscrewdriver())
+		anchored = !anchored
+		user.visible_message("<b>[user]</b> [anchored ? "" : "un"]fastens \the [src] [anchored ? "to" : "from"] the floor.", "You [anchored ? "" : "un"]fasten \the [src] [anchored ? "to" : "from"] the floor.")
+		return
+	return ..()
 
 /obj/item/device/radio/beacon/verb/alter_signal(t as text)
 	set name = "Alter Beacon's Signal"
@@ -39,4 +55,15 @@ var/global/list/teleportbeacons = list()
 
 /obj/item/device/radio/beacon/bacon //Probably a better way of doing this, I'm lazy.
 	proc/digest_delay()
-		QDEL_IN(src, 600)
\ No newline at end of file
+		QDEL_IN(src, 600)
+
+/obj/item/device/radio/beacon/fixed
+	alpha = 0
+	invisibility = INVISIBILITY_MAXIMUM
+	anchored = TRUE
+
+/obj/item/device/radio/beacon/fixed/ex_act(severity)
+	return
+
+/obj/item/device/radio/beacon/fixed/emp_act(severity)
+	return
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 1cebb4105f3..69e14788e06 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -75,6 +75,7 @@ var/global/list/default_medbay_channels = list(
 	var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies
 	var/mob/living/announcer/announcer = null // used in autosay, held by the radio for re-use
 	var/datum/wires/radio/wires = null
+	var/show_modify_on_examine = TRUE
 	var/b_stat = 0
 
 	var/list/channels = list() //see communications.dm for full list. First non-common, non-entertainment channel is a "default" for :h
@@ -506,12 +507,11 @@ var/global/list/default_medbay_channels = list(
 
 /obj/item/device/radio/examine(mob/user)
 	. = ..()
-	if ((in_range(src, user) || loc == user))
+	if(show_modify_on_examine && (in_range(src, user) || loc == user))
 		if (b_stat)
 			user.show_message("<span class='notice'>\The [src] can be attached and modified!</span>")
 		else
 			user.show_message("<span class='notice'>\The [src] can not be modified or attached!</span>")
-	return
 
 /obj/item/device/radio/attackby(obj/item/W as obj, mob/user as mob)
 	..()
diff --git a/html/changelogs/geeves-teleporter_beacons.yml b/html/changelogs/geeves-teleporter_beacons.yml
new file mode 100644
index 00000000000..e731fe60c65
--- /dev/null
+++ b/html/changelogs/geeves-teleporter_beacons.yml
@@ -0,0 +1,8 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - rscadd: "Added some permanent teleporter beacons around the map, specifically the bridge. Replaced a couple movable beacons with permanent ones, like in xenoarchaelogy and the engineering break room."
+  - rscadd: "Added three movable teleporter beacons, a first aid, and a box of flares to the teleporter room."
+  - rscadd: "Teleporter beacons can now be anchored to the floor by using a screwdriver on them."
diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
index 310da85ae9f..b9abbe4b75f 100644
--- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -157,8 +157,8 @@
 /area/maintenance/wing/starboard/deck1)
 "ajK" = (
 /obj/machinery/alarm{
-	pixel_x = -28;
-	dir = 4
+	dir = 4;
+	pixel_x = -28
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -2229,14 +2229,14 @@
 	dir = 4
 	},
 /obj/item/device/radio/intercom{
-	pixel_x = 24;
-	dir = 8
+	dir = 8;
+	pixel_x = 24
 	},
 /obj/machinery/button/remote/blast_door{
+	dir = 1;
 	id = "hangarlockdown";
 	name = "Hangar Lockdown";
-	pixel_y = -25;
-	dir = 1
+	pixel_y = -25
 	},
 /obj/machinery/light/small,
 /obj/structure/filingcabinet/filingcabinet{
@@ -3445,9 +3445,9 @@
 "cJJ" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /obj/machinery/door/blast/shutters/open{
+	dir = 4;
 	id = "shutters_deck2_portstairwellsec";
-	name = "Security Shutter";
-	dir = 4
+	name = "Security Shutter"
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/hangar/auxiliary)
@@ -4139,10 +4139,10 @@
 	pixel_y = 19
 	},
 /obj/item/paper/cig{
-	pixel_x = -6;
-	pixel_y = -2;
+	desc = "A thin piece of paper used to make smokables. Someone has written the text 'Hope to see you again sometime, my friend.' on it.";
 	name = "written-on rolling paper";
-	desc = "A thin piece of paper used to make smokables. Someone has written the text 'Hope to see you again sometime, my friend.' on it."
+	pixel_x = -6;
+	pixel_y = -2
 	},
 /obj/item/clothing/mask/smokable/cigarette{
 	pixel_x = 8;
@@ -4324,8 +4324,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/alarm{
-	pixel_x = -28;
-	dir = 4
+	dir = 4;
+	pixel_x = -28
 	},
 /obj/effect/floor_decal/corner/green{
 	dir = 9
@@ -7266,8 +7266,6 @@
 	dir = 5
 	},
 /obj/machinery/station_map{
-	dir = 2;
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled,
@@ -7750,9 +7748,9 @@
 	name = "Deck 1 Port Stairwell Auxiliary Hangar Elevator"
 	},
 /obj/machinery/door/blast/shutters/open{
+	dir = 2;
 	id = "shutters_deck2_portstairwellsec";
-	name = "Security Shutter";
-	dir = 2
+	name = "Security Shutter"
 	},
 /turf/simulated/floor/tiled/full,
 /area/rnd/eva)
@@ -8794,6 +8792,8 @@
 	dir = 6
 	},
 /obj/machinery/firealarm/east,
+/obj/structure/table/standard,
+/obj/item/storage/box/flares,
 /turf/simulated/floor/tiled/dark,
 /area/teleporter)
 "gGb" = (
@@ -9012,8 +9012,7 @@
 /obj/effect/floor_decal/corner/green/full,
 /obj/machinery/station_map{
 	dir = 4;
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/aft)
@@ -9375,9 +9374,9 @@
 /area/hangar/intrepid)
 "heH" = (
 /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
+	dir = 1;
 	frequency = 1441;
-	id_tag = "o2_out";
-	dir = 1
+	id_tag = "o2_out"
 	},
 /turf/simulated/floor/reinforced/oxygen,
 /area/engineering/atmos/air)
@@ -9605,8 +9604,8 @@
 	},
 /obj/structure/sign/directions/custodial{
 	dir = 8;
-	pixel_y = 9;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 9
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/aft)
@@ -10570,7 +10569,7 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/hangar/starboard)
 "icl" = (
-/obj/item/device/radio/beacon,
+/obj/machinery/bluespace_beacon,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
 "icm" = (
@@ -11730,8 +11729,8 @@
 "jdC" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/alarm{
-	pixel_x = 28;
-	dir = 8
+	dir = 8;
+	pixel_x = 28
 	},
 /obj/structure/closet/secure_closet/security,
 /obj/machinery/camera/network/security{
@@ -11807,8 +11806,8 @@
 	dir = 6
 	},
 /obj/machinery/alarm{
-	pixel_x = 28;
-	dir = 8
+	dir = 8;
+	pixel_x = 28
 	},
 /turf/simulated/floor/tiled/dark,
 /area/teleporter)
@@ -12207,12 +12206,12 @@
 	dir = 4
 	},
 /obj/machinery/button/remote/blast_door{
+	dir = 1;
 	id = "miningbay";
 	name = "Mining Bay Entrance";
 	pixel_x = 25;
 	pixel_y = -25;
-	req_access = list(48);
-	dir = 1
+	req_access = list(48)
 	},
 /turf/simulated/floor/tiled,
 /area/outpost/mining_main/refinery)
@@ -12854,9 +12853,9 @@
 	pixel_x = 30
 	},
 /obj/item/device/radio/intercom{
+	dir = 1;
 	name = "Station Intercom (General)";
-	pixel_y = 43;
-	dir = 1
+	pixel_y = 43
 	},
 /obj/structure/table/steel,
 /obj/item/device/binoculars/high_power{
@@ -12874,7 +12873,6 @@
 	dir = 6
 	},
 /obj/item/device/radio/intercom{
-	dir = 2;
 	name = "Station Intercom (General)";
 	pixel_y = 21
 	},
@@ -13834,11 +13832,11 @@
 /area/rnd/xenoarch_atrium)
 "kGf" = (
 /obj/effect/decal/fake_object{
-	name = "Residential Deck Stairwell Shutter";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "shutter1";
 	density = 1;
 	desc = "That looks like it doesn't open easily.";
+	icon = 'icons/obj/doors/rapid_pdoor.dmi';
+	icon_state = "shutter1";
+	name = "Residential Deck Stairwell Shutter";
 	opacity = 1
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -14049,8 +14047,6 @@
 	dir = 5
 	},
 /obj/machinery/station_map{
-	dir = 2;
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled,
@@ -15421,7 +15417,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/storage/eva)
 "lWu" = (
-/obj/item/device/radio/beacon,
+/obj/machinery/bluespace_beacon,
 /turf/simulated/floor/tiled,
 /area/hangar/intrepid)
 "lXa" = (
@@ -16409,8 +16405,8 @@
 	dir = 4
 	},
 /obj/machinery/alarm{
-	pixel_x = 28;
-	dir = 8
+	dir = 8;
+	pixel_x = 28
 	},
 /obj/effect/floor_decal/corner/green{
 	dir = 6
@@ -17049,8 +17045,8 @@
 "nmF" = (
 /obj/effect/floor_decal/corner/blue/full,
 /obj/item/device/radio/intercom{
-	pixel_x = -24;
-	dir = 4
+	dir = 4;
+	pixel_x = -24
 	},
 /obj/machinery/light/small,
 /obj/machinery/photocopier,
@@ -17260,9 +17256,9 @@
 	},
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/door/blast/shutters/open{
+	dir = 2;
 	id = "shutters_deck2_portstairwellsec";
-	name = "Security Shutter";
-	dir = 2
+	name = "Security Shutter"
 	},
 /turf/simulated/floor/tiled/full,
 /area/rnd/eva)
@@ -17287,8 +17283,8 @@
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/airlock/maintenance{
-	req_one_access = list(12,47);
-	name = "Maintenance Passthrough"
+	name = "Maintenance Passthrough";
+	req_one_access = list(12,47)
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/full,
@@ -20010,12 +20006,12 @@
 "pNf" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/hatch{
+	icon_state = "door_locked";
+	id_tag = "compactor_access";
+	locked = 1;
 	name = "Compactor Access";
 	req_one_access = list(26,67);
-	id_tag = "compactor_access";
-	secured_wires = 1;
-	locked = 1;
-	icon_state = "door_locked"
+	secured_wires = 1
 	},
 /obj/effect/floor_decal/industrial/hatch/red,
 /turf/simulated/floor/tiled/dark/full,
@@ -20660,9 +20656,9 @@
 	dir = 8
 	},
 /obj/machinery/computer/shuttle_control/lift{
+	pixel_x = -3;
 	pixel_y = 23;
-	shuttle_tag = "Morgue Lift";
-	pixel_x = -3
+	shuttle_tag = "Morgue Lift"
 	},
 /turf/simulated/floor/tiled,
 /area/medical/morgue/lower)
@@ -21518,8 +21514,8 @@
 	id = "shutters_hangarseccp";
 	name = "Security Checkpoint Shutters";
 	pixel_x = 25;
-	req_access = list(63);
-	pixel_y = -7
+	pixel_y = -7;
+	req_access = list(63)
 	},
 /obj/machinery/light{
 	dir = 4
@@ -21695,8 +21691,8 @@
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /obj/machinery/door/blast/shutters{
 	dir = 2;
-	name = "Viewing Shutter";
-	id = "shutters_deck1_morgue"
+	id = "shutters_deck1_morgue";
+	name = "Viewing Shutter"
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/medical/morgue/lower)
@@ -22522,13 +22518,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/operations)
-"rJQ" = (
-/obj/effect/floor_decal/corner/blue{
-	dir = 9
-	},
-/obj/machinery/bluespace_beacon,
-/turf/simulated/floor/tiled,
-/area/shuttle/intrepid/cargo_bay)
 "rJZ" = (
 /obj/machinery/conveyor{
 	dir = 1;
@@ -25562,8 +25551,8 @@
 	},
 /obj/machinery/firealarm/south{
 	dir = 4;
-	pixel_y = 0;
-	pixel_x = 30
+	pixel_x = 30;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cockpit)
@@ -25672,8 +25661,7 @@
 /obj/structure/disposalpipe/trunk,
 /obj/machinery/station_map{
 	dir = 4;
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /turf/simulated/floor/tiled,
 /area/hangar/intrepid)
@@ -25920,6 +25908,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/bluespace_beacon,
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/intrepid/crew_compartment)
 "unS" = (
@@ -26627,8 +26616,8 @@
 /obj/structure/sign/electricshock{
 	desc = "A warning sign which reads 'MECH BAY AND RECHARGING STATION' and 'HIGH VOLTAGE EQUIPMENT INSIDE'.";
 	name = "\improper MECH BAY AND RECHARGING STATION sign";
-	pixel_y = -32;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = -32
 	},
 /obj/effect/floor_decal/corner/green{
 	dir = 9
@@ -26717,8 +26706,8 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
 	},
-/obj/structure/table/rack,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/table/standard,
+/obj/item/storage/firstaid,
 /turf/simulated/floor/tiled/dark,
 /area/teleporter)
 "uWn" = (
@@ -27212,6 +27201,15 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/item/device/radio/beacon{
+	pixel_x = -4;
+	pixel_y = -4
+	},
+/obj/item/device/radio/beacon{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/device/radio/beacon,
 /turf/simulated/floor/tiled/dark,
 /area/teleporter)
 "vpl" = (
@@ -27336,14 +27334,14 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/light_switch{
+	dir = 1;
 	pixel_x = -9;
-	pixel_y = -24;
-	dir = 1
+	pixel_y = -24
 	},
 /obj/machinery/camera/motion{
 	c_tag = "Deck 1 - Teleporter";
-	network = list("Command","Security");
-	dir = 1
+	dir = 1;
+	network = list("Command","Security")
 	},
 /turf/simulated/floor/tiled/dark,
 /area/teleporter)
@@ -27921,8 +27919,8 @@
 	dir = 4
 	},
 /obj/machinery/door/window/westright{
-	req_access = list(47);
-	name = "Research Voidsuit Storage Rack Access"
+	name = "Research Voidsuit Storage Rack Access";
+	req_access = list(47)
 	},
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/suit/space/void/sci,
@@ -29472,8 +29470,8 @@
 	dir = 8
 	},
 /obj/machinery/alarm{
-	pixel_y = -28;
-	dir = 1
+	dir = 1;
+	pixel_y = -28
 	},
 /turf/simulated/floor/tiled,
 /area/medical/morgue/lower)
@@ -29584,8 +29582,8 @@
 /area/shuttle/mining)
 "xiq" = (
 /obj/machinery/alarm{
-	pixel_x = 28;
-	dir = 8
+	dir = 8;
+	pixel_x = 28
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -29813,8 +29811,8 @@
 	dir = 4
 	},
 /obj/machinery/door/window/westleft{
-	req_access = list(47);
-	name = "Research Voidsuit Storage Rack Access"
+	name = "Research Voidsuit Storage Rack Access";
+	req_access = list(47)
 	},
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/suit/space/void/sci,
@@ -30961,8 +30959,8 @@
 	dir = 9
 	},
 /obj/machinery/alarm{
-	pixel_x = -28;
-	dir = 4
+	dir = 4;
+	pixel_x = -28
 	},
 /obj/machinery/light{
 	dir = 8
@@ -51215,7 +51213,7 @@ dir
 pTp
 wnV
 nQH
-rJQ
+nQH
 brI
 hqg
 rRE
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index f7233668075..f1e159cc5c3 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -1538,8 +1538,8 @@
 	},
 /obj/machinery/door/blast/shutters{
 	dir = 8;
-	name = "Desk Shutter";
-	id = "shutters_deck2_librarydesk"
+	id = "shutters_deck2_librarydesk";
+	name = "Desk Shutter"
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/library)
@@ -3627,10 +3627,10 @@
 /area/engineering/engine_monitoring)
 "bFU" = (
 /obj/machinery/door/airlock/glass_security{
+	autoclose = 0;
 	id_tag = "cell_2";
 	name = "Cell B";
-	req_access = list(2);
-	autoclose = 0
+	req_access = list(2)
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/full,
@@ -5322,17 +5322,17 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/door/blast/shutters/open{
-	id = "shutters_deck1_security_cell_isolation";
 	dir = 4;
+	id = "shutters_deck1_security_cell_isolation";
 	name = "Isolation Cell Window Shutter"
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 2;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 2
+	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/brig)
@@ -7408,8 +7408,8 @@
 	name = "Pharmacy Desk Shutter"
 	},
 /obj/machinery/door/window/westleft{
-	req_access = list(33);
-	name = "Pharmacy Desk"
+	name = "Pharmacy Desk";
+	req_access = list(33)
 	},
 /obj/machinery/door/window/eastright{
 	name = "Pharmacy Desk"
@@ -8409,11 +8409,11 @@
 	dir = 8
 	},
 /obj/machinery/button/remote/blast_door{
+	dir = 4;
 	id = "armory";
 	name = "Armoury Shutters";
-	req_access = list(3);
 	pixel_x = -25;
-	dir = 4
+	req_access = list(3)
 	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -8651,8 +8651,8 @@
 /area/operations/lower/machinist)
 "enw" = (
 /obj/structure/disposalpipe/sortjunction/flipped{
-	sortType = "Library Office";
-	name = "Library Office"
+	name = "Library Office";
+	sortType = "Library Office"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -15857,9 +15857,9 @@
 	dir = 4
 	},
 /obj/machinery/light_switch{
+	dir = 4;
 	pixel_x = -21;
-	pixel_y = 20;
-	dir = 4
+	pixel_y = 20
 	},
 /turf/simulated/floor/wood,
 /area/horizon/library)
@@ -18628,11 +18628,11 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 2;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 2
+	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/brig)
@@ -18644,8 +18644,8 @@
 	dir = 9
 	},
 /obj/item/device/radio/intercom{
-	pixel_x = -24;
-	dir = 4
+	dir = 4;
+	pixel_x = -24
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
@@ -19061,11 +19061,11 @@
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 2;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 2
+	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/brig)
@@ -19468,11 +19468,11 @@
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 4
+	opacity = 0
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -19483,8 +19483,8 @@
 	opacity = 0
 	},
 /obj/machinery/door/blast/shutters/open{
-	id = "shutters_deck1_security_cell_isolation";
 	dir = 2;
+	id = "shutters_deck1_security_cell_isolation";
 	name = "Isolation Cell Window Shutter"
 	},
 /obj/structure/cable/green{
@@ -19509,10 +19509,10 @@
 "jAp" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/glass_security{
+	autoclose = 0;
 	id_tag = "cell_3";
 	name = "Cell C";
-	req_access = list(2);
-	autoclose = 0
+	req_access = list(2)
 	},
 /turf/simulated/floor/tiled/full,
 /area/horizon/security/brig)
@@ -20269,11 +20269,11 @@
 /obj/structure/cable/green,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 4
+	opacity = 0
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -21136,8 +21136,8 @@
 	dir = 8
 	},
 /obj/structure/filingcabinet/filingcabinet{
-	pixel_x = -9;
-	density = 0
+	density = 0;
+	pixel_x = -9
 	},
 /turf/simulated/floor/wood,
 /area/horizon/library)
@@ -21959,11 +21959,11 @@
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 4
+	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/brig)
@@ -23629,10 +23629,10 @@
 "lKN" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/glass_security{
-	name = "Isolation Cell";
-	req_access = list(2);
+	autoclose = 0;
 	id_tag = "cell_isolation";
-	autoclose = 0
+	name = "Isolation Cell";
+	req_access = list(2)
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -27324,8 +27324,8 @@
 /area/engineering/atmos/storage)
 "nxk" = (
 /obj/structure/sink/kitchen{
-	name = "sink";
 	dir = 8;
+	name = "sink";
 	pixel_x = 21
 	},
 /obj/effect/floor_decal/corner/green{
@@ -27496,6 +27496,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/machinery/bluespace_beacon,
 /turf/simulated/floor/tiled/full,
 /area/hallway/primary/central_one)
 "nBn" = (
@@ -30866,11 +30867,11 @@
 /obj/structure/cable/green,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 4
+	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/warden)
@@ -35873,11 +35874,11 @@
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 4
+	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/brig)
@@ -36355,9 +36356,9 @@
 /area/maintenance/wing/starboard)
 "rWq" = (
 /obj/machinery/door/blast/shutters/open{
+	dir = 4;
 	id = "CHE2shutters";
-	name = "Window Shutter";
-	dir = 4
+	name = "Window Shutter"
 	},
 /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
@@ -37678,15 +37679,15 @@
 	dir = 8;
 	id = "cell_isolation";
 	name = "Isolation Cell Bolts";
-	req_access = list(19);
-	specialfunctions = 4;
 	pixel_x = 25;
-	pixel_y = 7
+	pixel_y = 7;
+	req_access = list(19);
+	specialfunctions = 4
 	},
 /obj/machinery/button/remote/blast_door{
+	dir = 8;
 	id = "shutters_deck1_security_cell_isolation";
 	name = "Isolation Cell Window Shutters";
-	dir = 8;
 	pixel_x = 35;
 	pixel_y = 7
 	},
@@ -39959,11 +39960,11 @@
 /obj/structure/cable/green,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 4
+	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/brig)
@@ -42269,9 +42270,9 @@
 	dir = 4
 	},
 /obj/machinery/door/blast/regular{
+	dir = 2;
 	id = "shutters_deck1_security_cell_3";
-	name = "Cell Door";
-	dir = 2
+	name = "Cell Door"
 	},
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -45145,11 +45146,11 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 2;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 2
+	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/brig)
@@ -45947,9 +45948,9 @@
 /area/horizon/zta)
 "wEc" = (
 /obj/machinery/door/blast/shutters/open{
+	dir = 2;
 	id = "CHE2shutters";
-	name = "Window Shutter";
-	dir = 2
+	name = "Window Shutter"
 	},
 /obj/machinery/door/blast/shutters{
 	density = 0;
@@ -47185,20 +47186,20 @@
 "xeR" = (
 /obj/structure/table/standard,
 /obj/machinery/button/remote/blast_door{
+	dir = 1;
 	id = "CHE2shutters";
 	name = "Window Shutter Control";
 	pixel_x = 6;
 	pixel_y = 7;
-	req_access = list(33);
-	dir = 1
+	req_access = list(33)
 	},
 /obj/machinery/button/remote/blast_door{
+	dir = 1;
 	id = "CHE3shutters";
 	name = "Desk Shutter Control";
 	pixel_x = 6;
 	pixel_y = -3;
-	req_access = list(33);
-	dir = 1
+	req_access = list(33)
 	},
 /obj/effect/floor_decal/corner_wide/orange/full{
 	dir = 4
@@ -47817,10 +47818,10 @@
 "xxc" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/glass_security{
+	autoclose = 0;
 	id_tag = "cell_1";
 	name = "Cell A";
-	req_access = list(2);
-	autoclose = 0
+	req_access = list(2)
 	},
 /turf/simulated/floor/tiled/full,
 /area/horizon/security/brig)
@@ -48635,11 +48636,11 @@
 	dir = 8
 	},
 /obj/machinery/button/remote/blast_door{
-	pixel_y = 22;
 	dir = 4;
-	pixel_x = -22;
+	id = "shutters_deck2_librarydesk";
 	name = "Desk Shutter";
-	id = "shutters_deck2_librarydesk"
+	pixel_x = -22;
+	pixel_y = 22
 	},
 /turf/simulated/floor/wood,
 /area/horizon/library)
@@ -48776,11 +48777,11 @@
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Brig Lockdown";
 	name = "Brig Lockdown Blast Door";
-	opacity = 0;
-	dir = 4
+	opacity = 0
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -48791,8 +48792,8 @@
 	opacity = 0
 	},
 /obj/machinery/door/blast/shutters/open{
-	id = "shutters_deck1_security_cell_isolation";
 	dir = 2;
+	id = "shutters_deck1_security_cell_isolation";
 	name = "Isolation Cell Window Shutter"
 	},
 /obj/structure/cable/green{
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index 5568c83e974..95d1be92807 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -1058,7 +1058,6 @@
 	frequency = 1380;
 	id_tag = "dock_horizon_3_airlock";
 	pixel_x = 26;
-	pixel_y = 0;
 	req_one_access = list(13);
 	tag_airpump = "dock_horizon_3_pump";
 	tag_chamber_sensor = "dock_horizon_3_sensor";
@@ -5376,8 +5375,8 @@
 	},
 /obj/machinery/camera/motion{
 	c_tag = "Telecommunications - Control Room";
-	network = list("Command","Security","Telecommunications");
-	dir = 8
+	dir = 8;
+	network = list("Command","Security","Telecommunications")
 	},
 /turf/simulated/floor/carpet/rubber,
 /area/tcommsat/entrance)
@@ -5386,7 +5385,6 @@
 	frequency = 1380;
 	id_tag = "dock_horizon_4_airlock";
 	pixel_x = 26;
-	pixel_y = 0;
 	req_one_access = list(13);
 	tag_airpump = "dock_horizon_4_pump";
 	tag_chamber_sensor = "dock_horizon_4_sensor";
@@ -9724,11 +9722,11 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Security Lockdown";
 	name = "Security Blast Door";
-	opacity = 0;
-	dir = 4
+	opacity = 0
 	},
 /obj/structure/window/shuttle/scc_space_ship/cardinal,
 /turf/simulated/floor/plating,
@@ -10031,8 +10029,8 @@
 	},
 /obj/machinery/camera/motion{
 	c_tag = "Telecommunications - Port";
-	network = list("Command","Security","Telecommunications");
-	dir = 8
+	dir = 8;
+	network = list("Command","Security","Telecommunications")
 	},
 /obj/machinery/firealarm/east,
 /turf/simulated/floor/carpet/rubber,
@@ -11265,7 +11263,6 @@
 	frequency = 1380;
 	id_tag = "dock_horizon_1_airlock";
 	pixel_x = 26;
-	pixel_y = 0;
 	req_one_access = list(13);
 	tag_airpump = "dock_horizon_1_pump";
 	tag_chamber_sensor = "dock_horizon_1_sensor";
@@ -12741,6 +12738,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/interrogation)
+"ksn" = (
+/obj/effect/floor_decal/spline/plain,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/bluespace_beacon,
+/turf/simulated/floor/tiled,
+/area/bridge/controlroom)
 "kso" = (
 /obj/machinery/light_switch{
 	dir = 1;
@@ -14707,11 +14715,10 @@
 /turf/simulated/floor,
 /area/maintenance/bridge)
 "lWa" = (
-/obj/item/device/radio/beacon,
-/obj/effect/floor_decal/corner/yellow{
-	dir = 5
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
 	},
-/obj/effect/floor_decal/spline/plain,
+/obj/machinery/bluespace_beacon,
 /turf/simulated/floor/tiled,
 /area/engineering/break_room)
 "lWE" = (
@@ -16464,7 +16471,6 @@
 	},
 /obj/machinery/station_map{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
@@ -17642,11 +17648,11 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Security Lockdown";
 	name = "Security Blast Door";
-	opacity = 0;
-	dir = 4
+	opacity = 0
 	},
 /obj/structure/window/shuttle/scc_space_ship/cardinal,
 /turf/simulated/floor/plating,
@@ -19108,7 +19114,6 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/station_map{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled,
@@ -20399,8 +20404,8 @@
 "qDx" = (
 /obj/machinery/camera/motion{
 	c_tag = "Telecommunications - Starboard";
-	network = list("Command","Security","Telecommunications");
-	dir = 4
+	dir = 4;
+	network = list("Command","Security","Telecommunications")
 	},
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -24102,7 +24107,6 @@
 	},
 /obj/machinery/station_map{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
@@ -27959,8 +27963,8 @@
 	icon_state = "2-8"
 	},
 /obj/effect/floor_decal/sign/m{
-	pixel_y = 4;
-	pixel_x = -10
+	pixel_x = -10;
+	pixel_y = 4
 	},
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
@@ -50402,7 +50406,7 @@ kSF
 tYp
 mim
 vcu
-wVS
+ksn
 cTN
 mVg
 qMa
@@ -51348,7 +51352,7 @@ feY
 feY
 hBq
 iTU
-lWa
+eFf
 bpd
 cEY
 gHu
@@ -51753,7 +51757,7 @@ mjb
 aTd
 jjy
 hUQ
-qyo
+lWa
 qyo
 qyo
 qyo