From 4fc9e55e3b6f58d531a411173a4f61cb838cf897 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:08:33 -0400
Subject: [PATCH 01/43] done testing I think
---
.../dcs/signals/signals_atom/signals_atom.dm | 2 +-
code/datums/components/anti_magic.dm | 13 ++
code/datums/helper_datums/teleport.dm | 147 ++++++++++++------
code/game/atoms.dm | 17 ++
code/game/objects/items/scrolls.dm | 2 +-
code/game/objects/items/teleportation.dm | 9 +-
.../clock_cult/helpers/servant_warp.dm | 4 +-
.../clock_cult/structure/dimensional_rift.dm | 4 +-
.../sacrifice_knowledge.dm | 4 +-
.../revenant/revenant_abilities.dm | 2 +-
.../bluespace_anchor/bluespace_anchor.dm | 5 +
.../simple_animal/hostile/floor_cluwne.dm | 4 +-
.../suit/n_suit_verbs/energy_net_nets.dm | 2 +-
13 files changed, 146 insertions(+), 69 deletions(-)
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
index 02079493f1cbc..f41faf1ef0272 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
@@ -115,7 +115,7 @@
#define COMSIG_ATOM_CREATEDBY_PROCESSING "atom_createdby_processing"
///when an atom is processed (mob/living/user, obj/item/I, list/atom/results)
#define COMSIG_ATOM_PROCESSED "atom_processed"
-///! called when teleporting into a protected turf: (channel, turf/origin)
+///! from the base of atom/intercept_teleport: (channel, turf/origin, turf/destination)
#define COMSIG_ATOM_INTERCEPT_TELEPORT "intercept_teleport"
#define COMPONENT_BLOCK_TELEPORT 1
///called when an atom starts orbiting another atom: (atom)
diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm
index c7179c39a79ba..6d42c9f7b62d5 100644
--- a/code/datums/components/anti_magic.dm
+++ b/code/datums/components/anti_magic.dm
@@ -39,6 +39,9 @@
else
return COMPONENT_INCOMPATIBLE
+ if(ismovable(parent))
+ RegisterSignal(parent, COMSIG_ATOM_INTERCEPT_TELEPORT, PROC_REF(on_intercept_teleport))
+
/datum/component/anti_magic/proc/on_equip(datum/source, mob/equipper, slot)
SIGNAL_HANDLER
@@ -65,6 +68,8 @@
user.update_alt_appearances()
/datum/component/anti_magic/Destroy(force, silent)
+ if(ismovable(parent))
+ UnregisterSignal(parent, COMSIG_ATOM_INTERCEPT_TELEPORT)
if(ismob(parent)) //If the component is attached to an item, it should go through on_drop instead.
var/mob/user = parent
UnregisterSignal(user, COMSIG_MOB_RECEIVE_MAGIC)
@@ -84,3 +89,11 @@
if(charges <= 0)
expire?.Invoke(user)
return COMPONENT_BLOCK_MAGIC
+
+// Realistically, it shouldn't get to this point if parent is a mob because prior checks SHOULD factor in anti_magic
+// But if we do get to this point, parent is most likely an item and we should cancel the teleport in that case
+/datum/component/anti_magic/proc/on_intercept_teleport(datum/source, channel, turf/origin, turf/destination)
+ SIGNAL_HANDLER
+
+ if((holy && channel == TELEPORT_CHANNEL_CULT) || (magic && channel == TELEPORT_CHANNEL_MAGIC))
+ return COMPONENT_BLOCK_TELEPORT
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 2f88159ad3296..78e03c683ced2 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -1,13 +1,82 @@
-// teleatom: atom to teleport
-// destination: destination to teleport to
-// precision: teleport precision (0 is most precise, the default)
-// effectin: effect to show right before teleportation
-// effectout: effect to show right after teleportation
-// asoundin: soundfile to play before teleportation
-// asoundout: soundfile to play after teleportation
-// no_effects: disable the default effectin/effectout of sparks
-// forced: whether or not to ignore no_teleport
-/proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE, channel=TELEPORT_CHANNEL_BLUESPACE, forced = FALSE, teleport_mode = TELEPORT_MODE_DEFAULT, commit = TRUE, no_wake = FALSE)
+/**
+ * Returns FALSE if we SHOULDN'T do_teleport() with the given arguments
+ *
+ * Arguments:
+ * * teleatom: The atom to teleport
+ * * dest_turf: The destination turf for the atom to go
+ * * channel: Which teleport channel/type should we try to use (for blocking checks), defaults to TELEPORT_CHANNEL_BLUESPACE
+ * * bypass_area_restriction: Should we ignore SOFT atom and area TRAIT_NO_TELEPORT restriction and other area-related restrictions? Defaults to FALSE
+ * * teleport_mode: Teleport mode for religion/faction checks
+ */
+/proc/check_teleport(atom/movable/teleatom, turf/dest_turf, channel = TELEPORT_CHANNEL_BLUESPACE, bypass_area_restriction = FALSE, teleport_mode = TELEPORT_MODE_DEFAULT)
+ var/turf/cur_turf = get_turf(teleatom)
+
+ if(!istype(cur_turf) || !istype(dest_turf) || dest_turf.is_transition_turf())
+ return FALSE
+
+ // Checks bluespace anchors
+ if(channel != TELEPORT_CHANNEL_WORMHOLE && channel != TELEPORT_CHANNEL_FREE)
+ var/cur_zlevel = cur_turf.get_virtual_z_level()
+ var/dest_zlevel = dest_turf.get_virtual_z_level()
+ for (var/obj/machinery/bluespace_anchor/anchor as() in GLOB.active_bluespace_anchors)
+ var/anchor_zlevel = anchor.get_virtual_z_level()
+ // Not in range of our current turf or destination turf
+ if((cur_zlevel != anchor_zlevel && get_dist(cur_turf, anchor) > anchor.range) && (dest_zlevel != anchor_zlevel && get_dist(dest_turf, anchor) > anchor.range))
+ continue
+
+ // Try to activate the anchor, this also does the effect
+ if(!anchor.try_activate())
+ continue
+
+ // We're anchored, return false
+ return FALSE
+
+ // Checks antimagic
+ if(ismob(teleatom))
+ var/mob/tele_mob = teleatom
+ if(channel == TELEPORT_CHANNEL_CULT && tele_mob.anti_magic_check(magic = FALSE, holy = TRUE))
+ return FALSE
+ if(channel == TELEPORT_CHANNEL_MAGIC && tele_mob.anti_magic_check(magic = TRUE, holy = FALSE))
+ return FALSE
+
+ // Check for NO_TELEPORT restrictions
+ if(!bypass_area_restriction)
+ var/area/cur_area = cur_turf.loc
+ var/area/dest_area = dest_turf.loc
+ if(HAS_TRAIT(teleatom, TRAIT_NO_TELEPORT))
+ return FALSE
+ if(cur_area.teleport_restriction && cur_area.teleport_restriction != teleport_mode)
+ return FALSE
+ if(dest_area.teleport_restriction && dest_area.teleport_restriction != teleport_mode)
+ return FALSE
+
+ // Check for intercepting the teleport
+ if(cur_turf.intercept_teleport(channel, cur_turf, dest_turf) == COMPONENT_BLOCK_TELEPORT)
+ return FALSE
+ if(dest_turf.intercept_teleport(channel, cur_turf, dest_turf) == COMPONENT_BLOCK_TELEPORT)
+ return FALSE
+ if(teleatom.intercept_teleport(channel, cur_turf, dest_turf) == COMPONENT_BLOCK_TELEPORT)
+ return FALSE
+
+ return TRUE
+
+/**
+ * Returns TRUE if the teleport has been successful
+ *
+ * Arguments:
+ * * teleatom: atom to teleport
+ * * destination: destination to teleport to
+ * * precision: teleport precision (0 is most precise, the default)
+ * * effectin: effect to show right before teleportation
+ * * asoundin: soundfile to play before teleportation
+ * * asoundout: soundfile to play after teleportation
+ * * no_effects: disable the default effectin/effectout of sparks
+ * * channel: Which teleport channel/type should we try to use (for blocking checks)
+ * * ignore_check_teleport: Set this to true ONLY if you have already run check_teleport
+ * * bypass_area_restriction: Should we ignore SOFT atom and area TRAIT_NO_TELEPORT restriction and other area-related restrictions? Defaults to FALSE
+ * * no_wake: Whether or not we want a teleport wake to be created
+ */
+/proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE, channel=TELEPORT_CHANNEL_BLUESPACE, bypass_area_restriction = FALSE, teleport_mode = TELEPORT_MODE_DEFAULT, ignore_check_teleport = FALSE, no_wake = FALSE)
// teleporting most effects just deletes them
var/static/list/delete_atoms = typecacheof(list(
/obj/effect,
@@ -23,22 +92,6 @@
qdel(teleatom)
return FALSE
- //Check bluespace anchors
- if(channel != TELEPORT_CHANNEL_WORMHOLE && channel != TELEPORT_CHANNEL_FREE)
- for (var/obj/machinery/bluespace_anchor/anchor as() in GLOB.active_bluespace_anchors)
- //Not nearby
- if (anchor.get_virtual_z_level() != teleatom.get_virtual_z_level() || (get_dist(teleatom, anchor) > anchor.range && get_dist(destination, anchor) > anchor.range))
- continue
- //Check it
- if(!anchor.try_activate())
- continue
- do_sparks(5, FALSE, teleatom)
- playsound(anchor, 'sound/magic/repulse.ogg', 80, TRUE)
- if(ismob(teleatom))
- to_chat(teleatom, "You feel like you are being held in place.")
- //Anchored...
- return FALSE
-
// argument handling
// if the precision is not specified, default to 0, but apply BoH penalties
if (isnull(precision))
@@ -69,34 +122,25 @@
var/turf/curturf = get_turf(teleatom)
var/turf/destturf = get_teleport_turf(get_turf(destination), precision)
- if(!destturf || !curturf || destturf.is_transition_turf())
- return FALSE
-
- var/area/A = get_area(curturf)
- var/area/B = get_area(destturf)
- if(!forced && (HAS_TRAIT(teleatom, TRAIT_NO_TELEPORT)))
- return FALSE
-
- //Either area has teleport restriction and teleport mode isn't allowed in that area
- if(!forced && ((A.teleport_restriction && A.teleport_restriction != teleport_mode) || (B.teleport_restriction && B.teleport_restriction != teleport_mode)))
- return FALSE
-
- if(SEND_SIGNAL(destturf, COMSIG_ATOM_INTERCEPT_TELEPORT, channel, curturf, destturf))
- return FALSE
-
if(isobserver(teleatom))
teleatom.abstract_move(destturf)
return TRUE
- if (!commit)
- return TRUE
+ if(!ignore_check_teleport) // If we've already done it let's not check again
+ if(!check_teleport(teleatom, destturf, channel, bypass_area_restriction, teleport_mode))
+ return FALSE
// If we leave behind a wake, then create that here.
// Only leave a wake if we are going to a location that we can actually teleport to.
- if (!no_wake && (channel == TELEPORT_CHANNEL_BLUESPACE || channel == TELEPORT_CHANNEL_CULT || channel == TELEPORT_CHANNEL_MAGIC) && A.teleport_restriction == TELEPORT_MODE_DEFAULT && B.teleport_restriction == TELEPORT_MODE_DEFAULT && teleport_mode == TELEPORT_MODE_DEFAULT)
- new /obj/effect/temp_visual/teleportation_wake(get_turf(teleatom), destturf)
+ if (!no_wake && (channel == TELEPORT_CHANNEL_BLUESPACE || channel == TELEPORT_CHANNEL_CULT || channel == TELEPORT_CHANNEL_MAGIC))
+ var/area/cur_area = curturf.loc
+ var/area/dest_area = destturf.loc
+ if(cur_area.teleport_restriction == TELEPORT_MODE_DEFAULT && dest_area.teleport_restriction == TELEPORT_MODE_DEFAULT && teleport_mode == TELEPORT_MODE_DEFAULT)
+ new /obj/effect/temp_visual/teleportation_wake(get_turf(teleatom), destturf)
tele_play_specials(teleatom, curturf, effectin, asoundin)
+
+ // Actually teleport them
var/success = teleatom.forceMove(destturf)
if (success)
log_game("[key_name(teleatom)] has teleported from [loc_name(curturf)] to [loc_name(destturf)]")
@@ -113,12 +157,13 @@
return TRUE
/proc/tele_play_specials(atom/movable/teleatom, atom/location, datum/effect_system/effect, sound)
- if (location && !isobserver(teleatom))
- if (sound)
- playsound(location, sound, 60, 1)
- if (effect)
- effect.attach(location)
- effect.start()
+ if (!istype(location) || isobserver(teleatom))
+ return
+ if (sound)
+ playsound(location, sound, 60, 1)
+ if (effect)
+ effect.attach(location)
+ effect.start()
// Safe location finder
/proc/find_safe_turf(zlevel, list/zlevels, extended_safety_checks = FALSE, dense_atoms = TRUE)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index c8ae188439383..5b53da998fba9 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -1010,6 +1010,23 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom)
/atom/proc/teleport_act()
SEND_SIGNAL(src,COMSIG_ATOM_TELEPORT_ACT)
+/**
+ * Intercept our atom being teleported if we need to
+ *
+ * return COMPONENT_BLOCK_TELEPORT to explicity block teleportation
+ */
+/atom/proc/intercept_teleport(channel, turf/origin, turf/destination)
+ . = SEND_SIGNAL(src, COMSIG_ATOM_INTERCEPT_TELEPORT, channel, origin, destination)
+
+ if(. == COMPONENT_BLOCK_TELEPORT)
+ return
+
+ // Recursively check contents by default. This can be overriden if we want different behavior.
+ for(var/atom/thing in contents)
+ var/result = thing.intercept_teleport(channel, origin, destination)
+ if(result == COMPONENT_BLOCK_TELEPORT)
+ return result
+
/**
* Respond to our atom being checked by a virus extrapolator.
*
diff --git a/code/game/objects/items/scrolls.dm b/code/game/objects/items/scrolls.dm
index 98a642cb88746..487a0aa3c815a 100644
--- a/code/game/objects/items/scrolls.dm
+++ b/code/game/objects/items/scrolls.dm
@@ -64,7 +64,7 @@
to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.")
return
- if(do_teleport(user, pick(L), channel = TELEPORT_CHANNEL_MAGIC, forced = TRUE))
+ if(do_teleport(user, pick(L), channel = TELEPORT_CHANNEL_MAGIC, bypass_area_restriction = TRUE))
smoke.start()
uses--
else
diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index 16cdba633ad81..5179922aefb40 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -200,13 +200,10 @@
qdel(target_effect)
qdel(source_effect)
return
- var/area/A = get_area(teleport_target)
- if(A.teleport_restriction)
- to_chat(user, "\The [src] is malfunctioning.")
- return
current_location = get_turf(user) //Recheck.
current_area = current_location.loc
- if(!current_location || current_area.teleport_restriction || is_away_level(current_location.z) || is_centcom_level(current_location.z) || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
+ var/turf/dest_turf = get_teleport_turf(teleport_target)
+ if(isnull(current_area) || !check_teleport(user, dest_turf, channel = TELEPORT_CHANNEL_BLUESPACE) || is_away_level(current_location.z) || is_centcom_level(current_location.z))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
to_chat(user, "\The [src] is malfunctioning.")
return
var/list/obj/effect/portal/created = create_portal_pair(current_location, get_teleport_turf(get_turf(teleport_target)), src, 300, 1, null, atmos_link_override)
@@ -359,7 +356,7 @@
// Check if we can move here
current_area = current_location.loc
- if(!do_teleport(C, current_location, no_effects = TRUE, channel = TELEPORT_CHANNEL_BLINK, commit = FALSE))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
+ if(!check_teleport(C, current_location, channel = TELEPORT_CHANNEL_BLINK))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
current_location = previous
break
// If it contains objects, try to break it
diff --git a/code/modules/antagonists/clock_cult/helpers/servant_warp.dm b/code/modules/antagonists/clock_cult/helpers/servant_warp.dm
index ee6b570a1f24d..2bd8a8ef6fdb8 100644
--- a/code/modules/antagonists/clock_cult/helpers/servant_warp.dm
+++ b/code/modules/antagonists/clock_cult/helpers/servant_warp.dm
@@ -10,10 +10,10 @@
playsound(target_location, 'sound/magic/magic_missile.ogg', 50, TRUE)
do_sparks(5, TRUE, servant)
do_sparks(5, TRUE, target_location)
- do_teleport(M, target_location, channel = TELEPORT_CHANNEL_BLINK, no_effects = TRUE, teleport_mode = TELEPORT_MODE_CLOCKWORK)
+ do_teleport(M, target_location, channel = TELEPORT_CHANNEL_CULT, no_effects = TRUE, teleport_mode = TELEPORT_MODE_CLOCKWORK)
new /obj/effect/temp_visual/ratvar/warp(target_location)
to_chat(servant, "You warp to [get_area(target_location)].")
if(istype(P) && bring_dragging)
- do_teleport(P, target_location, channel = TELEPORT_CHANNEL_BLINK, no_effects = TRUE, teleport_mode = TELEPORT_MODE_CLOCKWORK)
+ do_teleport(P, target_location, channel = TELEPORT_CHANNEL_CULT, no_effects = TRUE, teleport_mode = TELEPORT_MODE_CLOCKWORK)
P.Paralyze(30)
to_chat(P, "You feel sick and confused...")
diff --git a/code/modules/antagonists/clock_cult/structure/dimensional_rift.dm b/code/modules/antagonists/clock_cult/structure/dimensional_rift.dm
index 5a904c68d3649..3bbe183833175 100644
--- a/code/modules/antagonists/clock_cult/structure/dimensional_rift.dm
+++ b/code/modules/antagonists/clock_cult/structure/dimensional_rift.dm
@@ -29,7 +29,7 @@
if(do_after(M, 50, target=src))
var/obj/effect/landmark/city_of_cogs/target_spawn = pick(GLOB.city_of_cogs_spawns)
var/turf/T = get_turf(target_spawn)
- do_teleport(M, T, no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, forced = TRUE)
+ do_teleport(M, T, no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, bypass_area_restriction = TRUE)
var/mob/living/M_mob = M
if(istype(M_mob))
if(M_mob.client)
@@ -43,4 +43,4 @@
//So we can push crates in too
var/obj/effect/landmark/city_of_cogs/target_spawn = pick(GLOB.city_of_cogs_spawns)
var/turf/T = get_turf(target_spawn)
- do_teleport(M, T, no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, forced = TRUE)
+ do_teleport(M, T, no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, bypass_area_restriction = TRUE)
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
index 45d07518cd1a8..5de108942ad72 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
@@ -265,7 +265,7 @@
return
// Send 'em to the destination. If the teleport fails, just disembowel them and stop the chain
- if(!destination || !do_teleport(sac_target, destination, asoundin = 'sound/magic/repulse.ogg', asoundout = 'sound/magic/blind.ogg', no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC, forced = TRUE, no_wake = TRUE))
+ if(!destination || !do_teleport(sac_target, destination, asoundin = 'sound/magic/repulse.ogg', asoundout = 'sound/magic/blind.ogg', no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC, bypass_area_restriction = TRUE, no_wake = TRUE))
disembowel_target(sac_target)
return
@@ -374,7 +374,7 @@
safe_turf = get_turf(backup_loc)
stack_trace("[type] - return_target was unable to find a safe turf for [sac_target] to return to. Defaulting to observer start turf.")
- if(!do_teleport(sac_target, safe_turf, asoundout = 'sound/magic/blind.ogg', no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, forced = TRUE, no_wake = TRUE))
+ if(!do_teleport(sac_target, safe_turf, asoundout = 'sound/magic/blind.ogg', no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, bypass_area_restriction = TRUE, no_wake = TRUE))
safe_turf = get_turf(backup_loc)
sac_target.forceMove(safe_turf)
stack_trace("[type] - return_target was unable to teleport [sac_target] to the observer start turf. Forcemoving.")
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index 85b96e894dc64..9208c198a8a33 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -187,7 +187,7 @@
if(QDELETED(src)) // it's bad when someone spams this...
return
var/turf/targetturf = get_random_station_turf()
- if(!do_teleport(user, targetturf, channel = TELEPORT_CHANNEL_CULT, forced=TRUE))
+ if(!do_teleport(user, targetturf, channel = TELEPORT_CHANNEL_CULT, bypass_area_restriction=TRUE))
to_chat(user, "You have failed to recall yourself to the station... You should try again.")
else
user.reveal(80)
diff --git a/code/modules/bluespace_anchor/bluespace_anchor.dm b/code/modules/bluespace_anchor/bluespace_anchor.dm
index 0ab3ceffc12bf..d4b29d75e75fb 100644
--- a/code/modules/bluespace_anchor/bluespace_anchor.dm
+++ b/code/modules/bluespace_anchor/bluespace_anchor.dm
@@ -66,6 +66,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/bluespace_anchor)
src.Beam(L, icon_state="lightning[rand(1,12)]", time=5, maxdistance = INFINITY)
var/shock_damage = min(round(power_usage_per_teleport/600), 90) + rand(-5, 5)
L.electrocute_act(shock_damage, src)
+ // Give feedback
+ do_sparks(5, FALSE, teleatom)
+ playsound(src, 'sound/magic/repulse.ogg', 80, TRUE)
+ if(ismob(teleatom))
+ to_chat(teleatom, "You feel like you are being held in place.")
return TRUE
/obj/machinery/bluespace_anchor/proc/set_cell(cell)
diff --git a/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm b/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
index 1252ca6c07f6e..e5261d797ff27 100644
--- a/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
+++ b/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
@@ -507,7 +507,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
return
// Send 'em to the destination. If the teleport fails, do nothing.
- if(!destination || !do_teleport(sac_target, destination, asoundin = 'sound/magic/repulse.ogg', asoundout = 'sound/magic/blind.ogg', no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC, forced = TRUE, no_wake = TRUE))
+ if(!destination || !do_teleport(sac_target, destination, asoundin = 'sound/magic/repulse.ogg', asoundout = 'sound/magic/blind.ogg', no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC, bypass_area_restriction = TRUE, no_wake = TRUE))
return
// If our target died during the (short) wait timer,
@@ -594,7 +594,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
safe_turf = get_turf(backup_loc)
stack_trace("[type] - return_target was unable to find a safe turf for [sac_target] to return to. Defaulting to observer start turf.")
- if(!do_teleport(sac_target, safe_turf, asoundout = 'sound/magic/blind.ogg', no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, forced = TRUE, no_wake = TRUE))
+ if(!do_teleport(sac_target, safe_turf, asoundout = 'sound/magic/blind.ogg', no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, bypass_area_restriction = TRUE, no_wake = TRUE))
safe_turf = get_turf(backup_loc)
sac_target.forceMove(safe_turf)
stack_trace("[type] - return_target was unable to teleport [sac_target] to the observer start turf. Forcemoving.")
diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
index c42e7457ff4a0..01bacdffe2c2d 100644
--- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
@@ -114,7 +114,7 @@ It is possible to destroy the net by the occupant or someone else.
// Teleport
var/turf/picked_station_level = get_random_station_turf() //Don't want to limit this specifically to z 2 in case we get multi-z in rotation
var/turf/safe_location = find_safe_turf(picked_station_level.z, extended_safety_checks = TRUE, dense_atoms = FALSE)
- do_teleport(target, safe_location, channel = TELEPORT_CHANNEL_FREE, forced = TRUE)
+ do_teleport(target, safe_location, channel = TELEPORT_CHANNEL_FREE, bypass_area_restriction = TRUE)
target.Unconscious(3 SECONDS)
/obj/structure/energy_net/attack_paw(mob/user)
From 2842b100812f29ba72f2d2b9eeb0ebe6f66ede7a Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:32:16 -0400
Subject: [PATCH 02/43] spelling mistake
---
code/modules/antagonists/cult/runes.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 7b13e2af68e76..7bc21a124e288 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -466,7 +466,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/rune/teleport)
visible_message("There is a sharp crack of inrushing air, and everything above the rune disappears!", null, "You hear a sharp crack.")
to_chat(user, "You[moveuserlater ? "r vision blurs, and you suddenly appear somewhere else":" send everything above the rune away"].")
else
- to_chat(user, "You[moveuserlater ? "r vision blurs briefly, but nothing happens":" try send everything above the rune away, but the teleportation fails"].")
+ to_chat(user, "You[moveuserlater ? "r vision blurs briefly, but nothing happens":" try send everything above the rune away, but the teleportation fails"].")
if(is_mining_level(z) && !is_mining_level(target.z)) //No effect if you stay on lavaland
actual_selected_rune.handle_portal("lava")
else
From ba22a33ae39088c229633fc47dacca56bc32e574 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Tue, 10 Sep 2024 00:08:05 -0400
Subject: [PATCH 03/43] Added overrides for bible and nullrod so they don't
inheritly block teleports
---
code/game/objects/items/holy_weapons.dm | 4 ++++
code/game/objects/items/storage/book.dm | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 992446e2edcf5..13dad924bde6b 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -271,6 +271,10 @@
message_admins("[ADMIN_LOOKUPFLW(user)] erased a [target_rune.cultist_name] rune with a null rod.")
SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_NARNAR] = TRUE
+// The nullrod by itself does not block cult/wizard teleports
+/obj/item/nullrod/intercept_teleport(channel, turf/origin, turf/destination)
+ return
+
/obj/item/nullrod/godhand
icon_state = "disintegrate"
item_state = "disintegrate"
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index d18fcc98415a5..e61b1321dbdaf 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -246,6 +246,10 @@
EX.name = "Purified [initial(EX.name)]"
user.visible_message("[user] has purified [SS]!")
+// The bible by itself does not block cult/wizard teleports.
+/obj/item/storage/book/bible/intercept_teleport(channel, turf/origin, turf/destination)
+ return
+
/obj/item/storage/book/bible/booze
desc = "To be applied to the head repeatedly."
From 7877a18f388f6653bf504a8afe6a350040e80f60 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Tue, 10 Sep 2024 23:51:59 -0400
Subject: [PATCH 04/43] If we're looping through all the items anyways, we
might as well use the built-in type filter.
---
code/datums/helper_datums/teleport.dm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 78e03c683ced2..633e1a44c4713 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -101,8 +101,7 @@
if(istype(teleatom, /obj/item/storage/backpack/holding))
precision = rand(1,100)
- var/static/list/bag_cache = typecacheof(/obj/item/storage/backpack/holding)
- var/list/bagholding = typecache_filter_list(teleatom.GetAllContents(), bag_cache)
+ var/list/bagholding = teleatom.GetAllContents(/obj/item/storage/backpack/holding)
if(bagholding.len)
precision = max(rand(1,100)*bagholding.len,100)
if(isliving(teleatom))
From 6e753dfd9bf87fecda7e28ded207d67b31076d8a Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Thu, 12 Sep 2024 00:18:31 -0400
Subject: [PATCH 05/43] maybe we should call parent
---
code/modules/mob/living/simple_animal/hostile/bread.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/modules/mob/living/simple_animal/hostile/bread.dm b/code/modules/mob/living/simple_animal/hostile/bread.dm
index 4c8ddba930b5b..7e62adfd45951 100644
--- a/code/modules/mob/living/simple_animal/hostile/bread.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bread.dm
@@ -27,6 +27,8 @@
mobchatspan = "blob"
/mob/living/simple_animal/hostile/breadloaf/teleport_act()
+ . = ..()
+
if(mutations == 0)
mutationcap = rand(1,mutability)
if(prob(90))
From 9bb40f60832ed4d778f950d9f997975430728ac9 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:40:32 -0400
Subject: [PATCH 06/43] fixes a hand-tele oopsie
---
code/datums/helper_datums/teleport.dm | 5 ++++-
code/game/objects/items/teleportation.dm | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 633e1a44c4713..19cf0e05b2b37 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -11,7 +11,10 @@
/proc/check_teleport(atom/movable/teleatom, turf/dest_turf, channel = TELEPORT_CHANNEL_BLUESPACE, bypass_area_restriction = FALSE, teleport_mode = TELEPORT_MODE_DEFAULT)
var/turf/cur_turf = get_turf(teleatom)
- if(!istype(cur_turf) || !istype(dest_turf) || dest_turf.is_transition_turf())
+ if(!istype(dest_turf))
+ stack_trace("Destination [dest_turf] is not a turf.")
+ return FALSE
+ if(!istype(cur_turf) || dest_turf.is_transition_turf())
return FALSE
// Checks bluespace anchors
diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index 5179922aefb40..852bc8c326261 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -202,7 +202,7 @@
return
current_location = get_turf(user) //Recheck.
current_area = current_location.loc
- var/turf/dest_turf = get_teleport_turf(teleport_target)
+ var/turf/dest_turf = get_teleport_turf(get_turf(teleport_target))
if(isnull(current_area) || !check_teleport(user, dest_turf, channel = TELEPORT_CHANNEL_BLUESPACE) || is_away_level(current_location.z) || is_centcom_level(current_location.z))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
to_chat(user, "\The [src] is malfunctioning.")
return
From 4da25d09fd4c006c8ad93d631a3e641b98a55565 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Thu, 12 Sep 2024 00:19:05 -0400
Subject: [PATCH 07/43] code should be done
---
code/__DEFINES/movement.dm | 2 +
code/_onclick/observer.dm | 23 +-
code/controllers/subsystem/mapping.dm | 3 +-
code/datums/helper_datums/teleport.dm | 41 ++-
code/modules/awaymissions/gateway.dm | 332 +++++++++---------
code/modules/awaymissions/pamphlet.dm | 62 ++--
code/modules/awaymissions/zlevel.dm | 7 -
.../jobs/job_types/cargo_technician.dm | 2 +-
code/modules/jobs/job_types/quartermaster.dm | 2 +-
code/modules/jobs/job_types/shaft_miner.dm | 2 +-
code/modules/mining/machine_vending.dm | 2 +-
11 files changed, 253 insertions(+), 225 deletions(-)
diff --git a/code/__DEFINES/movement.dm b/code/__DEFINES/movement.dm
index c34bcb82259a8..74e027d07c6de 100644
--- a/code/__DEFINES/movement.dm
+++ b/code/__DEFINES/movement.dm
@@ -35,6 +35,8 @@
/// Classic bluespace teleportation, requires a sender but no receiver
#define TELEPORT_CHANNEL_BLUESPACE "bluespace"
+/// /// Snowflakey gateway teleportation from Stargate... Gateway...? (idk) it uses old technology
+#define TELEPORT_CHANNEL_GATEWAY "gateway"
/// Quantum-based teleportation, requires both sender and receiver, but is free from normal disruption
#define TELEPORT_CHANNEL_QUANTUM "quantum"
/// Wormhole teleportation, is not disrupted by bluespace fluctuations but tends to be very random or unsafe
diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index 899255956d71c..30e5a593ebc1d 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -68,19 +68,18 @@
// And here are some good things for free:
// Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu
-/obj/machinery/gateway/centerstation/attack_ghost(mob/user)
- if(awaygate)
- user.abstract_move(awaygate.loc)
- else
- to_chat(user, "[src] has no destination.")
- return ..()
+/obj/machinery/gateway/attack_ghost(mob/user)
+ . = ..()
+ if(.)
+ return
-/obj/machinery/gateway/centeraway/attack_ghost(mob/user)
- if(stationgate)
- user.abstract_move(stationgate.loc)
- else
- to_chat(user, "[src] has no destination.")
- return ..()
+ if(!centerpiece)
+ return FALSE
+ if(linked_gateway)
+ user.abstract_move(get_turf(linked_gateway))
+ return TRUE
+ to_chat(user, "[src] has no destination.")
+ return TRUE
/obj/machinery/teleport/hub/attack_ghost(mob/user)
if(!power_station?.engaged || !power_station.teleporter_console || !power_station.teleporter_console.target_ref)
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index dbf2fe8c90742..6b1a9e2ba0ca6 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -568,8 +568,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
new_gate = G
break
//Link station gate with away gate and remove wait time.
- GLOB.the_gateway.awaygate = new_gate
- GLOB.the_gateway.wait = world.time
+ GLOB.the_gateway.linked_gateway = new_gate
/datum/controller/subsystem/mapping/proc/RequestBlockReservation(width, height, z, type = /datum/turf_reservation, turf_type_override)
UNTIL((!z || reservation_ready["[z]"]) && !clearing_reserved_turfs)
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 19cf0e05b2b37..cd68a46d957ee 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -18,7 +18,7 @@
return FALSE
// Checks bluespace anchors
- if(channel != TELEPORT_CHANNEL_WORMHOLE && channel != TELEPORT_CHANNEL_FREE)
+ if(channel != TELEPORT_CHANNEL_WORMHOLE && channel != TELEPORT_CHANNEL_FREE && channel != TELEPORT_CHANNEL_GATEWAY)
var/cur_zlevel = cur_turf.get_virtual_z_level()
var/dest_zlevel = dest_turf.get_virtual_z_level()
for (var/obj/machinery/bluespace_anchor/anchor as() in GLOB.active_bluespace_anchors)
@@ -150,6 +150,9 @@
if(ismegafauna(teleatom))
message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_VERBOSEJMP(curturf)] to [ADMIN_VERBOSEJMP(destturf)].")
+ if(ismegafauna(teleatom))
+ message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_VERBOSEJMP(curturf)] to [ADMIN_VERBOSEJMP(destturf)].")
+
if(ismob(teleatom))
var/mob/M = teleatom
M.cancel_camera()
@@ -310,3 +313,39 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/teleportation_wake)
transform = matrix() * 0
animate(src, time = 10 SECONDS, transform = matrix(), alpha = 255)
animate(time = 0.5 SECONDS, transform = matrix() * 0, alpha = 0)
+
+// mob-level gateway teleport checks
+/mob/living/carbon/intercept_teleport(channel, turf/origin, turf/destination)
+ . = ..()
+
+ if(. == COMPONENT_BLOCK_TELEPORT || channel != TELEPORT_CHANNEL_GATEWAY)
+ return
+
+ // Checking for exile implants
+ if(!isnull(implants))
+ for(var/obj/item/implant/exile/baddie in implants)
+ visible_message("The portal bends inward, but [src] can't seem to pass through it!", "The portal has detected your [baddie] and not letting you through!")
+ return COMPONENT_BLOCK_TELEPORT
+
+ // Ashwalker check
+ if(is_species(src, /datum/species/lizard/ashwalker))
+ visible_message("The portal bends inward, but [src] can't seem to pass through it!", "You can seem to go through the portal!")
+ return COMPONENT_BLOCK_TELEPORT
+
+/mob/living/simple_animal/hostile/megafauna/intercept_teleport(channel, turf/origin, turf/destination)
+ . = ..()
+
+ if(. == COMPONENT_BLOCK_TELEPORT || channel != TELEPORT_CHANNEL_GATEWAY)
+ return
+
+ visible_message("The portal bends inward, but [src] can't seem to pass through it!", "You can't seem to pass through the portal!")
+ return COMPONENT_BLOCK_TELEPORT
+
+/mob/living/simple_animal/hostile/asteroid/elite/intercept_teleport(channel, turf/origin, turf/destination)
+ . = ..()
+
+ if(. == COMPONENT_BLOCK_TELEPORT || channel != TELEPORT_CHANNEL_GATEWAY)
+ return
+
+ visible_message("The portal bends inward, but [src] can't seem to pass through it!", "You can't seem to pass through the portal!")
+ return COMPONENT_BLOCK_TELEPORT
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index db16531adffa7..7fcc277052cf7 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -2,106 +2,191 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
/obj/machinery/gateway
name = "gateway"
- desc = "A mysterious gateway built by unknown hands, it allows for faster than light travel to far-flung locations."
+ desc = "A gateway built for quick travel between linked destinations."
icon = 'icons/obj/machines/gateway.dmi'
icon_state = "off"
density = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- var/active = 0
+ var/active = FALSE
var/checkparts = TRUE
- var/list/obj/effect/landmark/randomspawns = list()
- var/calibrated = TRUE
- var/list/linked = list()
- var/can_link = FALSE //Is this the centerpiece?
+ var/list/adjacent_parts = list()
+ var/centerpiece = FALSE //Is this the centerpiece?
+
+ /// The gateway this machine is linked to
+ var/obj/machinery/gateway/linked_gateway
+
+ /// Cooldown for says and buzz-sigh
+ COOLDOWN_DECLARE(telegraph_cooldown)
/obj/machinery/gateway/Initialize(mapload)
- randomspawns = GLOB.awaydestinations
- update_icon()
- if(!istype(src, /obj/machinery/gateway/centerstation) && !istype(src, /obj/machinery/gateway/centeraway))
+ . = ..()
+ if(!centerpiece)
switch(dir)
if(SOUTH,SOUTHEAST,SOUTHWEST)
density = FALSE
+
+/obj/machinery/gateway/Destroy()
+ if(GLOB.the_gateway == src)
+ GLOB.the_gateway = null
+ if(linked_gateway)
+ linked_gateway.linked_gateway = null
+ linked_gateway = null
return ..()
-/obj/machinery/gateway/proc/toggleoff()
- for(var/obj/machinery/gateway/G in linked)
- G.active = 0
- G.update_icon()
- active = 0
- update_icon()
+/obj/machinery/gateway/Bumped(atom/movable/AM)
+ self_teleport(AM)
+
+/obj/machinery/gateway/MouseDrop_T(atom/movable/AM, mob/user)
+ . = ..()
+ if(AM == user)
+ self_teleport(AM) // This is so that if you're drag-clicking yourself into the gateway it'll appear as if you're entering it
+ return
-/obj/machinery/gateway/proc/detect()
- if(!can_link)
+ var/turf/dest_turf = get_step(get_turf(linked_gateway), SOUTH)
+ if(!pre_check_teleport(AM, dest_turf))
+ to_chat(user, "You can't seem to push [AM] into [src]...")
+ return
+
+ if(ismob(AM))
+ var/mob/M = AM
+ user.visible_message(\
+ "[user] tries to shove [M] into [src]...",\
+ "You try to shove [M] into [src]...",
+ ignored_mobs = list(M))
+ to_chat(M, "[user] is pushing you into [src]!")
+ if(!do_after(user, 5 SECONDS, src))
+ return // failed do_after, we don't teleport
+ user.visible_message("[user] shoves [M] into [src].", "You shove [M] into [src].")
+ else
+ user.visible_message("[AM] is pushed into [src].", "You push [AM] into [src].")
+
+ actually_teleport(AM, dest_turf)
+
+/obj/machinery/gateway/proc/pre_check_teleport(atom/movable/AM, turf/dest_turf)
+ if(!centerpiece)
+ return FALSE
+ if(!active)
return FALSE
- linked = list() //clear the list
- var/turf/T = loc
- var/ready = FALSE
+ if(!check_parts())
+ return FALSE
+ if(!linked_gateway || QDELETED(linked_gateway))
+ say_cooldown("Target destination not found.")
+ return FALSE
+ if(!linked_gateway.active)
+ say_cooldown("Destination gateway not active.")
+ return FALSE
+
+ return check_teleport(AM, dest_turf, channel = TELEPORT_CHANNEL_GATEWAY)
+
+/obj/machinery/gateway/proc/check_parts()
+ . = TRUE
+ if(!checkparts)
+ return
for(var/i in GLOB.alldirs)
- T = get_step(loc, i)
+ var/turf/T = get_step(src, i)
var/obj/machinery/gateway/G = locate(/obj/machinery/gateway) in T
if(G)
- linked.Add(G)
+ adjacent_parts.Add(G)
continue
- //this is only done if we fail to find a part
- ready = FALSE
+ // Failed to link to a piece of the gateway
+ . = FALSE
toggleoff()
break
- if((linked.len == 8) || !checkparts)
- ready = TRUE
- return ready
+/obj/machinery/gateway/proc/say_cooldown(words, sound)
+ if(COOLDOWN_FINISHED(src, telegraph_cooldown))
+ COOLDOWN_START(src, telegraph_cooldown, 5 SECONDS)
+ say(words)
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
-/obj/machinery/gateway/update_icon()
- if(active)
- icon_state = "on"
+/// Do a teleport initiated by the target
+/obj/machinery/gateway/proc/self_teleport(atom/movable/AM)
+ var/turf/dest_turf = get_step(get_turf(linked_gateway), SOUTH)
+ if(!pre_check_teleport(AM, dest_turf))
return
- icon_state = "off"
-/obj/machinery/gateway/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- if(!detect())
+ if(ismob(AM))
+ var/mob/M = AM
+ M.visible_message( \
+ "[AM] tries to climb into [src]...", \
+ "You begin climbing into [src]...")
+ if(!do_after(M, 5 SECONDS, src, timed_action_flags = IGNORE_HELD_ITEM))
+ return
+ else
+ AM.visible_message("[AM] enters the gateway.") // oooo~ ominous
+
+ actually_teleport(AM, dest_turf)
+
+
+/obj/machinery/gateway/proc/actually_teleport(atom/movable/AM, turf/dest_turf)
+ if(do_teleport(AM, dest_turf, no_effects = TRUE, channel = TELEPORT_CHANNEL_GATEWAY, ignore_check_teleport = TRUE)) // We've already done the check_teleport() hopefully
+ AM.visible_message("[AM] passes through [linked_gateway]!", "You pass through.")
+ AM.setDir(SOUTH)
+
+/obj/machinery/gateway/update_icon()
+ icon_state = active ? "on" : "off"
+
+/obj/machinery/gateway/interact(mob/user)
+ if(!centerpiece)
return
- if(!active)
- toggleon(user)
+
+ if(!check_parts())
+ to_chat(user, "It seems incomplete...")
return
- toggleoff()
+
+ if(active)
+ toggleoff(telegraph = TRUE)
+ to_chat(user, "You turn [src] off.")
+ else
+ if(toggleon(user))
+ to_chat(user, "You turn [src] on.")
+
+ . = ..()
/obj/machinery/gateway/proc/toggleon(mob/user)
- return FALSE
+ if(!centerpiece)
+ return
+ if(!powered())
+ to_chat(user, "It has no power!")
+ return FALSE
+ if(!linked_gateway)
+ to_chat(user, "No destination found!")
+ return FALSE
-/obj/machinery/gateway/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG)
- return
+ for(var/obj/machinery/gateway/G in adjacent_parts)
+ G.active = 1
+ G.update_icon()
+ active = 1
+ update_icon()
+ return TRUE
-/obj/machinery/gateway/centerstation/Initialize(mapload)
- . = ..()
- if(!GLOB.the_gateway)
- GLOB.the_gateway = src
+/obj/machinery/gateway/proc/toggleoff(telegraph = FALSE)
+ for(var/obj/machinery/gateway/G in adjacent_parts)
+ G.active = FALSE
+ G.update_icon()
+ active = FALSE
update_icon()
- wait = world.time + CONFIG_GET(number/gateway_delay) //+ thirty minutes default
- awaygate = locate(/obj/machinery/gateway/centeraway)
+ if(telegraph)
+ playsound(src, 'sound/machines/terminal_off.ogg', 50, 0)
-/obj/machinery/gateway/centerstation/Destroy()
- if(GLOB.the_gateway == src)
- GLOB.the_gateway = null
- if(awaygate)
- awaygate.stationgate = null
- awaygate = null
- return ..()
+/obj/machinery/gateway/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG)
+ return
//this is da important part wot makes things go
/obj/machinery/gateway/centerstation
density = TRUE
icon_state = "offcenter"
use_power = IDLE_POWER_USE
+ centerpiece = TRUE
- //warping vars
- var/wait = 0 //this just grabs world.time at world start
- var/obj/machinery/gateway/centeraway/awaygate = null
- can_link = TRUE
+/obj/machinery/gateway/centerstation/Initialize(mapload)
+ . = ..()
+ if(!GLOB.the_gateway)
+ GLOB.the_gateway = src
+ update_icon()
+ linked_gateway = locate(/obj/machinery/gateway/centeraway)
/obj/machinery/gateway/centerstation/update_icon()
if(active)
@@ -112,62 +197,15 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
/obj/machinery/gateway/centerstation/process()
if((machine_stat & (NOPOWER)) && use_power)
if(active)
- toggleoff()
+ toggleoff(TRUE)
return
- if(active)
- use_power(5000)
-
-/obj/machinery/gateway/centerstation/toggleon(mob/user)
- if(!detect())
+ if(!is_operational)
+ toggleoff(TRUE)
return
- if(!powered())
- return
- if(!awaygate)
- to_chat(user, "Error: No destination found.")
- return
- if(world.time < wait)
- to_chat(user, "Error: Warpspace triangulation in progress. Estimated time to completion: [DisplayTimeText(wait - world.time)].")
- return
-
- for(var/obj/machinery/gateway/G in linked)
- G.active = 1
- G.update_icon()
- active = 1
- update_icon()
-//okay, here's the good teleporting stuff
-/obj/machinery/gateway/centerstation/Bumped(atom/movable/AM)
- if(!active)
- return
- if(!detect())
- return
- if(!awaygate || QDELETED(awaygate))
- return
-
- if(awaygate.calibrated)
- AM.forceMove(get_step(awaygate.loc, SOUTH))
- AM.setDir(SOUTH)
- if (ismob(AM))
- var/mob/M = AM
- if (M.client)
- M.client.move_delay = max(world.time + 5, M.client.move_delay)
- return
- else
- var/obj/effect/landmark/dest = pick(randomspawns)
- if(dest)
- AM.forceMove(get_turf(dest))
- AM.setDir(SOUTH)
- use_power(5000)
- return
-
-/obj/machinery/gateway/centeraway/multitool_act(mob/living/user, obj/item/I)
- if(calibrated)
- to_chat(user, "\black The gate is already calibrated, there is no work for you to do here.")
- else
- to_chat(user, "Recalibration successful!: \black This gate's systems have been fine tuned. Travel to this gate will now be on target.")
- calibrated = TRUE
- return TRUE
+ if(active)
+ use_power(5000)
/////////////////////////////////////Away////////////////////////
@@ -176,20 +214,12 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
density = TRUE
icon_state = "offcenter"
use_power = NO_POWER_USE
- var/obj/machinery/gateway/centerstation/stationgate = null
- can_link = TRUE
-
+ centerpiece = TRUE
/obj/machinery/gateway/centeraway/Initialize(mapload)
. = ..()
update_icon()
- stationgate = locate(/obj/machinery/gateway/centerstation)
-
-/obj/machinery/gateway/centeraway/Destroy()
- if(stationgate)
- stationgate.awaygate = null
- stationgate = null
- return ..()
+ linked_gateway = locate(/obj/machinery/gateway/centerstation)
/obj/machinery/gateway/centeraway/update_icon()
if(active)
@@ -197,62 +227,26 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
return
icon_state = "offcenter"
-/obj/machinery/gateway/centeraway/toggleon(mob/user)
- if(!detect())
- return
- if(!stationgate)
- to_chat(user, "Error: No destination found.")
- return
-
- for(var/obj/machinery/gateway/G in linked)
- G.active = 1
- G.update_icon()
- active = 1
- update_icon()
-
-/obj/machinery/gateway/centeraway/proc/check_exile_implant(mob/living/L)
- for(var/obj/item/implant/exile/E in L.implants)//Checking that there is an exile implant
- to_chat(L, "\black The station gate has detected your exile implant and is blocking your entry.")
- return TRUE
- return FALSE
+/obj/machinery/gateway/centeraway/mining
+ use_power = IDLE_POWER_USE
-/obj/machinery/gateway/centeraway/Bumped(atom/movable/AM)
- if(!detect())
- return
- if(!active)
+/obj/machinery/gateway/centeraway/mining/process()
+ if((machine_stat & NOPOWER) && use_power)
+ if(active)
+ toggleoff(TRUE)
return
- if(!stationgate || QDELETED(stationgate))
+
+ if(!is_operational)
+ toggleoff(TRUE)
return
- if(isliving(AM))
- if(check_exile_implant(AM))
- return
- else
- for(var/mob/living/L in AM.contents)
- if(check_exile_implant(L))
- say("Rejecting [AM]: Exile implant detected in contained lifeform.")
- return
- if(AM.has_buckled_mobs())
- for(var/mob/living/L in AM.buckled_mobs)
- if(check_exile_implant(L))
- say("Rejecting [AM]: Exile implant detected in close proximity lifeform.")
- return
- AM.forceMove(get_step(stationgate.loc, SOUTH))
- AM.setDir(SOUTH)
- if (ismob(AM))
- var/mob/M = AM
- if (M.client)
- M.client.move_delay = max(world.time + 5, M.client.move_delay)
+ if(active)
+ use_power(5000)
/obj/machinery/gateway/centeraway/admin
desc = "A mysterious gateway built by unknown hands, this one seems more compact."
-/obj/machinery/gateway/centeraway/admin/Initialize(mapload)
- . = ..()
- if(stationgate && !stationgate.awaygate)
- stationgate.awaygate = src
-
-/obj/machinery/gateway/centeraway/admin/detect()
+/obj/machinery/gateway/centeraway/admin/check_parts()
return TRUE
diff --git a/code/modules/awaymissions/pamphlet.dm b/code/modules/awaymissions/pamphlet.dm
index e3f50fab8ed45..2a9df7ced0797 100644
--- a/code/modules/awaymissions/pamphlet.dm
+++ b/code/modules/awaymissions/pamphlet.dm
@@ -9,33 +9,35 @@
default_raw_text = "They don't make you kill people. There, we said it. Now get back to work!"
/obj/item/paper/pamphlet/gateway
- default_raw_text = "Welcome to the Nanotrasen Gateway project...
\
- Congratulations! If you're reading this, you and your superiors have decided that you're \
- ready to commit to a life spent colonising the rolling hills of far away worlds. You \
- must be ready for a lifetime of adventure, a little bit of hard work, and an award \
- winning dental plan- but that's not all the Nanotrasen Gateway project has to offer.
\
-
Because we care about you, we feel it is only fair to make sure you know the risks \
- before you commit to joining the Nanotrasen Gateway project. All away destinations have \
- been fully scanned by a Nanotrasen expeditionary team, and are certified to be 100% safe. \
- We've even left a case of space beer along with the basic materials you'll need to expand \
- Nanotrasen's operational area and start your new life.
\
- Gateway Operation Basics
\
- All Nanotrasen approved Gateways operate on the same basic principals. They operate off \
- area equipment power as you would expect, and without this supply, it cannot safely function, \
- causinng it to reject all attempts at operation.
\
- Once it is correctly setup, and once it has enough power to operate, the Gateway will begin \
- searching for an output location. The amount of time this takes is variable, but the Gateway \
- interface will give you an estimate accurate to the minute. Power loss will not interrupt the \
- searching process. Influenza will not interrupt the searching process. Temporal anomalies \
- may cause the estimate to be inaccurate, but will not interrupt the searching process.
\
- Life On The Other Side
\
- Once you have traversed the Gateway, you may experience some disorientation. Do not panic. \
- This is a normal side effect of travelling vast distances in a short period of time. You should \
- survey the immediate area, and attempt to locate your complimentary case of space beer. Our \
- expeditionary teams have ensured the complete safety of all away locations, but in a small \
- number of cases, the Gateway they have established may not be immediately obvious. \
- Do not panic if you cannot locate the return Gateway. Begin colonisation of the destination. \
-
A New World
\
- As a participant in the Nanotrasen Gateway Project, you will be on the frontiers of space. \
- Though complete safety is assured, participants are advised to prepare for inhospitable \
- environs."
+ default_raw_text = "Hello valued Nanotrasen employee!
\
+ You have volunteered and/or been selected to join our crew working, living, and \
+ enjoying our premier plasma resourcing planet endearingly named “Lavaland”!
\
+ Here are a few things to expect with your new work enviroment:
\
+ Sweet natural atmosphere!
\
+ Is the station just not your style? Are you partial to warmer climates? Is a lower than \
+ average barometric pressure a comfortable and welcome thing to you? Well by Jiminy, Lavaland \
+ isn't a paradise world but you won't be worried about explosive decompression! \
+ Just remember to keep your Oxygen mask on and step inside for break time when the wind picks up!
\
+ Game hunting!
\
+ Have you ever wanted to bag yourself a real hunting trophy? Well, here's your chance! There are all \
+ sorts of hearty creatures that float and stomp about the ashen plains. Get \
+ your dinner plates and wooden plaques ready for the next beast; be they goliath, watcher, \
+ ashwalker or even bigger and more exotic creatures! And the best part: you do it on company time!
\
+ Wild enviroment!
\
+ Are you the frontier type? Do you embrace the challenge of maintaining a building with your \
+ peers? Lavaland and its base are perfect for you! Sometimes the unexpected happens: some \
+ of the walls, pipework, and floors may need your expertise. Working in space on places like \
+ asteroids about the sector are also an NT approved course of action for the more void inclined!
\
+ Top of the line equipment!
\
+ You might be surprised how much of R&D's budget is devoted to outfitting our folks' digging! While \
+ we won't be discussing numbers, you can get a good idea based on the peerless equipment you'll \
+ be handling. From proto-kinetic accelerators, sonic resonators, and even new experimental \
+ technology like our plasma cutters! The latest in rock sundering and beast cleaving technological \
+ marvels are produced to make getting any materials an easy task!
\
+ So what are you waiting for?
\
+ Reap the rewards and make us proud!
\
+ “Lavaland” does not possess a breathable atmosphere. Volcanic ash storms capable of inflicting 1st to 3rd degree burns and death regularly occur. \
+ Various trophies gained through hunting are considered property of Nanotrasen and will be taken for company use at the end of the shift. \
+ Repair skills not necessary but recommended; no repair training provided. \
+ The seniority and skill of miners on shift may vary depending on current rates of death and dismemberment. \
+ Nanotrasen is not responsible for any injuries, death, or dismemberment which may occur as a direct or indirect result of this employment opportunity."
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index f4741af56d7db..90bfff7dec9f5 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -11,13 +11,6 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "awaymission
load_new_z_level(map, "Away Mission")
to_chat(world, "Away mission loaded.")
-/proc/reset_gateway_spawns(reset = FALSE)
- for(var/obj/machinery/gateway/G in GLOB.machines)
- if(reset)
- G.randomspawns = GLOB.awaydestinations
- else
- G.randomspawns.Add(GLOB.awaydestinations)
-
/obj/effect/landmark/awaystart
name = "away mission spawn"
desc = "Randomly picked away mission spawn points."
diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm
index ba07498cbd9fa..af37aa1ffeac4 100644
--- a/code/modules/jobs/job_types/cargo_technician.dm
+++ b/code/modules/jobs/job_types/cargo_technician.dm
@@ -13,7 +13,7 @@
outfit = /datum/outfit/job/cargo_technician
base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)
- extra_access = list(ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION,ACCESS_MECH_MINING)
+ extra_access = list(ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_GATEWAY)
departments = DEPT_BITFLAG_CAR
bank_account_department = ACCOUNT_CAR_BITFLAG
diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm
index e7f73f93703d7..b3d9f40afbdf9 100644
--- a/code/modules/jobs/job_types/quartermaster.dm
+++ b/code/modules/jobs/job_types/quartermaster.dm
@@ -14,7 +14,7 @@
outfit = /datum/outfit/job/quartermaster
- base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE, ACCESS_EXPLORATION)
+ base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE, ACCESS_EXPLORATION, ACCESS_GATEWAY)
extra_access = list()
departments = DEPT_BITFLAG_CAR
diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm
index e354e11dfac6a..f8d51a86c3e5a 100644
--- a/code/modules/jobs/job_types/shaft_miner.dm
+++ b/code/modules/jobs/job_types/shaft_miner.dm
@@ -12,7 +12,7 @@
outfit = /datum/outfit/job/miner
- base_access = list(ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE)
+ base_access = list(ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE, ACCESS_GATEWAY)
extra_access = list(ACCESS_QM, ACCESS_CARGO, ACCESS_MAINT_TUNNELS)
departments = DEPT_BITFLAG_CAR
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 976f4a1babf2b..dc5a8691d9f9a 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -326,7 +326,7 @@
/obj/item/card/id/pass/mining_access_card
name = "mining access card"
desc = "A small card, that when used on any ID, will add mining access."
- access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO)
+ access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_GATEWAY)
/obj/item/storage/backpack/duffelbag/mining_conscript
name = "mining conscription kit"
From f7b9ae8e9d2a98254a0091e4cdde88891933fe3f Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Thu, 12 Sep 2024 00:34:58 -0400
Subject: [PATCH 08/43] random mapping changes done
---
_maps/RandomZLevels/caves.dmm | 28 +++---
_maps/RandomZLevels/moonoutpost19.dmm | 99 +++++++++-----------
_maps/RandomZLevels/research.dmm | 8 +-
_maps/RandomZLevels/snowdin.dmm | 16 +---
_maps/RandomZLevels/spacebattle.dmm | 4 +-
_maps/RandomZLevels/undergroundoutpost45.dmm | 16 ++--
6 files changed, 73 insertions(+), 98 deletions(-)
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index e92b6fd23105c..c1f430e5fd154 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -425,9 +425,7 @@
},
/area/awaymission/caves/BMP_asteroid/level_four)
"bm" = (
-/obj/machinery/gateway/centeraway{
- calibrated = 0
- },
+/obj/machinery/gateway/centeraway,
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
@@ -1679,8 +1677,8 @@
"qo" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/pickaxe{
- attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
- attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ attack_verb_continuous = list("bashes","bludgeons","thrashes","whacks");
+ attack_verb_simple = list("bash","bludgeon","thrash","whack");
desc = "A pickaxe thats been left to rust.";
force = 1;
name = "rusty pickaxe";
@@ -1883,8 +1881,8 @@
"CL" = (
/obj/structure/table,
/obj/item/pickaxe{
- attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
- attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ attack_verb_continuous = list("bashes","bludgeons","thrashes","whacks");
+ attack_verb_simple = list("bash","bludgeon","thrash","whack");
desc = "A pickaxe thats been left to rust.";
force = 1;
name = "rusty pickaxe";
@@ -1892,8 +1890,8 @@
throwforce = 1
},
/obj/item/pickaxe{
- attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
- attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ attack_verb_continuous = list("bashes","bludgeons","thrashes","whacks");
+ attack_verb_simple = list("bash","bludgeon","thrash","whack");
desc = "A pickaxe thats been left to rust.";
force = 1;
name = "rusty pickaxe";
@@ -1920,8 +1918,8 @@
name = "Mining cart"
},
/obj/item/pickaxe{
- attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
- attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ attack_verb_continuous = list("bashes","bludgeons","thrashes","whacks");
+ attack_verb_simple = list("bash","bludgeon","thrash","whack");
desc = "A pickaxe thats been left to rust.";
force = 1;
name = "rusty pickaxe";
@@ -2055,8 +2053,8 @@
/area/awaymission/caves/northblock)
"NZ" = (
/obj/item/pickaxe{
- attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
- attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ attack_verb_continuous = list("bashes","bludgeons","thrashes","whacks");
+ attack_verb_simple = list("bash","bludgeon","thrash","whack");
desc = "A pickaxe thats been left to rust.";
force = 1;
name = "rusty pickaxe";
@@ -2081,8 +2079,8 @@
name = "Mining cart"
},
/obj/item/pickaxe{
- attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
- attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ attack_verb_continuous = list("bashes","bludgeons","thrashes","whacks");
+ attack_verb_simple = list("bash","bludgeon","thrash","whack");
desc = "A pickaxe thats been left to rust.";
force = 1;
name = "rusty pickaxe";
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 2cef09ba236cf..f725fc5d9d552 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -164,9 +164,7 @@
/turf/open/floor/iron/dark,
/area/awaymission/moonoutpost19/syndicate)
"aP" = (
-/obj/machinery/gateway/centeraway{
- calibrated = 0
- },
+/obj/machinery/gateway/centeraway,
/turf/open/floor/iron/dark,
/area/awaymission/moonoutpost19/syndicate)
"aR" = (
@@ -1741,9 +1739,6 @@
},
/turf/open/floor/iron,
/area/awaymission/moonoutpost19/research)
-"fk" = (
-/turf/open/floor/iron/white,
-/area/awaymission/moonoutpost19/research)
"fl" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -2936,10 +2931,6 @@
},
/turf/open/floor/iron/freezer,
/area/awaymission/moonoutpost19/arrivals)
-"io" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/awaymission/moonoutpost19/arrivals)
"ip" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced{
@@ -32988,7 +32979,7 @@ ea
jq
jU
ku
-io
+lA
ba
ld
mc
@@ -33245,7 +33236,7 @@ dZ
jr
jU
kv
-io
+lA
ba
ld
md
@@ -33502,7 +33493,7 @@ ea
js
jV
ku
-io
+lA
ba
lA
mc
@@ -34016,7 +34007,7 @@ ea
ju
jU
ku
-io
+lA
ld
lD
lD
@@ -34273,7 +34264,7 @@ dZ
jr
jV
kv
-io
+lA
lc
lE
mf
@@ -34530,13 +34521,13 @@ ea
jv
jV
kv
-io
+lA
ba
ba
ba
-io
+lA
mL
-io
+lA
ba
ba
ba
@@ -34793,7 +34784,7 @@ ba
ba
mv
lM
-io
+lA
ba
ba
ba
@@ -35046,13 +35037,13 @@ jY
kx
hI
hI
-io
-io
-io
+lA
+lA
+lA
mM
-io
-io
-io
+lA
+lA
+lA
hI
hI
hI
@@ -35291,7 +35282,7 @@ gF
gR
gR
gR
-fk
+hj
hj
hN
ea
@@ -35818,12 +35809,12 @@ jF
kO
lh
lH
-io
-io
+lA
+lA
hI
-io
-io
-io
+lA
+lA
+lA
hI
nB
nL
@@ -36075,7 +36066,7 @@ kz
hJ
hJ
hJ
-io
+lA
ba
mO
ba
@@ -36315,7 +36306,7 @@ fg
fy
eu
go
-fk
+hj
gT
ea
hm
@@ -36572,7 +36563,7 @@ fh
fz
ee
gp
-fk
+hj
gU
dZ
hn
@@ -36583,7 +36574,7 @@ ig
dZ
ba
ba
-io
+lA
kc
kB
jC
@@ -36840,7 +36831,7 @@ ih
ea
ba
ba
-io
+lA
kd
kC
kP
@@ -37097,7 +37088,7 @@ ii
ea
ba
ba
-io
+lA
ke
kD
IH
@@ -37339,9 +37330,9 @@ dZ
eh
eh
eM
-fk
+hj
fB
-fk
+hj
gr
gJ
gW
@@ -37598,9 +37589,9 @@ ex
eN
fl
fC
-fk
-fk
-fk
+hj
+hj
+hj
gX
dZ
ba
@@ -37614,7 +37605,7 @@ ba
wX
kg
kE
-io
+lA
ba
ba
ba
@@ -37871,7 +37862,7 @@ ja
jB
Ik
kF
-io
+lA
ba
ba
ba
@@ -38128,7 +38119,7 @@ ba
jC
ki
kG
-io
+lA
ba
ba
ba
@@ -38894,7 +38885,7 @@ ba
ba
ba
ba
-io
+lA
jc
jF
jV
@@ -39151,7 +39142,7 @@ ba
ba
ba
ba
-io
+lA
jd
jF
jU
@@ -42233,7 +42224,7 @@ ba
ba
ba
ba
-io
+lA
Bn
xH
zl
@@ -42490,7 +42481,7 @@ ba
ba
ba
ba
-io
+lA
ZB
Ey
zl
@@ -42747,7 +42738,7 @@ ba
ba
ba
ba
-io
+lA
WB
Xd
LQ
@@ -43530,7 +43521,7 @@ lt
lR
lS
mD
-io
+lA
ba
ba
ba
@@ -43787,7 +43778,7 @@ iX
lS
lR
mE
-io
+lA
ba
ba
ba
@@ -44044,7 +44035,7 @@ iX
lR
lR
mF
-io
+lA
ba
ba
ba
@@ -44807,7 +44798,7 @@ ba
hJ
hJ
hI
-io
+lA
hJ
hJ
hJ
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index b47fee0ad7f33..9e9d117b55279 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -397,9 +397,7 @@
/turf/open/floor/iron/dark,
/area/awaymission/research/interior/gateway)
"bT" = (
-/obj/machinery/gateway/centeraway{
- calibrated = 0
- },
+/obj/machinery/gateway/centeraway,
/turf/open/floor/iron/dark,
/area/awaymission/research/interior/gateway)
"bU" = (
@@ -684,7 +682,7 @@
/obj/structure/closet/crate,
/obj/item/disk/data{
desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
- genetic_makeup_buffer = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+ genetic_makeup_buffer = list("label"="Buffer1:Kr-$$@##","UI"="f8f603857000f930127c4","SE"="414401462231053131010241514651403453121613263463440351136366","UE"="340008485c321e542aed4df7032ac04d","name"="Krystal Symers","blood_type"="A+");
name = "dusty genetics data disk";
read_only = 1
},
@@ -764,7 +762,7 @@
/obj/structure/closet/crate,
/obj/item/disk/data{
desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off with the words 'DO NOT CLONE' hastily written over it.";
- genetic_makeup_buffer = list("label" = "Buffer1:George Melons", "UI" = "3c300f11b5421ca7014d8", "SE" = "430431205660551642142504334461413202111310233445620533134255", "UE" = "6893e6a0b0076a41897776b10cc2b324", "name" = "George Melons", "blood_type" = "B+");
+ genetic_makeup_buffer = list("label"="Buffer1:George Melons","UI"="3c300f11b5421ca7014d8","SE"="430431205660551642142504334461413202111310233445620533134255","UE"="6893e6a0b0076a41897776b10cc2b324","name"="George Melons","blood_type"="B+");
name = "old genetics data disk"
},
/obj/item/disk/data{
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 64ba57911f45e..4b02f0f4c2c5f 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -1431,9 +1431,7 @@
/turf/open/floor/iron,
/area/awaymission/snowdin/post/gateway)
"gx" = (
-/obj/machinery/gateway/centeraway{
- calibrated = 0
- },
+/obj/machinery/gateway/centeraway,
/obj/effect/turf_decal/bot,
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -11939,12 +11937,6 @@
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
-"Se" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
"Sf" = (
/obj/item/shard,
/obj/item/retractor,
@@ -59637,9 +59629,9 @@ xW
xW
xW
LJ
-Se
+Oq
wL
-Se
+Oq
ZI
Qx
Lm
@@ -59892,7 +59884,7 @@ xW
xW
xW
wL
-Se
+Oq
GD
GZ
xy
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index 09a8d1c437889..ee2d9e913238c 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -892,9 +892,7 @@
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"en" = (
-/obj/machinery/gateway/centeraway{
- calibrated = 0
- },
+/obj/machinery/gateway/centeraway,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"eo" = (
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index b07ed2c46f8bb..1e7dcc8fb2ce7 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -1808,9 +1808,7 @@
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"hu" = (
-/obj/machinery/gateway/centeraway{
- calibrated = 0
- },
+/obj/machinery/gateway/centeraway,
/turf/open/floor/iron/dark,
/area/awaymission/undergroundoutpost45/gateway)
"hw" = (
@@ -6676,7 +6674,7 @@
/obj/machinery/computer/atmos_control{
dir = 4;
name = "Distribution and Waste Monitor";
- sensors = list("UO45_air_sensor" = "Mixed Air Supply Tank", "UO45_distro_meter" = "Distribution Loop", "UO45_waste_meter" = "Waste Loop")
+ sensors = list("UO45_air_sensor"="Mixed Air Supply Tank","UO45_distro_meter"="Distribution Loop","UO45_waste_meter"="Waste Loop")
},
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -8320,7 +8318,7 @@
input_tag = "UO45_air_in";
name = "Mixed Air Supply Control";
output_tag = "UO45_air_out";
- sensors = list("UO45_air_sensor" = "Tank")
+ sensors = list("UO45_air_sensor"="Tank")
},
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
@@ -9575,7 +9573,7 @@
input_tag = "UO45_mix_in";
name = "Gas Mix Tank Control";
output_tag = "UO45_mix_in";
- sensors = list("UO45_mix_sensor" = "Tank")
+ sensors = list("UO45_mix_sensor"="Tank")
},
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 6
@@ -9710,7 +9708,7 @@
/obj/machinery/computer/atmos_control{
dir = 4;
name = "Tank Monitor";
- sensors = list("UO45_n2_sensor" = "Nitrogen", "UO45_o2_sensor" = "Oxygen", "UO45_mix_sensor" = "Gas Mix Tank")
+ sensors = list("UO45_n2_sensor"="Nitrogen","UO45_o2_sensor"="Oxygen","UO45_mix_sensor"="Gas Mix Tank")
},
/obj/effect/turf_decal/tile/yellow/opposingcorners{
dir = 1
@@ -9917,7 +9915,7 @@
input_tag = "UO45_n2_in";
name = "Nitrogen Supply Control";
output_tag = "UO45_n2_out";
- sensors = list("UO45_n2_sensor" = "Tank")
+ sensors = list("UO45_n2_sensor"="Tank")
},
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
@@ -10416,7 +10414,7 @@
input_tag = "UO45_o2_in";
name = "Oxygen Supply Control";
output_tag = "UO45_o2_out";
- sensors = list("UO45_o2_sensor" = "Tank")
+ sensors = list("UO45_o2_sensor"="Tank")
},
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/iron,
From 252a74b65bbd24a71ab0741d8984d6363372d3e9 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:37:48 -0400
Subject: [PATCH 09/43] gateway kind of works
---
_maps/map_files/Mining/Lavaland.dmm | 743 +++++++++++++++------------
code/game/area/areas/mining.dm | 38 +-
code/modules/awaymissions/gateway.dm | 8 +-
3 files changed, 422 insertions(+), 367 deletions(-)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 9a660252c5951..8dbc46b404c35 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -28,7 +28,7 @@
dir = 8
},
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"ap" = (
/obj/machinery/recharge_station,
/turf/open/floor/iron,
@@ -153,13 +153,13 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"bb" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"bc" = (
/obj/structure/stone_tile/surrounding_tile,
/obj/structure/stone_tile/surrounding_tile{
@@ -256,7 +256,7 @@
icon_state = "1-2"
},
/turf/open/floor/iron,
-/area/mine/storage)
+/area/mine/production)
"ca" = (
/obj/effect/spawner/randomvend/snack,
/turf/open/floor/iron,
@@ -267,7 +267,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"ce" = (
/obj/structure/chair/office{
dir = 8
@@ -315,7 +315,7 @@
dir = 4
},
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"co" = (
/obj/structure/stone_tile/block/cracked{
dir = 4
@@ -368,12 +368,13 @@
/turf/open/floor/iron,
/area/mine/science)
"cR" = (
-/obj/structure/table,
-/obj/item/paper/fluff/stations/lavaland/orm_notice,
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
-/turf/open/floor/iron,
-/area/mine/production)
+/obj/machinery/gateway{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"cT" = (
/obj/structure/stone_tile{
dir = 4
@@ -422,7 +423,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"dG" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
@@ -483,7 +484,7 @@
dir = 8
},
/turf/open/floor/plating,
-/area/mine/storage)
+/area/mine/production)
"ea" = (
/obj/structure/stone_tile,
/obj/structure/stone_tile{
@@ -542,7 +543,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"er" = (
/obj/structure/stone_tile{
dir = 8
@@ -659,8 +660,12 @@
/turf/open/floor/iron/dark,
/area/mine/science)
"eY" = (
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/plating,
-/area/mine/production)
+/area/mine/gateway)
"fb" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -768,8 +773,9 @@
/turf/open/floor/plating/lavaland,
/area/lavaland/surface/outdoors/explored)
"fN" = (
-/turf/open/floor/iron,
-/area/mine/storage)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/gateway)
"fR" = (
/obj/effect/turf_decal/bot,
/obj/machinery/computer/security{
@@ -814,7 +820,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"ga" = (
/obj/structure/window/reinforced{
dir = 8
@@ -840,7 +846,7 @@
},
/obj/machinery/door/firedoor,
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"ge" = (
/obj/machinery/washing_machine,
/obj/effect/turf_decal/stripes/line,
@@ -933,7 +939,7 @@
/obj/item/wrench,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"gH" = (
/obj/machinery/door/poddoor/preopen{
id = "labor";
@@ -953,8 +959,11 @@
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
},
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"gM" = (
/obj/machinery/light/small{
dir = 8
@@ -973,7 +982,7 @@
dir = 1
},
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"gR" = (
/obj/structure/table,
/obj/machinery/computer/libraryconsole/bookmanagement,
@@ -998,7 +1007,7 @@
pixel_x = -26
},
/turf/open/floor/iron/dark,
-/area/mine/storage)
+/area/mine/production)
"gU" = (
/obj/structure/stone_tile/block/cracked{
dir = 4
@@ -1145,7 +1154,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"hV" = (
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -1185,7 +1194,7 @@
icon_state = "1-4"
},
/turf/open/floor/iron,
-/area/mine/storage)
+/area/mine/production)
"ij" = (
/obj/machinery/mineral/processing_unit_console,
/turf/closed/wall,
@@ -1214,13 +1223,13 @@
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"is" = (
-/obj/structure/plasticflaps,
-/obj/machinery/conveyor{
- dir = 8;
- id = "mining_internal"
+/obj/machinery/gateway{
+ dir = 5
},
+/obj/effect/turf_decal/bot_white/left,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
-/area/mine/production)
+/area/mine/gateway)
"iu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
@@ -1373,7 +1382,7 @@
icon_state = "1-8"
},
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"jo" = (
/obj/machinery/door/airlock/research/glass{
name = "Research Division Atrium";
@@ -1392,17 +1401,17 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"jr" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron,
-/area/mine/production)
+/obj/machinery/gateway{
+ dir = 10
+ },
+/obj/effect/turf_decal/bot_white/left,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"ju" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "mining_internal"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
},
-/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
/area/mine/production)
"jw" = (
@@ -1437,7 +1446,7 @@
/obj/machinery/processor,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"jF" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -1446,7 +1455,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"jG" = (
/obj/machinery/door/airlock/security/glass{
name = "Labor Camp Shuttle Security Airlock";
@@ -1490,11 +1499,13 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/mine/production)
"jY" = (
@@ -1516,6 +1527,9 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
/turf/open/floor/iron,
/area/mine/production)
"ke" = (
@@ -1583,7 +1597,7 @@
"kC" = (
/obj/structure/closet/crate/secure/loot,
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"kD" = (
/obj/structure/stone_tile/block,
/turf/open/lava/smooth/lava_land_surface,
@@ -1612,11 +1626,6 @@
/obj/machinery/light_switch{
pixel_x = 25
},
-/obj/structure/table,
-/obj/item/stack/package_wrap,
-/obj/item/stack/package_wrap,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
/turf/open/floor/iron,
/area/mine/eva)
"kL" = (
@@ -1626,7 +1635,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"kM" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -1639,7 +1648,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"kO" = (
/obj/machinery/light{
dir = 1
@@ -1652,7 +1661,7 @@
"kQ" = (
/obj/structure/closet/secure_closet/miner,
/turf/open/floor/iron/dark,
-/area/mine/storage)
+/area/mine/production)
"kU" = (
/obj/machinery/space_heater,
/obj/machinery/atmospherics/components/unary/outlet_injector/on,
@@ -1669,22 +1678,24 @@
/turf/open/floor/iron/grid/steel,
/area/mine/living_quarters)
"kZ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/iron,
-/area/mine/production)
+/obj/machinery/gateway{
+ dir = 9
+ },
+/obj/effect/turf_decal/bot_white/right,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"ld" = (
/turf/closed/wall/r_wall,
/area/lavaland/surface/outdoors)
"lg" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining/glass{
- name = "Processing Area";
- req_access_txt = "48"
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
+/obj/machinery/light,
+/mob/living/simple_animal/turtle{
+ dir = 4
},
-/obj/effect/turf_decal/stripes/closeup,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/iron/techmaint,
-/area/mine/production)
+/turf/open/floor/iron,
+/area/mine/gateway)
"lp" = (
/obj/machinery/button/door{
id = "miningdorm2";
@@ -1779,7 +1790,7 @@
pixel_y = -24
},
/turf/open/floor/iron,
-/area/mine/storage)
+/area/mine/production)
"lH" = (
/obj/structure/stone_tile/block/cracked,
/obj/structure/stone_tile/block/cracked{
@@ -1792,6 +1803,12 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/engine,
/area/mine/science)
+"lJ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/mine/gateway)
"lT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -1800,7 +1817,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"lX" = (
/obj/item/toy/plush/lizard_plushie{
pixel_x = 5;
@@ -1871,7 +1888,7 @@
opened = 1
},
/turf/open/floor/plating,
-/area/mine/production)
+/area/mine/gateway)
"mz" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -2001,11 +2018,13 @@
/turf/open/floor/iron,
/area/mine/laborcamp)
"nI" = (
-/mob/living/simple_animal/turtle{
- dir = 4
+/obj/machinery/gateway{
+ dir = 6
},
-/turf/open/floor/iron,
-/area/mine/production)
+/obj/effect/turf_decal/bot_white/right,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"nJ" = (
/obj/structure/sink{
dir = 4;
@@ -2084,7 +2103,7 @@
dir = 4
},
/turf/open/floor/plating,
-/area/mine/storage)
+/area/mine/production)
"oc" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron,
@@ -2111,7 +2130,7 @@
dir = 4
},
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"oq" = (
/obj/structure/table,
/obj/item/stack/ore/slag{
@@ -2174,7 +2193,7 @@
},
/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
-/area/mine/storage)
+/area/mine/production)
"oV" = (
/obj/structure/cable/yellow,
/obj/machinery/power/apc/auto_name/directional/south{
@@ -2253,9 +2272,13 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"pE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron,
-/area/mine/production)
+/obj/machinery/gateway{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"pF" = (
/obj/machinery/camera{
c_tag = "Labor Camp External";
@@ -2341,7 +2364,7 @@
"qe" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
-/area/mine/production)
+/area/mine/gateway)
"qg" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -2373,18 +2396,22 @@
/obj/effect/spawner/lootdrop/donkpockets,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"qy" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/chem_heater,
/turf/open/floor/engine,
/area/mine/science)
"qA" = (
-/obj/machinery/conveyor/inverted{
- dir = 6;
- id = "mining_internal"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/iron,
/area/mine/production)
"qI" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
@@ -2439,14 +2466,12 @@
dir = 6
},
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"qY" = (
-/obj/machinery/conveyor{
- dir = 1;
- id = "mining_internal"
- },
+/obj/effect/turf_decal/bot,
+/obj/structure/ore_box,
/turf/open/floor/iron/dark,
-/area/mine/production)
+/area/mine/gateway)
"qZ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -2460,9 +2485,8 @@
/turf/open/floor/iron/dark,
/area/mine/science)
"re" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/storage)
+/turf/open/floor/iron,
+/area/mine/gateway)
"rf" = (
/turf/open/floor/plating/lavaland,
/area/lavaland/surface/outdoors)
@@ -2557,10 +2581,11 @@
/turf/open/floor/iron,
/area/mine/science)
"rV" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/ore_box,
-/turf/open/floor/iron,
-/area/mine/production)
+/obj/machinery/gateway,
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"rW" = (
/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/carpet/royalblue,
@@ -2579,7 +2604,7 @@
pixel_x = -22
},
/turf/open/floor/iron/dark,
-/area/mine/storage)
+/area/mine/production)
"se" = (
/obj/structure/stone_tile/cracked{
dir = 4
@@ -2608,6 +2633,10 @@
},
/turf/open/floor/iron,
/area/mine/living_quarters)
+"so" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"ss" = (
/obj/docking_port/stationary{
dwidth = 6;
@@ -2620,12 +2649,15 @@
/turf/open/floor/plating/lavaland,
/area/lavaland/surface/outdoors)
"su" = (
-/obj/machinery/mineral/unloading_machine{
- icon_state = "unloader-corner2";
- output_dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
},
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
-/area/mine/production)
+/area/mine/gateway)
"sy" = (
/obj/structure/stone_tile/surrounding,
/obj/structure/stone_tile/center/cracked,
@@ -2866,6 +2898,9 @@
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/iron,
/area/mine/production)
"uF" = (
@@ -2884,7 +2919,7 @@
"uG" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
-/area/mine/production)
+/area/mine/gateway)
"uH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2916,7 +2951,7 @@
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"uP" = (
/obj/structure/closet/crate/critter,
/turf/open/floor/iron,
@@ -3059,22 +3094,27 @@
/turf/open/floor/carpet/black,
/area/mine/science)
"vR" = (
-/obj/effect/turf_decal/tile/brown{
+/obj/machinery/gateway{
dir = 4
},
-/turf/open/floor/iron,
-/area/mine/production)
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"vS" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/mine/science)
"vV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup,
+/obj/machinery/door/airlock/mining/glass{
+ name = "Processing Area";
+ req_access_txt = "48"
},
-/turf/open/floor/iron,
-/area/mine/production)
+/turf/open/floor/iron/techmaint,
+/area/mine/gateway)
"vX" = (
/obj/structure/stone_tile/surrounding_tile{
dir = 4
@@ -3107,7 +3147,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"wd" = (
/obj/structure/stone_tile/cracked,
/obj/structure/stone_tile{
@@ -3295,8 +3335,18 @@
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 1
},
+/obj/structure/table,
+/obj/item/pickaxe{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/pickaxe,
+/obj/item/pickaxe{
+ pixel_x = 4;
+ pixel_y = -4
+ },
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"xL" = (
/obj/effect/decal/cleanable/robot_debris,
/obj/item/bot_assembly/cleanbot{
@@ -3366,13 +3416,14 @@
/turf/open/floor/iron/techmaint,
/area/mine/laborcamp)
"yE" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "mining_internal"
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
},
-/obj/structure/plasticflaps,
-/turf/open/floor/iron/dark,
-/area/mine/production)
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/mine/gateway)
"yF" = (
/obj/structure/stone_tile/surrounding_tile{
dir = 8
@@ -3388,8 +3439,11 @@
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 1
},
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"yJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -3455,7 +3509,7 @@
dir = 4
},
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"zv" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
@@ -3633,7 +3687,7 @@
network = list("mine")
},
/turf/open/floor/iron/dark,
-/area/mine/storage)
+/area/mine/production)
"Ba" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -3662,16 +3716,16 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"Bf" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"Bi" = (
/obj/structure/stone_tile,
/obj/structure/stone_tile{
@@ -3839,7 +3893,7 @@
"Ck" = (
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"Cm" = (
/turf/open/floor/wood,
/area/mine/living_quarters)
@@ -3850,7 +3904,7 @@
"Cp" = (
/obj/effect/spawner/structure/window/depleteduranium,
/turf/open/floor/plating,
-/area/mine/storage)
+/area/mine/production)
"Ct" = (
/obj/docking_port/stationary{
dir = 2;
@@ -3870,8 +3924,15 @@
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 1
},
+/obj/structure/table,
+/obj/item/resonator{
+ pixel_x = -4
+ },
+/obj/item/resonator{
+ pixel_x = 4
+ },
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"CD" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -3931,8 +3992,11 @@
},
/obj/effect/turf_decal/stripes/closeup,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron/techmaint,
-/area/mine/production)
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/mine/gateway)
"CX" = (
/obj/structure/bed,
/obj/item/bedsheet/brown,
@@ -3945,7 +4009,7 @@
},
/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
-/area/mine/storage)
+/area/mine/production)
"De" = (
/obj/structure/stone_tile/block{
dir = 8
@@ -4019,7 +4083,7 @@
dir = 8
},
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"DN" = (
/turf/open/floor/iron,
/area/mine/production)
@@ -4031,7 +4095,7 @@
dir = 8
},
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"DS" = (
/obj/machinery/atmospherics/pipe/simple/general/hidden,
/obj/effect/turf_decal/siding/wood,
@@ -4058,7 +4122,7 @@
/obj/effect/turf_decal/stripes/closeup,
/obj/machinery/door/firedoor,
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"Eg" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -4093,7 +4157,7 @@
/obj/structure/chair,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"EH" = (
/obj/structure/fence/door{
dir = 4
@@ -4124,9 +4188,16 @@
/turf/open/floor/iron/dark,
/area/mine/laborcamp)
"EU" = (
-/obj/machinery/mineral/processing_unit_console,
-/turf/closed/wall,
-/area/mine/production)
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -26
+ },
+/obj/structure/table,
+/obj/item/hand_labeler,
+/obj/item/stack/package_wrap,
+/obj/item/stack/package_wrap,
+/obj/item/stack/package_wrap,
+/turf/open/floor/iron/dark,
+/area/mine/eva)
"EV" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/closeup{
@@ -4293,7 +4364,7 @@
dir = 1
},
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"FQ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -4404,7 +4475,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"GR" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
@@ -4412,6 +4483,12 @@
/obj/machinery/portable_atmospherics/canister/water_vapor,
/turf/open/floor/iron/grid/steel,
/area/mine/living_quarters)
+"GT" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/mine/gateway)
"GY" = (
/obj/structure/stone_tile/center,
/obj/structure/stone_tile/surrounding_tile,
@@ -4426,21 +4503,33 @@
"Hc" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
-/area/mine/production)
+/area/mine/gateway)
"Hd" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron,
/area/mine/laborcamp)
"He" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
+/obj/structure/table,
+/obj/item/tank/internals/emergency_oxygen/engi{
+ pixel_x = -5;
+ pixel_y = 8
},
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
+/obj/item/tank/internals/emergency_oxygen/engi{
+ pixel_y = 4;
+ pixel_x = 1
},
-/turf/open/floor/iron,
-/area/mine/production)
+/obj/item/tank/internals/emergency_oxygen/engi{
+ pixel_x = 6;
+ pixel_y = -1
+ },
+/obj/machinery/camera{
+ c_tag = "Gateway";
+ dir = 4;
+ network = list("mine")
+ },
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"Hh" = (
/obj/machinery/door/window/westleft{
base_state = "right";
@@ -4466,7 +4555,7 @@
/obj/machinery/reagentgrinder,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"Hl" = (
/obj/machinery/iv_drip,
/turf/open/floor/iron/white,
@@ -4631,11 +4720,12 @@
/turf/open/floor/iron,
/area/mine/production)
"IB" = (
-/obj/effect/turf_decal/loading_area{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
},
-/turf/open/floor/iron,
-/area/mine/production)
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"ID" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/bot,
@@ -4916,7 +5006,7 @@
power_gen = 11000
},
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"Kl" = (
/obj/structure/table,
/obj/item/wormhole_jaunter{
@@ -4954,18 +5044,6 @@
},
/turf/open/floor/iron/dark,
/area/mine/science)
-"Kz" = (
-/obj/effect/turf_decal/loading_area{
- dir = 8
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/mine/production)
"KD" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -5006,13 +5084,16 @@
pixel_y = 8
},
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"KL" = (
/obj/machinery/door/airlock{
name = "Closet"
},
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
-/area/mine/production)
+/area/mine/gateway)
"KM" = (
/obj/structure/table,
/obj/structure/bedsheetbin,
@@ -5091,7 +5172,7 @@
"Lm" = (
/obj/machinery/vendor/mining,
/turf/open/floor/iron/dark,
-/area/mine/storage)
+/area/mine/gateway)
"Ln" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -5129,7 +5210,7 @@
icon_state = "0-4"
},
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"LI" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/reagent_dispensers/watertank,
@@ -5198,7 +5279,7 @@
dir = 1
},
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"Mi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -5226,7 +5307,7 @@
/area/mine/laborcamp)
"Mu" = (
/turf/open/floor/plating,
-/area/mine/storage)
+/area/mine/production)
"Mw" = (
/obj/structure/fence{
dir = 4
@@ -5393,7 +5474,7 @@
},
/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
-/area/mine/storage)
+/area/mine/production)
"Oo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -5629,7 +5710,7 @@
icon_state = "0-8"
},
/turf/open/floor/iron,
-/area/mine/storage)
+/area/mine/production)
"Qa" = (
/obj/machinery/airalarm/directional/south{
pixel_y = -22
@@ -5790,13 +5871,13 @@
dir = 4
},
/turf/open/floor/iron/dark,
-/area/mine/storage)
+/area/mine/production)
"Rn" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating,
-/area/mine/production)
+/area/mine/gateway)
"Rp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
@@ -5807,11 +5888,12 @@
/turf/open/floor/iron,
/area/mine/laborcamp)
"Rr" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -26
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron,
-/area/mine/eva)
+/area/mine/production)
"Rt" = (
/obj/structure/chair/stool/directional/west,
/turf/open/floor/iron/grid/steel,
@@ -6047,28 +6129,24 @@
/turf/open/floor/iron,
/area/mine/eva)
"Th" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron,
-/area/mine/production)
+/area/mine/gateway)
"Tm" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "mining_internal"
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 4
},
-/obj/machinery/light/small,
-/turf/open/floor/iron/dark,
-/area/mine/production)
+/turf/open/floor/iron,
+/area/mine/gateway)
"Tp" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
-/area/mine/storage)
+/area/mine/production)
"Tr" = (
/obj/machinery/conveyor{
dir = 1;
@@ -6146,7 +6224,7 @@
/obj/structure/chair/stool,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"TX" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -6167,17 +6245,9 @@
/turf/open/floor/engine,
/area/mine/science)
"Un" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "mining_internal";
- name = "mining conveyor"
- },
-/obj/machinery/camera/directional/east{
- c_tag = "Processing Area";
- network = list("mine")
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/mine/production)
+/obj/machinery/gateway/centeraway/mining,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"Uo" = (
/obj/structure/frame/machine,
/obj/effect/decal/cleanable/dirt/dust,
@@ -6285,7 +6355,7 @@
"Va" = (
/obj/machinery/space_heater,
/turf/open/floor/plating,
-/area/mine/production)
+/area/mine/gateway)
"Vb" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -6317,7 +6387,7 @@
"Ve" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"Vg" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
@@ -6377,14 +6447,14 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"Vv" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/components/binary/pump/on,
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"Vy" = (
/obj/machinery/camera{
c_tag = "Crew Area Hallway West";
@@ -6420,15 +6490,26 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"VR" = (
-/obj/machinery/light/small{
- dir = 4
+/obj/machinery/light{
+ bulb_colour = "#22bfa2";
+ bulb_vacuum_colour = "#22bfa2";
+ dir = 4;
+ nightshift_light_color = "#22bfa2"
},
-/obj/machinery/mineral/processing_unit{
- input_dir = 2;
- output_dir = 1
+/obj/structure/table,
+/obj/item/clothing/glasses/meson{
+ pixel_x = -6;
+ pixel_y = 7
+ },
+/obj/item/clothing/glasses/meson{
+ pixel_y = 2
+ },
+/obj/item/clothing/glasses/meson{
+ pixel_x = 6;
+ pixel_y = -3
},
/turf/open/floor/iron/dark,
-/area/mine/production)
+/area/mine/gateway)
"VW" = (
/obj/structure/stone_tile/cracked{
dir = 1
@@ -6588,7 +6669,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"WB" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
@@ -6608,7 +6689,7 @@
},
/obj/effect/turf_decal/stripes/closeup,
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"WI" = (
/obj/structure/window/reinforced{
dir = 8
@@ -6677,7 +6758,7 @@
/obj/machinery/deepfryer,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"Xs" = (
/obj/structure/spider/stickyweb,
/obj/structure/spider/stickyweb,
@@ -6770,7 +6851,7 @@
dir = 4
},
/turf/open/floor/iron/techmaint,
-/area/mine/storage)
+/area/mine/production)
"XV" = (
/obj/structure/stone_tile{
dir = 1
@@ -6778,8 +6859,8 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"XX" = (
-/turf/closed/wall,
-/area/mine/storage)
+/turf/closed/wall/r_wall,
+/area/mine/gateway)
"XZ" = (
/obj/structure/window/reinforced{
dir = 8
@@ -6820,7 +6901,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"Yi" = (
/obj/effect/decal/cleanable/oil/slippery,
/obj/machinery/door/airlock/research/glass{
@@ -6846,7 +6927,7 @@
"Yp" = (
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"Yq" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
@@ -6902,7 +6983,7 @@
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
-/area/mine/living_quarters)
+/area/mine/production)
"YF" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
@@ -6925,8 +7006,8 @@
/turf/open/floor/iron/grid/steel,
/area/mine/living_quarters)
"YQ" = (
-/turf/closed/wall/r_wall,
-/area/mine/storage)
+/turf/closed/wall,
+/area/mine/gateway)
"YT" = (
/obj/machinery/door/airlock/mining/glass{
name = "Mining Station Bridge";
@@ -6946,7 +7027,7 @@
icon_state = "4-8"
},
/turf/open/floor/iron/techmaint,
-/area/mine/living_quarters)
+/area/mine/production)
"YU" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -7107,11 +7188,11 @@
/turf/open/floor/iron/grid/steel,
/area/mine/laborcamp)
"ZZ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
-/area/mine/storage)
+/area/mine/gateway)
(1,1,1) = {"
nO
@@ -35352,7 +35433,7 @@ RR
RR
xT
xT
-ND
+XX
qe
Va
Xj
@@ -35609,7 +35690,7 @@ RR
RR
RR
RR
-ND
+XX
Rn
uG
Xj
@@ -35866,7 +35947,7 @@ RR
RR
RR
RR
-ND
+XX
eY
my
Xj
@@ -36119,13 +36200,13 @@ RR
RR
RR
RR
-jw
-ND
-ND
-ND
-ND
+XX
+XX
+XX
+XX
+XX
KL
-ND
+XX
Xj
GI
Wt
@@ -36376,14 +36457,14 @@ RR
RR
RR
RR
-jw
+YQ
FP
gP
xK
Cz
yH
DQ
-jw
+YQ
kO
xX
DN
@@ -36633,14 +36714,14 @@ RR
RR
Zd
Zd
-aT
+fN
cn
-DN
-DN
-rV
-DN
+re
+re
+re
+Bf
DK
-Hc
+YQ
CF
uF
DN
@@ -36890,12 +36971,12 @@ Zd
Zd
Zd
Zd
-aT
-CF
+fN
+GT
kZ
pE
jr
-pE
+su
gL
CT
uD
@@ -37147,15 +37228,15 @@ Zd
hu
Bq
Bq
-jw
-CF
-DN
-DN
+YQ
+yE
+cR
+Un
rV
-DN
-He
-lg
-vV
+so
+ZZ
+Hc
+CF
jU
Rl
jw
@@ -37404,16 +37485,16 @@ Zd
Mw
Zd
Zd
-jw
-Kz
-Ck
+fN
+GT
+is
vR
nI
IB
Th
-Hc
-CF
-uF
+vV
+Rr
+qA
DN
aT
mz
@@ -37661,14 +37742,14 @@ Zd
Mw
Zd
Zd
-jw
-is
-jw
-Bf
-Un
-ju
-cR
-jw
+fN
+GT
+re
+re
+re
+lJ
+ZZ
+YQ
DX
AE
eU
@@ -37918,14 +37999,14 @@ Zd
PV
Zd
TL
-aT
+YQ
Tm
-jw
-EU
-jw
-yE
-jw
-jw
+Ck
+Ck
+Ck
+Ck
+lg
+YQ
OO
nM
OO
@@ -38175,14 +38256,14 @@ Zd
Mw
Zd
TL
-aT
-qA
+YQ
qY
-VR
qY
-su
-jw
-wK
+VR
+He
+Lm
+Lm
+YQ
DN
uF
DN
@@ -38439,7 +38520,7 @@ wS
wS
wS
wS
-wK
+wS
DN
uF
DN
@@ -38695,7 +38776,7 @@ Yk
Zz
gz
gb
-wS
+EU
wS
HC
uF
@@ -38952,7 +39033,7 @@ Sf
iu
Sf
Sf
-Rr
+Sf
IZ
CF
gf
@@ -40496,14 +40577,14 @@ sE
Wn
AF
wS
-ZH
+jw
YT
-cY
-ZH
-ZH
-ZH
-ZH
-ZH
+aT
+jw
+jw
+jw
+jw
+jw
Zd
Zd
Zd
@@ -40744,8 +40825,8 @@ IJ
IJ
IJ
IJ
-YQ
-XX
+ND
+jw
wS
wS
wS
@@ -40760,7 +40841,7 @@ KI
ba
kL
Xn
-ZH
+jw
Zd
Zd
Zd
@@ -40997,19 +41078,19 @@ Zd
Zd
IJ
IJ
-YQ
-YQ
-YQ
-YQ
-YQ
+ND
+ND
+ND
+ND
+ND
Mh
ak
kC
-XX
-Lm
+jw
+wK
sc
gT
-XX
+jw
Wz
kM
Yp
@@ -41017,7 +41098,7 @@ TV
IX
Yp
Hi
-cY
+aT
Zd
Zd
RR
@@ -41254,7 +41335,7 @@ Zd
IJ
IJ
IJ
-YQ
+ND
Mu
dV
Mu
@@ -41274,7 +41355,7 @@ hU
GQ
fZ
qv
-cY
+aT
Zd
RR
RR
@@ -41511,7 +41592,7 @@ Zd
IJ
IJ
IJ
-YQ
+ND
Mu
Kj
Tp
@@ -41519,11 +41600,11 @@ WD
jl
zt
Ve
-XX
+jw
PY
-fN
-ZZ
-re
+DN
+ju
+aT
EF
Bd
cd
@@ -41531,7 +41612,7 @@ YE
Yp
Yp
jB
-cY
+aT
Zd
RR
RR
@@ -41768,7 +41849,7 @@ Zd
Zd
IJ
IJ
-YQ
+ND
Mu
nZ
Mu
@@ -41776,11 +41857,11 @@ Cp
bb
XS
on
-XX
+jw
AR
Rm
kQ
-XX
+jw
uM
Vs
Yp
@@ -41788,7 +41869,7 @@ YE
dv
wb
gD
-ZH
+jw
Zd
Zd
Zd
@@ -42025,19 +42106,19 @@ Zd
Zd
IJ
IJ
-YQ
-YQ
-YQ
-YQ
-YQ
+ND
+ND
+ND
+ND
+ND
oR
Oh
Da
-XX
-XX
-XX
-XX
-XX
+jw
+jw
+jw
+jw
+jw
ZH
ZH
cY
@@ -42286,11 +42367,11 @@ IJ
IJ
IJ
IJ
-XX
-XX
-XX
-XX
-XX
+jw
+jw
+jw
+jw
+jw
aD
LL
Rh
diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm
index 8c8c663e3dd95..fe114c87bd0ca 100644
--- a/code/game/area/areas/mining.dm
+++ b/code/game/area/areas/mining.dm
@@ -44,16 +44,10 @@
/area/mine/lobby
name = "Mining Station"
-/area/mine/storage
- name = "Mining Station Storage"
-
/area/mine/production
name = "Mining Station Starboard Wing"
icon_state = "mining_production"
-/area/mine/abandoned
- name = "Abandoned Mining Station"
-
/area/mine/living_quarters
name = "Mining Station Port Wing"
icon_state = "mining_living"
@@ -67,14 +61,9 @@
lighting_colour_tube = "#edfdff"
lighting_colour_bulb = "#dafffd"
-/area/mine/cafeteria
- name = "Mining Station Cafeteria"
-
-/area/mine/hydroponics
- name = "Mining Station Hydroponics"
-
-/area/mine/sleeper
- name = "Mining Station Emergency Sleeper"
+/area/mine/gateway
+ name = "Mining Station Gateway Terminal"
+ icon_state = "mining_dock"
/area/mine/laborcamp
name = "Labor Camp"
@@ -92,27 +81,6 @@
icon_state = "medresearch"
requires_power = TRUE //Remove this when there will be pre-built APCs in the area.
-/area/mine/science/shuttledock
- name = "Outpost"
-
-/area/mine/science/xenoarch
- name = "Outpost Xenoarcheology Lab"
-
-/area/mine/science/elevator //for going to lavaland depths if there will be those
- name = "Outpost Elevator"
-
-/area/mine/science/experimentor
- name = "Outpost Experimentor Lab"
-
-/area/mine/science/heavyexperiment
- name = "Outpost Reinforced Chamber"
-
-/area/mine/science/robotics
- name = "Outpost Robotics"
-
-
-
-
/**********************Lavaland Areas**************************/
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 7fcc277052cf7..03c1a621763c6 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -42,6 +42,9 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
self_teleport(AM) // This is so that if you're drag-clicking yourself into the gateway it'll appear as if you're entering it
return
+ if(isnull(linked_gateway))
+ return
+
var/turf/dest_turf = get_step(get_turf(linked_gateway), SOUTH)
if(!pre_check_teleport(AM, dest_turf))
to_chat(user, "You can't seem to push [AM] into [src]...")
@@ -103,6 +106,9 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
/// Do a teleport initiated by the target
/obj/machinery/gateway/proc/self_teleport(atom/movable/AM)
+ if(isnull(linked_gateway))
+ return
+
var/turf/dest_turf = get_step(get_turf(linked_gateway), SOUTH)
if(!pre_check_teleport(AM, dest_turf))
return
@@ -183,7 +189,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
/obj/machinery/gateway/centerstation/Initialize(mapload)
. = ..()
- if(!GLOB.the_gateway)
+ if(isnull(GLOB.the_gateway))
GLOB.the_gateway = src
update_icon()
linked_gateway = locate(/obj/machinery/gateway/centeraway)
From fd0e2b19503bf2119a4175de73b4c706dd452df0 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 14:54:32 -0400
Subject: [PATCH 10/43] Wizard can teleport with full hardsuit.
---
code/__DEFINES/movement.dm | 10 ++--------
code/datums/components/anti_magic.dm | 13 -------------
code/datums/helper_datums/teleport.dm | 10 +++++-----
code/game/area/areas/centcom.dm | 2 +-
code/game/atoms.dm | 4 ++++
.../antagonists/abductor/machinery/experiment.dm | 2 +-
code/modules/antagonists/abductor/machinery/pad.dm | 8 ++++----
.../antagonists/clock_cult/helpers/servant_warp.dm | 4 ++--
.../antagonists/wizard/equipment/artefact.dm | 2 +-
code/modules/projectiles/guns/magic/wand.dm | 4 ++--
code/modules/spells/spell_types/area_teleport.dm | 4 ++--
code/modules/spells/spell_types/turf_teleport.dm | 2 +-
12 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/code/__DEFINES/movement.dm b/code/__DEFINES/movement.dm
index c34bcb82259a8..b1ba18d0fae79 100644
--- a/code/__DEFINES/movement.dm
+++ b/code/__DEFINES/movement.dm
@@ -57,14 +57,8 @@
#define TELEPORT_ALLOW_CLOCKWORK 2
/// Everyone but abductors is restricted
#define TELEPORT_ALLOW_ABDUCTORS 3
-
-//Teleport modes
-/// Default teleport mode
-#define TELEPORT_MODE_DEFAULT 0
-/// A clockwork teleport
-#define TELEPORT_MODE_CLOCKWORK 2
-/// An abductor teleport
-#define TELEPORT_MODE_ABDUCTORS 3
+/// Everyone but wizards is restricted
+#define TELEPORT_ALLOW_WIZARD 4
// Jetpack Thrust
/// Thrust needed with gravity
diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm
index 6d42c9f7b62d5..c7179c39a79ba 100644
--- a/code/datums/components/anti_magic.dm
+++ b/code/datums/components/anti_magic.dm
@@ -39,9 +39,6 @@
else
return COMPONENT_INCOMPATIBLE
- if(ismovable(parent))
- RegisterSignal(parent, COMSIG_ATOM_INTERCEPT_TELEPORT, PROC_REF(on_intercept_teleport))
-
/datum/component/anti_magic/proc/on_equip(datum/source, mob/equipper, slot)
SIGNAL_HANDLER
@@ -68,8 +65,6 @@
user.update_alt_appearances()
/datum/component/anti_magic/Destroy(force, silent)
- if(ismovable(parent))
- UnregisterSignal(parent, COMSIG_ATOM_INTERCEPT_TELEPORT)
if(ismob(parent)) //If the component is attached to an item, it should go through on_drop instead.
var/mob/user = parent
UnregisterSignal(user, COMSIG_MOB_RECEIVE_MAGIC)
@@ -89,11 +84,3 @@
if(charges <= 0)
expire?.Invoke(user)
return COMPONENT_BLOCK_MAGIC
-
-// Realistically, it shouldn't get to this point if parent is a mob because prior checks SHOULD factor in anti_magic
-// But if we do get to this point, parent is most likely an item and we should cancel the teleport in that case
-/datum/component/anti_magic/proc/on_intercept_teleport(datum/source, channel, turf/origin, turf/destination)
- SIGNAL_HANDLER
-
- if((holy && channel == TELEPORT_CHANNEL_CULT) || (magic && channel == TELEPORT_CHANNEL_MAGIC))
- return COMPONENT_BLOCK_TELEPORT
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 19cf0e05b2b37..50f22401bf52a 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -8,7 +8,7 @@
* * bypass_area_restriction: Should we ignore SOFT atom and area TRAIT_NO_TELEPORT restriction and other area-related restrictions? Defaults to FALSE
* * teleport_mode: Teleport mode for religion/faction checks
*/
-/proc/check_teleport(atom/movable/teleatom, turf/dest_turf, channel = TELEPORT_CHANNEL_BLUESPACE, bypass_area_restriction = FALSE, teleport_mode = TELEPORT_MODE_DEFAULT)
+/proc/check_teleport(atom/movable/teleatom, turf/dest_turf, channel = TELEPORT_CHANNEL_BLUESPACE, bypass_area_restriction = FALSE, teleport_mode = TELEPORT_ALLOW_ALL)
var/turf/cur_turf = get_turf(teleatom)
if(!istype(dest_turf))
@@ -37,9 +37,9 @@
// Checks antimagic
if(ismob(teleatom))
var/mob/tele_mob = teleatom
- if(channel == TELEPORT_CHANNEL_CULT && tele_mob.anti_magic_check(magic = FALSE, holy = TRUE))
+ if(channel == TELEPORT_CHANNEL_CULT && tele_mob.anti_magic_check(magic = FALSE, holy = TRUE, self = TRUE))
return FALSE
- if(channel == TELEPORT_CHANNEL_MAGIC && tele_mob.anti_magic_check(magic = TRUE, holy = FALSE))
+ if(channel == TELEPORT_CHANNEL_MAGIC && tele_mob.anti_magic_check(magic = TRUE, holy = FALSE, self = TRUE))
return FALSE
// Check for NO_TELEPORT restrictions
@@ -79,7 +79,7 @@
* * bypass_area_restriction: Should we ignore SOFT atom and area TRAIT_NO_TELEPORT restriction and other area-related restrictions? Defaults to FALSE
* * no_wake: Whether or not we want a teleport wake to be created
*/
-/proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE, channel=TELEPORT_CHANNEL_BLUESPACE, bypass_area_restriction = FALSE, teleport_mode = TELEPORT_MODE_DEFAULT, ignore_check_teleport = FALSE, no_wake = FALSE)
+/proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE, channel=TELEPORT_CHANNEL_BLUESPACE, bypass_area_restriction = FALSE, teleport_mode = TELEPORT_ALLOW_ALL, ignore_check_teleport = FALSE, no_wake = FALSE)
// teleporting most effects just deletes them
var/static/list/delete_atoms = typecacheof(list(
/obj/effect,
@@ -137,7 +137,7 @@
if (!no_wake && (channel == TELEPORT_CHANNEL_BLUESPACE || channel == TELEPORT_CHANNEL_CULT || channel == TELEPORT_CHANNEL_MAGIC))
var/area/cur_area = curturf.loc
var/area/dest_area = destturf.loc
- if(cur_area.teleport_restriction == TELEPORT_MODE_DEFAULT && dest_area.teleport_restriction == TELEPORT_MODE_DEFAULT && teleport_mode == TELEPORT_MODE_DEFAULT)
+ if(cur_area.teleport_restriction == TELEPORT_ALLOW_ALL && dest_area.teleport_restriction == TELEPORT_ALLOW_ALL && teleport_mode == TELEPORT_ALLOW_ALL)
new /obj/effect/temp_visual/teleportation_wake(get_turf(teleatom), destturf)
tele_play_specials(teleatom, curturf, effectin, asoundin)
diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm
index 3f162914b61e5..fc94c7d60b48b 100644
--- a/code/game/area/areas/centcom.dm
+++ b/code/game/area/areas/centcom.dm
@@ -125,7 +125,7 @@
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
requires_power = FALSE
has_gravity = STANDARD_GRAVITY
- teleport_restriction = TELEPORT_ALLOW_NONE
+ teleport_restriction = TELEPORT_ALLOW_WIZARD
area_flags = VALID_TERRITORY | UNIQUE_AREA
flags_1 = NONE
network_root_id = "MAGIC_NET"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 5b53da998fba9..c34be0707b21d 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -1023,6 +1023,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom)
// Recursively check contents by default. This can be overriden if we want different behavior.
for(var/atom/thing in contents)
+ // For the purposes of intercepting teleports, mobs on the turf don't count.
+ // We're already doing logic for intercepting teleports on the teleatom-level
+ if(isturf(src) && ismob(thing))
+ continue
var/result = thing.intercept_teleport(channel, origin, destination)
if(result == COMPONENT_BLOCK_TELEPORT)
return result
diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm
index 403a1e55bce35..bef2992c94f57 100644
--- a/code/modules/antagonists/abductor/machinery/experiment.dm
+++ b/code/modules/antagonists/abductor/machinery/experiment.dm
@@ -178,7 +178,7 @@
H.uncuff()
H.cauterise_wounds()
if(console && console.pad && console.pad.teleport_target)
- do_teleport(H, console.pad.teleport_target, channel = TELEPORT_CHANNEL_BLINK, no_effects = TRUE, teleport_mode = TELEPORT_MODE_ABDUCTORS)
+ do_teleport(H, console.pad.teleport_target, channel = TELEPORT_CHANNEL_BLINK, no_effects = TRUE, teleport_mode = TELEPORT_ALLOW_ABDUCTORS)
return
//Area not chosen / It's not safe area - teleport to arrivals
SSjob.SendToLateJoin(H, FALSE)
diff --git a/code/modules/antagonists/abductor/machinery/pad.dm b/code/modules/antagonists/abductor/machinery/pad.dm
index 9c08ed9c88828..b892b098630da 100644
--- a/code/modules/antagonists/abductor/machinery/pad.dm
+++ b/code/modules/antagonists/abductor/machinery/pad.dm
@@ -7,14 +7,14 @@
/obj/machinery/abductor/pad/proc/Warp(mob/living/target)
if(!target.buckled)
- do_teleport(target, get_turf(src), no_effects = TRUE, channel = TELEPORT_CHANNEL_BLINK, teleport_mode = TELEPORT_MODE_ABDUCTORS)
+ do_teleport(target, get_turf(src), no_effects = TRUE, channel = TELEPORT_CHANNEL_BLINK, teleport_mode = TELEPORT_ALLOW_ABDUCTORS)
/obj/machinery/abductor/pad/proc/Send()
if(teleport_target == null)
teleport_target = GLOB.teleportlocs[pick(GLOB.teleportlocs)]
flick("alien-pad", src)
for(var/mob/living/target in loc)
- do_teleport(target, teleport_target, no_effects = TRUE, channel = TELEPORT_CHANNEL_BLINK, teleport_mode = TELEPORT_MODE_ABDUCTORS)
+ do_teleport(target, teleport_target, no_effects = TRUE, channel = TELEPORT_CHANNEL_BLINK, teleport_mode = TELEPORT_ALLOW_ABDUCTORS)
new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
to_chat(target, "The instability of the warp leaves you disoriented!")
target.SetSleeping(60)
@@ -33,7 +33,7 @@
/obj/machinery/abductor/pad/proc/doMobToLoc(place, atom/movable/target)
flick("alien-pad", src)
- do_teleport(target, place, no_effects = TRUE, channel = TELEPORT_CHANNEL_BLINK, teleport_mode = TELEPORT_MODE_ABDUCTORS)
+ do_teleport(target, place, no_effects = TRUE, channel = TELEPORT_CHANNEL_BLINK, teleport_mode = TELEPORT_ALLOW_ABDUCTORS)
new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
/obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target)
@@ -43,7 +43,7 @@
/obj/machinery/abductor/pad/proc/doPadToLoc(place)
flick("alien-pad", src)
for(var/mob/living/target in get_turf(src))
- do_teleport(target, place, no_effects = TRUE, channel = TELEPORT_CHANNEL_BLINK, teleport_mode = TELEPORT_MODE_ABDUCTORS)
+ do_teleport(target, place, no_effects = TRUE, channel = TELEPORT_CHANNEL_BLINK, teleport_mode = TELEPORT_ALLOW_ABDUCTORS)
new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
/obj/machinery/abductor/pad/proc/PadToLoc(place)
diff --git a/code/modules/antagonists/clock_cult/helpers/servant_warp.dm b/code/modules/antagonists/clock_cult/helpers/servant_warp.dm
index 2bd8a8ef6fdb8..5dfdefee00976 100644
--- a/code/modules/antagonists/clock_cult/helpers/servant_warp.dm
+++ b/code/modules/antagonists/clock_cult/helpers/servant_warp.dm
@@ -10,10 +10,10 @@
playsound(target_location, 'sound/magic/magic_missile.ogg', 50, TRUE)
do_sparks(5, TRUE, servant)
do_sparks(5, TRUE, target_location)
- do_teleport(M, target_location, channel = TELEPORT_CHANNEL_CULT, no_effects = TRUE, teleport_mode = TELEPORT_MODE_CLOCKWORK)
+ do_teleport(M, target_location, channel = TELEPORT_CHANNEL_CULT, no_effects = TRUE, teleport_mode = TELEPORT_ALLOW_CLOCKWORK)
new /obj/effect/temp_visual/ratvar/warp(target_location)
to_chat(servant, "You warp to [get_area(target_location)].")
if(istype(P) && bring_dragging)
- do_teleport(P, target_location, channel = TELEPORT_CHANNEL_CULT, no_effects = TRUE, teleport_mode = TELEPORT_MODE_CLOCKWORK)
+ do_teleport(P, target_location, channel = TELEPORT_CHANNEL_CULT, no_effects = TRUE, teleport_mode = TELEPORT_ALLOW_CLOCKWORK)
P.Paralyze(30)
to_chat(P, "You feel sick and confused...")
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index e78e9d1d2f941..710cdf672cd60 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -488,7 +488,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/rend)
while(breakout < 50)
var/turf/potential_T = find_safe_turf()
if(T.get_virtual_z_level() != potential_T.get_virtual_z_level() || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout)
- do_teleport(user, potential_T, channel = TELEPORT_CHANNEL_MAGIC)
+ do_teleport(user, potential_T, channel = TELEPORT_CHANNEL_MAGIC, teleport_mode = TELEPORT_ALLOW_WIZARD)
T = potential_T
break
breakout += 1
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index ce80f3c01e65d..730186f0f3488 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -142,7 +142,7 @@
no_den_usage = TRUE
/obj/item/gun/magic/wand/teleport/zap_self(mob/living/user)
- if(do_teleport(user, user, 10, channel = TELEPORT_CHANNEL_MAGIC))
+ if(do_teleport(user, user, 10, channel = TELEPORT_CHANNEL_MAGIC, teleport_mode = TELEPORT_ALLOW_WIZARD))
var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(3, user.loc)
smoke.start()
@@ -162,7 +162,7 @@
var/turf/origin = get_turf(user)
var/turf/destination = find_safe_turf()
- if(do_teleport(user, destination, channel=TELEPORT_CHANNEL_MAGIC))
+ if(do_teleport(user, destination, channel=TELEPORT_CHANNEL_MAGIC, teleport_mode = TELEPORT_ALLOW_WIZARD))
for(var/t in list(origin, destination))
var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(0, t)
diff --git a/code/modules/spells/spell_types/area_teleport.dm b/code/modules/spells/spell_types/area_teleport.dm
index 2980830bd87f1..66362c4f43cae 100644
--- a/code/modules/spells/spell_types/area_teleport.dm
+++ b/code/modules/spells/spell_types/area_teleport.dm
@@ -60,7 +60,7 @@
var/success = FALSE
while(tempL.len)
attempt = pick(tempL)
- do_teleport(target, attempt, channel = TELEPORT_CHANNEL_MAGIC)
+ do_teleport(target, attempt, channel = TELEPORT_CHANNEL_MAGIC, teleport_mode = TELEPORT_ALLOW_WIZARD)
if(get_turf(target) == attempt)
success = TRUE
break
@@ -68,7 +68,7 @@
tempL.Remove(attempt)
if(!success)
- do_teleport(target, L, channel = TELEPORT_CHANNEL_MAGIC)
+ do_teleport(target, L, channel = TELEPORT_CHANNEL_MAGIC, teleport_mode = TELEPORT_ALLOW_WIZARD)
playsound(get_turf(user), sound2, 50,1)
/obj/effect/proc_holder/spell/targeted/area_teleport/invocation(area/chosenarea = null,mob/living/user = usr)
diff --git a/code/modules/spells/spell_types/turf_teleport.dm b/code/modules/spells/spell_types/turf_teleport.dm
index 3dbe76e5cddc4..15efcc345c6b0 100644
--- a/code/modules/spells/spell_types/turf_teleport.dm
+++ b/code/modules/spells/spell_types/turf_teleport.dm
@@ -34,5 +34,5 @@
if(!picked || !isturf(picked))
return
- if(do_teleport(user, picked, channel = TELEPORT_CHANNEL_MAGIC))
+ if(do_teleport(user, picked, channel = TELEPORT_CHANNEL_MAGIC, teleport_mode = TELEPORT_ALLOW_WIZARD))
playsound(get_turf(user), sound1, 50,1)
From efbdf3e653ebda00d02195f541537bb6d9940b74 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 15:14:33 -0400
Subject: [PATCH 11/43] Not needed anymore
---
code/game/objects/items/holy_weapons.dm | 4 ----
code/game/objects/items/storage/book.dm | 4 ----
2 files changed, 8 deletions(-)
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 13dad924bde6b..992446e2edcf5 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -271,10 +271,6 @@
message_admins("[ADMIN_LOOKUPFLW(user)] erased a [target_rune.cultist_name] rune with a null rod.")
SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_NARNAR] = TRUE
-// The nullrod by itself does not block cult/wizard teleports
-/obj/item/nullrod/intercept_teleport(channel, turf/origin, turf/destination)
- return
-
/obj/item/nullrod/godhand
icon_state = "disintegrate"
item_state = "disintegrate"
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index e61b1321dbdaf..d18fcc98415a5 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -246,10 +246,6 @@
EX.name = "Purified [initial(EX.name)]"
user.visible_message("[user] has purified [SS]!")
-// The bible by itself does not block cult/wizard teleports.
-/obj/item/storage/book/bible/intercept_teleport(channel, turf/origin, turf/destination)
- return
-
/obj/item/storage/book/bible/booze
desc = "To be applied to the head repeatedly."
From added07eb05258be613419edf6af51bea75fd91b Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:07:02 -0400
Subject: [PATCH 12/43] removes excess gateways from RandomZLevels
---
_maps/RandomZLevels/SnowCabin.dmm | 63 ++----------
_maps/RandomZLevels/TheBeach.dmm | 99 ++-----------------
_maps/RandomZLevels/caves.dmm | 86 ++--------------
_maps/RandomZLevels/moonoutpost19.dmm | 58 ++---------
_maps/RandomZLevels/research.dmm | 28 +-----
_maps/RandomZLevels/snowdin.dmm | 48 +--------
_maps/RandomZLevels/spacebattle.dmm | 68 ++-----------
_maps/RandomZLevels/undergroundoutpost45.dmm | 64 ++----------
.../Scripts/11577_remove_excess_gateways.txt | 2 +
9 files changed, 55 insertions(+), 461 deletions(-)
create mode 100644 tools/UpdatePaths/Scripts/11577_remove_excess_gateways.txt
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
index 505fc7a5b8cc1..63935735342f0 100644
--- a/_maps/RandomZLevels/SnowCabin.dmm
+++ b/_maps/RandomZLevels/SnowCabin.dmm
@@ -646,24 +646,6 @@
},
/turf/open/floor/wood,
/area/awaymission/cabin)
-"cb" = (
-/obj/machinery/gateway{
- dir = 9
- },
-/turf/open/floor/wood,
-/area/awaymission/cabin)
-"cc" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/awaymission/cabin)
-"cd" = (
-/obj/machinery/gateway{
- dir = 5
- },
-/turf/open/floor/wood,
-/area/awaymission/cabin)
"ce" = (
/obj/structure/chair/wood{
dir = 4
@@ -738,22 +720,6 @@
"cn" = (
/turf/open/lava,
/area/awaymission/cabin/caves/mountain)
-"co" = (
-/obj/machinery/gateway{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/awaymission/cabin)
-"cp" = (
-/obj/machinery/gateway/centeraway,
-/turf/open/floor/wood,
-/area/awaymission/cabin)
-"cq" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/awaymission/cabin)
"cr" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -791,24 +757,12 @@
},
/turf/open/floor/iron/white,
/area/awaymission/cabin)
-"cw" = (
-/obj/machinery/gateway{
- dir = 10
- },
-/turf/open/floor/wood,
-/area/awaymission/cabin)
"cx" = (
/obj/structure/sign/poster/official/soft_cap_pop_art{
pixel_y = 32
},
/turf/open/floor/wood,
/area/awaymission/cabin)
-"cy" = (
-/obj/machinery/gateway{
- dir = 6
- },
-/turf/open/floor/wood,
-/area/awaymission/cabin)
"cz" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -2318,7 +2272,6 @@
/turf/open/floor/plating,
/area/awaymission/cabin)
"hC" = (
-/obj/machinery/gateway,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -35483,9 +35436,9 @@ an
bk
bJ
an
-cb
-co
-cw
+aq
+aq
+aq
aq
he
hG
@@ -35740,8 +35693,8 @@ an
nU
an
an
-cc
-cp
+aq
+aq
hC
cI
cI
@@ -35997,9 +35950,9 @@ an
jf
ay
an
-cd
-cq
-cy
+aq
+aq
+aq
aq
he
hi
diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index c02738946b515..ed3e5f7f8a27a 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -224,65 +224,10 @@
/mob/living/simple_animal/crab,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
-"aL" = (
-/obj/machinery/gateway{
- dir = 9
- },
-/obj/effect/turf_decal/sand,
-/obj/effect/turf_decal/stripes/asteroid/line{
- dir = 9
- },
-/turf/open/floor/plating/beach/sand,
-/area/awaymission/beach)
-"aM" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/obj/effect/turf_decal/sand,
-/obj/effect/turf_decal/stripes/asteroid/line{
- dir = 1
- },
-/turf/open/floor/plating/beach/sand,
-/area/awaymission/beach)
-"aN" = (
-/obj/machinery/gateway{
- dir = 5
- },
-/obj/effect/turf_decal/sand,
-/obj/effect/turf_decal/stripes/asteroid/line{
- dir = 5
- },
-/turf/open/floor/plating/beach/sand,
-/area/awaymission/beach)
"aO" = (
/obj/effect/baseturf_helper/beach/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
-"aP" = (
-/obj/machinery/gateway{
- dir = 8
- },
-/obj/effect/turf_decal/sand,
-/obj/effect/turf_decal/stripes/asteroid/line{
- dir = 8
- },
-/turf/open/floor/plating/beach/sand,
-/area/awaymission/beach)
-"aQ" = (
-/obj/machinery/gateway/centeraway,
-/obj/effect/turf_decal/sand,
-/turf/open/floor/plating/beach/sand,
-/area/awaymission/beach)
-"aR" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/obj/effect/turf_decal/sand,
-/obj/effect/turf_decal/stripes/asteroid/line{
- dir = 4
- },
-/turf/open/floor/plating/beach/sand,
-/area/awaymission/beach)
"aS" = (
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
pixel_x = -12;
@@ -295,32 +240,6 @@
dir = 8
},
/area/awaymission/beach)
-"aU" = (
-/obj/machinery/gateway{
- dir = 10
- },
-/obj/effect/turf_decal/sand,
-/obj/effect/turf_decal/stripes/asteroid/line{
- dir = 10
- },
-/turf/open/floor/plating/beach/sand,
-/area/awaymission/beach)
-"aV" = (
-/obj/machinery/gateway,
-/obj/effect/turf_decal/sand,
-/obj/effect/turf_decal/stripes/asteroid/line,
-/turf/open/floor/plating/beach/sand,
-/area/awaymission/beach)
-"aW" = (
-/obj/machinery/gateway{
- dir = 6
- },
-/obj/effect/turf_decal/sand,
-/obj/effect/turf_decal/stripes/asteroid/line{
- dir = 6
- },
-/turf/open/floor/plating/beach/sand,
-/area/awaymission/beach)
"aX" = (
/turf/closed/wall/mineral/sandstone,
/area/awaymission/beach)
@@ -6900,9 +6819,9 @@ ak
ak
ak
ak
-aL
-aP
-aU
+bf
+bp
+bx
ak
ak
ba
@@ -7007,9 +6926,9 @@ ak
ak
ak
ak
-aM
-aQ
-aV
+bg
+ba
+by
ba
ba
ba
@@ -7114,9 +7033,9 @@ ak
ak
ak
ak
-aN
-aR
-aW
+bh
+br
+bz
ak
ak
ak
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index c1f430e5fd154..b3fb205fb82f6 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -392,52 +392,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_three)
-"bi" = (
-/obj/machinery/gateway{
- dir = 9
- },
-/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_four)
-"bj" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_four)
-"bk" = (
-/obj/machinery/gateway{
- dir = 5
- },
-/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_four)
-"bl" = (
-/obj/machinery/gateway{
- dir = 8
- },
-/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_four)
-"bm" = (
-/obj/machinery/gateway/centeraway,
-/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_four)
-"bn" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_four)
"bo" = (
/obj/structure/flora/rock,
/obj/item/soulstone/anybody,
@@ -445,28 +399,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_three)
-"bp" = (
-/obj/machinery/gateway{
- dir = 10
- },
-/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_four)
-"bq" = (
-/obj/machinery/gateway,
-/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_four)
-"br" = (
-/obj/machinery/gateway{
- dir = 6
- },
-/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_four)
"bs" = (
/obj/structure/trap/stun{
desc = "A rune inscribed in the floor, the air feeling electrified around it.";
@@ -58090,9 +58022,9 @@ ao
ao
ao
bf
-bi
-bl
-bp
+ao
+ao
+ao
aw
ao
bz
@@ -58347,9 +58279,9 @@ ao
ao
bf
ap
-bj
-bm
-bq
+ao
+ao
+ao
bf
bw
bA
@@ -58604,9 +58536,9 @@ ao
ao
ao
bf
-bk
-bn
-br
+ao
+ao
+ao
ao
ao
bz
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index f725fc5d9d552..2b56545f14348 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -163,10 +163,6 @@
},
/turf/open/floor/iron/dark,
/area/awaymission/moonoutpost19/syndicate)
-"aP" = (
-/obj/machinery/gateway/centeraway,
-/turf/open/floor/iron/dark,
-/area/awaymission/moonoutpost19/syndicate)
"aR" = (
/obj/machinery/light{
dir = 4
@@ -5005,9 +5001,6 @@
},
/area/awaymission/moonoutpost19/arrivals)
"qI" = (
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/awaymission/moonoutpost19/syndicate)
@@ -5141,13 +5134,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/moonoutpost19/arrivals)
-"wP" = (
-/obj/machinery/gateway{
- dir = 10
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/moonoutpost19/syndicate)
"wX" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
@@ -5504,13 +5490,6 @@
initial_temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
-"In" = (
-/obj/machinery/gateway{
- dir = 5
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/moonoutpost19/syndicate)
"Iz" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -5528,13 +5507,6 @@
initial_temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
-"II" = (
-/obj/machinery/gateway{
- dir = 9
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/moonoutpost19/syndicate)
"Jc" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron{
@@ -5655,20 +5627,6 @@
broken = 1
},
/area/awaymission/moonoutpost19/research)
-"OT" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/moonoutpost19/syndicate)
-"Pq" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/moonoutpost19/syndicate)
"QH" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
@@ -5762,9 +5720,6 @@
},
/area/awaymission/moonoutpost19/syndicate)
"Uo" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -5823,7 +5778,6 @@
/turf/open/floor/iron,
/area/awaymission/moonoutpost19/arrivals)
"Yx" = (
-/obj/machinery/gateway,
/obj/structure/cable{
icon_state = "0-2"
},
@@ -40634,9 +40588,9 @@ ac
ac
at
az
-II
qI
-wP
+qI
+qI
aV
br
bB
@@ -40891,8 +40845,8 @@ ac
ac
at
aA
-OT
-aP
+qI
+aA
Yx
bg
bs
@@ -41148,8 +41102,8 @@ ac
ac
at
aB
-In
-Pq
+qI
+qI
Uo
bh
bt
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index 9e9d117b55279..d348276925f13 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -325,27 +325,18 @@
/turf/open/floor/iron/dark,
/area/awaymission/research/interior/gateway)
"bA" = (
-/obj/machinery/gateway{
- dir = 9
- },
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/iron/dark,
/area/awaymission/research/interior/gateway)
"bB" = (
-/obj/machinery/gateway{
- dir = 1
- },
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/iron/dark,
/area/awaymission/research/interior/gateway)
"bC" = (
-/obj/machinery/gateway{
- dir = 5
- },
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -388,46 +379,29 @@
/turf/open/floor/iron/dark,
/area/awaymission/research/interior/gateway)
"bS" = (
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/iron/dark,
/area/awaymission/research/interior/gateway)
-"bT" = (
-/obj/machinery/gateway/centeraway,
-/turf/open/floor/iron/dark,
-/area/awaymission/research/interior/gateway)
"bU" = (
-/obj/machinery/gateway{
- dir = 4
- },
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/iron/dark,
/area/awaymission/research/interior/gateway)
"bY" = (
-/obj/machinery/gateway{
- dir = 10
- },
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/iron/dark,
/area/awaymission/research/interior/gateway)
"bZ" = (
-/obj/machinery/gateway,
/obj/effect/landmark/awaystart,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/dark,
/area/awaymission/research/interior/gateway)
"ca" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -33401,7 +33375,7 @@ ji
ji
bl
bB
-bT
+bz
bZ
ck
bz
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 4b02f0f4c2c5f..e965c83482e81 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -1244,23 +1244,6 @@
/turf/open/floor/iron,
/area/awaymission/snowdin/post/gateway)
"fG" = (
-/obj/machinery/gateway{
- dir = 9
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/gateway)
-"fH" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/gateway)
-"fI" = (
-/obj/machinery/gateway{
- dir = 5
- },
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/awaymission/snowdin/post/gateway)
@@ -1423,15 +1406,11 @@
/turf/open/floor/iron,
/area/awaymission/snowdin/post/gateway)
"gw" = (
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/awaymission/snowdin/post/gateway)
"gx" = (
-/obj/machinery/gateway/centeraway,
/obj/effect/turf_decal/bot,
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -1439,13 +1418,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/awaymission/snowdin/post/gateway)
-"gy" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/gateway)
"gz" = (
/obj/machinery/light/broken{
dir = 4
@@ -1638,16 +1610,7 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/awaymission/snowdin/post/gateway)
-"hl" = (
-/obj/machinery/gateway{
- dir = 10
- },
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/gateway)
"hm" = (
-/obj/machinery/gateway,
/obj/effect/turf_decal/bot,
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -1659,9 +1622,6 @@
/turf/open/floor/iron,
/area/awaymission/snowdin/post/gateway)
"hn" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -24728,7 +24688,7 @@ en
fh
fG
gw
-hl
+gw
hR
iA
ju
@@ -24983,7 +24943,7 @@ Vj
dK
eo
fh
-fH
+fG
gx
hm
hS
@@ -25240,8 +25200,8 @@ WJ
dK
ep
fh
-fI
-gy
+fG
+fG
hn
Tf
cE
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index ee2d9e913238c..2a0e161e4f8f7 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -838,24 +838,6 @@
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"ec" = (
-/obj/machinery/gateway{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
-"ed" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
-"ee" = (
-/obj/machinery/gateway{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
"ef" = (
/mob/living/simple_animal/hostile/syndicate/melee/spacebattle,
/turf/open/floor/mineral/plastitanium/red,
@@ -885,41 +867,9 @@
"el" = (
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
-"em" = (
-/obj/machinery/gateway{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
-"en" = (
-/obj/machinery/gateway/centeraway,
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
-"eo" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
"er" = (
/turf/closed/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate4)
-"et" = (
-/obj/machinery/gateway{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
-"eu" = (
-/obj/machinery/gateway,
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
-"ev" = (
-/obj/machinery/gateway{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
"ew" = (
/obj/structure/chair,
/turf/open/floor/mineral/plastitanium/red,
@@ -26736,9 +26686,9 @@ cc
cc
bT
cK
-ec
-em
-et
+cK
+cK
+cK
cK
cK
cK
@@ -26993,9 +26943,9 @@ cA
cc
bT
cK
-ed
-en
-eu
+cK
+cK
+cK
cK
cK
cK
@@ -27250,9 +27200,9 @@ cc
cc
bT
cK
-ee
-eo
-ev
+cK
+cK
+cK
cK
jF
fb
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 1e7dcc8fb2ce7..296d05d0c80d0 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -1807,10 +1807,6 @@
dir = 5
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"hu" = (
-/obj/machinery/gateway/centeraway,
-/turf/open/floor/iron/dark,
-/area/awaymission/undergroundoutpost45/gateway)
"hw" = (
/obj/structure/chair{
dir = 8
@@ -8303,9 +8299,6 @@
},
/area/awaymission/undergroundoutpost45/research)
"Cg" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/awaymission/undergroundoutpost45/gateway)
@@ -8589,13 +8582,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/awaymission/undergroundoutpost45/central)
-"FM" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/undergroundoutpost45/gateway)
"FN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -8814,13 +8800,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/awaymission/undergroundoutpost45/crew_quarters)
-"Hq" = (
-/obj/machinery/gateway{
- dir = 10
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/undergroundoutpost45/gateway)
"Hr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -9247,7 +9226,6 @@
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
"LS" = (
-/obj/machinery/gateway,
/obj/structure/cable{
icon_state = "0-2"
},
@@ -9882,13 +9860,6 @@
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
-"Sz" = (
-/obj/machinery/gateway{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/undergroundoutpost45/gateway)
"SL" = (
/obj/machinery/computer/station_alert{
dir = 1
@@ -9997,13 +9968,6 @@
/obj/effect/turf_decal/tile/green/half/contrasted,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
-"Ud" = (
-/obj/machinery/gateway{
- dir = 9
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/undergroundoutpost45/gateway)
"Uo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/table,
@@ -10309,13 +10273,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
-"Wz" = (
-/obj/machinery/gateway{
- dir = 5
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/undergroundoutpost45/gateway)
"WH" = (
/obj/machinery/biogenerator,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -10522,13 +10479,6 @@
broken = 1
},
/area/awaymission/undergroundoutpost45/central)
-"Zk" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/awaymission/undergroundoutpost45/gateway)
"Zl" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -30023,9 +29973,9 @@ ad
ad
gv
gJ
-Ud
-Sz
-Hq
+Cg
+Cg
+Cg
it
iO
jh
@@ -30280,8 +30230,8 @@ ad
ad
gv
gJ
-Zk
-hu
+Cg
+gJ
LS
iu
iP
@@ -30537,8 +30487,8 @@ ad
ad
gw
gJ
-Wz
-FM
+Cg
+Cg
Cg
iv
iQ
diff --git a/tools/UpdatePaths/Scripts/11577_remove_excess_gateways.txt b/tools/UpdatePaths/Scripts/11577_remove_excess_gateways.txt
new file mode 100644
index 0000000000000..35896ddb1fc04
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/11577_remove_excess_gateways.txt
@@ -0,0 +1,2 @@
+/obj/machinery/gateway : @DELETE
+/obj/machinery/gateway/centeraway : @DELETE
From fde08c96dabd75414821b7f196275abe05113a4a Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:20:04 -0400
Subject: [PATCH 13/43] it works flawlessly!
---
code/modules/awaymissions/gateway.dm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 03c1a621763c6..dd95bf7784deb 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -7,6 +7,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
icon_state = "off"
density = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ move_resist = INFINITY
var/active = FALSE
var/checkparts = TRUE
var/list/adjacent_parts = list()
@@ -34,9 +35,13 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
return ..()
/obj/machinery/gateway/Bumped(atom/movable/AM)
+ if(!centerpiece)
+ return
self_teleport(AM)
/obj/machinery/gateway/MouseDrop_T(atom/movable/AM, mob/user)
+ if(!centerpiece)
+ return
. = ..()
if(AM == user)
self_teleport(AM) // This is so that if you're drag-clicking yourself into the gateway it'll appear as if you're entering it
@@ -79,7 +84,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
say_cooldown("Destination gateway not active.")
return FALSE
- return check_teleport(AM, dest_turf, channel = TELEPORT_CHANNEL_GATEWAY)
+ return TRUE
/obj/machinery/gateway/proc/check_parts()
. = TRUE
@@ -111,6 +116,12 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
var/turf/dest_turf = get_step(get_turf(linked_gateway), SOUTH)
if(!pre_check_teleport(AM, dest_turf))
+ return // Gateway off/broken
+
+ if(!check_teleport(AM, dest_turf, channel = TELEPORT_CHANNEL_GATEWAY))
+ AM.visible_message( \
+ "[AM] can't seem to go through [src]...", \
+ "You can't seem to force your way through [src]...")
return
if(ismob(AM))
From e22791ec67fafce77458f4117788a46cae0ef834 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:35:39 -0400
Subject: [PATCH 14/43] Added arrows to better help lost spessmen find out
where to go
---
_maps/map_files/BoxStation/BoxStation.dmm | 18 +++++++
_maps/map_files/CorgStation/CorgStation.dmm | 9 +++-
.../map_files/Deltastation/DeltaStation2.dmm | 30 +++++++++---
_maps/map_files/EchoStation/EchoStation.dmm | 11 ++++-
_maps/map_files/FlandStation/FlandStation.dmm | 24 ++++++++--
_maps/map_files/KiloStation/KiloStation.dmm | 48 +++++++++++--------
_maps/map_files/MetaStation/MetaStation.dmm | 24 ++++++++--
_maps/map_files/Mining/Lavaland.dmm | 18 +++++++
_maps/map_files/RadStation/RadStation.dmm | 14 ++++--
9 files changed, 158 insertions(+), 38 deletions(-)
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 62d532a7d9ebd..0546884f3cdd2 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -14015,6 +14015,9 @@
/obj/machinery/gateway{
dir = 9
},
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
/turf/open/floor/engine,
/area/gateway)
"cCf" = (
@@ -14054,6 +14057,10 @@
/obj/structure/window/reinforced{
dir = 4
},
+/obj/effect/turf_decal/arrows{
+ pixel_x = -24
+ },
+/obj/effect/turf_decal/box/corners,
/turf/open/floor/engine,
/area/gateway)
"cCq" = (
@@ -20240,6 +20247,14 @@
/obj/machinery/light{
dir = 8
},
+/obj/effect/turf_decal/arrows{
+ dir = 1;
+ pixel_x = 24;
+ pixel_y = -14
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
/turf/open/floor/engine,
/area/gateway)
"eJj" = (
@@ -66972,6 +66987,9 @@
/obj/structure/window/reinforced{
dir = 4
},
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
/turf/open/floor/engine,
/area/gateway)
"xtf" = (
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index 038ec31ca3030..000600b9da149 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -7988,7 +7988,6 @@
/area/engine/engineering)
"cnH" = (
/obj/machinery/gateway,
-/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/gateway)
"cnI" = (
@@ -72351,6 +72350,11 @@
/obj/machinery/gateway{
dir = 10
},
+/obj/effect/turf_decal/arrows{
+ dir = 1;
+ pixel_x = 24;
+ pixel_y = -14
+ },
/turf/open/floor/circuit,
/area/gateway)
"xsd" = (
@@ -73239,6 +73243,9 @@
/obj/machinery/gateway{
dir = 6
},
+/obj/effect/turf_decal/arrows{
+ pixel_x = -24
+ },
/turf/open/floor/circuit,
/area/gateway)
"xGR" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 08c1ad212a92c..16f88ba04b4cd 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -26836,7 +26836,7 @@
name = "Replica CentCom officer's jumpsuit"
},
/obj/item/clothing/head/hats/centcom_cap{
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "stamina" = 0);
+ armor = list("melee"=0,"bullet"=0,"laser"=0,"energy"=0,"bomb"=0,"bio"=0,"rad"=0,"stamina"=0);
desc = "A replica hat of a Central Commander's attire. It has a small tag on it saying, 'It's good to be emperor.'";
name = "Replica CentCom hat"
},
@@ -66386,6 +66386,10 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/arrows{
+ pixel_x = -24
+ },
+/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
/area/gateway)
"plW" = (
@@ -69011,7 +69015,7 @@
/obj/item/folder/red,
/obj/item/toy/gun,
/obj/item/clothing/head/beret/sec{
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "stamina" = 0);
+ armor = list("melee"=0,"bullet"=0,"laser"=0,"energy"=0,"bomb"=0,"bio"=0,"rad"=0,"stamina"=0);
desc = "A replica beret resembling that of a special operations officer under Nanotrasen.";
name = "replica officer's beret"
},
@@ -72826,12 +72830,12 @@
pixel_y = 2
},
/obj/machinery/vending/wallmed{
- contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1);
+ contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate=1,/obj/item/storage/box/hug/medical=1,/obj/item/reagent_containers/glass/bottle/random_virus=1);
name = "Upgraded NanoMed";
pixel_x = -1;
pixel_y = -32;
- premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
- products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+ premium = list(/obj/item/storage/firstaid/regular=3,/obj/item/storage/belt/medical=3,/obj/item/sensor_device=2,/obj/item/pinpointer/crew=2,/obj/item/healthanalyzer=2,/obj/item/wrench/medical=1);
+ products = list(/obj/item/reagent_containers/syringe=12,/obj/item/reagent_containers/dropper=3,/obj/item/reagent_containers/medspray=6,/obj/item/storage/pill_bottle=6,/obj/item/reagent_containers/glass/bottle=10,/obj/item/reagent_containers/spray/cleaner=1,/obj/item/stack/medical/gauze=8,/obj/item/reagent_containers/hypospray/medipen=8,/obj/item/reagent_containers/hypospray/medipen/dexalin=8,/obj/item/reagent_containers/glass/bottle/epinephrine=4,/obj/item/reagent_containers/glass/bottle/charcoal=4,/obj/item/reagent_containers/glass/bottle/salglu_solution=4,/obj/item/reagent_containers/glass/bottle/tricordrazine=1,/obj/item/reagent_containers/glass/bottle/spaceacillin=1,/obj/item/reagent_containers/glass/bottle/morphine=2,/obj/item/reagent_containers/glass/bottle/toxin=4,/obj/item/reagent_containers/medspray/sterilizine=4)
},
/obj/item/reagent_containers/dropper{
pixel_x = 2;
@@ -82445,6 +82449,9 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"umy" = (
@@ -84430,6 +84437,9 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"uVF" = (
@@ -86820,7 +86830,7 @@
},
/obj/item/reagent_containers/food/drinks/beer{
desc = "Whatever it is, it reeks of foul, putrid froth.";
- list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing = 15);
+ list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing=15);
name = "Delta-Down";
pixel_x = 5;
pixel_y = 5
@@ -88036,6 +88046,14 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/arrows{
+ dir = 1;
+ pixel_x = 24;
+ pixel_y = -14
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"wbu" = (
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
index f378a214d0f49..0082a8b0ceaac 100644
--- a/_maps/map_files/EchoStation/EchoStation.dmm
+++ b/_maps/map_files/EchoStation/EchoStation.dmm
@@ -11267,7 +11267,6 @@
/area/engine/atmos)
"ftM" = (
/obj/machinery/gateway,
-/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/gateway)
"ftU" = (
@@ -25516,6 +25515,11 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -28
},
+/obj/effect/turf_decal/arrows{
+ dir = 1;
+ pixel_x = 24;
+ pixel_y = -14
+ },
/turf/open/floor/circuit,
/area/gateway)
"mAp" = (
@@ -33204,7 +33208,7 @@
/area/maintenance/department/science/central)
"qpL" = (
/mob/living/simple_animal/chicken/turkey{
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0);
+ atmos_requirements = list("min_oxy"=0,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=0,"min_n2"=0,"max_n2"=0);
desc = "A veteran of Nanotrasen's Animal Experimentation Program that attempted to replicate the organic space suit that some hostile entities are known to have exhibited, Tom now serves Nanotrasen as the mascot of the Exploration Crew.";
health = 200;
maxHealth = 200;
@@ -38212,6 +38216,9 @@
dir = 6
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/effect/turf_decal/arrows{
+ pixel_x = -24
+ },
/turf/open/floor/circuit,
/area/gateway)
"sWP" = (
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index fb946d007f5e6..1f39a3e15e4cd 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -19336,12 +19336,12 @@
},
/obj/machinery/firealarm/directional/west,
/obj/machinery/vending/wallmed{
- contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1);
+ contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate=1,/obj/item/storage/box/hug/medical=1,/obj/item/reagent_containers/glass/bottle/random_virus=1);
name = "Upgraded NanoMed";
pixel_x = -1;
pixel_y = -32;
- premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
- products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+ premium = list(/obj/item/storage/firstaid/regular=3,/obj/item/storage/belt/medical=3,/obj/item/sensor_device=2,/obj/item/pinpointer/crew=2,/obj/item/healthanalyzer=2,/obj/item/wrench/medical=1);
+ products = list(/obj/item/reagent_containers/syringe=12,/obj/item/reagent_containers/dropper=3,/obj/item/reagent_containers/medspray=6,/obj/item/storage/pill_bottle=6,/obj/item/reagent_containers/glass/bottle=10,/obj/item/reagent_containers/spray/cleaner=1,/obj/item/stack/medical/gauze=8,/obj/item/reagent_containers/hypospray/medipen=8,/obj/item/reagent_containers/hypospray/medipen/dexalin=8,/obj/item/reagent_containers/glass/bottle/epinephrine=4,/obj/item/reagent_containers/glass/bottle/charcoal=4,/obj/item/reagent_containers/glass/bottle/salglu_solution=4,/obj/item/reagent_containers/glass/bottle/tricordrazine=1,/obj/item/reagent_containers/glass/bottle/spaceacillin=1,/obj/item/reagent_containers/glass/bottle/morphine=2,/obj/item/reagent_containers/glass/bottle/toxin=4,/obj/item/reagent_containers/medspray/sterilizine=4)
},
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
@@ -54270,6 +54270,9 @@
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"nSy" = (
@@ -61906,6 +61909,10 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/arrows{
+ pixel_x = -24
+ },
+/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
/area/gateway)
"pYt" = (
@@ -71277,6 +71284,9 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"smW" = (
@@ -88633,6 +88643,14 @@
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/arrows{
+ dir = 1;
+ pixel_x = 24;
+ pixel_y = -14
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"wwX" = (
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index b183d76f71a44..2c46bc9861959 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -13891,7 +13891,7 @@
dir = 4
},
/obj/machinery/camera/autoname/directional/west{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -25879,7 +25879,7 @@
dir = 1
},
/obj/machinery/camera/directional/north{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/turf/open/floor/iron,
/area/security/brig/aft)
@@ -29172,7 +29172,7 @@
dir = 8
},
/obj/machinery/camera/autoname{
- network = list("ss13", "prison", "security")
+ network = list("ss13","prison","security")
},
/turf/open/floor/iron,
/area/hallway/primary/aft)
@@ -29429,7 +29429,7 @@
icon_state = "0-4"
},
/obj/machinery/camera/directional/north{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/hos)
@@ -29799,7 +29799,7 @@
/obj/machinery/flasher/portable,
/obj/machinery/camera/motion/directional/east{
c_tag = "Armory Internal";
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/obj/effect/turf_decal/box,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
@@ -31790,7 +31790,7 @@
/area/crew_quarters/heads/captain)
"eMU" = (
/obj/machinery/camera/autoname/directional/south{
- network = list("ss13", "prison")
+ network = list("ss13","prison")
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -36796,7 +36796,7 @@
/area/maintenance/starboard/aft)
"gxo" = (
/obj/machinery/camera/autoname/directional/south{
- network = list("ss13", "prison")
+ network = list("ss13","prison")
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
@@ -37640,7 +37640,7 @@
},
/obj/item/kirbyplants/random,
/obj/machinery/camera/directional/north{
- network = list("ss13", "prison")
+ network = list("ss13","prison")
},
/turf/open/floor/wood,
/area/security/prison)
@@ -42376,7 +42376,7 @@
pixel_y = 30
},
/obj/machinery/camera/directional/north{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron/dark,
@@ -42622,7 +42622,7 @@
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
pixel_x = 6;
pixel_y = 7;
- list_reagents = list(/datum/reagent/consumable/pwr_game = 5)
+ list_reagents = list(/datum/reagent/consumable/pwr_game=5)
},
/obj/item/reagent_containers/food/drinks/britcup{
pixel_x = -5;
@@ -43244,7 +43244,7 @@
dir = 4
},
/obj/machinery/camera/autoname/directional/west{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/obj/item/kirbyplants{
icon_state = "plant-02";
@@ -43452,6 +43452,9 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
+/obj/effect/turf_decal/arrows{
+ pixel_x = -24
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"iLn" = (
@@ -48937,7 +48940,7 @@
/obj/structure/lattice/catwalk,
/obj/machinery/camera/motion/directional/south{
c_tag = "Armory - External";
- network = list("ss13", "prison")
+ network = list("ss13","prison")
},
/turf/open/floor/plating/airless{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -54057,7 +54060,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/camera/autoname/directional/east{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/turf/open/floor/iron,
/area/security/brig)
@@ -56602,7 +56605,7 @@
dir = 1
},
/obj/machinery/camera/autoname/directional/east{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/turf/open/floor/iron/dark,
/area/security/main)
@@ -63662,7 +63665,7 @@
pixel_x = 25
},
/obj/machinery/camera/autoname/directional/east{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/turf/open/floor/iron,
/area/security/brig/aft)
@@ -63872,7 +63875,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Brig Cells";
- network = list("ss13", "prison")
+ network = list("ss13","prison")
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -70804,7 +70807,7 @@
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/machinery/camera/autoname/directional/west{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/obj/machinery/rnd/production/techfab/department/security,
/obj/effect/turf_decal/stripes/box,
@@ -73709,7 +73712,7 @@
icon_state = "4-8"
},
/obj/machinery/camera/directional/north{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -82617,6 +82620,11 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 8
},
+/obj/effect/turf_decal/arrows{
+ dir = 1;
+ pixel_x = 24;
+ pixel_y = -14
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"vzg" = (
@@ -86221,7 +86229,7 @@
/obj/machinery/airalarm/directional/south,
/obj/structure/table/reinforced,
/obj/machinery/camera/autoname{
- network = list("ss13", "prison")
+ network = list("ss13","prison")
},
/turf/open/floor/iron/techmaint,
/area/security/prison)
@@ -91486,7 +91494,7 @@
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/light,
/obj/machinery/camera/autoname/directional/south{
- network = list("ss13", "security")
+ network = list("ss13","security")
},
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index f98a7ca81881d..283be04f88ccc 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -25244,6 +25244,14 @@
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/arrows{
+ dir = 1;
+ pixel_x = 24;
+ pixel_y = -14
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"ewn" = (
@@ -37241,12 +37249,12 @@
pixel_y = 2
},
/obj/machinery/vending/wallmed{
- contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1);
+ contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate=1,/obj/item/storage/box/hug/medical=1,/obj/item/reagent_containers/glass/bottle/random_virus=1);
name = "Upgraded NanoMed";
pixel_x = -1;
pixel_y = -32;
- premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
- products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+ premium = list(/obj/item/storage/firstaid/regular=3,/obj/item/storage/belt/medical=3,/obj/item/sensor_device=2,/obj/item/pinpointer/crew=2,/obj/item/healthanalyzer=2,/obj/item/wrench/medical=1);
+ products = list(/obj/item/reagent_containers/syringe=12,/obj/item/reagent_containers/dropper=3,/obj/item/reagent_containers/medspray=6,/obj/item/storage/pill_bottle=6,/obj/item/reagent_containers/glass/bottle=10,/obj/item/reagent_containers/spray/cleaner=1,/obj/item/stack/medical/gauze=8,/obj/item/reagent_containers/hypospray/medipen=8,/obj/item/reagent_containers/hypospray/medipen/dexalin=8,/obj/item/reagent_containers/glass/bottle/epinephrine=4,/obj/item/reagent_containers/glass/bottle/charcoal=4,/obj/item/reagent_containers/glass/bottle/salglu_solution=4,/obj/item/reagent_containers/glass/bottle/tricordrazine=1,/obj/item/reagent_containers/glass/bottle/spaceacillin=1,/obj/item/reagent_containers/glass/bottle/morphine=2,/obj/item/reagent_containers/glass/bottle/toxin=4,/obj/item/reagent_containers/medspray/sterilizine=4)
},
/obj/item/reagent_containers/dropper{
pixel_x = 2;
@@ -44056,6 +44064,9 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"lDu" = (
@@ -52768,6 +52779,10 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/arrows{
+ pixel_x = -24
+ },
+/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
/area/gateway)
"oEY" = (
@@ -54176,6 +54191,9 @@
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"piG" = (
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 1e497af2bce6d..2f33130c8a238 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -1128,6 +1128,14 @@
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/arrows{
+ dir = 1;
+ pixel_x = 24;
+ pixel_y = -14
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/mine/gateway)
"ia" = (
@@ -4303,6 +4311,9 @@
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/mine/gateway)
"FI" = (
@@ -4447,6 +4458,10 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/arrows{
+ pixel_x = -24
+ },
+/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
/area/mine/gateway)
"GG" = (
@@ -5340,6 +5355,9 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/mine/gateway)
"NB" = (
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index c17544cce94fe..a700fbc317a4b 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -9571,6 +9571,11 @@
/obj/effect/turf_decal/box/corners{
dir = 8
},
+/obj/effect/turf_decal/arrows{
+ dir = 1;
+ pixel_x = 24;
+ pixel_y = -14
+ },
/turf/open/floor/iron/techmaint,
/area/gateway)
"das" = (
@@ -15777,7 +15782,7 @@
},
/obj/machinery/vending/wallmed{
pixel_y = -32;
- products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 2)
+ products = list(/obj/item/stack/medical/gauze=4,/obj/item/reagent_containers/hypospray/medipen=3,/obj/item/reagent_containers/hypospray/medipen/dexalin=3,/obj/item/reagent_containers/glass/bottle/epinephrine=2,/obj/item/reagent_containers/glass/bottle/charcoal=2)
},
/obj/machinery/newscaster{
pixel_x = -32;
@@ -45195,7 +45200,7 @@
/area/medical/cryo)
"ops" = (
/obj/machinery/smartfridge/sci{
- initial_contents = list(/obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/micro_laser = 2, /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/scanning_module = 2);
+ initial_contents = list(/obj/item/stock_parts/capacitor=2,/obj/item/stock_parts/manipulator=2,/obj/item/stock_parts/micro_laser=2,/obj/item/stock_parts/matter_bin=2,/obj/item/stock_parts/scanning_module=2);
name = "Science vender"
},
/turf/open/floor/iron,
@@ -66960,6 +66965,9 @@
},
/obj/effect/turf_decal/box/corners,
/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/arrows{
+ pixel_x = -24
+ },
/turf/open/floor/iron/techmaint,
/area/gateway)
"vjz" = (
@@ -75815,7 +75823,7 @@
/area/science/xenobiology)
"yid" = (
/obj/machinery/smartfridge/sci{
- initial_contents = list(/obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/micro_laser = 2, /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/scanning_module = 2);
+ initial_contents = list(/obj/item/stock_parts/capacitor=2,/obj/item/stock_parts/manipulator=2,/obj/item/stock_parts/micro_laser=2,/obj/item/stock_parts/matter_bin=2,/obj/item/stock_parts/scanning_module=2);
name = "Science vender"
},
/turf/open/floor/iron,
From 297ba65f5917d5a817d94a609da96353a66c3b80 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 17:23:13 -0400
Subject: [PATCH 15/43] fix up those maps
---
_maps/map_files/BoxStation/BoxStation.dmm | 9 +--------
_maps/map_files/CorgStation/CorgStation.dmm | 9 +--------
_maps/map_files/Deltastation/DeltaStation2.dmm | 10 +---------
_maps/map_files/EchoStation/EchoStation.dmm | 9 +--------
_maps/map_files/FlandStation/FlandStation.dmm | 10 +---------
_maps/map_files/KiloStation/KiloStation.dmm | 9 +--------
_maps/map_files/MetaStation/MetaStation.dmm | 10 +---------
_maps/map_files/Mining/Lavaland.dmm | 10 +---------
_maps/map_files/RadStation/RadStation.dmm | 9 +--------
.../gamemodes/dynamic/dynamic_rulesets_midround.dm | 5 ++++-
code/modules/antagonists/swarmer/swarmer_event.dm | 14 ++++++++++----
11 files changed, 23 insertions(+), 81 deletions(-)
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 0546884f3cdd2..50976171ae4b6 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -14057,9 +14057,6 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/effect/turf_decal/arrows{
- pixel_x = -24
- },
/obj/effect/turf_decal/box/corners,
/turf/open/floor/engine,
/area/gateway)
@@ -20247,11 +20244,6 @@
/obj/machinery/light{
dir = 8
},
-/obj/effect/turf_decal/arrows{
- dir = 1;
- pixel_x = 24;
- pixel_y = -14
- },
/obj/effect/turf_decal/box/corners{
dir = 8
},
@@ -29704,6 +29696,7 @@
"isI" = (
/obj/machinery/gateway,
/obj/effect/landmark/xeno_spawn,
+/obj/effect/turf_decal/box,
/turf/open/floor/engine,
/area/gateway)
"isM" = (
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index 000600b9da149..f7fee741f7fda 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -7988,6 +7988,7 @@
/area/engine/engineering)
"cnH" = (
/obj/machinery/gateway,
+/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/gateway)
"cnI" = (
@@ -72350,11 +72351,6 @@
/obj/machinery/gateway{
dir = 10
},
-/obj/effect/turf_decal/arrows{
- dir = 1;
- pixel_x = 24;
- pixel_y = -14
- },
/turf/open/floor/circuit,
/area/gateway)
"xsd" = (
@@ -73243,9 +73239,6 @@
/obj/machinery/gateway{
dir = 6
},
-/obj/effect/turf_decal/arrows{
- pixel_x = -24
- },
/turf/open/floor/circuit,
/area/gateway)
"xGR" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 16f88ba04b4cd..c4cce6384e684 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -50082,8 +50082,8 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/gateway)
"jXx" = (
@@ -66386,9 +66386,6 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/effect/turf_decal/arrows{
- pixel_x = -24
- },
/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
/area/gateway)
@@ -88046,11 +88043,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/effect/turf_decal/arrows{
- dir = 1;
- pixel_x = 24;
- pixel_y = -14
- },
/obj/effect/turf_decal/box/corners{
dir = 8
},
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
index 0082a8b0ceaac..a9df12bfe1fa2 100644
--- a/_maps/map_files/EchoStation/EchoStation.dmm
+++ b/_maps/map_files/EchoStation/EchoStation.dmm
@@ -11267,6 +11267,7 @@
/area/engine/atmos)
"ftM" = (
/obj/machinery/gateway,
+/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/gateway)
"ftU" = (
@@ -25515,11 +25516,6 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -28
},
-/obj/effect/turf_decal/arrows{
- dir = 1;
- pixel_x = 24;
- pixel_y = -14
- },
/turf/open/floor/circuit,
/area/gateway)
"mAp" = (
@@ -38216,9 +38212,6 @@
dir = 6
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/effect/turf_decal/arrows{
- pixel_x = -24
- },
/turf/open/floor/circuit,
/area/gateway)
"sWP" = (
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 1f39a3e15e4cd..64c9545a27d66 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -58509,8 +58509,8 @@
/obj/structure/cable/yellow{
icon_state = "0-2"
},
-/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/gateway)
"pbe" = (
@@ -61909,9 +61909,6 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/effect/turf_decal/arrows{
- pixel_x = -24
- },
/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
/area/gateway)
@@ -88643,11 +88640,6 @@
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/effect/turf_decal/arrows{
- dir = 1;
- pixel_x = 24;
- pixel_y = -14
- },
/obj/effect/turf_decal/box/corners{
dir = 8
},
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 2c46bc9861959..5ed4738f5998c 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -43452,9 +43452,6 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
-/obj/effect/turf_decal/arrows{
- pixel_x = -24
- },
/turf/open/floor/iron/dark,
/area/gateway)
"iLn" = (
@@ -68182,6 +68179,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
+/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/gateway)
"qGk" = (
@@ -82620,11 +82618,6 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 8
},
-/obj/effect/turf_decal/arrows{
- dir = 1;
- pixel_x = 24;
- pixel_y = -14
- },
/turf/open/floor/iron/dark,
/area/gateway)
"vzg" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 283be04f88ccc..c2e773cadfddd 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -25244,11 +25244,6 @@
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/effect/turf_decal/arrows{
- dir = 1;
- pixel_x = 24;
- pixel_y = -14
- },
/obj/effect/turf_decal/box/corners{
dir = 8
},
@@ -48446,8 +48441,8 @@
/obj/structure/cable/yellow{
icon_state = "0-2"
},
-/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/gateway)
"neU" = (
@@ -52779,9 +52774,6 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/effect/turf_decal/arrows{
- pixel_x = -24
- },
/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
/area/gateway)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 2f33130c8a238..b2de560f3a476 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -1128,11 +1128,6 @@
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/effect/turf_decal/arrows{
- dir = 1;
- pixel_x = 24;
- pixel_y = -14
- },
/obj/effect/turf_decal/box/corners{
dir = 8
},
@@ -2595,8 +2590,8 @@
/area/mine/science)
"tf" = (
/obj/machinery/gateway,
-/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/mine/gateway)
"tg" = (
@@ -4458,9 +4453,6 @@
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/effect/turf_decal/arrows{
- pixel_x = -24
- },
/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
/area/mine/gateway)
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index a700fbc317a4b..29428939e5ed7 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -9571,11 +9571,6 @@
/obj/effect/turf_decal/box/corners{
dir = 8
},
-/obj/effect/turf_decal/arrows{
- dir = 1;
- pixel_x = 24;
- pixel_y = -14
- },
/turf/open/floor/iron/techmaint,
/area/gateway)
"das" = (
@@ -26774,6 +26769,7 @@
/area/security/brig)
"iwt" = (
/obj/machinery/gateway,
+/obj/effect/turf_decal/box,
/turf/open/floor/iron/techmaint,
/area/gateway)
"iwO" = (
@@ -66965,9 +66961,6 @@
},
/obj/effect/turf_decal/box/corners,
/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/arrows{
- pixel_x = -24
- },
/turf/open/floor/iron/techmaint,
/area/gateway)
"vjz" = (
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
index 64c35dc67f18a..a10f08fb7a17f 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
@@ -760,9 +760,12 @@
/datum/dynamic_ruleset/midround/from_ghosts/swarmer/ready(forced = FALSE)
if(!..())
return FALSE
- if(!GLOB.the_gateway)
+ if(isnull(GLOB.the_gateway))
log_game("DYNAMIC: [ruletype] ruleset [name] execute failed due to no valid spawn locations (no gateway on map).")
return FALSE
+ if(!GLOB.the_gateway.active)
+ log_game("DYNAMIC: [ruletype] ruleset [name] execute failed due to no valid spawn locations (no ACTIVE gateway on map).")
+ return FALSE
return TRUE
/datum/dynamic_ruleset/midround/from_ghosts/swarmer/generate_ruleset_body(mob/applicant)
diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm
index abfab408e0dd7..d72629e657825 100644
--- a/code/modules/antagonists/swarmer/swarmer_event.dm
+++ b/code/modules/antagonists/swarmer/swarmer_event.dm
@@ -7,15 +7,21 @@
min_players = 15
dynamic_should_hijack = TRUE
+/datum/round_event_control/spawn_swarmer/preRunEvent()
+ if(!GLOB.the_gateway)
+ return EVENT_CANT_RUN // We don't return CANT_RUN if the gateway is off because this disqualifies the event from EVER running again.
+ ..()
/datum/round_event/spawn_swarmer
/datum/round_event/spawn_swarmer/start()
if(find_swarmer())
- return 0
- if(!GLOB.the_gateway)
- return 0
- new /obj/effect/mob_spawn/swarmer(get_turf(GLOB.the_gateway))
+ return FALSE // There already is active swarmers
+ if(isnull(GLOB.the_gateway))
+ return FALSE // There is no gateway
+ if(!GLOB.the_gateway.powered() || !GLOB.the_gateway.active)
+ return FALSE // The gateway
+ new /obj/effect/mob_spawn/swarmer(get_step(GLOB.the_gateway, SOUTH))
if(prob(25)) //25% chance to announce it to the crew
announce_swarmer()
From 2406a4714aa684ef68869047d6776ff8c36820df Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 17:27:05 -0400
Subject: [PATCH 16/43] added swarmer block for teleporting through gateways
---
code/datums/helper_datums/teleport.dm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 7df5b7f766e97..102f25127304d 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -349,3 +349,12 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/teleportation_wake)
visible_message("The portal bends inward, but [src] can't seem to pass through it!", "You can't seem to pass through the portal!")
return COMPONENT_BLOCK_TELEPORT
+
+/mob/living/simple_animal/hostile/swarmer/intercept_teleport(channel, turf/origin, turf/destination)
+ . = ..()
+
+ if(. == COMPONENT_BLOCK_TELEPORT || channel != TELEPORT_CHANNEL_GATEWAY)
+ return
+
+ visible_message("[src] stops just before entering the portal.", "Going back the way you came would not be productive. Aborting.")
+ return COMPONENT_BLOCK_TELEPORT
From 846ab505dccec6a809ef92755a3b2c0cd98e3052 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 17:35:09 -0400
Subject: [PATCH 17/43] Okay run that back
---
code/modules/awaymissions/gateway.dm | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index dd95bf7784deb..87af8a588c065 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -84,7 +84,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
say_cooldown("Destination gateway not active.")
return FALSE
- return TRUE
+ return check_teleport(AM, dest_turf, channel = TELEPORT_CHANNEL_GATEWAY)
/obj/machinery/gateway/proc/check_parts()
. = TRUE
@@ -118,12 +118,6 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
if(!pre_check_teleport(AM, dest_turf))
return // Gateway off/broken
- if(!check_teleport(AM, dest_turf, channel = TELEPORT_CHANNEL_GATEWAY))
- AM.visible_message( \
- "[AM] can't seem to go through [src]...", \
- "You can't seem to force your way through [src]...")
- return
-
if(ismob(AM))
var/mob/M = AM
M.visible_message( \
From 72b2a4ed7b5bac0a93b45b3a3bab04da39c4c655 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 17:44:29 -0400
Subject: [PATCH 18/43] added a sanity check
---
code/modules/awaymissions/gateway.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 87af8a588c065..298bb7f73292d 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -49,6 +49,8 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
if(isnull(linked_gateway))
return
+ if(AM.anchored)
+ return
var/turf/dest_turf = get_step(get_turf(linked_gateway), SOUTH)
if(!pre_check_teleport(AM, dest_turf))
From 1f790670bb928d38930a8394918ab71b219833f3 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 18:20:47 -0400
Subject: [PATCH 19/43] Let's make sure we aren't spamming do_afters
---
code/modules/awaymissions/gateway.dm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 298bb7f73292d..eeffb410eb8fd 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -59,6 +59,9 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
if(ismob(AM))
var/mob/M = AM
+ if(src in M.do_afters)
+ return // Don't enter if we're already trying to enter
+
user.visible_message(\
"[user] tries to shove [M] into [src]...",\
"You try to shove [M] into [src]...",
@@ -122,6 +125,9 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
if(ismob(AM))
var/mob/M = AM
+ if(src in M.do_afters)
+ return // Don't enter if we're already trying to enter
+
M.visible_message( \
"[AM] tries to climb into [src]...", \
"You begin climbing into [src]...")
From f69903f09f83ce6aff430299af13724a37d4eaf7 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 19:32:34 -0400
Subject: [PATCH 20/43] Added feedback
---
code/modules/awaymissions/gateway.dm | 59 +++++++++++++++++++++-------
1 file changed, 44 insertions(+), 15 deletions(-)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index eeffb410eb8fd..51dac967f7b1d 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -34,6 +34,19 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
linked_gateway = null
return ..()
+/obj/machinery/gateway/examine(mob/user)
+ . = ..()
+
+ if(!centerpiece)
+ . += "It appears to be a part of an overall structure."
+ return
+
+ . += "It appears to be [active ? (istype(linked_gateway) ? "on, and connected to a destination" : "on, and not linked") : "off"]."
+
+ if(active)
+ . += ""
+ . += "Use a multi-tool to turn it off."
+
/obj/machinery/gateway/Bumped(atom/movable/AM)
if(!centerpiece)
return
@@ -138,7 +151,6 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
actually_teleport(AM, dest_turf)
-
/obj/machinery/gateway/proc/actually_teleport(atom/movable/AM, turf/dest_turf)
if(do_teleport(AM, dest_turf, no_effects = TRUE, channel = TELEPORT_CHANNEL_GATEWAY, ignore_check_teleport = TRUE)) // We've already done the check_teleport() hopefully
AM.visible_message("[AM] passes through [linked_gateway]!", "You pass through.")
@@ -147,25 +159,39 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
/obj/machinery/gateway/update_icon()
icon_state = active ? "on" : "off"
-/obj/machinery/gateway/interact(mob/user)
- if(!centerpiece)
- return
-
- if(!check_parts())
- to_chat(user, "It seems incomplete...")
- return
-
+// Try to turn it on
+/obj/machinery/gateway/attack_hand(mob/living/user)
+ if(!active && toggleon(user))
+ user.visible_message("[user] switches [src] on.", "You switch [src] on.")
+ return TRUE
if(active)
- toggleoff(telegraph = TRUE)
- to_chat(user, "You turn [src] off.")
- else
- if(toggleon(user))
- to_chat(user, "You turn [src] on.")
+ to_chat(user, "You need a multitool to turn it on!")
+ return TRUE
+ return ..()
- . = ..()
+// Silicons can turn it on and off however they please
+/obj/machinery/gateway/attack_silicon(mob/user)
+ if(active ? toggleoff(telegraph = TRUE) : toggleon(user))
+ to_chat(user, "You turn send a [active ? "startup" : "shutdown"] signal to [src].")
+ visible_message("[src] turns on.", ignored_mobs = list(user))
+ return TRUE
+ return ..()
+
+// Otherwise, you need a multitool to turn it off
+/obj/machinery/gateway/multitool_act(mob/living/user, obj/item/I)
+ if(active && toggleoff(telegraph = TRUE))
+ user.visible_message("[user] switches [src] off.", "You switch [src] off.")
+ return TRUE
+ else if(!active)
+ to_chat(user, "Its already on!")
+ return TRUE
+ return ..()
/obj/machinery/gateway/proc/toggleon(mob/user)
if(!centerpiece)
+ return FALSE
+ if(!check_parts())
+ to_chat(user, "It seems incomplete...")
return
if(!powered())
to_chat(user, "It has no power!")
@@ -182,6 +208,8 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
return TRUE
/obj/machinery/gateway/proc/toggleoff(telegraph = FALSE)
+ if(!active)
+ return FALSE
for(var/obj/machinery/gateway/G in adjacent_parts)
G.active = FALSE
G.update_icon()
@@ -189,6 +217,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
update_icon()
if(telegraph)
playsound(src, 'sound/machines/terminal_off.ogg', 50, 0)
+ return TRUE
/obj/machinery/gateway/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG)
return
From 732814355ad05db774751944fbcdd39945b8e1d1 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 20:00:25 -0400
Subject: [PATCH 21/43] removed some rwalls
---
_maps/map_files/Mining/Lavaland.dmm | 48 ++++++++++++++---------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index b2de560f3a476..0d51471d7e2c0 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -371,8 +371,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
},
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron,
/area/mine/gateway)
"dl" = (
/obj/machinery/atmospherics/pipe/simple/general/hidden{
@@ -1046,6 +1045,8 @@
icon_state = "0-4"
},
/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/mine/gateway)
"ht" = (
@@ -1829,9 +1830,6 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/mine/laborcamp/security)
-"mU" = (
-/turf/closed/wall/r_wall,
-/area/mine/gateway)
"mW" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating/lavaland,
@@ -2088,6 +2086,8 @@
/obj/structure/closet/crate{
opened = 1
},
+/obj/item/toy/plush/moth/bluespace,
+/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/mine/gateway)
"pj" = (
@@ -2267,6 +2267,7 @@
/area/mine/science)
"qn" = (
/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/mine/gateway)
"qs" = (
@@ -2326,10 +2327,6 @@
},
/turf/open/floor/iron,
/area/mine/laborcamp/security)
-"qW" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/mine/gateway)
"qZ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -2441,6 +2438,7 @@
/area/mine/science)
"rU" = (
/obj/structure/reagent_dispensers/watertank,
+/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/mine/gateway)
"rW" = (
@@ -2570,7 +2568,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plating,
+/turf/open/floor/iron/techmaint,
/area/mine/gateway)
"ta" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -3488,7 +3486,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plating,
+/turf/open/floor/iron/techmaint,
/area/mine/gateway)
"zD" = (
/obj/structure/table,
@@ -3938,8 +3936,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron,
/area/mine/gateway)
"De" = (
/obj/structure/stone_tile/block{
@@ -4820,6 +4817,7 @@
/area/mine/eva)
"Jc" = (
/obj/machinery/space_heater,
+/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/mine/gateway)
"Jf" = (
@@ -5995,6 +5993,8 @@
/obj/machinery/light/small{
dir = 1
},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/mine/gateway)
"Sf" = (
@@ -35442,8 +35442,8 @@ RR
RR
RR
xT
-xT
-mU
+RR
+To
rU
Jc
Xj
@@ -35700,7 +35700,7 @@ RR
RR
RR
RR
-mU
+To
Sd
qn
Xj
@@ -35957,7 +35957,7 @@ RR
RR
RR
RR
-mU
+To
ho
pg
Xj
@@ -36210,13 +36210,13 @@ RR
RR
RR
RR
-mU
-mU
-mU
-mU
-mU
+To
+To
+To
+To
+To
sU
-mU
+To
Xj
GI
Wt
@@ -37243,7 +37243,7 @@ xg
OF
AM
tf
-qW
+WM
wD
ri
CF
From 4f54680f871cc750da7280b1e8a2f43bf55b57ac Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Wed, 25 Sep 2024 20:33:27 -0400
Subject: [PATCH 22/43] d
---
_maps/map_files/Mining/Lavaland.dmm | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 0d51471d7e2c0..37401c756edcd 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -2083,9 +2083,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"pg" = (
-/obj/structure/closet/crate{
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/item/toy/plush/moth/bluespace,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
From c417482fb636f9bbf367b65a8ac4d18ef06c1f10 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:14:25 -0400
Subject: [PATCH 23/43] preform the update paths
---
_maps/Prefab/Departments.dmm | 5 +-
_maps/RandomRuins/SpaceRuins/deepstorage.dmm | 7 +-
_maps/RandomZLevels/moonoutpost19.dmm | 49 +-
_maps/RandomZLevels/undergroundoutpost45.dmm | 71 +-
_maps/RuinGeneration/13x13_ai-lab.dmm | 3 +-
_maps/RuinGeneration/21x29_solars.dmm | 2 +-
_maps/RuinGeneration/9x9_chemlab.dmm | 2 +-
_maps/map_files/BoxStation/BoxStation.dmm | 601 ++++--------
_maps/map_files/CorgStation/CorgStation.dmm | 545 +++++------
.../map_files/Deltastation/DeltaStation2.dmm | 413 +++------
_maps/map_files/EchoStation/EchoStation.dmm | 503 +++-------
_maps/map_files/FlandStation/FlandStation.dmm | 874 +++++++-----------
_maps/map_files/KiloStation/KiloStation.dmm | 467 +++-------
_maps/map_files/MetaStation/MetaStation.dmm | 420 +++------
_maps/map_files/Mining/Lavaland.dmm | 60 +-
_maps/map_files/RadStation/RadStation.dmm | 849 ++++++-----------
_maps/map_files/debug/runtimestation.dmm | 14 +-
_maps/map_files/generic/CentCom.dmm | 7 +-
_maps/shuttles/aux_base/aux_base_default.dmm | 4 +-
_maps/shuttles/aux_base/aux_base_small.dmm | 4 +-
_maps/shuttles/emergency/emergency_tiny.dmm | 19 +-
.../shuttles/exploration/exploration_corg.dmm | 5 +-
.../shuttles/exploration/exploration_rad.dmm | 4 +-
.../exploration/exploration_shuttle.dmm | 2 +-
_maps/shuttles/mining/mining_rad.dmm | 4 +-
_maps/shuttles/mining/mining_tiny.dmm | 4 +-
.../ruin/ruin_syndicate_fighter_shiv.dmm | 6 +-
27 files changed, 1673 insertions(+), 3271 deletions(-)
diff --git a/_maps/Prefab/Departments.dmm b/_maps/Prefab/Departments.dmm
index 3e9a90dbd494d..b5ad8aca2bdf2 100644
--- a/_maps/Prefab/Departments.dmm
+++ b/_maps/Prefab/Departments.dmm
@@ -884,9 +884,8 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","rd")
+/obj/machinery/camera{
+ dir = 10
},
/turf/open/floor/iron,
/area/space)
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index fa7c6ddc117f9..05e2a42452989 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -1965,10 +1965,8 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
+/obj/machinery/computer/security/telescreen/bunker{
dir = 1;
- name = "Bunker Entrance monitor";
- network = list("bunker1");
pixel_y = 2
},
/obj/effect/decal/cleanable/dirt,
@@ -2508,8 +2506,7 @@
/area/ruin/space/has_grav/deepstorage)
"fU" = (
/obj/machinery/camera/directional/north{
- c_tag = "Bunker entrance";
- network = list("bunker1")
+ c_tag = "Bunker entrance"
},
/obj/structure/sign/warning/securearea{
pixel_y = 32
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 5bd88a65d007a..09bddf71327c3 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -1408,8 +1408,7 @@
/obj/structure/alien/weeds,
/obj/structure/alien/egg/burst,
/obj/machinery/camera/directional/north{
- c_tag = "Xenobiology Containment North";
- network = list("mo19x")
+ c_tag = "Xenobiology Containment North"
},
/turf/open/floor/engine,
/area/awaymission/moonoutpost19/research)
@@ -1462,12 +1461,6 @@
"ey" = (
/obj/structure/table/reinforced,
/obj/structure/alien/weeds,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the contents of the xenobiology containment pen.";
- dir = 8;
- name = "xenobiology monitor";
- network = list("mo19x")
- },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -1522,8 +1515,7 @@
dir = 8
},
/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology";
- network = list("mo19","mo19r")
+ c_tag = "Xenobiology"
},
/turf/open/floor/iron/white/side{
dir = 6
@@ -1967,8 +1959,7 @@
},
/obj/structure/alien/weeds,
/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Containment East";
- network = list("mo19x")
+ c_tag = "Xenobiology Containment East"
},
/turf/open/floor/engine,
/area/awaymission/moonoutpost19/research)
@@ -2442,8 +2433,7 @@
/obj/machinery/light/broken,
/obj/structure/alien/weeds,
/obj/machinery/camera/directional/south{
- c_tag = "Xenobiology Containment South";
- network = list("mo19x")
+ c_tag = "Xenobiology Containment South"
},
/turf/open/floor/engine,
/area/awaymission/moonoutpost19/research)
@@ -2653,8 +2643,7 @@
/obj/machinery/light/small/broken,
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/evacuation,
/obj/machinery/camera/directional/south{
- c_tag = "Research Division";
- network = list("mo19","mo19r")
+ c_tag = "Research Division"
},
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -2804,11 +2793,6 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring the research division and the labs within.";
- name = "research monitor";
- network = list("mo19x","mo19r")
- },
/turf/open/floor/iron/cafeteria{
dir = 5
},
@@ -3067,8 +3051,7 @@
},
/obj/machinery/light/small/broken,
/obj/machinery/camera/directional/south{
- c_tag = "Research Director's Office";
- network = list("mo19","mo19r")
+ c_tag = "Research Director's Office"
},
/turf/open/floor/iron/cafeteria{
dir = 5
@@ -3703,8 +3686,7 @@
pixel_y = -32
},
/obj/machinery/camera/directional/south{
- c_tag = "Arrivals North";
- network = list("mo19")
+ c_tag = "Arrivals North"
},
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -3874,8 +3856,7 @@
pixel_x = 26
},
/obj/machinery/camera/directional/east{
- c_tag = "Kitchen";
- network = list("mo19")
+ c_tag = "Kitchen"
},
/turf/open/floor/iron/cafeteria{
dir = 5
@@ -4435,8 +4416,7 @@
},
/obj/item/paper/fluff/awaymissions/moonoutpost19/welcome,
/obj/machinery/camera/directional/east{
- c_tag = "Arrivals South";
- network = list("mo19")
+ c_tag = "Arrivals South"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -4645,8 +4625,7 @@
icon_state = "ltrails_2"
},
/obj/machinery/camera/directional/west{
- c_tag = "Dormitories";
- network = list("mo19")
+ c_tag = "Dormitories"
},
/turf/open/floor/iron{
dir = 8;
@@ -5025,11 +5004,6 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/machinery/computer/security{
- desc = "Used to access the various cameras on the outpost.";
- dir = 4;
- network = list("mo19r","mo19")
- },
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
@@ -5042,8 +5016,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/east{
- c_tag = "Bar";
- network = list("mo19")
+ c_tag = "Bar"
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index b26caee9bb1a2..5f8dcf90caac5 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -99,8 +99,7 @@
/area/awaymission/undergroundoutpost45/central)
"aw" = (
/obj/machinery/camera/directional/east{
- c_tag = "Bar";
- network = list("uo45")
+ c_tag = "Bar"
},
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -1382,8 +1381,7 @@
pixel_y = -24
},
/obj/machinery/camera/directional/south{
- c_tag = "Central Hallway";
- network = list("uo45")
+ c_tag = "Central Hallway"
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
@@ -1708,8 +1706,7 @@
dir = 1
},
/obj/machinery/camera/directional/north{
- c_tag = "Research Lab";
- network = list("uo45","uo45r")
+ c_tag = "Research Lab"
},
/turf/open/floor/iron/white,
/area/awaymission/undergroundoutpost45/research)
@@ -1819,8 +1816,7 @@
pixel_x = 23
},
/obj/machinery/camera/directional/east{
- c_tag = "Kitchen";
- network = list("uo45")
+ c_tag = "Kitchen"
},
/obj/structure/table,
/obj/machinery/microwave{
@@ -2353,8 +2349,7 @@
pixel_x = -23
},
/obj/machinery/camera/directional/west{
- c_tag = "Gateway Chamber";
- network = list("uo45","uo45r")
+ c_tag = "Gateway Chamber"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -3079,8 +3074,7 @@
dir = 4
},
/obj/machinery/camera/directional/north{
- c_tag = "Gateway Ready Room";
- network = list("uo45","uo45r")
+ c_tag = "Gateway Ready Room"
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/gateway)
@@ -3163,8 +3157,7 @@
dir = 4
},
/obj/machinery/camera/directional/south{
- c_tag = "Research Division West";
- network = list("uo45","uo45r")
+ c_tag = "Research Division West"
},
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron/white,
@@ -3316,8 +3309,7 @@
pixel_y = -24
},
/obj/machinery/camera/directional/south{
- c_tag = "Research Division East";
- network = list("uo45","uo45r")
+ c_tag = "Research Division East"
},
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron/white,
@@ -3381,8 +3373,7 @@
dir = 1
},
/obj/machinery/camera/directional/north{
- c_tag = "Engineering Secure Storage";
- network = list("uo45")
+ c_tag = "Engineering Secure Storage"
},
/turf/open/floor/plating,
/area/awaymission/undergroundoutpost45/engineering)
@@ -4066,11 +4057,6 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring the research division and the labs within.";
- name = "research monitor";
- network = list("uo45r")
- },
/turf/open/floor/iron/cafeteria{
dir = 5
},
@@ -4137,8 +4123,7 @@
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/camera/directional/north{
- c_tag = "Dormitories";
- network = list("uo45")
+ c_tag = "Dormitories"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -5154,8 +5139,7 @@
dir = 10
},
/obj/machinery/camera/directional/north{
- c_tag = "Atmospherics";
- network = list("uo45")
+ c_tag = "Atmospherics"
},
/obj/structure/table,
/obj/item/clothing/gloves/color/yellow,
@@ -5540,8 +5524,7 @@
dir = 8
},
/obj/machinery/camera/directional/west{
- c_tag = "Engineering Hallway";
- network = list("uo45")
+ c_tag = "Engineering Hallway"
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
@@ -7103,8 +7086,7 @@
},
/obj/machinery/vending/engivend,
/obj/machinery/camera/directional/south{
- c_tag = "Engineering Foyer";
- network = list("uo45")
+ c_tag = "Engineering Foyer"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -7576,8 +7558,7 @@
dir = 8
},
/obj/machinery/camera/directional/west{
- c_tag = "Mining";
- network = list("uo45")
+ c_tag = "Mining"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -8273,10 +8254,6 @@
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
"BR" = (
-/obj/machinery/computer/security{
- dir = 1;
- network = list("uo45")
- },
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
@@ -8404,12 +8381,6 @@
/area/awaymission/undergroundoutpost45/research)
"DX" = (
/obj/structure/table,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring the research division and the labs within.";
- dir = 8;
- name = "research monitor";
- network = list("uo45r")
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
@@ -8723,10 +8694,6 @@
},
/area/awaymission/undergroundoutpost45/central)
"GO" = (
-/obj/machinery/computer/security{
- dir = 1;
- network = list("uo45")
- },
/obj/machinery/button/door{
desc = "A remote control-switch for the security Privacy Shutters.";
id = "UO45_EngineeringOffice";
@@ -9042,10 +9009,6 @@
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
"Kr" = (
-/obj/machinery/computer/security{
- dir = 4;
- network = list("uo45")
- },
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
@@ -9678,8 +9641,7 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"Rl" = (
/obj/machinery/camera/directional/south{
- c_tag = "Hydroponics";
- network = list("uo45")
+ c_tag = "Hydroponics"
},
/obj/machinery/power/apc/highcap/fifteen_k{
locked = 0;
@@ -10546,8 +10508,7 @@
"ZJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera/directional/east{
- c_tag = "Arrivals";
- network = list("uo45")
+ c_tag = "Arrivals"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
diff --git a/_maps/RuinGeneration/13x13_ai-lab.dmm b/_maps/RuinGeneration/13x13_ai-lab.dmm
index 5c318db19c6f9..c56d2437a73d3 100644
--- a/_maps/RuinGeneration/13x13_ai-lab.dmm
+++ b/_maps/RuinGeneration/13x13_ai-lab.dmm
@@ -273,8 +273,7 @@
/obj/effect/decal/cleanable/robot_debris/old,
/obj/machinery/camera{
c_tag = "Telecomms - Server Room - Aft-Port";
- dir = 6;
- network = list("ss13","tcomms")
+ dir = 6
},
/obj/effect/decal/cleanable/blood/tracks,
/obj/item/ammo_casing/c9mm{
diff --git a/_maps/RuinGeneration/21x29_solars.dmm b/_maps/RuinGeneration/21x29_solars.dmm
index 19ee7e2def8c2..239e2aff26b4b 100644
--- a/_maps/RuinGeneration/21x29_solars.dmm
+++ b/_maps/RuinGeneration/21x29_solars.dmm
@@ -205,7 +205,7 @@
icon_state = "0-8"
},
/obj/machinery/power/smes,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating,
/area/ruin/unpowered)
"N" = (
diff --git a/_maps/RuinGeneration/9x9_chemlab.dmm b/_maps/RuinGeneration/9x9_chemlab.dmm
index 83c0acb084bf9..413060bdf953f 100644
--- a/_maps/RuinGeneration/9x9_chemlab.dmm
+++ b/_maps/RuinGeneration/9x9_chemlab.dmm
@@ -206,7 +206,7 @@
/turf/open/floor/iron/white,
/area/ruin)
"FI" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/structure/rack,
/obj/item/storage/box/beakers,
/obj/item/storage/box/medsprays,
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 50976171ae4b6..1d23296d10774 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -204,7 +204,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/science/mixing/chamber)
"acO" = (
@@ -653,7 +653,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"ahS" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/bridge)
@@ -1117,7 +1117,7 @@
dir = 1
},
/obj/machinery/telecomms/server/presets/exploration,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/circuit/telecomms/server,
/area/quartermaster/exploration_dock)
"aoU" = (
@@ -1228,7 +1228,7 @@
/area/hallway/secondary/entry)
"arE" = (
/obj/machinery/airalarm/directional/east,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hydroponics/garden)
"arM" = (
@@ -2025,13 +2025,6 @@
},
/turf/open/floor/circuit,
/area/ai_monitored/nuke_storage)
-"aBW" = (
-/obj/structure/lattice,
-/obj/machinery/camera/autoname/directional/west{
- network = list("minisat")
- },
-/turf/open/space,
-/area/space/nearstation)
"aBZ" = (
/obj/structure/closet/crate,
/obj/effect/decal/cleanable/dirt,
@@ -2081,9 +2074,7 @@
/area/maintenance/central)
"aCI" = (
/obj/machinery/computer/security/mining,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/quartermaster/miningdock)
"aCJ" = (
@@ -4161,9 +4152,7 @@
/turf/closed/wall,
/area/crew_quarters/toilet/locker)
"aXX" = (
-/obj/machinery/camera/directional/north{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/north,
/turf/open/space,
/area/space/nearstation)
"aYe" = (
@@ -5014,9 +5003,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/structure/table/wood/fancy,
/obj/item/soulstone/anybody/chaplain,
/obj/item/organ/heart,
@@ -6374,9 +6361,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
@@ -7413,9 +7398,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
@@ -7806,9 +7789,7 @@
/turf/open/floor/iron,
/area/science/xenobiology)
"bKY" = (
-/obj/machinery/computer/security/telescreen{
- name = "Test Chamber Monitor";
- network = list("xeno");
+/obj/machinery/computer/security/telescreen/research{
pixel_y = 2
},
/obj/structure/table/reinforced,
@@ -7962,7 +7943,7 @@
name = "Air Outlet Pump";
target_pressure = 500
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
@@ -7995,9 +7976,7 @@
/obj/item/clothing/gloves/color/black,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/light{
dir = 8
},
@@ -9227,9 +9206,7 @@
/obj/structure/cable/yellow{
icon_state = "0-2"
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13, prison")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron/techmaint,
/area/security/prison/shielded)
@@ -10744,7 +10721,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -13438,7 +13415,7 @@
pixel_x = 6;
pixel_y = -25
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 8
},
@@ -13586,9 +13563,7 @@
/obj/structure/sign/poster/official/do_not_question{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/security/brig)
"cyQ" = (
@@ -13791,9 +13766,7 @@
/area/quartermaster/warehouse)
"cAE" = (
/obj/structure/table,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/engine/engineering)
"cAF" = (
@@ -15273,9 +15246,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/structure/disposalpipe/junction/flip{
dir = 2
},
@@ -15316,9 +15287,7 @@
/area/security/prison)
"cMg" = (
/obj/structure/lattice,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","minisat")
- },
+/obj/machinery/camera/directional/west,
/turf/open/space,
/area/space/nearstation)
"cMm" = (
@@ -15390,7 +15359,7 @@
"cNz" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/quartermaster/miningdock)
"cNG" = (
@@ -15452,7 +15421,7 @@
/obj/item/radio/intercom{
pixel_y = -28
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/storage/tech)
"cOI" = (
@@ -15991,7 +15960,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/aft)
"cZF" = (
@@ -16085,14 +16054,12 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 1
},
-/obj/machinery/camera/directional/north{
- network = list("ss13, security, prison")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/security/courtroom)
"dcD" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -16102,8 +16069,7 @@
/area/bridge)
"dcL" = (
/obj/machinery/camera/directional/north{
- c_tag = "MiniSat AI Chamber South";
- network = list("aicore")
+ c_tag = "MiniSat AI Chamber South"
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
@@ -16292,7 +16258,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/white/corner{
dir = 1
},
@@ -16644,8 +16610,7 @@
/obj/item/key/security,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/machinery/camera/motion/directional/south{
- c_tag = "Armory - External";
- network = list("ss13","security")
+ c_tag = "Armory - External"
},
/turf/open/floor/iron/dark,
/area/ai_monitored/security/armory)
@@ -16721,7 +16686,7 @@
/obj/effect/turf_decal/tile/purple{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/white,
/area/science/lab)
"dpE" = (
@@ -16963,11 +16928,8 @@
name = "AI Upload turret control";
pixel_y = 28
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the AI Upload.";
+/obj/machinery/computer/security/telescreen/aiupload{
dir = 4;
- name = "AI Upload Monitor";
- network = list("aiupload");
pixel_x = -29
},
/obj/item/radio/intercom{
@@ -17468,7 +17430,7 @@
/turf/open/floor/carpet/green,
/area/crew_quarters/dorms)
"dFF" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/chapel/main)
"dGz" = (
@@ -17503,8 +17465,7 @@
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/lighter,
/obj/machinery/camera/directional/east{
- c_tag = "Detective's Office";
- network = list("ss13","security")
+ c_tag = "Detective's Office"
},
/obj/machinery/button/door{
id = "detective_shutters";
@@ -17636,7 +17597,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/crew_quarters/fitness)
"dIs" = (
@@ -18099,9 +18060,7 @@
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/hop)
"dQQ" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/chapel/main)
"dRx" = (
@@ -18311,9 +18270,7 @@
/area/vacant_room/office)
"dUO" = (
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/power/apc/highcap/fifteen_k{
areastring = "/area/engine/engineering";
dir = 1;
@@ -18428,7 +18385,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/freezer,
/area/medical/virology)
"dYh" = (
@@ -18602,8 +18559,6 @@
},
/obj/machinery/computer/security/telescreen{
dir = 8;
- name = "Station Monitor";
- network = list("ss13");
pixel_x = 24
},
/obj/machinery/light/small{
@@ -18689,9 +18644,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/security/main)
"ecV" = (
@@ -18985,7 +18938,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/medical/morgue)
"ehY" = (
@@ -19093,7 +19046,7 @@
/obj/machinery/computer/camera_advanced/base_construction{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/turf/open/floor/iron,
/area/construction/mining/aux_base)
@@ -20005,9 +19958,7 @@
/obj/item/folder/white,
/obj/item/pen,
/obj/item/clothing/neck/stethoscope,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/freezer,
/area/medical/virology)
"eDN" = (
@@ -21587,9 +21538,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/fore)
"fjl" = (
@@ -22308,7 +22257,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/white/corner{
dir = 1
},
@@ -22726,7 +22675,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"fIi" = (
@@ -22990,9 +22939,7 @@
pixel_y = 33
},
/obj/effect/landmark/prisonspawn,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13, prison")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/prison,
/area/security/prison)
"fPr" = (
@@ -23322,7 +23269,7 @@
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/chief)
"fUN" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/science/robotics/lab)
"fUO" = (
@@ -23405,9 +23352,7 @@
req_access_txt = "65"
},
/obj/machinery/light/small,
-/obj/machinery/camera/autoname/directional/south{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"fWD" = (
@@ -23813,9 +23758,7 @@
dir = 8
},
/obj/effect/turf_decal/stripes/closeup,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/techmaint,
/area/security/prison)
"gdO" = (
@@ -24077,7 +24020,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -27
},
-/obj/machinery/computer/security/telescreen/turbine{
+/obj/machinery/computer/security/telescreen/engine{
dir = 1;
pixel_y = -30
},
@@ -24181,7 +24124,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/medical/cryo)
"gmN" = (
@@ -24408,7 +24351,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/science/mixing)
"gqR" = (
@@ -24424,7 +24367,7 @@
/obj/machinery/power/apc/auto_name/directional/west{
pixel_x = -24
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/light_switch{
pixel_y = -26
},
@@ -25305,9 +25248,7 @@
},
/obj/machinery/firealarm/directional/east,
/obj/structure/closet/bombcloset/security,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/security/execution/transfer)
"gHJ" = (
@@ -25374,8 +25315,7 @@
pixel_y = -24
},
/obj/machinery/camera/motion/directional/south{
- c_tag = "MiniSat AI Chamber North";
- network = list("aicore")
+ c_tag = "MiniSat AI Chamber North"
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
@@ -25740,7 +25680,7 @@
icon_state = "0-8"
},
/obj/machinery/power/smes,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"gRA" = (
@@ -25764,9 +25704,7 @@
/turf/open/floor/wood,
/area/crew_quarters/bar/atrium)
"gSu" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/engine/engineering)
"gSK" = (
@@ -26083,9 +26021,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat/atmos)
"hbp" = (
@@ -26457,7 +26393,7 @@
/obj/machinery/computer/security/mining{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/obj/structure/reagent_dispensers/peppertank/directional/east,
/turf/open/floor/iron,
@@ -26603,9 +26539,7 @@
/area/security/brig)
"hnr" = (
/obj/machinery/telecomms/receiver/preset_left,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/circuit/telecomms,
/area/tcommsat/server)
"hnD" = (
@@ -26663,9 +26597,7 @@
name = "killroom vent";
pressure_checks = 0
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/circuit/telecomms,
/area/science/xenobiology)
"hoL" = (
@@ -26921,7 +26853,7 @@
/turf/open/floor/iron/white,
/area/medical/genetics/cloning)
"htB" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/wood,
/area/medical/break_room)
@@ -27060,9 +26992,7 @@
/turf/open/floor/prison/dark,
/area/security/prison)
"hwE" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/east,
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
name = "Prison Intercom (General)";
@@ -27187,9 +27117,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine,
/area/engine/supermatter)
"hzb" = (
@@ -27379,9 +27307,7 @@
/obj/structure/sign/departments/minsky/supply/cargo{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/brown{
dir = 8
},
@@ -27816,9 +27742,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/structure/cable,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
@@ -27845,9 +27769,7 @@
dir = 4
},
/obj/effect/landmark/start/scientist,
-/obj/machinery/computer/security/telescreen{
- name = "Test Chamber Monitor";
- network = list("test");
+/obj/machinery/computer/security/telescreen/research{
pixel_y = 32
},
/obj/machinery/light{
@@ -27882,7 +27804,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
@@ -28391,9 +28313,7 @@
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine,
/area/engine/engineering)
"hWq" = (
@@ -28538,7 +28458,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/science/mixing)
"hYi" = (
@@ -28635,9 +28555,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/computer/cargo{
@@ -28970,10 +28888,6 @@
},
/turf/open/floor/iron,
/area/storage/art)
-"ihb" = (
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron,
-/area/hallway/primary/starboard)
"ihc" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
@@ -29922,9 +29836,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -30
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/hallway/primary/fore)
"ixj" = (
@@ -30589,7 +30501,7 @@
/obj/structure/sign/departments/minsky/research/research{
pixel_x = 32
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/spawner/randomvend/cola,
/turf/open/floor/iron,
/area/maintenance/aft)
@@ -30635,7 +30547,7 @@
/obj/item/radio/intercom{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/prison,
/area/security/prison)
"iOO" = (
@@ -30709,9 +30621,7 @@
/turf/open/floor/iron/white,
/area/medical/surgery)
"iPN" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13, security")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/security/brig)
@@ -30842,7 +30752,7 @@
/turf/open/floor/wood,
/area/security/detectives_office)
"iRA" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/structure/sign/painting/library{
pixel_x = 32
},
@@ -31154,9 +31064,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/fore)
"iYT" = (
@@ -31251,9 +31159,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
@@ -31411,7 +31317,7 @@
/turf/open/floor/iron,
/area/quartermaster/storage)
"jfm" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/hallway/primary/central)
"jfw" = (
@@ -31719,7 +31625,7 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron/dark,
/area/science/server)
@@ -31833,7 +31739,7 @@
/obj/structure/sign/warning/deathsposal{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/medical/virology)
"jnC" = (
@@ -32064,7 +31970,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white/corner{
dir = 4
},
@@ -32277,7 +32183,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/crew_quarters/locker)
"jvW" = (
@@ -32613,7 +32519,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/white,
/area/medical/chemistry)
"jAQ" = (
@@ -32779,9 +32685,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/engine,
/area/engine/engineering)
"jFF" = (
@@ -33448,9 +33352,7 @@
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine,
/area/engine/engineering)
"jTo" = (
@@ -33673,7 +33575,7 @@
/obj/effect/turf_decal/tile/dark_blue{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/cmo)
"jXT" = (
@@ -33976,7 +33878,7 @@
/area/maintenance/starboard/fore)
"kdn" = (
/obj/effect/turf_decal/box/corners,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine,
/area/science/explab)
"kdx" = (
@@ -34133,7 +34035,7 @@
icon_state = "1-8"
},
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -34327,7 +34229,7 @@
/turf/open/floor/wood/big,
/area/crew_quarters/bar)
"kmK" = (
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 6
},
/turf/open/floor/carpet/green,
@@ -34501,9 +34403,7 @@
/turf/open/floor/engine/n2,
/area/engine/atmos)
"kph" = (
-/obj/machinery/camera/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine,
/area/science/explab)
"kpk" = (
@@ -35196,9 +35096,7 @@
dir = 1;
pixel_y = -26
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/engine,
/area/engine/engineering)
"kCf" = (
@@ -35394,7 +35292,7 @@
/area/science/nanite)
"kFE" = (
/obj/effect/turf_decal/tile/blue,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"kFU" = (
@@ -35465,7 +35363,7 @@
/obj/item/stack/sheet/iron/fifty,
/obj/item/stack/sheet/iron/fifty,
/obj/item/storage/box/lights/mixed,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/storage/tools)
"kGV" = (
@@ -35707,9 +35605,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat/service)
"kJV" = (
@@ -36215,8 +36111,7 @@
/area/medical/medbay/lobby)
"kTk" = (
/obj/machinery/camera/motion/directional/south{
- c_tag = "AI Upload Chamber - External";
- network = list("aiupload")
+ c_tag = "AI Upload Chamber - External"
},
/turf/open/space/basic,
/area/space)
@@ -36552,7 +36447,7 @@
/area/crew_quarters/dorms)
"laO" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/light{
dir = 4
},
@@ -36591,7 +36486,7 @@
/area/medical/virology)
"lbz" = (
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
"lbA" = (
@@ -38275,9 +38170,7 @@
/obj/item/clothing/mask/balaclava,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
-/obj/machinery/camera/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/reagent_dispensers/peppertank/directional/west,
/turf/open/floor/iron/dark,
/area/security/main)
@@ -38749,9 +38642,7 @@
/obj/machinery/atmospherics/components/binary/pump{
name = "Port to Filter"
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/engine/atmos)
"lZR" = (
@@ -38854,9 +38745,7 @@
},
/obj/item/storage/box/deputy,
/obj/item/toy/figure/hos,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
"mcV" = (
@@ -39237,7 +39126,7 @@
dir = 4
},
/obj/structure/cable/yellow,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/power/apc/auto_name/directional/east,
/turf/open/floor/iron,
/area/science/mixing/chamber)
@@ -39330,7 +39219,7 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/hallway/primary/central)
"mnn" = (
@@ -39890,7 +39779,7 @@
pixel_x = 24
},
/obj/structure/cable/yellow,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
"mBL" = (
@@ -39905,8 +39794,7 @@
/area/security/checkpoint/science)
"mCb" = (
/obj/machinery/camera/directional/north{
- c_tag = "Warden's Office";
- network = list("ss13, security")
+ c_tag = "Warden's Office"
},
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical{
@@ -40219,9 +40107,7 @@
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/prison,
/area/security/prison)
"mJF" = (
@@ -40287,9 +40173,7 @@
/obj/machinery/light_switch{
pixel_y = 28
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/white,
/area/science/explab)
"mLr" = (
@@ -40382,8 +40266,7 @@
pixel_y = 32
},
/obj/machinery/camera/directional/north{
- c_tag = "AI Upload Chamber - Fore";
- network = list("aiupload")
+ c_tag = "AI Upload Chamber - Fore"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
@@ -40899,7 +40782,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/medical/virology)
"mYR" = (
@@ -41024,7 +40907,7 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"naP" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
dir = 8
@@ -41032,7 +40915,7 @@
/turf/open/floor/iron,
/area/tcommsat/computer)
"naR" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/railing/corner{
dir = 1
},
@@ -41862,9 +41745,7 @@
dir = 4
},
/obj/machinery/airalarm/directional/east,
-/obj/machinery/camera/motion/directional/east{
- network = list("aiupload")
- },
+/obj/machinery/camera/motion/directional/east,
/obj/item/kirbyplants/photosynthetic,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
@@ -43150,7 +43031,7 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"nTf" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/iron/dark,
/area/engine/gravity_generator)
@@ -43197,9 +43078,7 @@
icon_state = "4-8"
},
/obj/machinery/firealarm/directional/south,
-/obj/machinery/camera/motion/directional/south{
- network = list("aiupload")
- },
+/obj/machinery/camera/motion/directional/south,
/turf/open/floor/iron/grid/steel,
/area/ai_monitored/turret_protected/ai_upload)
"nTL" = (
@@ -43399,7 +43278,7 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/hydroponics)
"nXF" = (
@@ -43556,7 +43435,7 @@
dir = 2
},
/obj/machinery/firealarm/directional/north,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/structure/sign/departments/minsky/security/security{
pixel_y = 32
},
@@ -43842,7 +43721,7 @@
/turf/open/floor/iron/cafeteria_red,
/area/crew_quarters/bar)
"ohc" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
@@ -44101,10 +43980,7 @@
/turf/open/floor/iron,
/area/hallway/primary/fore)
"ooM" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_x = 32
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -44226,9 +44102,7 @@
pixel_x = -12;
pixel_y = 2
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/science/xenobiology)
"orQ" = (
@@ -44532,7 +44406,7 @@
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
"oxu" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/secondary/entry)
"oyc" = (
@@ -45279,7 +45153,7 @@
/obj/machinery/status_display/evac{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/hallway/secondary/command)
"oRK" = (
@@ -45314,7 +45188,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/medical/chemistry)
"oSc" = (
@@ -45378,9 +45252,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark/side{
dir = 8
},
@@ -45714,7 +45586,7 @@
/obj/structure/rack,
/obj/item/wrench,
/obj/item/screwdriver,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/brown/opposingcorners{
dir = 1
},
@@ -45945,7 +45817,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -26
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -45958,9 +45830,7 @@
pixel_y = -22
},
/obj/machinery/light/small,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13, security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/courtroom)
"phr" = (
@@ -46521,13 +46391,6 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
-"prn" = (
-/obj/structure/lattice,
-/obj/machinery/camera/autoname/directional/east{
- network = list("minisat")
- },
-/turf/open/space,
-/area/space/nearstation)
"prs" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -46628,7 +46491,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/techfloorgrid{
dir = 6
},
@@ -46663,7 +46526,7 @@
/obj/machinery/recharger{
pixel_y = 2
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"puf" = (
@@ -46853,7 +46716,7 @@
/area/maintenance/starboard/fore)
"pxR" = (
/obj/item/storage/firstaid/regular,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/structure/table,
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
@@ -47241,9 +47104,7 @@
dir = 8
},
/obj/machinery/vending/wardrobe/sec_wardrobe,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
@@ -47272,9 +47133,7 @@
pixel_x = -30
},
/obj/machinery/rnd/production/techfab/department/cargo,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/quartermaster/office)
"pEC" = (
@@ -47648,9 +47507,7 @@
/turf/open/floor/iron/grid,
/area/medical/patients_rooms)
"pLw" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13, security")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
@@ -48013,7 +47870,7 @@
/obj/machinery/light_switch{
pixel_x = 27
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"pTk" = (
@@ -48477,10 +48334,6 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
-"qgK" = (
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"qgO" = (
/obj/effect/turf_decal/pool,
/turf/open/floor/iron,
@@ -49111,7 +48964,7 @@
"qvA" = (
/obj/structure/bed/roller,
/obj/machinery/airalarm/directional/south,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/medical/virology)
"qvO" = (
@@ -49593,9 +49446,7 @@
"qEO" = (
/obj/machinery/computer/nanite_cloud_controller,
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/science/nanite)
"qET" = (
@@ -49820,9 +49671,7 @@
/obj/machinery/status_display/evac{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/dark_blue{
dir = 8
},
@@ -49845,9 +49694,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/reagent_dispensers/peppertank/directional/south,
/turf/open/floor/iron/dark,
/area/security/brig)
@@ -49977,7 +49824,7 @@
/obj/item/radio/intercom{
pixel_y = -29
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/item/book/manual/wiki/sopcommand,
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/heads/hor)
@@ -50014,16 +49861,14 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/medical/genetics/cloning)
"qMv" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13, security")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/light,
/obj/structure/disposalpipe/segment{
dir = 8
@@ -50724,9 +50569,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13, prison")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/arrows{
dir = 1
},
@@ -51223,8 +51066,7 @@
/area/quartermaster/office)
"rkd" = (
/obj/machinery/camera/motion/directional/west{
- c_tag = "MiniSat Core Hallway";
- network = list("aicore")
+ c_tag = "MiniSat Core Hallway"
},
/obj/machinery/firealarm{
dir = 4;
@@ -52123,7 +51965,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/white,
/area/medical/apothecary)
@@ -52845,9 +52687,7 @@
/obj/effect/landmark/secequipment,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/main)
"rOk" = (
@@ -53108,7 +52948,7 @@
/obj/item/storage/toolbox/mechanical,
/obj/item/crowbar/large,
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/science/robotics/mechbay)
"rSr" = (
@@ -53174,7 +53014,7 @@
dir = 1
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/science/xenobiology)
@@ -53184,9 +53024,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"rUj" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
@@ -53636,11 +53474,11 @@
/area/ai_monitored/turret_protected/aisat_interior)
"sdt" = (
/obj/machinery/light/small,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"sdu" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Captain's Quarters"
},
/obj/structure/table/wood,
@@ -53785,7 +53623,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/white,
/area/medical/virology)
"siD" = (
@@ -53892,8 +53730,7 @@
/obj/structure/closet/radiation,
/obj/effect/turf_decal/bot,
/obj/machinery/camera/directional/north{
- c_tag = "Incinerator";
- network = list("ss13","turbine")
+ c_tag = "Incinerator"
},
/turf/open/floor/iron/dark/textured_large,
/area/maintenance/disposal/incinerator)
@@ -53928,9 +53765,7 @@
req_access = null;
req_access_txt = "65"
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -54961,7 +54796,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -55101,7 +54936,7 @@
/obj/structure/chair/fancy/sofa/old/right{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/siding/thinplating_new{
dir = 4
},
@@ -55271,9 +55106,7 @@
/obj/machinery/computer/security/qm{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
dir = 8
},
@@ -56075,13 +55908,6 @@
},
/turf/open/floor/wood/big,
/area/maintenance/aft)
-"taz" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron,
-/area/hallway/primary/port)
"taJ" = (
/obj/machinery/light,
/obj/structure/table,
@@ -57038,7 +56864,7 @@
/area/security/execution/transfer)
"ttR" = (
/obj/machinery/door/firedoor,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/hallway/primary/central)
"tud" = (
@@ -57113,7 +56939,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/catwalk_floor/iron,
/area/engine/atmos)
"tuB" = (
@@ -57277,7 +57103,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
@@ -57582,7 +57408,7 @@
/turf/open/floor/iron/white,
/area/medical/virology)
"tCY" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -57950,9 +57776,7 @@
/obj/machinery/computer/card/minor/ce{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/chief)
@@ -58877,9 +58701,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
@@ -58985,7 +58807,7 @@
dir = 1;
pixel_y = -27
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/engine/break_room)
"ufk" = (
@@ -59073,7 +58895,7 @@
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/blue,
/obj/machinery/airalarm/directional/west,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/medical/storage)
"ugK" = (
@@ -59281,9 +59103,7 @@
name = "Solitary confinement timer";
pixel_y = 32
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/tech,
/area/security/prison/shielded)
"umF" = (
@@ -59669,9 +59489,7 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"usI" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/turf/open/floor/iron/dark/side{
dir = 8
@@ -60085,7 +59903,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -60346,7 +60164,7 @@
dir = 5
},
/obj/structure/bed/dogbed/vector,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/medical/virology)
"uLx" = (
@@ -60558,9 +60376,7 @@
/area/crew_quarters/bar/atrium)
"uRa" = (
/obj/machinery/light/small,
-/obj/machinery/camera/autoname/directional/south{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
@@ -61277,9 +61093,7 @@
/area/maintenance/fore/secondary)
"vhZ" = (
/obj/effect/turf_decal/tile/red/half/contrasted,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13, security")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
@@ -61409,8 +61223,7 @@
pixel_y = -24
},
/obj/machinery/camera/motion/directional/south{
- c_tag = "AI Upload Chamber - Starboard";
- network = list("aiupload")
+ c_tag = "AI Upload Chamber - Starboard"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -61422,7 +61235,7 @@
/area/ai_monitored/turret_protected/ai_upload)
"vkr" = (
/obj/effect/landmark/event_spawn,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/freezer,
/area/crew_quarters/toilet/locker)
"vkx" = (
@@ -61988,9 +61801,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
@@ -62084,7 +61895,7 @@
},
/area/maintenance/starboard/aft)
"vve" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/suit_storage_unit/standard_unit,
/obj/structure/window/reinforced{
dir = 4
@@ -62167,9 +61978,7 @@
/area/hydroponics)
"vyv" = (
/obj/structure/chair/fancy/bench/right,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","prison","security")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
@@ -62364,9 +62173,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13, prison")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/prison,
/area/security/prison)
"vCs" = (
@@ -63266,9 +63073,7 @@
/turf/open/floor/iron,
/area/quartermaster/miningdock)
"vUv" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/light_switch{
pixel_x = -28
},
@@ -63280,9 +63085,7 @@
pixel_x = 5;
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13, security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/courtroom)
"vUB" = (
@@ -63518,7 +63321,7 @@
/turf/open/floor/engine,
/area/engine/engineering)
"vZt" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/white/side{
dir = 9
},
@@ -64217,9 +64020,7 @@
/area/hallway/secondary/command)
"wmW" = (
/obj/machinery/vending/wardrobe/engi_wardrobe,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
@@ -64631,7 +64432,7 @@
dir = 4
},
/obj/effect/landmark/start/depsec/medical,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
@@ -65045,7 +64846,7 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"wEU" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
@@ -65647,9 +65448,7 @@
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
"wQW" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/plating,
/area/engine/engineering)
"wRS" = (
@@ -65684,9 +65483,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/plating,
/area/engine/engineering)
"wSx" = (
@@ -65943,7 +65740,7 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"wYu" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/quartermaster/storage)
"wYC" = (
@@ -65953,7 +65750,7 @@
/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/bridge)
"wYO" = (
@@ -66318,7 +66115,7 @@
/turf/open/floor/iron,
/area/crew_quarters/kitchen/coldroom)
"xgC" = (
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark,
@@ -67490,9 +67287,7 @@
/area/hydroponics)
"xEl" = (
/obj/structure/lattice,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","minisat")
- },
+/obj/machinery/camera/directional/east,
/turf/open/space,
/area/space/nearstation)
"xEr" = (
@@ -68053,9 +67848,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13, security")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/closet/secure_closet/evidence,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -68516,9 +68309,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine,
/area/engine/engineering)
"ybz" = (
@@ -68529,9 +68320,7 @@
icon_state = "0-4"
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/science/storage)
"ybK" = (
@@ -68688,7 +68477,7 @@
/obj/item/radio/intercom{
pixel_y = 23
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -68988,7 +68777,7 @@
dir = 4
},
/obj/machinery/power/apc/auto_name/directional/west,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/medical/medbay/central)
@@ -86841,7 +86630,7 @@ aIX
aBQ
aLE
aNm
-taz
+fpk
aPA
wTO
aQN
@@ -102287,7 +102076,7 @@ aJq
taa
aJq
oGj
-qgK
+cJr
aRt
cjx
gUu
@@ -103640,7 +103429,7 @@ jAD
aaf
aaa
aaf
-prn
+xEl
aaf
aaa
aaa
@@ -107238,7 +107027,7 @@ cvc
aaf
aaa
aaf
-aBW
+cMg
aaf
aaa
aaa
@@ -108955,7 +108744,7 @@ eUF
hcQ
aYV
aYV
-ihb
+uYQ
xJf
xtf
jLS
@@ -113067,7 +112856,7 @@ uKS
aFu
aYV
aXq
-ihb
+uYQ
bfV
amo
biL
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index f7fee741f7fda..c96664ae86a09 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -12,9 +12,7 @@
/obj/machinery/porta_turret/ai{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("aicore")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"aad" = (
@@ -111,9 +109,7 @@
/obj/machinery/porta_turret/ai{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("aicore")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"aau" = (
@@ -140,37 +136,27 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/machinery/camera/directional/north{
- network = list("aicore")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai)
"aav" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("aicore")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai)
"aaw" = (
/obj/machinery/airalarm/directional/north,
-/obj/machinery/camera/directional/north{
- network = list("aicore")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"aax" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("aicore")
- },
+/obj/machinery/camera/directional/west,
/turf/open/space/basic,
/area/space)
"aay" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("aicore")
- },
+/obj/machinery/camera/directional/east,
/turf/open/space/basic,
/area/space)
"aaz" = (
@@ -536,8 +522,7 @@
/area/engine/supermatter)
"aey" = (
/obj/machinery/camera/directional/east{
- c_tag = "Medbay Break Room";
- network = list("ss13","medbay")
+ c_tag = "Medbay Break Room"
},
/obj/effect/turf_decal/tile/green/anticorner/contrasted,
/turf/open/floor/iron/white,
@@ -897,7 +882,7 @@
/turf/open/floor/engine,
/area/engine/engine_room)
"aiA" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/light,
/turf/open/floor/engine,
/area/science/xenobiology)
@@ -1659,7 +1644,7 @@
/turf/open/floor/iron,
/area/engine/storage_shared)
"arZ" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
@@ -2057,7 +2042,7 @@
/turf/open/floor/iron/dark,
/area/engine/atmos)
"ayt" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/structure/rack,
/obj/item/storage/box/beakers,
/obj/item/storage/box/medsprays,
@@ -2614,7 +2599,7 @@
dir = 8
},
/obj/structure/closet/l3closet/scientist,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/light{
dir = 8
},
@@ -2668,7 +2653,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/catwalk_floor/iron_dark,
/area/engine/atmos)
"aGK" = (
@@ -2753,7 +2738,7 @@
/turf/open/floor/engine,
/area/engine/engine_room)
"aHG" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/space/basic,
/area/space)
"aHI" = (
@@ -3286,7 +3271,7 @@
/obj/machinery/requests_console{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/security/checkpoint/customs)
@@ -4075,7 +4060,7 @@
},
/obj/effect/turf_decal/tile/brown/half/contrasted,
/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/hallway/primary/starboard)
"aXu" = (
@@ -4506,7 +4491,7 @@
/turf/open/floor/iron/dark,
/area/chapel/main/monastery)
"bfk" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron/dark,
@@ -4627,7 +4612,7 @@
/turf/open/floor/iron,
/area/hallway/primary/aft)
"bhc" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -5386,7 +5371,7 @@
/area/engine/atmos)
"bwx" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
},
@@ -5544,9 +5529,7 @@
dir = 8
},
/obj/machinery/gulag_teleporter,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/security/brig/dock)
"bzW" = (
@@ -5563,11 +5546,11 @@
/area/security/warden)
"bAm" = (
/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/engine/engine_room)
"bAn" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/light{
dir = 4
},
@@ -5882,7 +5865,7 @@
dir = 1
},
/obj/structure/table,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/quartermaster/exploration_prep)
"bFD" = (
@@ -5973,7 +5956,7 @@
/turf/open/floor/iron/white,
/area/medical/storage)
"bGC" = (
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 10
},
/obj/machinery/light_switch{
@@ -6566,7 +6549,7 @@
/turf/open/floor/iron,
/area/engine/atmos)
"bOS" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
@@ -7350,7 +7333,7 @@
/turf/open/floor/iron/white,
/area/science/research)
"ccc" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/airalarm/directional/west,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/effect/turf_decal/tile/blue/half/contrasted{
@@ -7567,15 +7550,14 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"cfY" = (
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 6
},
/turf/open/floor/iron/freezer,
/area/medical/virology)
"cgb" = (
/obj/machinery/camera/motion/directional/east{
- c_tag = "Vault";
- network = list("vault")
+ c_tag = "Vault"
},
/turf/open/space/basic,
/area/space)
@@ -7824,7 +7806,7 @@
/turf/open/floor/iron,
/area/engine/atmos)
"ckQ" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/maintenance/starboard/central)
"clk" = (
@@ -7870,7 +7852,7 @@
/obj/structure/cable/yellow,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/closet/crate/freezer/surplus_limbs,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/security/brig/medbay)
"cmv" = (
@@ -8115,7 +8097,7 @@
/obj/machinery/power/apc/auto_name/directional/west{
pixel_x = -24
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/cable/yellow{
icon_state = "0-4"
},
@@ -8202,9 +8184,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
},
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","security")
+/obj/machinery/camera{
+ dir = 10
},
/turf/open/floor/wood,
/area/security/prison)
@@ -9418,7 +9399,7 @@
"cQe" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
@@ -9761,7 +9742,7 @@
pixel_x = 1;
pixel_y = -1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
},
@@ -9928,7 +9909,7 @@
/obj/item/radio/intercom{
pixel_x = 27
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/engine/atmos)
"cZY" = (
@@ -10312,7 +10293,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/sign/map/right{
pixel_x = 16;
pixel_y = -32
@@ -10402,7 +10383,7 @@
/obj/machinery/newscaster{
pixel_y = -30
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/green/fourcorners/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/central)
@@ -10455,7 +10436,7 @@
name = "Gas to Chamber"
},
/obj/machinery/light/small,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/light_switch{
pixel_x = -25
},
@@ -10528,7 +10509,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
@@ -10789,7 +10770,7 @@
/turf/open/floor/iron,
/area/hallway/primary/starboard)
"dmN" = (
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 10
},
/obj/effect/turf_decal/siding/wood{
@@ -10841,7 +10822,7 @@
/area/hallway/primary/aft)
"dog" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/central)
@@ -10870,7 +10851,7 @@
/obj/machinery/newscaster{
pixel_x = -30
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 1
},
@@ -10878,7 +10859,7 @@
/area/science/research)
"dop" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/fore)
"doz" = (
@@ -10925,9 +10906,7 @@
pixel_x = 24
},
/obj/effect/turf_decal/tile/red/half/contrasted,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/security/prison)
"dpt" = (
@@ -11671,10 +11650,7 @@
/area/hallway/primary/starboard)
"dEK" = (
/obj/structure/closet/toolcloset,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for the Auxillary Mining Base.";
- name = "Auxillary Base Monitor";
- network = list("auxbase");
+/obj/machinery/computer/security/telescreen/auxbase{
pixel_y = 28
},
/obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -12279,8 +12255,7 @@
"dNN" = (
/obj/machinery/camera/motion{
c_tag = "E.V.A. Storage";
- dir = 6;
- network = list("ss13","security")
+ dir = 6
},
/obj/item/storage/secure/safe{
pixel_x = 37
@@ -13206,7 +13181,7 @@
/area/hallway/primary/fore)
"eaY" = (
/obj/structure/flora/ausbushes/stalkybush,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/plating/asteroid,
/area/maintenance/port)
"ebm" = (
@@ -13471,9 +13446,7 @@
/obj/structure/window/reinforced/spawner{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("aisat")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAP)
"egU" = (
@@ -14034,7 +14007,7 @@
/turf/open/floor/catwalk_floor/iron_dark,
/area/security/nuke_storage)
"erf" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
@@ -14148,9 +14121,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/window/reinforced{
dir = 4
},
@@ -14945,7 +14916,7 @@
/turf/open/floor/iron,
/area/hallway/primary/central)
"eIR" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/telecomms/bus/preset_two,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
@@ -14986,9 +14957,7 @@
/turf/open/floor/iron/dark,
/area/quartermaster/miningdock)
"eJJ" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/prison,
/area/security/prison)
"eJK" = (
@@ -15235,7 +15204,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"ePb" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/cable/yellow{
icon_state = "0-4"
},
@@ -15314,7 +15283,7 @@
/turf/open/floor/iron/dark,
/area/security/main)
"ePT" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
@@ -15376,7 +15345,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -16031,7 +16000,7 @@
/turf/open/floor/iron,
/area/hallway/primary/fore)
"fde" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron/white,
/area/science/research)
@@ -16797,7 +16766,7 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/maintenance/department/chapel/monastery)
"fpx" = (
@@ -17016,7 +16985,7 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"ftv" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine,
/area/engine/engine_room)
"ftA" = (
@@ -17577,7 +17546,7 @@
/area/medical/genetics)
"fCw" = (
/obj/effect/landmark/start/cyborg,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/light_switch{
pixel_x = -25
},
@@ -17902,7 +17871,7 @@
pixel_y = 2
},
/obj/item/beacon,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/requests_console{
pixel_y = -32
},
@@ -18001,7 +17970,7 @@
/obj/machinery/computer/atmos_alert{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
@@ -18492,7 +18461,7 @@
/turf/open/floor/iron/dark,
/area/security/main)
"fSz" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/chapel/main/monastery)
@@ -18880,7 +18849,7 @@
/obj/structure/mirror{
pixel_x = 28
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/white,
/area/crew_quarters/toilet)
"fZK" = (
@@ -19050,7 +19019,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
@@ -19183,7 +19152,7 @@
/area/engine/atmos)
"gfC" = (
/obj/machinery/airalarm/directional/south,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/crew_quarters/toilet)
"gfJ" = (
@@ -19326,9 +19295,7 @@
pixel_x = 29;
pixel_y = -2
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/security/brig)
"ghP" = (
@@ -19457,7 +19424,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/crew_quarters/fitness/recreation)
"gjH" = (
@@ -19491,12 +19458,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/iron,
/area/quartermaster/sorting)
-"gjY" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("aisat")
- },
-/turf/open/space/basic,
-/area/space)
"gkz" = (
/obj/machinery/firealarm/directional/north,
/obj/structure/cable/yellow{
@@ -19765,7 +19726,7 @@
/area/science/lab)
"goJ" = (
/obj/item/kirbyplants/random,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -21930,9 +21891,7 @@
/turf/open/floor/iron,
/area/ai_monitored/turret_protected/aisat/foyer)
"gZl" = (
-/obj/machinery/camera/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/cable/yellow{
icon_state = "2-8"
},
@@ -22046,7 +22005,7 @@
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"hbr" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
},
@@ -22431,7 +22390,7 @@
/area/crew_quarters/kitchen/coldroom)
"hht" = (
/obj/structure/bed/dogbed,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating,
/area/crew_quarters/fitness/recreation)
"hhw" = (
@@ -22996,7 +22955,7 @@
pixel_x = -26;
pixel_y = -35
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/carpet/orange,
/area/crew_quarters/heads/chief)
"hqx" = (
@@ -23349,7 +23308,7 @@
/turf/open/floor/iron,
/area/ai_monitored/security/armory)
"hwN" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -23949,7 +23908,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"hGR" = (
@@ -24554,7 +24513,7 @@
dir = 10
},
/obj/machinery/suit_storage_unit/atmos,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 9
},
@@ -25300,7 +25259,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
dir = 5
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/engine,
/area/engine/engine_room)
"ibU" = (
@@ -25432,7 +25391,7 @@
pixel_x = -1;
pixel_y = 2
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/requests_console{
pixel_y = -32
},
@@ -25619,7 +25578,7 @@
/area/science/robotics/lab)
"igS" = (
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/green{
dir = 8
},
@@ -26123,11 +26082,11 @@
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"ipd" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/plating/asteroid,
/area/maintenance/starboard/secondary)
"ipm" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/telecomms/bus/preset_four,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
@@ -26309,7 +26268,7 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"irc" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
@@ -26527,7 +26486,7 @@
/turf/open/floor/iron,
/area/construction/mining/aux_base)
"iuR" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -26666,9 +26625,7 @@
dir = 9
},
/obj/structure/closet/secure_closet/detective,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/item/toy/plush/moth/poison{
pixel_x = 1
},
@@ -26998,7 +26955,7 @@
/turf/open/floor/iron,
/area/engine/atmos)
"iBX" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -27255,7 +27212,7 @@
/turf/open/floor/iron/white,
/area/medical/virology)
"iFK" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
@@ -27302,7 +27259,7 @@
/area/ai_monitored/turret_protected/AIsatextAP)
"iGG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -27907,7 +27864,7 @@
/turf/open/floor/iron/dark,
/area/hallway/primary/central)
"iSn" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating,
/area/crew_quarters/fitness/recreation)
"iSp" = (
@@ -27951,8 +27908,7 @@
dir = 4
},
/obj/machinery/camera/directional/east{
- c_tag = "Interrogation room";
- network = list("interrogation")
+ c_tag = "Interrogation room"
},
/turf/open/floor/iron/dark,
/area/security/brig)
@@ -28031,7 +27987,7 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
dir = 8
},
@@ -28232,7 +28188,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/medical/cryo)
"iXN" = (
@@ -28540,7 +28496,7 @@
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/janitor)
"jbx" = (
@@ -28612,7 +28568,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
@@ -28855,7 +28811,7 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"jgd" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/dock/drydock,
/area/science/shuttle)
"jge" = (
@@ -28981,7 +28937,7 @@
/turf/open/floor/plating,
/area/medical/medbay/aft)
"jiP" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/computer/cargo{
dir = 8
},
@@ -29462,7 +29418,7 @@
"jtc" = (
/obj/item/kirbyplants/random,
/obj/structure/flora/ausbushes/brflowers,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/firealarm{
pixel_y = -24
},
@@ -29671,7 +29627,7 @@
/obj/item/reagent_containers/dropper{
pixel_y = 2
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron/white,
@@ -30876,7 +30832,7 @@
/turf/open/floor/iron,
/area/engine/atmos)
"jSu" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/light_switch{
pixel_x = -25
},
@@ -31456,7 +31412,7 @@
/turf/open/floor/plating/asteroid,
/area/maintenance/starboard/secondary)
"kcx" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/dock/drydock,
/area/science/shuttle)
"kcK" = (
@@ -32202,9 +32158,7 @@
/obj/item/stack/sheet/cardboard{
amount = 10
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("aisat")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/quartermaster/sorting)
"kox" = (
@@ -32394,12 +32348,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/starboard)
-"kqw" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
-/turf/open/space/basic,
-/area/space)
"kqH" = (
/obj/machinery/light_switch{
pixel_x = -25
@@ -32676,7 +32624,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/quartermaster/storage)
"kvO" = (
@@ -32910,7 +32858,7 @@
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/engine/atmos)
"kyY" = (
@@ -33105,7 +33053,7 @@
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"kCE" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/siding/wood{
dir = 4
},
@@ -33177,7 +33125,7 @@
/area/medical/medbay/central)
"kEy" = (
/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/ai_monitored/storage/eva)
"kEH" = (
@@ -33413,7 +33361,7 @@
/area/maintenance/disposal)
"kJx" = (
/obj/machinery/nanite_programmer,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/circuit,
/area/science/nanite)
"kJE" = (
@@ -34064,9 +34012,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/security/brig)
"kVq" = (
@@ -34326,7 +34272,7 @@
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
"kZS" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -34367,7 +34313,7 @@
/area/security/checkpoint/science)
"lbu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/crew_quarters/bar)
"lbE" = (
@@ -35127,11 +35073,8 @@
/obj/structure/chair{
dir = 8
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the test chamber.";
+/obj/machinery/computer/security/telescreen/toxins{
dir = 8;
- name = "Test Chamber Telescreen";
- network = list("toxins");
pixel_x = -32
},
/turf/open/floor/iron/white,
@@ -35400,7 +35343,7 @@
name = "Captain RC";
pixel_x = 32
},
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 6
},
/obj/effect/landmark/start/captain,
@@ -35773,7 +35716,7 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -31
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/carpet/green,
/area/library)
"lyI" = (
@@ -35828,11 +35771,8 @@
/obj/structure/chair{
dir = 8
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the test chamber.";
+/obj/machinery/computer/security/telescreen/toxins{
dir = 8;
- name = "Test Chamber Telescreen";
- network = list("toxins");
pixel_x = -32
},
/turf/open/floor/iron/white,
@@ -37641,7 +37581,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/white,
/area/crew_quarters/heads/hor)
"mbJ" = (
@@ -38312,7 +38252,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
},
@@ -38855,7 +38795,7 @@
/turf/open/floor/iron,
/area/janitor)
"mtN" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/crew_quarters/fitness/recreation)
@@ -39535,7 +39475,7 @@
/obj/machinery/computer/cargo{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -40605,7 +40545,7 @@
"mUT" = (
/obj/structure/chair/fancy/sofa/old/right,
/obj/effect/landmark/start/assistant,
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 10
},
/obj/item/radio/intercom{
@@ -40682,7 +40622,7 @@
/turf/open/space/basic,
/area/space/nearstation)
"mWq" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
@@ -40726,9 +40666,7 @@
/obj/item/radio/intercom{
pixel_y = 24
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("aisat")
- },
+/obj/machinery/camera/directional/west,
/obj/structure/chair/fancy/comfy{
dir = 4
},
@@ -40786,7 +40724,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
},
@@ -40847,7 +40785,7 @@
/obj/machinery/atmospherics/pipe/manifold/general/hidden{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/circuit,
/area/science/server)
"mZM" = (
@@ -41965,7 +41903,7 @@
/obj/item/radio/intercom{
pixel_y = -28
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/reflector/single/anchored{
dir = 10
},
@@ -42007,7 +41945,7 @@
department = "Tech Storage";
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/electrical{
pixel_x = 1;
@@ -42861,7 +42799,7 @@
},
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/brown/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/quartermaster/warehouse)
@@ -42930,7 +42868,7 @@
/turf/open/floor/iron,
/area/science/mixing)
"nKZ" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -43554,7 +43492,7 @@
/obj/structure/window/reinforced/spawner{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAP)
"nUZ" = (
@@ -43686,7 +43624,7 @@
/obj/item/radio/intercom{
pixel_x = -26
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/plating/asteroid,
/area/maintenance/starboard/secondary)
"nXe" = (
@@ -44436,8 +44374,7 @@
icon_state = "0-8"
},
/obj/machinery/camera/directional/north{
- c_tag = "Turbine Chamber";
- network = list("turbine")
+ c_tag = "Turbine Chamber"
},
/turf/open/floor/engine/vacuum,
/area/engine/atmospherics_engine)
@@ -44588,9 +44525,7 @@
pixel_y = 8
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/autoname/directional/west{
- network = list("aisat")
- },
+/obj/machinery/camera/directional/west,
/obj/item/radio/intercom{
pixel_x = -32;
pixel_y = -8
@@ -44843,7 +44778,7 @@
/turf/open/floor/iron,
/area/hallway/secondary/service)
"oqt" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/maintenance/starboard/secondary)
"oqF" = (
@@ -45078,7 +45013,7 @@
/turf/open/floor/iron,
/area/engine/atmos)
"ovb" = (
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 9
},
/obj/effect/turf_decal/box/corners{
@@ -45136,7 +45071,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -45865,7 +45800,7 @@
/area/engine/engineering)
"oGO" = (
/obj/structure/table/wood/fancy/royalblue,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/item/radio/intercom{
pixel_x = 29;
pixel_y = -2
@@ -46252,7 +46187,7 @@
/turf/open/floor/iron/dark,
/area/lawoffice)
"oOP" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/purple{
dir = 1
},
@@ -46513,7 +46448,7 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"oUZ" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/circuit/green,
/area/engine/gravity_generator)
"oVg" = (
@@ -46712,7 +46647,7 @@
/area/maintenance/port)
"oYM" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 6
},
/obj/effect/turf_decal/tile/green,
@@ -46827,7 +46762,7 @@
/obj/machinery/light_switch{
pixel_x = -25
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/engine/gravity_generator)
"pbr" = (
@@ -47238,7 +47173,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/theatre)
"piY" = (
@@ -47270,7 +47205,7 @@
/area/crew_quarters/bar)
"pjt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -47596,7 +47531,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/structure/tank_dispenser,
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/turf/open/floor/iron,
@@ -47719,7 +47654,7 @@
/turf/open/floor/iron/dark,
/area/security/main)
"ptc" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/chem_master,
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 8
@@ -47892,8 +47827,7 @@
/obj/item/book/manual/wiki/engineering_hacking,
/obj/item/clothing/neck/stethoscope,
/obj/machinery/camera/motion/directional/west{
- c_tag = "Vault";
- network = list("vault")
+ c_tag = "Vault"
},
/obj/machinery/requests_console{
announcementConsole = 1;
@@ -48149,7 +48083,7 @@
/obj/structure/flora/ausbushes/pointybush,
/obj/machinery/airalarm/directional/east,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/grass/no_border,
/area/hallway/secondary/command)
"pzm" = (
@@ -48388,9 +48322,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/camera/directional/north{
- network = list("aisat")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/ai_monitored/turret_protected/aisat/foyer)
"pDB" = (
@@ -48538,7 +48470,7 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/medical/genetics/cloning)
"pFS" = (
@@ -48598,7 +48530,7 @@
/turf/open/floor/iron/dark,
/area/security/brig)
"pGV" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
@@ -49241,9 +49173,7 @@
/obj/effect/turf_decal/caution{
dir = 8
},
-/obj/machinery/camera/directional/north{
- network = list("aisat")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
"pRb" = (
@@ -49292,7 +49222,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -49381,7 +49311,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -49473,7 +49403,7 @@
"pVH" = (
/obj/effect/turf_decal/caution,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/noslip/standard,
/area/hallway/secondary/service)
@@ -50001,7 +49931,7 @@
/turf/open/floor/iron,
/area/hallway/primary/aft)
"qem" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/light{
dir = 8
},
@@ -50075,8 +50005,7 @@
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves,
/obj/machinery/camera/directional/east{
- c_tag = "Medbay Break Room";
- network = list("ss13","medbay")
+ c_tag = "Medbay Break Room"
},
/obj/effect/turf_decal/box,
/turf/open/floor/iron,
@@ -50204,7 +50133,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/medical/surgery)
"qiD" = (
@@ -50532,7 +50461,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine,
/area/engine/supermatter)
"qop" = (
@@ -52301,7 +52230,7 @@
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/main)
"qRP" = (
@@ -52361,9 +52290,7 @@
/turf/open/floor/iron/white,
/area/medical/medbay/aft)
"qSU" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/structure/table/reinforced,
/obj/item/clothing/mask/gas/clown_hat{
pixel_y = -1;
@@ -52756,7 +52683,7 @@
/area/space/nearstation)
"rav" = (
/obj/structure/closet/secure_closet/engineering_personal,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/noslip/dark,
/area/engine/engineering)
"raK" = (
@@ -52920,7 +52847,7 @@
/obj/machinery/light_switch{
pixel_x = -25
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
@@ -53417,7 +53344,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/table,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson{
@@ -53454,9 +53381,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/power/apc/auto_name/directional/west{
pixel_x = -24
},
@@ -53840,7 +53765,7 @@
/area/crew_quarters/fitness/recreation)
"rrO" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/central)
@@ -53959,7 +53884,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/item/radio/intercom{
pixel_y = -28
},
@@ -54582,7 +54507,7 @@
/obj/item/radio/intercom{
pixel_y = -28
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
/area/library)
@@ -54623,7 +54548,7 @@
/area/medical/virology)
"rFe" = (
/obj/structure/bookcase/random/fiction,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/wood,
/area/library)
"rFj" = (
@@ -54643,9 +54568,7 @@
"rFo" = (
/obj/structure/bed/dogbed/ian,
/mob/living/simple_animal/hostile/carp/lia,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/button/door{
desc = "A remote control switch.";
id = "hosroom";
@@ -55013,7 +54936,7 @@
/turf/open/floor/iron,
/area/hallway/secondary/service)
"rLp" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -55028,7 +54951,7 @@
/area/maintenance/starboard/fore)
"rLO" = (
/obj/machinery/suit_storage_unit/cmo,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/keycard_auth{
pixel_x = -26;
pixel_y = 1
@@ -55375,7 +55298,7 @@
/area/medical/cryo)
"rRh" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
},
@@ -55668,7 +55591,7 @@
/turf/open/floor/iron/white,
/area/science/xenobiology)
"rXH" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
@@ -56059,7 +55982,7 @@
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
"sdG" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
@@ -56908,10 +56831,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
-/obj/machinery/computer/security{
- network = list("security");
- name = "brig cameras console"
- },
+/obj/machinery/computer/security/security,
/turf/open/floor/iron/dark,
/area/security/warden)
"sqJ" = (
@@ -56930,9 +56850,7 @@
name = "Head of Security's Office Shutters";
pixel_x = -26
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/item/kirbyplants{
icon_state = "plant-06"
},
@@ -56945,7 +56863,7 @@
/turf/open/floor/iron/white,
/area/science/explab)
"srf" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/engine,
/area/science/xenobiology)
"srF" = (
@@ -57223,7 +57141,7 @@
/obj/machinery/computer/med_data{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/light_switch{
pixel_x = 1;
pixel_y = 28
@@ -57304,7 +57222,7 @@
/turf/open/floor/plating,
/area/medical/surgery)
"sxV" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -58073,9 +57991,7 @@
/obj/structure/window/reinforced/spawner{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("aisat")
- },
+/obj/machinery/camera/directional/south,
/turf/open/space/basic,
/area/space/nearstation)
"sKS" = (
@@ -58320,7 +58236,7 @@
color = "#666666";
dir = 4
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
@@ -59260,9 +59176,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/security/brig)
@@ -59770,7 +59684,7 @@
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"toN" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
@@ -59867,7 +59781,7 @@
dir = 6
},
/obj/effect/turf_decal/tile/purple/anticorner/contrasted,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/white,
/area/science/research)
"tqE" = (
@@ -60570,7 +60484,7 @@
/turf/open/floor/iron/white,
/area/science/xenobiology)
"tCU" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
@@ -60739,7 +60653,7 @@
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/relay)
"tES" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/light_switch{
pixel_x = 26
},
@@ -61017,7 +60931,7 @@
/turf/open/floor/iron,
/area/engine/engineering)
"tJI" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron/white,
/area/science/research)
@@ -61376,7 +61290,7 @@
/obj/structure/sign/poster/random{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/green{
dir = 8
},
@@ -62000,9 +61914,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("aisat")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat/foyer)
"uaU" = (
@@ -62104,7 +62016,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/freezer,
/area/medical/virology)
"ucM" = (
@@ -62938,7 +62850,7 @@
/turf/open/floor/iron,
/area/science/mixing)
"upl" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 10
},
@@ -63007,8 +62919,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay Break Room";
- dir = 10;
- network = list("ss13","medbay")
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
@@ -63034,7 +62945,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"urr" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/disposal/bin,
/obj/machinery/firealarm{
pixel_y = -24
@@ -63285,12 +63196,6 @@
},
/turf/open/floor/iron/white,
/area/crew_quarters/heads/cmo)
-"uwe" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("aisat")
- },
-/turf/open/space/basic,
-/area/space)
"uwl" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -63713,7 +63618,7 @@
"uDM" = (
/obj/machinery/washing_machine,
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/tile/green/half/contrasted,
/turf/open/floor/iron,
@@ -63985,7 +63890,7 @@
/obj/item/radio/intercom{
pixel_y = -28
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
@@ -64281,7 +64186,7 @@
pixel_x = 32
},
/obj/effect/turf_decal/tile/brown/half/contrasted,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/quartermaster/miningdock)
"uLg" = (
@@ -64419,7 +64324,7 @@
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/engine/engine_room)
"uMY" = (
@@ -64895,7 +64800,7 @@
/area/hallway/primary/aft)
"uVo" = (
/obj/machinery/airalarm/directional/east,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/neutral/opposingcorners{
dir = 1
},
@@ -65215,9 +65120,7 @@
departmentType = 4;
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
@@ -65518,7 +65421,7 @@
/turf/open/floor/iron,
/area/security/brig)
"vgF" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron/dark,
/area/security/courtroom)
@@ -65859,7 +65762,7 @@
"vmn" = (
/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/science/storage)
"vmr" = (
@@ -66358,7 +66261,7 @@
pixel_x = -1;
pixel_y = 4
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/light/small,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable/yellow{
@@ -67023,7 +66926,7 @@
"vCv" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/crew_quarters/dorms)
"vCz" = (
@@ -67520,7 +67423,7 @@
/turf/open/floor/iron/dark,
/area/engine/engineering)
"vJv" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
@@ -67713,7 +67616,7 @@
/obj/item/radio/intercom{
pixel_y = -28
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating/asteroid,
/area/maintenance/starboard/secondary)
"vNq" = (
@@ -67888,9 +67791,7 @@
/area/security/checkpoint/medical)
"vQI" = (
/obj/structure/lattice,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/space/basic,
/area/space/nearstation)
"vQJ" = (
@@ -67915,7 +67816,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"vRw" = (
@@ -68005,7 +67906,7 @@
/obj/machinery/computer/camera_advanced/xenobio{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/purple/fourcorners/contrasted,
/turf/open/floor/iron/white,
/area/science/xenobiology)
@@ -68589,7 +68490,7 @@
/obj/structure/bodycontainer/crematorium{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/maintenance/department/chapel/monastery)
@@ -68743,7 +68644,7 @@
/obj/machinery/airalarm/directional/east,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/dark,
@@ -69144,7 +69045,7 @@
/turf/open/floor/iron/dark,
/area/maintenance/department/chapel/monastery)
"wmL" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/structure/sign/poster/random{
pixel_x = 32
},
@@ -69469,7 +69370,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/engine/atmos)
"wsy" = (
@@ -69791,7 +69692,7 @@
/turf/open/floor/engine/co2,
/area/engine/atmos)
"wyA" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/carpet/grimy,
/area/chapel/office)
"wyN" = (
@@ -71722,9 +71623,7 @@
/obj/machinery/light_switch{
pixel_x = 26
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("aisat")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAP)
"xgs" = (
@@ -71740,7 +71639,7 @@
/turf/open/floor/iron/dark,
/area/maintenance/department/chapel/monastery)
"xgE" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/item/radio/intercom{
pixel_y = -28
},
@@ -71845,7 +71744,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/hallway/secondary/command)
"xjD" = (
@@ -72357,7 +72256,7 @@
/obj/machinery/newscaster{
pixel_x = -30
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
@@ -72806,7 +72705,7 @@
"xAd" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/segment,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
@@ -72887,7 +72786,7 @@
/turf/open/floor/iron/white,
/area/medical/virology)
"xAX" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
@@ -73532,7 +73431,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 6
},
/obj/machinery/requests_console{
@@ -73562,7 +73461,7 @@
color = "#666666";
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/item/radio/intercom{
pixel_y = -28
},
@@ -74034,7 +73933,7 @@
/obj/item/radio/intercom{
pixel_y = 32
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/quartermaster/sorting)
"xRO" = (
@@ -74253,7 +74152,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 8
},
@@ -106253,7 +106152,7 @@ aMT
anT
aMT
aMT
-uwe
+aay
aMT
anT
aMT
@@ -110365,7 +110264,7 @@ aMT
anT
aMT
aMT
-gjY
+aax
aMT
anT
aMT
@@ -111694,7 +111593,7 @@ aMT
anT
aMT
aMT
-kqw
+aHG
oRA
oRA
oRA
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index c4cce6384e684..910e7747ace15 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -3583,8 +3583,7 @@
icon_state = "4-8"
},
/obj/machinery/camera/directional/north{
- c_tag = "Supermatter Chamber";
- network = list("engine")
+ c_tag = "Supermatter Chamber"
},
/turf/open/floor/engine,
/area/engine/supermatter)
@@ -4989,8 +4988,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Supermatter Engine - Aft";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -5866,8 +5864,7 @@
/obj/machinery/light/small,
/obj/machinery/camera/directional/south{
c_tag = "Xenobiology - Cell 4";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -6325,7 +6322,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/north{
c_tag = "Turbine Chamber";
- network = list("turbine");
pixel_x = 22
},
/turf/open/floor/engine/vacuum,
@@ -6363,8 +6359,7 @@
"aOc" = (
/obj/machinery/camera/motion/directional/south{
c_tag = "AI Chamber - Aft";
- name = "motion-sensitive ai camera";
- network = list("aichamber")
+ name = "motion-sensitive ai camera"
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -6858,7 +6853,7 @@
/area/engine/atmos)
"aRB" = (
/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/light{
dir = 4
},
@@ -8397,8 +8392,7 @@
/obj/machinery/iv_drip,
/obj/machinery/camera/directional/east{
c_tag = "Medbay - Recovery Room";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -10150,8 +10144,7 @@
"bor" = (
/obj/machinery/camera/directional/east{
c_tag = "Science - Fore";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
@@ -11295,8 +11288,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "AI Chamber - Fore";
- name = "motion-sensitive ai camera";
- network = list("aichamber")
+ name = "motion-sensitive ai camera"
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/dark,
@@ -12054,11 +12046,8 @@
pixel_x = -38;
req_access_txt = "24"
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the Engine.";
+/obj/machinery/computer/security/telescreen/engine{
dir = 4;
- name = "Engine Monitor";
- network = list("engine");
pixel_x = -24
},
/obj/effect/turf_decal/tile/yellow{
@@ -12151,10 +12140,7 @@
/area/bridge)
"bBM" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
- name = "Research Monitor";
- network = list("rd","minisat");
+/obj/machinery/computer/security/telescreen/rd{
pixel_y = 2
},
/turf/open/floor/iron/dark,
@@ -14290,7 +14276,6 @@
/obj/machinery/camera/directional/east{
c_tag = "AI Satellite - Maintenance";
name = "ai camera";
- network = list("minisat");
start_active = 1
},
/obj/effect/turf_decal/stripes/line,
@@ -14329,8 +14314,7 @@
pixel_x = 32
},
/obj/machinery/camera/directional/east{
- c_tag = "Interrogation room";
- network = list("interrogation")
+ c_tag = "Interrogation room"
},
/obj/structure/chair/foldable{
dir = 8
@@ -16063,8 +16047,7 @@
/area/ai_monitored/turret_protected/ai_upload)
"cfB" = (
/obj/machinery/camera/emp_proof/directional/east{
- c_tag = "Containment - Fore Starboard";
- network = list("singularity")
+ c_tag = "Containment - Fore Starboard"
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
@@ -16671,8 +16654,7 @@
"ciY" = (
/obj/structure/lattice,
/obj/machinery/camera/emp_proof/directional/west{
- c_tag = "Containment - Fore Port";
- network = list("singularity")
+ c_tag = "Containment - Fore Port"
},
/turf/open/space,
/area/space/nearstation)
@@ -16890,9 +16872,8 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/camera/autoname{
- dir = 9;
- network = list("ss13","prison")
+/obj/machinery/camera{
+ dir = 9
},
/turf/open/floor/prison/dark,
/area/security/prison)
@@ -17576,8 +17557,7 @@
"coj" = (
/obj/machinery/camera/directional/east{
c_tag = "Telecomms - Cooling Room";
- name = "telecomms camera";
- network = list("ss13","tcomms")
+ name = "telecomms camera"
},
/obj/effect/turf_decal/delivery,
/obj/structure/table,
@@ -18280,11 +18260,8 @@
c_tag = "Engineering - Central";
name = "engineering camera"
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the singularity chamber.";
+/obj/machinery/computer/security/telescreen/engine{
dir = 4;
- name = "Engine Containment Telescreen";
- network = list("singularity");
pixel_x = -30
},
/obj/effect/turf_decal/stripes/line{
@@ -18799,8 +18776,7 @@
icon_state = "4-8"
},
/obj/machinery/camera/emp_proof/directional/south{
- c_tag = "Containment - Particle Accelerator";
- network = list("singularity")
+ c_tag = "Containment - Particle Accelerator"
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
@@ -20020,8 +19996,7 @@
"cAG" = (
/obj/structure/lattice,
/obj/machinery/camera/emp_proof/directional/west{
- c_tag = "Containment - Aft Port";
- network = list("singularity")
+ c_tag = "Containment - Aft Port"
},
/turf/open/space,
/area/space/nearstation)
@@ -20387,8 +20362,7 @@
"cCq" = (
/obj/structure/lattice,
/obj/machinery/camera/directional/north{
- c_tag = "Security - Head of Security's Office";
- network = list("ss13","security")
+ c_tag = "Security - Head of Security's Office"
},
/turf/open/space,
/area/space/nearstation)
@@ -20640,8 +20614,7 @@
/area/space/nearstation)
"cDV" = (
/obj/machinery/camera/emp_proof/directional/east{
- c_tag = "Containment - Aft Starboard";
- network = list("singularity")
+ c_tag = "Containment - Aft Starboard"
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
@@ -21016,9 +20989,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/item/lightreplacer,
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 10
},
/turf/open/floor/plating,
/area/janitor/custodian)
@@ -22252,9 +22224,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/light{
dir = 1
},
@@ -23074,8 +23044,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Xenobiology - Port";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
@@ -23352,9 +23321,8 @@
/area/science/xenobiology)
"cTC" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
- dir = 4;
- network = list("xeno")
+/obj/machinery/computer/security/telescreen/research{
+ dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
@@ -23956,8 +23924,7 @@
/obj/machinery/light,
/obj/machinery/camera/directional/south{
c_tag = "Science - Waiting Room";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -24108,8 +24075,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Xenobiology - Starboard";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/delivery,
/obj/structure/sign/warning/deathsposal{
@@ -24715,8 +24681,7 @@
/obj/structure/closet/firecloset,
/obj/machinery/camera/directional/east{
c_tag = "Science - Research Division Access";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
@@ -25134,8 +25099,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Science - Research and Development";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron/white,
@@ -25305,7 +25269,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/prison,
/area/security/prison)
"die" = (
@@ -25813,8 +25777,7 @@
"dmO" = (
/obj/machinery/camera/directional/east{
c_tag = "Science - Lab Access";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/bot,
/obj/machinery/firealarm{
@@ -26153,8 +26116,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Science - Lab Access";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/structure/table/reinforced,
/obj/item/clothing/ears/earmuffs,
@@ -26397,8 +26359,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Science - Research Director's Office";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/bot,
/obj/item/book/manual/wiki/sopscience,
@@ -26875,8 +26836,7 @@
"dwg" = (
/obj/machinery/camera/directional/west{
c_tag = "Science - Toxins Mixing Lab Fore";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
@@ -26954,8 +26914,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Science - Mech Bay";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
@@ -27714,8 +27673,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Science - Research Director's Quarters";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/modular_computer/console/preset/research{
dir = 1
@@ -28115,8 +28073,7 @@
/obj/item/clothing/mask/gas,
/obj/machinery/camera/directional/north{
c_tag = "Science - Toxins Launch Site";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/bot,
/obj/machinery/light{
@@ -28179,8 +28136,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Science - Toxins Mixing Lab Aft";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -28278,9 +28234,7 @@
pixel_x = 31;
pixel_y = -3
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/medical/exam_room)
"dGR" = (
@@ -28631,8 +28585,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Science - Server Room";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/science/server)
@@ -28642,8 +28595,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Science - Aft";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -28862,8 +28814,7 @@
"dJZ" = (
/obj/machinery/camera/directional/west{
c_tag = "Science - Toxins Secure Storage";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/pump{
@@ -30581,8 +30532,7 @@
"dYI" = (
/obj/machinery/camera/directional/north{
c_tag = "Science - Center";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -32878,8 +32828,7 @@
"eyG" = (
/obj/machinery/camera/directional/north{
c_tag = "AI - Upload";
- name = "motion-sensitive ai camera";
- network = list("aiupload")
+ name = "motion-sensitive ai camera"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -33911,7 +33860,7 @@
dir = 4
},
/obj/machinery/vendor/exploration,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/structure/extinguisher_cabinet{
pixel_x = 26
},
@@ -36078,7 +36027,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/crew_quarters/fitness/recreation)
"fAO" = (
@@ -37403,9 +37352,8 @@
/obj/item/kirbyplants{
icon_state = "plant-21"
},
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 10
},
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable/yellow,
@@ -38262,8 +38210,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Research Division - Nanite Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/item/radio/intercom{
pixel_x = -26
@@ -39477,8 +39424,7 @@
"gCy" = (
/obj/machinery/camera/directional/west{
c_tag = "Xenobiology - Secure Cell";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/machinery/light{
dir = 8
@@ -41784,8 +41730,7 @@
/obj/machinery/light/small,
/obj/machinery/camera/directional/south{
c_tag = "Xenobiology - Cell 6";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -41896,8 +41841,7 @@
"hnV" = (
/obj/machinery/camera/directional/north{
c_tag = "Science - Experimentation Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/bot,
/obj/machinery/airalarm/directional/north{
@@ -42550,8 +42494,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Science - Robotics Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -42723,7 +42666,7 @@
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 10
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/medical/patients_rooms)
"hEk" = (
@@ -42841,9 +42784,7 @@
dir = 8;
pixel_y = -26
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/smooth,
/area/security/main)
"hFD" = (
@@ -42979,9 +42920,7 @@
},
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/item/kirbyplants/random,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/security/prison)
"hIg" = (
@@ -43664,9 +43603,8 @@
"hQN" = (
/obj/structure/reagent_dispensers/water_cooler,
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
-/obj/machinery/camera/autoname{
- dir = 9;
- network = list("ss13","security")
+/obj/machinery/camera{
+ dir = 9
},
/turf/open/floor/iron/dark,
/area/security/main)
@@ -44371,7 +44309,6 @@
/obj/machinery/camera/directional/west{
c_tag = "AI Satellite - Teleporter";
name = "ai camera";
- network = list("minisat");
start_active = 1
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -44553,8 +44490,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/east{
c_tag = "Science - Toxins Mixing Lab Burn Chamber";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -45629,9 +45565,8 @@
dir = 1
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 10
},
/turf/open/floor/iron/dark,
/area/medical/morgue)
@@ -45987,7 +45922,7 @@
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/prison,
/area/security/prison)
"iBI" = (
@@ -46139,8 +46074,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Telecomms - Chamber Port";
- name = "telecomms camera";
- network = list("ss13","tcomms")
+ name = "telecomms camera"
},
/turf/open/floor/iron/smooth,
/area/tcommsat/server)
@@ -46588,9 +46522,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
"iMX" = (
@@ -47108,8 +47040,7 @@
/obj/machinery/light/small,
/obj/machinery/camera/directional/south{
c_tag = "Xenobiology - Cell 5";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -47176,7 +47107,6 @@
/obj/machinery/camera/directional/east{
c_tag = "AI Satellite - Port";
name = "ai camera";
- network = list("minisat");
start_active = 1
},
/turf/open/space,
@@ -47410,8 +47340,7 @@
},
/obj/item/kirbyplants/random,
/obj/machinery/camera/directional/east{
- c_tag = "Security Post - Science";
- network = list("ss13","rd")
+ c_tag = "Security Post - Science"
},
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/turf/open/floor/iron,
@@ -47731,8 +47660,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Xenobiology - Cell 1";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -48791,9 +48719,8 @@
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
-/obj/machinery/camera/autoname{
- dir = 9;
- network = list("ss13","security")
+/obj/machinery/camera{
+ dir = 9
},
/turf/open/floor/iron/dark/side{
dir = 9
@@ -49034,8 +48961,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Science - Port";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -49239,8 +49165,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Xenobiology - Killroom Chamber";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark/telecomms,
@@ -49692,8 +49617,7 @@
"jRP" = (
/obj/machinery/camera/directional/east{
c_tag = "Telecomms - Chamber Starboard";
- name = "telecomms camera";
- network = list("ss13","tcomms")
+ name = "telecomms camera"
},
/turf/open/floor/iron/smooth,
/area/tcommsat/server)
@@ -51177,8 +51101,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Security Hallway - Center";
- name = "hallway camera";
- network = list("ss13","security")
+ name = "hallway camera"
},
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron,
@@ -51896,7 +51819,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/quartermaster/exploration_prep)
"kAZ" = (
@@ -52235,7 +52158,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/blue,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/medical/morgue)
"kGh" = (
@@ -52846,9 +52769,7 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/structure/table,
/obj/item/paper_bin,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/light_switch{
pixel_x = 25
},
@@ -53175,9 +53096,8 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 10
},
/turf/open/floor/iron/white,
/area/medical/surgery)
@@ -53291,8 +53211,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Xenobiology - Cell 2";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -55431,8 +55350,7 @@
/area/medical/morgue)
"lLw" = (
/obj/machinery/camera/directional/west{
- c_tag = "Detective's Office";
- network = list("ss13","security")
+ c_tag = "Detective's Office"
},
/obj/machinery/button/door{
id = "detectivewindows";
@@ -55825,9 +55743,7 @@
"lRN" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable/yellow,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/techmaint,
/area/security/prison/shielded)
"lRP" = (
@@ -57494,8 +57410,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Supermatter Engine - Port";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{
@@ -59538,9 +59453,8 @@
pixel_x = -24
},
/obj/structure/cable/yellow,
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 10
},
/turf/open/floor/iron/dark,
/area/medical/surgery)
@@ -59745,7 +59659,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/medical/surgery)
"neH" = (
@@ -60526,8 +60440,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Supermatter Engine - Starboard";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -61127,8 +61040,7 @@
"nyl" = (
/obj/machinery/camera/directional/north{
c_tag = "Supermatter Engine - Fore";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -62534,8 +62446,7 @@
"nUs" = (
/obj/machinery/camera{
c_tag = "Courtroom - Center";
- dir = 9;
- network = list("ss13","security")
+ dir = 9
},
/obj/machinery/light{
dir = 1
@@ -62697,7 +62608,6 @@
/obj/machinery/camera/directional/east{
c_tag = "AI Satellite - Port";
name = "ai camera";
- network = list("minisat");
start_active = 1
},
/turf/open/floor/iron/dark,
@@ -63310,8 +63220,7 @@
"oja" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/machinery/camera/motion/directional/west{
- c_tag = "Vault";
- network = list("vault")
+ c_tag = "Vault"
},
/turf/open/floor/circuit/green,
/area/security/nuke_storage)
@@ -63635,8 +63544,7 @@
"ops" = (
/obj/machinery/camera/directional/north{
c_tag = "Telecomms - Monitoring";
- name = "telecomms camera";
- network = list("ss13","tcomms")
+ name = "telecomms camera"
},
/turf/open/floor/carpet/grimy,
/area/tcommsat/computer)
@@ -63755,9 +63663,7 @@
/obj/structure/disposalpipe/segment{
dir = 2
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/airalarm/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -64268,7 +64174,7 @@
pixel_x = -26;
pixel_y = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark/smooth_edge{
dir = 4
},
@@ -64978,9 +64884,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/prison,
/area/security/prison)
"oLD" = (
@@ -65378,8 +65282,7 @@
/obj/item/toy/figure/hos,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/machinery/camera/directional/north{
- c_tag = "Security - Head of Security's Office";
- network = list("ss13","security")
+ c_tag = "Security - Head of Security's Office"
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable/yellow{
@@ -66068,9 +65971,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/camera/autoname{
- dir = 9;
- network = list("ss13","prison")
+/obj/machinery/camera{
+ dir = 9
},
/turf/open/floor/prison/dark,
/area/security/prison)
@@ -66534,7 +66436,7 @@
/turf/open/floor/iron/dark,
/area/library)
"pnP" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/main)
"pnV" = (
@@ -66904,7 +66806,6 @@
/obj/machinery/camera/directional/north{
c_tag = "AI Satellite - Transit Tube";
name = "ai camera";
- network = list("minisat");
start_active = 1
},
/obj/item/clipboard,
@@ -67329,7 +67230,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/security/brig/medbay)
"pDc" = (
@@ -67919,9 +67820,7 @@
pixel_x = -32;
pixel_y = 1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -68414,9 +68313,7 @@
/obj/effect/turf_decal/box,
/obj/item/circuitboard/machine/chem_heater,
/obj/machinery/firealarm/directional/west,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/medical/virology)
"pTo" = (
@@ -68792,9 +68689,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/security/brig)
@@ -69919,8 +69814,7 @@
dir = 4
},
/obj/machinery/camera/motion/directional/south{
- c_tag = "Armory - Internal";
- network = list("ss13","security")
+ c_tag = "Armory - Internal"
},
/turf/open/floor/iron/dark,
/area/ai_monitored/security/armory)
@@ -71179,8 +71073,7 @@
"qOp" = (
/obj/machinery/camera/directional/north{
c_tag = "Medbay - Break Room";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/machinery/airalarm/directional/north{
pixel_y = 23
@@ -71613,8 +71506,7 @@
"qTy" = (
/obj/machinery/camera/directional/south{
c_tag = "Medbay - Starboard";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/effect/turf_decal/tile/blue,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -71743,10 +71635,7 @@
/turf/open/floor/iron,
/area/storage/tech)
"qVl" = (
-/obj/machinery/computer/security{
- name = "Medbay camera console";
- network = list("medbay")
- },
+/obj/machinery/computer/security/medbay,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
@@ -72074,7 +71963,7 @@
/area/maintenance/port/aft)
"rbB" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/medical/genetics/cloning)
"rbE" = (
@@ -72393,8 +72282,7 @@
/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
/obj/machinery/camera/directional/east{
c_tag = "Science - Break Room";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
@@ -73387,8 +73275,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Xenobiology - Cell 3";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -75680,9 +75567,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/light_switch{
pixel_x = -23
},
@@ -76944,7 +76829,6 @@
/obj/machinery/camera/directional/north{
c_tag = "AI Satellite - Antechamber";
name = "ai camera";
- network = list("minisat");
start_active = 1
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -77333,7 +77217,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -77955,9 +77839,7 @@
/obj/structure/disposalpipe/trunk{
dir = 2
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
"sPK" = (
@@ -78039,9 +77921,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/prison,
/area/security/prison)
"sQX" = (
@@ -78915,7 +78795,6 @@
},
/obj/machinery/camera/directional/east{
c_tag = "MiniSat Service Bay";
- network = list("minisat");
start_active = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -79680,9 +79559,7 @@
pixel_x = 32
},
/obj/machinery/chem_dispenser,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/medical/chemistry)
"trb" = (
@@ -80800,9 +80677,7 @@
pixel_y = -24
},
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/requests_console{
department = "Security";
name = "Security RC";
@@ -82251,9 +82126,8 @@
pixel_y = -32
},
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 10
},
/turf/open/floor/iron/white,
/area/medical/medbay/central)
@@ -83107,10 +82981,7 @@
/turf/open/floor/iron,
/area/crew_quarters/fitness/recreation)
"uxD" = (
-/obj/machinery/computer/security{
- name = "Medbay camera console";
- network = list("medbay")
- },
+/obj/machinery/computer/security/medbay,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/cmo)
"uxY" = (
@@ -85789,9 +85660,7 @@
pixel_x = 27
},
/obj/machinery/photocopier,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/cmo)
"vrJ" = (
@@ -85939,9 +85808,7 @@
/turf/open/space,
/area/space/nearstation)
"vtn" = (
-/obj/machinery/camera/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/chair/fancy/comfy{
buildstackamount = 0;
color = "#742925"
@@ -86411,9 +86278,8 @@
/obj/effect/loot_jobscale/medical/medkits{
pixel_x = 5
},
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 10
},
/turf/open/floor/iron,
/area/medical/storage)
@@ -86673,8 +86539,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/camera/directional/east{
c_tag = "Science - Aft Center";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -86968,9 +86833,7 @@
dir = 8
},
/obj/item/bedsheet/brown,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/tech,
/area/security/prison/shielded)
"vKg" = (
@@ -88853,7 +88716,7 @@
pixel_y = -26
},
/obj/structure/fluff/hedge,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark/smooth_edge{
dir = 8
},
@@ -91010,11 +90873,8 @@
/obj/machinery/computer/secure_data{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring medbay to ensure patient safety.";
+/obj/machinery/computer/security/telescreen/cmo{
dir = 1;
- name = "Medbay Monitor";
- network = list("medbay");
pixel_y = -32
},
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
@@ -93201,7 +93061,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/security/main)
"xDX" = (
@@ -93718,9 +93578,8 @@
dir = 9
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/machinery/camera/autoname{
- dir = 9;
- network = list("ss13","prison")
+/obj/machinery/camera{
+ dir = 9
},
/turf/open/floor/prison/dark,
/area/security/prison)
@@ -94297,9 +94156,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/security/brig)
"xVS" = (
@@ -94964,9 +94821,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/white,
/area/medical/medbay/aft)
"yer" = (
@@ -95331,9 +95186,7 @@
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"ykF" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine,
/area/science/explab)
"ykO" = (
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
index a9df12bfe1fa2..65a4cbfa954f4 100644
--- a/_maps/map_files/EchoStation/EchoStation.dmm
+++ b/_maps/map_files/EchoStation/EchoStation.dmm
@@ -912,9 +912,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("aiupload")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/tech/grid,
/area/ai_monitored/turret_protected/aisat_interior)
"arX" = (
@@ -1215,7 +1213,7 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/obj/structure/reagent_dispensers/water_cooler,
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/bridge)
"azd" = (
@@ -1548,9 +1546,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("aiupload")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/status_display/evac{
pixel_x = 32
},
@@ -2214,7 +2210,7 @@
/area/crew_quarters/heads/hos)
"aRb" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Teleporter Room"
},
/obj/structure/table/wood,
@@ -2243,9 +2239,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/plating,
/area/quartermaster/warehouse)
"aRP" = (
@@ -2483,9 +2477,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/hos)
"aWU" = (
@@ -3520,9 +3512,7 @@
pixel_y = 30;
receive_ore_updates = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/science/research)
"bvY" = (
@@ -3744,7 +3734,7 @@
/obj/machinery/newscaster{
pixel_y = 34
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Corporate Meeting Room"
},
/obj/structure/chair/fancy/comfy{
@@ -3882,9 +3872,7 @@
"bFv" = (
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/plasma,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -3914,9 +3902,7 @@
icon_state = "0-2"
},
/obj/structure/cable,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"bGD" = (
@@ -4424,9 +4410,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/power/emitter,
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/engine/engineering)
"bUA" = (
@@ -5009,9 +4993,7 @@
/obj/machinery/computer/med_data/laptop{
pixel_y = 4
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/wood,
/area/medical/exam_room)
"ckI" = (
@@ -5789,9 +5771,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/obj/item/storage/toolbox/emergency{
pixel_x = 3;
pixel_y = -1
@@ -5915,9 +5895,7 @@
/obj/structure/disposalpipe/segment{
dir = 2
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/security/brig)
"cDM" = (
@@ -6169,7 +6147,7 @@
/turf/open/floor/plating/asteroid/basalt/planetary,
/area/quartermaster/storage)
"cKB" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark/side{
dir = 4
},
@@ -6547,9 +6525,8 @@
pixel_x = 32;
receive_ore_updates = 1
},
-/obj/machinery/camera/autoname/directional/north{
- dir = 4;
- network = list("ss13","rd")
+/obj/machinery/camera/directional/north{
+ dir = 4
},
/turf/open/floor/iron/white,
/area/science/robotics)
@@ -6664,9 +6641,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/security/brig)
"dbT" = (
@@ -7093,7 +7068,7 @@
/turf/open/floor/plating/dirt/planetary,
/area/asteroid/paradise/surface)
"dmw" = (
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 4
},
@@ -7449,9 +7424,7 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
"dyQ" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/lattice/catwalk/over,
/turf/open/openspace,
/area/maintenance/department/security/brig)
@@ -7673,9 +7646,7 @@
dir = 6
},
/obj/structure/window/reinforced,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/structure/table,
/turf/open/floor/iron,
/area/security/brig)
@@ -8471,9 +8442,6 @@
/area/medical/storage)
"dXn" = (
/obj/machinery/computer/security/wooden_tv{
- desc = "Welcome to KOZU 5... your number one source for weather, news, and entertainment. And now, the weather forecast for tomorrow...";
- name = "Budget TV";
- network = list("public");
pixel_x = 2;
pixel_y = 8
},
@@ -8607,9 +8575,7 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","public")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating,
/area/library/abandoned)
"eci" = (
@@ -9425,9 +9391,7 @@
dir = 1
},
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/firealarm/directional/south,
/obj/machinery/ai_slipper{
uses = 10
@@ -9531,9 +9495,7 @@
/area/engine/engineering)
"eBY" = (
/obj/structure/railing,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/openspace,
/area/engine/atmos)
"eCd" = (
@@ -9904,9 +9866,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","public")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/maintenance/department/crew_quarters/dorms)
"eKt" = (
@@ -10234,7 +10194,7 @@
/area/asteroid/paradise)
"eUf" = (
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/gibber,
/turf/open/floor/iron/freezer,
/area/crew_quarters/kitchen/coldroom)
@@ -10489,7 +10449,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/digital_clock/directional/west,
/turf/open/floor/iron/dark/side{
dir = 8
@@ -10579,7 +10539,6 @@
"fae" = (
/obj/machinery/camera/motion/directional/south{
c_tag = "MiniSat Exterior 1";
- network = list("minisat");
view_range = 5
},
/turf/open/openspace,
@@ -11419,7 +11378,7 @@
/area/tcommsat/server)
"fxn" = (
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/telecomms/server/presets/supply,
/obj/effect/turf_decal/stripes/closeup,
/turf/open/floor/circuit/green/telecomms/mainframe,
@@ -11797,9 +11756,7 @@
alpha = 100;
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","public")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/extinguisher_cabinet{
pixel_y = -32
},
@@ -12089,9 +12046,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","public")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/carpet/green,
/area/chapel/main)
"fNV" = (
@@ -12496,7 +12451,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark/corner,
/area/hallway/primary/central)
"fVK" = (
@@ -12977,9 +12932,7 @@
pixel_x = -30
},
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/storage/tech)
"gjO" = (
@@ -13509,10 +13462,9 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Interrogation room";
- name = "Interrogation room";
- network = list("interrogation")
+ name = "Interrogation room"
},
/obj/machinery/light_switch{
pixel_x = 21;
@@ -13854,9 +13806,7 @@
/turf/open/openspace,
/area/hallway/primary/fore)
"gGp" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
@@ -14252,7 +14202,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/storage/primary)
"gQh" = (
@@ -14304,7 +14254,7 @@
pixel_x = -8;
pixel_y = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
@@ -15758,13 +15708,9 @@
/obj/item/camera/detective,
/obj/machinery/computer/security/telescreen{
dir = 8;
- name = "Station Monitor";
- network = list("ss13");
pixel_x = 24
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/item/holosign_creator/security,
/turf/open/floor/wood,
/area/security/detectives_office)
@@ -15824,9 +15770,7 @@
pixel_y = 4
},
/obj/machinery/airalarm/directional/north,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/light{
dir = 1
},
@@ -16693,9 +16637,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/plating/asteroid/basalt/planetary,
/area/quartermaster/storage)
"ifj" = (
@@ -17497,7 +17439,7 @@
/turf/open/floor/iron,
/area/maintenance/department/crew_quarters/dorms)
"iBT" = (
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/openspace,
/area/crew_quarters/kitchen)
"iCD" = (
@@ -17621,9 +17563,7 @@
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 5
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/requests_console{
announcementConsole = 1;
department = "Chief Engineer's Desk";
@@ -17768,7 +17708,7 @@
},
/obj/machinery/light,
/obj/item/kirbyplants/random,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
@@ -18027,9 +17967,7 @@
dir = 4
},
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating/asteroid/planetary,
/area/quartermaster/storage)
"iRh" = (
@@ -18043,9 +17981,7 @@
name = "Storage Locker";
req_one_access_txt = "1;4"
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/security/brig)
"iRv" = (
@@ -18103,7 +18039,7 @@
name = "Coffin Storage";
req_access_txt = "22"
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/techmaint/planetary,
/area/chapel/office)
"iUx" = (
@@ -18190,9 +18126,7 @@
alpha = 180;
color = "#DE3A3A"
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
@@ -18387,7 +18321,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/catwalk_floor/iron_dark,
/area/crew_quarters/heads/hop)
"jeo" = (
@@ -18527,9 +18461,7 @@
"jie" = (
/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/science/mixing)
"jij" = (
@@ -18981,9 +18913,7 @@
pixel_y = -28
},
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/tech,
/area/science/mixing)
"jsc" = (
@@ -19326,9 +19256,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark/telecomms{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
@@ -19548,9 +19476,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/quartermaster/qm)
"jGc" = (
@@ -19624,9 +19550,7 @@
},
/obj/structure/table,
/obj/structure/railing,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/science/robotics)
"jGA" = (
@@ -19758,7 +19682,7 @@
pixel_y = 1
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/item/radio/intercom{
dir = 1;
pixel_y = 29
@@ -20018,9 +19942,7 @@
/obj/machinery/status_display/evac{
pixel_y = 32
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/medical/medbay/central)
"jSs" = (
@@ -20172,9 +20094,7 @@
/area/medical/genetics/cloning)
"jXg" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/status_display/evac{
pixel_x = -32
},
@@ -20253,7 +20173,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/bridge)
"jYA" = (
@@ -20444,7 +20364,6 @@
},
/obj/structure/table/wood,
/obj/machinery/computer/security/telescreen/entertainment{
- network = list("thunder","court","public");
pixel_x = -1;
pixel_y = 31
},
@@ -20639,9 +20558,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/openspace,
/area/hallway/primary/fore)
"kiZ" = (
@@ -21017,9 +20934,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security","prison")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/security/prison)
"kra" = (
@@ -21219,9 +21134,7 @@
pixel_y = 32
},
/obj/structure/filingcabinet/chestdrawer,
-/obj/machinery/camera/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -21668,9 +21581,7 @@
/obj/machinery/atmospherics/pipe/simple/green/hidden{
dir = 8
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine/co2,
/area/engine/atmos)
"kFW" = (
@@ -22044,9 +21955,7 @@
dir = 4
},
/obj/machinery/firealarm/directional/north,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/medical/medbay/central)
"kPl" = (
@@ -22173,9 +22082,8 @@
dir = 1;
light_color = "#7AC3FF"
},
-/obj/machinery/camera/autoname/directional/north{
- c_tag = "Captain's Quarters";
- network = list("ss13","public")
+/obj/machinery/camera/directional/north{
+ c_tag = "Captain's Quarters"
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/sign/barsign{
@@ -22382,9 +22290,7 @@
/obj/machinery/power/apc/auto_name/directional/north{
pixel_y = 24
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -22458,9 +22364,7 @@
/obj/effect/turf_decal/bot{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/engine/atmos)
"lal" = (
@@ -22561,9 +22465,7 @@
/obj/effect/turf_decal/trimline/dark/warning{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine","public")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/engineering/hallway)
"lcQ" = (
@@ -22576,9 +22478,7 @@
"lcR" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/light{
dir = 1
},
@@ -23051,9 +22951,7 @@
/area/asteroid/paradise/surface)
"lok" = (
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/engine/atmos)
"loM" = (
@@ -23269,9 +23167,7 @@
alpha = 180;
dir = 1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/button/door{
id = "armory";
name = "Armory Shutter Toggle";
@@ -23551,9 +23447,7 @@
/turf/closed/wall/r_wall/rust,
/area/engine/engineering)
"lDc" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","public")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/light{
dir = 4
},
@@ -24021,7 +23915,7 @@
"lQd" = (
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/sign/warning/nosmoking/circle{
pixel_x = -32
},
@@ -24437,10 +24331,9 @@
},
/obj/machinery/airalarm/directional/west,
/obj/machinery/monkey_recycler,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Xenobiology Lab";
- name = "Xeno camera";
- network = list("ss13","rd","xeno")
+ name = "Xeno camera"
},
/turf/open/floor/iron/grid/steel,
/area/science/xenobiology)
@@ -24491,9 +24384,7 @@
pixel_x = 1;
pixel_y = 23
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/medical/genetics/cloning)
"man" = (
@@ -25240,11 +25131,8 @@
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 8
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring medbay to ensure patient safety.";
+/obj/machinery/computer/security/telescreen/cmo{
dir = 1;
- name = "Medbay Monitor";
- network = list("medbay");
pixel_x = 1;
pixel_y = -32
},
@@ -25312,7 +25200,7 @@
"mwy" = (
/obj/structure/railing/corner,
/obj/effect/turf_decal/siding/wood,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/machinery/vending/games{
pixel_y = -1
},
@@ -25501,7 +25389,7 @@
pixel_y = 7
},
/obj/item/clothing/suit/hooded/ian_costume,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/hop)
"mzC" = (
@@ -25809,9 +25697,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/item/kirbyplants/random,
/obj/structure/sink/kitchen{
pixel_y = 22
@@ -26188,9 +26074,7 @@
/obj/structure/sign/painting/library{
pixel_y = 32
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay","public")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/medical/storage)
"mRW" = (
@@ -26833,9 +26717,7 @@
/area/maintenance/disposal/incinerator)
"niR" = (
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/power/apc/auto_name/directional/south{
pixel_y = -24
},
@@ -26860,9 +26742,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"nlE" = (
@@ -27116,9 +26996,7 @@
/turf/open/floor/iron/dark,
/area/engine/engineering)
"nrr" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/turf/open/openspace,
/area/science/explab)
"nrw" = (
@@ -27503,9 +27381,7 @@
/area/maintenance/disposal/incinerator)
"nAU" = (
/obj/structure/flora/ausbushes/lavendergrass,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","public")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/plating/asteroid/planetary,
/area/hallway/primary/fore)
"nBs" = (
@@ -27683,7 +27559,6 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/computer/security/telescreen/entertainment{
- network = list("thunder","court","public");
pixel_x = -1;
pixel_y = 31
},
@@ -28386,7 +28261,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"oam" = (
@@ -28569,7 +28444,7 @@
"ohb" = (
/obj/machinery/vending/autodrobe/all_access,
/obj/machinery/airalarm/directional/north,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/wood,
/area/crew_quarters/theatre/backstage)
"ohg" = (
@@ -29953,9 +29828,7 @@
},
/obj/effect/turf_decal/bot,
/obj/structure/cable/yellow,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/plating,
/area/engine/engineering)
"oMA" = (
@@ -30177,9 +30050,7 @@
/turf/open/floor/iron/sepia,
/area/quartermaster/storage)
"oQQ" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/light,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -30232,9 +30103,7 @@
pixel_y = 1
},
/obj/item/kirbyplants/random,
-/obj/machinery/camera/autoname/directional/south{
- network = list("aiupload")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/engine,
/area/ai_monitored/turret_protected/ai)
"oRL" = (
@@ -30356,9 +30225,7 @@
pixel_x = 1;
pixel_y = -34
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/detectives_office)
"oUR" = (
@@ -31006,9 +30873,7 @@
/area/medical/morgue)
"pjQ" = (
/obj/structure/flora/ausbushes/fullgrass,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/plating/asteroid/basalt/planetary,
/area/asteroid/paradise)
"pjU" = (
@@ -31143,13 +31008,6 @@
dir = 4
},
/area/hallway/primary/central)
-"pmk" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/light{
- dir = 4
- },
-/turf/open/floor/engine/light,
-/area/holodeck/small)
"pmx" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -31280,11 +31138,8 @@
icon_state = "4-32"
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the AI Upload.";
+/obj/machinery/computer/security/telescreen/aiupload{
dir = 4;
- name = "AI Upload Monitor";
- network = list("aiupload");
pixel_x = -29
},
/obj/structure/table/reinforced,
@@ -31604,9 +31459,7 @@
dir = 1
},
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/plating/airless,
/area/science/mixing)
"pBJ" = (
@@ -31823,9 +31676,7 @@
/obj/machinery/vending/wallmed{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer_4,
/obj/structure/cable/yellow{
icon_state = "0-4"
@@ -32168,9 +32019,7 @@
/turf/open/floor/plating/grass,
/area/asteroid/paradise/surface)
"pSj" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
@@ -32679,9 +32528,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("aiupload")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/engine,
/area/ai_monitored/turret_protected/ai)
"qbw" = (
@@ -33582,7 +33429,7 @@
pixel_x = 7;
pixel_y = 2
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/hallway/primary/fore)
"qBw" = (
@@ -34206,8 +34053,7 @@
},
/obj/machinery/camera/motion/directional/east{
c_tag = "Technical Storage";
- name = "motion-sensitive Technical Storage";
- network = list("ss13","engine")
+ name = "motion-sensitive Technical Storage"
},
/turf/open/floor/iron/techmaint/planetary,
/area/storage/tech)
@@ -34725,9 +34571,7 @@
/turf/open/floor/iron,
/area/storage/primary)
"rhe" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/computer/security/telescreen/toxins{
pixel_x = 1;
pixel_y = 30
@@ -34923,8 +34767,7 @@
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/machinery/camera/motion/directional/west{
- c_tag = "vault";
- network = list("ss13","security","cargo")
+ c_tag = "vault"
},
/obj/machinery/ntnet_relay,
/turf/open/floor/iron/dark,
@@ -35441,7 +35284,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/white,
/area/crew_quarters/fitness/recreation)
"rzg" = (
@@ -35880,9 +35723,7 @@
color = "#DE3A3A"
},
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/security/brig)
"rKg" = (
@@ -35994,9 +35835,7 @@
},
/area/asteroid/paradise/surface)
"rPi" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/components/binary/pump{
name = "Gas to Chamber"
},
@@ -36020,9 +35859,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/kirbyplants/random,
/obj/machinery/firealarm/directional/south,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/crew_quarters/heads/hor)
"rPu" = (
@@ -36133,7 +35970,7 @@
dir = 1;
pixel_y = 20
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/hydroponics)
"rRY" = (
@@ -36469,7 +36306,7 @@
pixel_x = 1;
pixel_y = -1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
},
@@ -37205,9 +37042,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security","prison","public")
- },
+/obj/machinery/camera/directional/north,
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
name = "Prison Intercom (General)";
@@ -37243,9 +37078,7 @@
/obj/machinery/computer/atmos_control{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/light{
dir = 4
},
@@ -37425,9 +37258,7 @@
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/hop)
"szZ" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","public")
- },
+/obj/machinery/camera/directional/west,
/turf/open/openspace,
/area/hallway/primary/fore)
"sAa" = (
@@ -37655,7 +37486,7 @@
pixel_y = -1
},
/obj/item/book/manual/wiki/sopcommand,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/bridge)
"sFy" = (
@@ -38075,9 +37906,7 @@
/obj/machinery/porta_turret/ai{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("aiupload")
- },
+/obj/machinery/camera/directional/west,
/obj/item/radio/intercom{
dir = 8;
freerange = 1;
@@ -38276,9 +38105,7 @@
"sYh" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/closet/secure_closet/atmospherics{
anchored = 1;
req_access = null;
@@ -38954,9 +38781,7 @@
pixel_x = -32;
pixel_y = -1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/light{
dir = 8
},
@@ -39325,7 +39150,7 @@
/obj/structure/sign/poster/official/suit_sensors{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark/side{
dir = 9
},
@@ -39606,9 +39431,7 @@
/obj/effect/turf_decal/siding/dark{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine","public")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/engineering/hallway)
"tAL" = (
@@ -39816,9 +39639,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security","prison")
- },
+/obj/machinery/camera/directional/west,
/obj/structure/cable/yellow{
icon_state = "1-4"
},
@@ -40423,11 +40244,8 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
+/obj/machinery/computer/security/telescreen/prison{
dir = 8;
- name = "Prison Monitor";
- network = list("prison");
pixel_x = 31;
pixel_y = 1
},
@@ -40587,9 +40405,7 @@
receive_ore_updates = 1
},
/obj/machinery/airalarm/directional/south,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -40661,9 +40477,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/table/reinforced,
/obj/item/stack/package_wrap{
pixel_x = -15
@@ -41574,9 +41388,7 @@
/obj/item/radio/intercom{
pixel_y = 28
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/engine/atmos)
"uzO" = (
@@ -41820,7 +41632,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/openspace,
/area/hallway/primary/fore)
"uHQ" = (
@@ -41936,9 +41748,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/science/robotics)
"uJN" = (
@@ -42079,9 +41889,7 @@
dir = 6
},
/obj/machinery/firealarm/directional/north,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/vending/cigarette,
/turf/open/floor/iron,
/area/medical/surgery)
@@ -42182,7 +41990,7 @@
/obj/machinery/newscaster{
pixel_y = 34
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/item/storage/secure/safe{
pixel_x = -27;
pixel_y = 1
@@ -42399,9 +42207,7 @@
/turf/open/floor/iron,
/area/teleporter)
"uTt" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","medbay","public")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/grid/steel,
/area/medical/patients_rooms)
@@ -43506,9 +43312,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/science/explab)
"vsU" = (
@@ -43934,9 +43738,7 @@
dir = 4
},
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/numbers/two_nine,
/turf/open/floor/iron/sepia,
/area/hallway/primary/aft)
@@ -44130,8 +43932,7 @@
color = "#DE3A3A"
},
/obj/machinery/camera/motion/directional/west{
- c_tag = "Armory - Internal";
- network = list("ss13","security")
+ c_tag = "Armory - Internal"
},
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
@@ -44235,9 +44036,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/engineering/hallway)
"vSp" = (
@@ -44985,9 +44784,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/firealarm/directional/north,
/obj/structure/disposalpipe/segment{
dir = 8
@@ -45600,7 +45397,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/railing/corner{
dir = 1
},
@@ -45879,9 +45676,7 @@
/turf/open/floor/plating/asteroid/planetary,
/area/engine/engineering)
"wIp" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine,
/area/science/explab)
"wIv" = (
@@ -45950,9 +45745,7 @@
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/heads/captain)
"wKs" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/vending/medical,
/obj/machinery/power/apc/auto_name/directional/north{
pixel_y = 24
@@ -46160,9 +45953,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("aiupload")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/firealarm/directional/north,
/turf/open/openspace,
/area/hallway/primary/fore)
@@ -46611,9 +46402,7 @@
/obj/machinery/modular_computer/console/preset/engineering{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/engine/engineering)
"xdb" = (
@@ -46758,7 +46547,7 @@
pixel_x = 1;
pixel_y = -33
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/teleporter)
"xfA" = (
@@ -47103,9 +46892,7 @@
/turf/open/floor/carpet/red,
/area/crew_quarters/theatre/backstage)
"xoc" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/east,
/obj/structure/extinguisher_cabinet{
pixel_x = 25
},
@@ -47560,21 +47347,16 @@
dir = 10
},
/obj/machinery/computer/security/mining{
- dir = 1;
- network = list("vault","cargo")
- },
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","cargo")
+ dir = 1
},
+/obj/machinery/camera/directional/south,
/obj/structure/sign/painting/library{
pixel_x = -31
},
/turf/open/floor/carpet/orange,
/area/quartermaster/qm)
"xyk" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output/layer2,
/turf/open/floor/engine/n2,
/area/engine/atmos)
@@ -48007,7 +47789,7 @@
dir = 1
},
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/wood,
/area/crew_quarters/cafeteria)
"xIW" = (
@@ -49080,7 +48862,6 @@
"ykM" = (
/obj/machinery/camera/motion/directional/south{
c_tag = "MiniSat Exterior 2";
- network = list("minisat");
view_range = 5
},
/turf/open/openspace,
@@ -64689,7 +64470,7 @@ atf
lyC
hhu
xQN
-pmk
+lDc
dqm
oor
kWi
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 64c9545a27d66..966581c375a8e 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -238,7 +238,7 @@
/obj/effect/turf_decal/tile/red/opposingcorners{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Fore Primary Hallway - Security shuttle view";
name = "hallway camera"
},
@@ -281,7 +281,7 @@
/obj/machinery/airalarm/directional/west{
pixel_x = -22
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Chapel - Port";
name = "chapel camera"
},
@@ -408,7 +408,7 @@
/obj/structure/rack,
/obj/item/aicard,
/obj/item/storage/secure/briefcase,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Bridge - Port Central";
name = "command camera"
},
@@ -754,10 +754,9 @@
/turf/open/floor/plating,
/area/maintenance/port/central)
"akh" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Science - Break Room";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/newscaster{
pixel_y = -28
@@ -932,7 +931,7 @@
/obj/effect/turf_decal/guideline/guideline_mid/purple,
/obj/effect/turf_decal/guideline/guideline_out/yellow,
/obj/effect/turf_decal/guideline/guideline_in/blue,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Central Primary Hallway - Central Starboard";
name = "hallway camera"
},
@@ -1816,10 +1815,9 @@
/turf/open/floor/carpet/green,
/area/security/detectives_office)
"aze" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Medbay - Cloning Lab";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
@@ -1915,7 +1913,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/sepia,
/area/science/shuttle)
"aAl" = (
@@ -1938,7 +1936,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/science/shuttle)
"aAu" = (
@@ -2347,10 +2345,9 @@
"aFL" = (
/obj/structure/cable/yellow,
/obj/machinery/power/apc/auto_name/directional/south,
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Science - Robotics Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -3671,11 +3668,8 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the engine containment area.";
+/obj/machinery/computer/security/telescreen/engine{
dir = 8;
- name = "Engine Monitor";
- network = list("engine");
pixel_x = 32
},
/turf/open/floor/iron/sepia,
@@ -4331,9 +4325,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/item/kirbyplants/random,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
@@ -4370,10 +4362,9 @@
"aYi" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Medbay - Chief Medical Officer's Office";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/item/kirbyplants/random,
/obj/structure/cable/yellow{
@@ -4406,10 +4397,9 @@
/turf/closed/mineral/random/labormineral,
/area/ai_monitored/turret_protected/ai)
"aYA" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Medbay - Fore";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/effect/turf_decal/trimline/blue/line{
@@ -5388,10 +5378,9 @@
/turf/open/floor/iron/ridged/steel,
/area/science/xenobiology)
"bmD" = (
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Science - Experimentation Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/item/hand_labeler,
/obj/item/stack/package_wrap,
@@ -5513,9 +5502,7 @@
dir = 8
},
/obj/item/flashlight/seclite,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
"bnZ" = (
@@ -6081,7 +6068,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Cargo - Quartermaster's Office";
name = "cargo camera"
},
@@ -6424,7 +6411,7 @@
/obj/effect/turf_decal/pool{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/noslip/standard,
/area/crew_quarters/fitness/recreation)
"bCW" = (
@@ -6936,7 +6923,7 @@
/turf/open/floor/iron/techmaint,
/area/science/shuttle)
"bMi" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Arrivals - Station Entrance";
name = "hallway camera"
},
@@ -7457,7 +7444,7 @@
pixel_x = 30
},
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Hydroponics - Starboard";
name = "service camera"
},
@@ -7741,10 +7728,9 @@
/obj/machinery/airalarm/directional/west{
pixel_x = -22
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Medbay - Cloning Lab";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/turf/open/floor/iron/grid/steel,
/area/medical/medbay/lobby)
@@ -7972,7 +7958,7 @@
pixel_y = -24;
req_access_txt = "32;47;48"
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Auxiliary Base Construction"
},
/turf/open/floor/iron/sepia,
@@ -8092,7 +8078,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/sepia,
/area/engine/break_room)
"cca" = (
@@ -8427,10 +8413,9 @@
pixel_x = 7;
pixel_y = 3
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Engieneering- Engine Access";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/turf/open/floor/iron/dark,
/area/engine/engine_room)
@@ -8651,7 +8636,7 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/engine/atmos)
"ckd" = (
@@ -9796,9 +9781,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/vault,
/area/engine/engine_room)
"czO" = (
@@ -10967,10 +10950,9 @@
pixel_x = -26
},
/obj/item/kirbyplants/random,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Research Division - Nanite Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/iron/techmaint,
/area/science/nanite)
@@ -11059,8 +11041,7 @@
},
/obj/machinery/camera/motion{
c_tag = "Armory - Interior";
- dir = 9;
- network = list("ss13","security")
+ dir = 9
},
/obj/item/survivalcapsule/capsule_checkpoint,
/turf/open/floor/iron/dark,
@@ -11419,9 +11400,7 @@
/obj/machinery/status_display/evac{
pixel_y = 32
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"cUI" = (
@@ -11659,7 +11638,7 @@
pixel_y = -32
},
/obj/machinery/light/small,
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Engineering - Power Tools";
name = "engineering camera"
},
@@ -11843,7 +11822,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Cargo - Office";
name = "cargo camera"
},
@@ -12553,7 +12532,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/hallway/primary/aft)
"dku" = (
@@ -12720,10 +12699,9 @@
"dme" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Supermatter Engine - Fore";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/machinery/light{
dir = 1
@@ -13190,7 +13168,7 @@
/turf/open/floor/iron/sepia,
/area/engine/break_room)
"dtF" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Chapel Crematorium";
name = "Chapel camera"
},
@@ -13436,7 +13414,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/hallway/primary/central)
"dwQ" = (
@@ -13650,10 +13628,9 @@
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/dropper,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Xenobiology - Research Area";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/machinery/light{
dir = 1
@@ -14426,7 +14403,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/plating/airless{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
@@ -14556,10 +14533,7 @@
},
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/dest_tagger,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
- name = "Research Monitor";
- network = list("rd","minisat");
+/obj/machinery/computer/security/telescreen/rd{
pixel_y = 30
},
/turf/open/floor/iron/dark,
@@ -14698,9 +14672,7 @@
/obj/structure/sign/poster/official/cleanliness{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/anesthetic_machine,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath/medical,
@@ -15082,7 +15054,7 @@
/obj/item/tank/internals/emergency_oxygen/engi,
/obj/item/stack/cable_coil/white,
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Engineering - Fore";
name = "engineering camera"
},
@@ -15484,7 +15456,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Dormitories - Central";
name = "dormitories camera"
},
@@ -15982,7 +15954,7 @@
/obj/item/clothing/head/collectable/HoP{
name = "novelty HoP hat"
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Bridge - Corporate Showroom";
name = "command camera"
},
@@ -16626,7 +16598,7 @@
dir = 1
},
/obj/machinery/light/small,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/chapel/main)
"ere" = (
@@ -17004,8 +16976,7 @@
/obj/effect/turf_decal/sand/plating,
/obj/machinery/camera/motion/directional/south{
c_tag = "AI Chamber - Outside - Fore";
- name = "motion-sensitive ai camera";
- network = list("aichamber")
+ name = "motion-sensitive ai camera"
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
@@ -17854,7 +17825,7 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/security/checkpoint/customs)
"eIl" = (
@@ -18958,9 +18929,7 @@
/turf/open/floor/iron/dark,
/area/security/prison/shielded)
"eTf" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","xeno","rd")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/grid/steel,
/area/science/xenobiology)
"eTg" = (
@@ -18983,7 +18952,7 @@
/obj/machinery/newscaster{
pixel_y = 31
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/hallway/secondary/entry)
"eTo" = (
@@ -19424,10 +19393,9 @@
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/toy/figure/borg,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "AI - Teleporter - Port";
name = "ai camera";
- network = list("minisat");
start_active = 1
},
/turf/open/floor/iron/dark,
@@ -19551,10 +19519,9 @@
/turf/open/floor/plating,
/area/security/checkpoint/medical)
"eYX" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Science - Research Director's Office";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
@@ -19826,7 +19793,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark/corner{
dir = 1
},
@@ -19860,7 +19827,7 @@
pixel_x = 22
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/aft)
"fdE" = (
@@ -20225,7 +20192,7 @@
/obj/item/restraints/handcuffs{
pixel_y = 3
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Bridge - Port";
name = "command camera"
},
@@ -20405,9 +20372,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/tech/grid,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"flq" = (
@@ -20627,7 +20592,7 @@
/turf/open/floor/iron/grid/steel,
/area/hallway/secondary/exit/departure_lounge)
"foB" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Security - Departures Fore"
},
/obj/structure/chair/fancy/bench/left{
@@ -20871,19 +20836,14 @@
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring medbay to ensure patient safety.";
+/obj/machinery/computer/security/telescreen/cmo{
dir = 1;
- name = "Medbay Monitor";
- network = list("medbay");
pixel_y = -28
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"fsa" = (
@@ -21209,7 +21169,7 @@
pixel_x = -28;
pixel_y = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/wood,
/area/bridge/meeting_room/council)
"fuW" = (
@@ -21623,7 +21583,7 @@
/area/hallway/primary/fore)
"fAw" = (
/obj/effect/landmark/start/lawyer,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Courtroom - Center"
},
/obj/machinery/light{
@@ -21808,10 +21768,9 @@
},
/area/ai_monitored/turret_protected/ai)
"fDc" = (
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "AI Chamber - Fore";
- name = "motion-sensitive ai camera";
- network = list("aichamber")
+ name = "motion-sensitive ai camera"
},
/obj/effect/turf_decal/siding/wideplating_new/dark{
dir = 1
@@ -21968,10 +21927,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Science - Research Director's Quarters";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/light/small{
dir = 4
@@ -22262,7 +22220,7 @@
/obj/item/stock_parts/micro_laser/high,
/obj/item/stock_parts/micro_laser/high,
/obj/item/stock_parts/micro_laser/high,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Technology Storage";
name = "engineering camera"
},
@@ -22309,7 +22267,7 @@
/obj/machinery/airalarm/directional/west{
pixel_x = -22
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/bridge)
"fIN" = (
@@ -22547,7 +22505,7 @@
name = "Bridge RC";
pixel_x = 30
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/grid/steel,
/area/bridge)
"fLF" = (
@@ -22788,7 +22746,7 @@
/obj/structure/disposalpipe/trunk{
dir = 2
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/hallway/primary/fore)
"fOi" = (
@@ -24042,10 +24000,9 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/hos)
"geA" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Supermatter Engine - Laser room";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/structure/cable/orange{
icon_state = "0-8"
@@ -24363,8 +24320,7 @@
},
/obj/machinery/camera/motion/directional/west{
c_tag = "AI Chamber - Port";
- name = "motion-sensitive ai camera";
- network = list("aichamber")
+ name = "motion-sensitive ai camera"
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
@@ -24438,11 +24394,8 @@
dir = 8
},
/obj/effect/turf_decal/bot,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
+/obj/machinery/computer/security/telescreen/prison{
dir = 8;
- name = "Prison Monitor";
- network = list("prison");
pixel_x = 31;
pixel_y = 1
},
@@ -25693,7 +25646,7 @@
pixel_y = 23;
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Atmospherics - Turbines";
name = "atmospherics camera"
},
@@ -25745,7 +25698,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/grid/steel,
/area/bridge)
"gAu" = (
@@ -26096,8 +26049,7 @@
"gEm" = (
/obj/machinery/camera/motion{
c_tag = "Vault";
- dir = 6;
- network = list("vault")
+ dir = 6
},
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable/yellow{
@@ -26129,10 +26081,9 @@
/turf/open/floor/iron/checker,
/area/quartermaster/storage)
"gEP" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Medbay - Genetics Desk";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/structure/noticeboard{
dir = 8;
@@ -26713,10 +26664,9 @@
/obj/machinery/atmospherics/components/trinary/mixer{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Science - Experimentor";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/iron/techmaint,
/area/science/mixing)
@@ -26901,7 +26851,7 @@
name = "Atmospherics RC";
pixel_y = -30
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark/side,
/area/engine/atmos)
"gOY" = (
@@ -27023,8 +26973,7 @@
/obj/structure/cable/white,
/obj/machinery/camera/motion/directional/west{
c_tag = "AI Chamber - Central";
- name = "motion-sensitive ai camera";
- network = list("aichamber")
+ name = "motion-sensitive ai camera"
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai)
@@ -27060,8 +27009,7 @@
/obj/effect/turf_decal/sand/plating,
/obj/machinery/camera/motion/directional/west{
c_tag = "AI Chamber - Outside - Starboard";
- name = "motion-sensitive ai camera";
- network = list("aichamber")
+ name = "motion-sensitive ai camera"
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
@@ -27257,7 +27205,7 @@
/area/quartermaster/exploration_prep)
"gTR" = (
/obj/item/kirbyplants/random,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/library)
"gTS" = (
@@ -27321,7 +27269,7 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"gUV" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Escape Shuttle Hallway - Aft";
name = "hallway camera"
},
@@ -27615,7 +27563,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/hallway/secondary/exit/departure_lounge)
"gZd" = (
@@ -27788,7 +27736,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/ai_monitored/storage/eva)
"hbD" = (
@@ -28071,7 +28019,7 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"hfY" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Vacant Commissary #1"
},
/obj/machinery/newscaster{
@@ -28636,7 +28584,7 @@
/turf/open/floor/plating,
/area/maintenance/port/central)
"hmI" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Port Primary Hallway - Center";
name = "hallway camera"
},
@@ -29021,7 +28969,7 @@
/area/medical/surgery)
"htj" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/hallway/primary/aft)
"htv" = (
@@ -29479,9 +29427,7 @@
/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"hAd" = (
@@ -29614,7 +29560,7 @@
/obj/effect/turf_decal/guideline/guideline_out/blue{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Starboard Primary Hallway - Port";
name = "hallway camera"
},
@@ -29944,9 +29890,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/security/prison/shielded)
"hHX" = (
@@ -29986,10 +29930,9 @@
/obj/structure/chair/fancy/sofa/old/left{
color = "#742925"
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Medbay - Break Room";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
@@ -30340,8 +30283,7 @@
"hLs" = (
/obj/machinery/camera/motion/directional/west{
c_tag = "AI Chamber - Port";
- name = "motion-sensitive ai camera";
- network = list("aichamber")
+ name = "motion-sensitive ai camera"
},
/obj/effect/turf_decal/siding/wideplating_new/dark{
dir = 8
@@ -30648,10 +30590,9 @@
dir = 4
},
/obj/effect/turf_decal/trimline/purple/filled/warning,
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Science - Research Division Access";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/iron/grid/steel,
/area/science/lobby)
@@ -30921,9 +30862,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/vault,
/area/engine/engine_room)
"hSZ" = (
@@ -32087,7 +32026,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/hallway/primary/port)
"iix" = (
@@ -32496,7 +32435,7 @@
/turf/open/floor/iron/dark,
/area/security/execution/transfer)
"ioe" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Starboard Primary Hallway - AI antechamber Entrance";
name = "hallway camera"
},
@@ -32514,7 +32453,7 @@
/turf/open/floor/prison,
/area/security/prison)
"ioj" = (
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Engineering Maintenance - Center";
name = "engineering camera"
},
@@ -32780,7 +32719,7 @@
/turf/open/floor/iron/grid,
/area/medical/virology)
"irr" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Atmospherics - Plasma Cell"
},
/turf/open/floor/engine/air/light,
@@ -33647,8 +33586,7 @@
"iBs" = (
/obj/machinery/camera/motion/directional/south{
c_tag = "AI Chamber - Aft";
- name = "motion-sensitive ai camera";
- network = list("aichamber")
+ name = "motion-sensitive ai camera"
},
/obj/effect/turf_decal/siding/wideplating_new/dark,
/turf/open/floor/iron/dark,
@@ -33995,9 +33933,7 @@
/obj/structure/railing/corner{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/obj/structure/sign/poster/official/safety_eye_protection{
pixel_x = 32
},
@@ -34684,8 +34620,6 @@
"iOM" = (
/obj/machinery/computer/security/telescreen{
dir = 8;
- name = "Station Monitor";
- network = list("ss13");
pixel_x = 24
},
/obj/machinery/computer/secure_data{
@@ -35001,10 +34935,9 @@
/turf/open/floor/iron,
/area/quartermaster/office)
"iSn" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Xenobiology - Fore";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/obj/machinery/button/door{
id = "telelab";
@@ -35095,7 +35028,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"iTB" = (
@@ -35289,7 +35222,7 @@
/turf/open/floor/iron,
/area/crew_quarters/fitness/recreation)
"iWh" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Atmospherics - Fore Port";
name = "atmospherics camera"
},
@@ -35775,7 +35708,7 @@
"jdc" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/structure/reagent_dispensers/fueltank,
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Cargo - Quartermaster's Office";
name = "cargo camera"
},
@@ -36385,7 +36318,7 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = 32
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/library)
"jlz" = (
@@ -36416,9 +36349,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/techmaint,
/area/security/checkpoint/auxiliary)
"jlC" = (
@@ -36652,10 +36583,9 @@
/obj/machinery/airalarm/directional/east{
pixel_x = 22
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Telecomms - Antechamber";
- name = "telecomms camera";
- network = list("ss13","tcomms")
+ name = "telecomms camera"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -37133,7 +37063,7 @@
name = "Sign Door";
req_one_access = "25"
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Cafeteria antechamber";
name = "service camera"
},
@@ -37705,7 +37635,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Primary Restroom";
name = "Restroom camera"
},
@@ -37907,10 +37837,9 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Medbay - Surgery";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
@@ -38074,7 +38003,7 @@
/turf/open/floor/grass,
/area/hydroponics/garden)
"jKb" = (
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Engineering Maintenance - Starboard";
name = "engineering camera"
},
@@ -38149,7 +38078,7 @@
pixel_x = -28
},
/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/storage/primary)
"jLa" = (
@@ -38475,9 +38404,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/techmaint,
/area/security/prison)
"jPp" = (
@@ -38520,7 +38447,7 @@
/obj/effect/turf_decal/guideline/guideline_out/blue{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/aft)
"jPK" = (
@@ -38661,7 +38588,7 @@
/obj/machinery/newscaster{
pixel_y = -29
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/hallway/primary/central)
"jQL" = (
@@ -38735,9 +38662,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/prison,
/area/security/prison)
"jRy" = (
@@ -39176,9 +39101,7 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/security/main)
"jXP" = (
@@ -39303,7 +39226,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Locker Room - Starboard";
name = "dormitories camera"
},
@@ -39370,7 +39293,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/maintenance/department/engine)
"jZV" = (
@@ -39483,10 +39406,9 @@
/obj/machinery/vending/wallmed{
pixel_x = -24
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Medbay - Surgery";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 8
@@ -39874,7 +39796,6 @@
},
/obj/machinery/computer/security/telescreen{
dir = 1;
- network = list("ss13");
pixel_y = -30
},
/turf/open/floor/wood,
@@ -41093,7 +41014,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/hallway/secondary/entry)
"kvJ" = (
@@ -41983,7 +41904,7 @@
dir = 4;
pixel_x = -26
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Teleporter";
name = "command camera"
},
@@ -42244,7 +42165,7 @@
/obj/machinery/status_display/evac{
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Fore Primary Hallway - Starboard";
name = "hallway camera"
},
@@ -42414,7 +42335,7 @@
},
/area/quartermaster/office)
"kPe" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Engineering - Central";
name = "engineering camera"
},
@@ -42515,9 +42436,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/tech/grid,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"kQD" = (
@@ -42595,7 +42514,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 26
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Garden - Port";
name = "garden camera"
},
@@ -42660,7 +42579,7 @@
/obj/machinery/newscaster{
pixel_y = -28
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Cryogenic Lounge";
name = "recreation camera"
},
@@ -42725,10 +42644,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Medbay - Chemistry";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable/yellow{
@@ -43126,9 +43044,7 @@
/turf/open/floor/plating,
/area/engine/gravity_generator)
"kWN" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"kWP" = (
@@ -43185,10 +43101,9 @@
/turf/open/floor/prison,
/area/security/prison)
"kXo" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Telecomms - Server Room";
- name = "telecomms camera";
- network = list("ss13","tcomms")
+ name = "telecomms camera"
},
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -43743,7 +43658,7 @@
/obj/item/kirbyplants/random,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/item/toy/plush/moth/firewatch,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark/side{
dir = 5
},
@@ -43790,7 +43705,7 @@
/obj/effect/turf_decal/tile/bar/opposingcorners{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/cafeteria,
/area/vacant_room/commissary/commissaryFood)
"ldq" = (
@@ -43838,10 +43753,9 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Science - Aft hallway";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/iron/grid/steel,
/area/science/research)
@@ -43944,7 +43858,7 @@
/area/medical/apothecary)
"lfr" = (
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Arrivals - Aft Arm - Center";
name = "hallway camera"
},
@@ -44238,10 +44152,7 @@
pixel_x = 28;
pixel_y = 1
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_y = 30
},
/obj/structure/chair,
@@ -44487,7 +44398,7 @@
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
"lkP" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Service Hallways";
name = "service camera"
},
@@ -44559,7 +44470,7 @@
/obj/structure/sign/poster/official/random{
pixel_x = 32
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Dormitories - Fore";
name = "dormitories camera"
},
@@ -44868,7 +44779,7 @@
/turf/open/floor/iron,
/area/quartermaster/sorting)
"lpz" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Port Primary Hallway - Fore";
name = "hallway camera"
},
@@ -44890,8 +44801,7 @@
/obj/machinery/camera/motion{
c_tag = "AI Chamber - Outside - Aft";
dir = 9;
- name = "motion-sensitive ai camera";
- network = list("aichamber")
+ name = "motion-sensitive ai camera"
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
@@ -44955,10 +44865,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Xenobiology - Research Area";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/turf/open/floor/iron/grid/steel,
/area/science/misc_lab)
@@ -45371,10 +45280,9 @@
/obj/machinery/airalarm/directional/north{
pixel_y = 22
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Medbay - Aft Port";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
@@ -45496,7 +45404,7 @@
/obj/effect/turf_decal/guideline/guideline_out/blue{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Port Primary Hallway - Port";
name = "hallway camera"
},
@@ -46154,7 +46062,7 @@
/obj/structure/chair/fancy/bench/pew/left{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/courtroom)
"lHb" = (
@@ -46325,7 +46233,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/wood,
/area/library/lounge)
"lJJ" = (
@@ -46357,7 +46265,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Library - Entrance";
name = "library camera"
},
@@ -46562,7 +46470,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
@@ -46683,7 +46591,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Technology Storage - Secure";
name = "engineering camera"
},
@@ -46878,7 +46786,7 @@
/turf/open/floor/iron,
/area/hallway/primary/starboard)
"lSo" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Starboard Primary Hallway - Starboard";
name = "hallway camera"
},
@@ -47330,7 +47238,7 @@
/obj/item/book/manual/wiki/security_space_law,
/obj/item/radio,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Security Post - Arrivals"
},
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -47377,7 +47285,7 @@
/obj/item/storage/firstaid/regular,
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Security - Medbay"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -47814,10 +47722,9 @@
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"mfv" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Science - Toxins Secure Storage";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -47948,9 +47855,7 @@
/obj/machinery/computer/security{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/security/main)
"mib" = (
@@ -48196,7 +48101,7 @@
id = "medcell";
name = "Medical Cell Locker"
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Security Post - Arrivals"
},
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -48715,9 +48620,7 @@
"mtP" = (
/obj/structure/punching_bag,
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/prison,
/area/security/prison)
"mtQ" = (
@@ -49606,7 +49509,7 @@
/obj/structure/sign/poster/official/cleanliness{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/hydroponics)
"mEH" = (
@@ -49781,7 +49684,7 @@
/turf/open/floor/iron/sepia,
/area/engine/engineering)
"mGW" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Auxiliary Restroom";
name = "restroom camera"
},
@@ -50126,9 +50029,7 @@
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/evidence,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/sign/poster/official/safety_report{
pixel_y = -32
},
@@ -50208,10 +50109,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Xenobiology - Secure Cell";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/turf/open/floor/engine,
/area/science/xenobiology)
@@ -50265,7 +50165,7 @@
/turf/open/floor/iron/dark,
/area/medical/storage)
"mNx" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Central Primary Hallway - Central Port";
name = "hallway camera"
},
@@ -50910,10 +50810,9 @@
name = "Virology Requests Console";
pixel_x = 30
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Virology - Virology Breakroom";
- name = "virology camera";
- network = list("ss13","medbay")
+ name = "virology camera"
},
/obj/machinery/light/small{
dir = 4
@@ -51384,7 +51283,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Port Primary Hallway - Mech bay";
name = "hallway camera"
},
@@ -51669,7 +51568,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = 30
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Atmospherics - Distro Loop";
name = "atmospherics camera"
},
@@ -51848,7 +51747,7 @@
/area/library/lounge)
"njt" = (
/obj/machinery/power/tesla_coil,
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Engineering - Secure Storage";
name = "engineering camera"
},
@@ -51886,9 +51785,7 @@
dir = 4
},
/obj/machinery/light/small,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/detectives_office)
"nkz" = (
@@ -52560,10 +52457,9 @@
/obj/structure/bed,
/obj/item/bedsheet/medical,
/obj/machinery/iv_drip,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Medbay - Recovery Room";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = 32
@@ -52955,9 +52851,7 @@
/obj/effect/turf_decal/trimline/red/line{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/brig)
"nzD" = (
@@ -53075,7 +52969,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Courtroom - Fore"
},
/obj/structure/chair/fancy/bench/pew/right{
@@ -54144,7 +54038,7 @@
/turf/open/floor/plating,
/area/construction)
"nPP" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Unique Commissary"
},
/turf/open/floor/plating,
@@ -54442,10 +54336,7 @@
/obj/item/clothing/mask/muzzle,
/obj/item/clothing/mask/muzzle,
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_x = 30
},
/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted,
@@ -54594,9 +54485,7 @@
/turf/open/floor/iron/techmaint,
/area/maintenance/department/security/brig)
"nXK" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine/light,
/area/science/explab)
"nXL" = (
@@ -54756,7 +54645,7 @@
/area/bridge/meeting_room/council)
"nZD" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Atmospherics - Engine Passage";
name = "atmospherics camera"
},
@@ -55165,9 +55054,7 @@
/area/hallway/primary/fore)
"odz" = (
/obj/machinery/firealarm/directional/south,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/engine/engine_room)
"odD" = (
@@ -55488,7 +55375,7 @@
/turf/open/floor/iron/techmaint,
/area/quartermaster/exploration_prep)
"ojt" = (
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/catwalk_floor,
/area/drydock)
"oju" = (
@@ -55877,7 +55764,7 @@
/obj/structure/sign/nanotrasen{
pixel_y = 32
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/hallway/primary/starboard)
"oon" = (
@@ -56525,7 +56412,7 @@
/obj/effect/turf_decal/guideline/guideline_in_arrow_con/red{
dir = 9
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/fore)
"owW" = (
@@ -56762,7 +56649,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/wood,
/area/lawoffice)
"oBN" = (
@@ -56929,7 +56816,7 @@
/obj/structure/sign/poster/official/do_not_question{
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Vacant Office"
},
/obj/item/camera_film{
@@ -56942,7 +56829,7 @@
"oDB" = (
/obj/structure/table/wood/fancy/royalblack,
/obj/item/flashlight/lamp,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Cargo - Quartermaster's Quarters";
name = "cargo camera"
},
@@ -56984,7 +56871,7 @@
/obj/effect/turf_decal/guideline/guideline_mid/darkblue{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Fore Primary Hallway - Security shuttle";
name = "hallway camera"
},
@@ -57120,10 +57007,9 @@
},
/obj/machinery/computer/rdservercontrol,
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Science - Server Room";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/vault,
/area/science/server)
@@ -57460,10 +57346,9 @@
"oKv" = (
/obj/machinery/computer/objective,
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Science - Exploration Preparation";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/structure/sign/poster/random{
pixel_x = 32
@@ -59236,10 +59121,9 @@
/turf/open/floor/iron,
/area/vacant_room/commissary/commissary1)
"pla" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Science - Research and Development";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
@@ -60761,10 +60645,9 @@
/obj/machinery/light_switch{
pixel_y = -24
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Medbay - Storage";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/turf/open/floor/iron/white,
/area/medical/storage)
@@ -60808,7 +60691,7 @@
/area/hallway/primary/port)
"pHV" = (
/obj/structure/filingcabinet/chestdrawer,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/lawoffice)
"pHW" = (
@@ -60911,7 +60794,7 @@
"pIV" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/portable_atmospherics/pump,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Atmospherics - Pumps";
name = "atmospherics camera"
},
@@ -60951,7 +60834,7 @@
dir = 4
},
/obj/machinery/firealarm/directional/south,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"pJl" = (
@@ -60986,10 +60869,9 @@
/turf/open/floor/catwalk_floor/iron_smooth,
/area/maintenance/disposal/incinerator)
"pJI" = (
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Xenobiology - Research Area";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/turf/open/floor/iron/dark,
/area/maintenance/department/science)
@@ -61408,7 +61290,7 @@
/obj/machinery/computer/atmos_alert{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Atmospherics - Desk";
name = "atmospherics camera"
},
@@ -61549,7 +61431,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Engineering - Chief Engineer's Quarters";
name = "engineering camera"
},
@@ -61722,7 +61604,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Arrivals - Fore Arm - Far";
name = "hallway camera"
},
@@ -61966,10 +61848,9 @@
/obj/machinery/status_display/evac{
pixel_x = 32
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Medbay - Chief Medical Officer's Quarters";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/cmo)
@@ -62280,7 +62161,7 @@
dir = 1
},
/obj/machinery/firealarm/directional/west,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
"qcA" = (
@@ -62683,7 +62564,7 @@
/turf/open/floor/plating,
/area/ai_monitored/storage/eva)
"qhL" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Recreation - port";
name = "recreation camera"
},
@@ -63098,7 +62979,7 @@
/area/construction)
"qmP" = (
/obj/machinery/vending/sustenance,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Cafeteria"
},
/turf/open/floor/iron/cafeteria,
@@ -63440,7 +63321,7 @@
/obj/machinery/microwave{
pixel_y = 5
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Kitchen";
name = "service camera"
},
@@ -63486,7 +63367,7 @@
/turf/open/floor/carpet,
/area/vacant_room/office)
"qsh" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Dormitories - Locker Room";
name = "dormitories camera"
},
@@ -63618,7 +63499,7 @@
/turf/open/floor/iron/dark,
/area/tcommsat/computer)
"qtt" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Atmospherics - Mix Cell";
name = "atmospherics camera"
},
@@ -63741,9 +63622,7 @@
"quf" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable/yellow,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","tcomms")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/engine{
initial_gas_mix = "n2=100;TEMP=80";
name = "mainframe floor"
@@ -63752,7 +63631,7 @@
"quh" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Cargo Bay - Starboard";
name = "cargo camera"
},
@@ -63934,7 +63813,7 @@
/turf/open/floor/catwalk_floor/iron_smooth,
/area/maintenance/disposal/incinerator)
"qwL" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Arrivals - Inner corridor";
name = "hallway camera"
},
@@ -64038,7 +63917,7 @@
pixel_x = -28;
pixel_y = 1
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Escape Shuttle Hallway - Aft Central";
name = "hallway camera"
},
@@ -64731,9 +64610,7 @@
/area/quartermaster/qm)
"qHb" = (
/obj/structure/reagent_dispensers/water_cooler,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/medical/exam_room)
"qHu" = (
@@ -65109,10 +64986,8 @@
/area/hallway/primary/central)
"qLi" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
- dir = 4;
- name = "Test Chamber Monitor";
- network = list("xeno")
+/obj/machinery/computer/security/telescreen/research{
+ dir = 4
},
/turf/open/floor/iron/grid/steel,
/area/science/xenobiology)
@@ -65580,10 +65455,9 @@
/obj/item/radio/intercom{
pixel_y = -28
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Science - Experimentor";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/engine/light,
/area/science/xenobiology)
@@ -67460,7 +67334,7 @@
dir = 4
},
/obj/machinery/firealarm/directional/north,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/wood,
/area/hallway/primary/aft)
"rsJ" = (
@@ -68109,10 +67983,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Science - Toxins Storage Passtrough";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/iron/techmaint,
/area/science/storage)
@@ -68151,7 +68024,7 @@
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"rBC" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Gambling Corner";
name = "service camera"
},
@@ -68365,10 +68238,9 @@
/turf/open/floor/iron/dark,
/area/engine/atmos)
"rEf" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Medbay - Auxiliary Fore Entrance";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/machinery/computer/med_data{
dir = 8
@@ -68621,10 +68493,9 @@
/area/engine/engine_room)
"rHf" = (
/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Science - Toxins Mixing Lab Burn Chamber";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
@@ -68982,7 +68853,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Cargo - Foyer";
name = "cargo camera"
},
@@ -69156,10 +69027,9 @@
/obj/machinery/computer/cryopod{
pixel_y = 25
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Medbay - Sleepers";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/turf/open/floor/iron/dark/airless,
/area/medical/surgery)
@@ -69634,7 +69504,7 @@
},
/obj/item/stack/sheet/plasteel/twenty,
/obj/item/wrench,
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Engineering - Gravity Generator Foyer";
name = "engineering camera"
},
@@ -69649,8 +69519,7 @@
/obj/machinery/camera/motion{
c_tag = "AI - Upload";
dir = 4;
- name = "motion-sensitive ai camera";
- network = list("aiupload")
+ name = "motion-sensitive ai camera"
},
/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -69734,7 +69603,7 @@
/turf/open/floor/iron/techmaint,
/area/maintenance/department/engine)
"rSU" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Chapel Office Antechamber";
name = "chapel camera"
},
@@ -69793,7 +69662,7 @@
/turf/open/floor/iron,
/area/hallway/secondary/exit/departure_lounge)
"rUg" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Central Primary Hallway - Courtroom Entrance";
name = "hallway camera"
},
@@ -69992,7 +69861,7 @@
/obj/effect/turf_decal/siding/white{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/hallway/primary/port)
"rWG" = (
@@ -70133,9 +70002,7 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -70612,11 +70479,11 @@
/obj/machinery/status_display/ai{
pixel_y = 32
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/hallway/primary/port)
"sfk" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Atmospherics - Plasma Cell";
name = "atmospherics camera"
},
@@ -70654,10 +70521,9 @@
},
/area/maintenance/aft)
"sfP" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Medbay - Waiting Room";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -70775,7 +70641,7 @@
/area/hallway/primary/fore)
"shn" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/hallway/primary/central)
"shs" = (
@@ -71013,7 +70879,7 @@
/turf/open/floor/iron,
/area/hallway/primary/starboard)
"ska" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Arrivals - Lounge";
name = "lounge camera"
},
@@ -71631,7 +71497,7 @@
/obj/machinery/status_display/ai{
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/hallway/primary/aft)
"ssT" = (
@@ -72111,7 +71977,7 @@
/turf/open/floor/vault,
/area/engine/engine_room)
"syL" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/catwalk_floor,
/area/drydock/security)
"syR" = (
@@ -72214,9 +72080,8 @@
name = "Interrogation Intercom";
pixel_y = 24
},
-/obj/machinery/camera/autoname/directional/north{
- c_tag = "Interrogation room";
- network = list("interrogation")
+/obj/machinery/camera/directional/north{
+ c_tag = "Interrogation room"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -72557,7 +72422,7 @@
/obj/item/crowbar,
/obj/item/wirecutters,
/obj/item/stack/cable_coil/white,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Engineering - Gear Storage";
name = "engineering camera"
},
@@ -72700,9 +72565,8 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/machinery/camera/autoname/directional/east{
- c_tag = "Security Post - Science";
- network = list("ss13","rd")
+/obj/machinery/camera/directional/east{
+ c_tag = "Security Post - Science"
},
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
@@ -72800,7 +72664,7 @@
},
/area/quartermaster/office)
"sGY" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Atmospherics - Port";
name = "atmospherics camera"
},
@@ -73425,10 +73289,9 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Science - Central hallway";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/item/radio/intercom{
pixel_x = 28
@@ -73439,7 +73302,7 @@
/obj/machinery/newscaster{
pixel_y = 31
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/vacant_room/commissary/commissary2)
"sRl" = (
@@ -73873,7 +73736,7 @@
/obj/effect/turf_decal/guideline/guideline_in/red{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Central Primary Hallway - Bow";
name = "hallway camera"
},
@@ -75209,10 +75072,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Science - Experimentor";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/item/radio/intercom{
pixel_y = -28
@@ -76651,7 +76513,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Atmospherics - Atmos Storage";
name = "atmospherics camera"
},
@@ -77063,10 +76925,9 @@
/turf/open/floor/iron,
/area/hallway/secondary/entry)
"tNV" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Medbay - Genetics Lab";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/machinery/light_switch{
pixel_x = -24
@@ -77355,7 +77216,7 @@
/turf/open/floor/catwalk_floor,
/area/security/checkpoint/escape)
"tQo" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Bridge - Dock - Aft";
name = "command camera"
},
@@ -77363,7 +77224,7 @@
/turf/open/floor/iron/dark,
/area/bridge)
"tQu" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Port Primary Hallway - Checkpoint";
name = "hallway camera"
},
@@ -77666,7 +77527,7 @@
/turf/open/floor/iron/dark,
/area/bridge/showroom/corporate)
"tUe" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Atmospherics - Nitrous Oxide Cell";
name = "atmospherics camera"
},
@@ -77991,10 +77852,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Supermatter Engine - Backup Starboard";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/turf/open/floor/vault,
/area/engine/engine_room)
@@ -78038,10 +77898,9 @@
/area/science/storage)
"tZF" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Xenobiology - Research Area";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/turf/open/floor/iron/dark,
/area/maintenance/department/science)
@@ -78743,7 +78602,7 @@
pixel_y = 6
},
/obj/item/pen,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Engineering - Chief Engineer's Office";
name = "engineering camera"
},
@@ -78920,7 +78779,7 @@
/obj/item/radio/intercom{
pixel_x = 28
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/central)
"ulP" = (
@@ -79028,7 +78887,7 @@
pixel_x = -32;
pixel_y = 37
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"umz" = (
@@ -79658,7 +79517,7 @@
/turf/open/floor/vault,
/area/engine/engine_room)
"uuU" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Recreation - Cryo Lounge";
name = "recreation camera"
},
@@ -80715,11 +80574,8 @@
pixel_y = 24;
req_access_txt = "3"
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
+/obj/machinery/computer/security/telescreen/prison{
dir = 8;
- name = "Security Monitor";
- network = list("ss13","labor");
pixel_x = 31;
pixel_y = 1
},
@@ -80897,7 +80753,7 @@
dir = 8
},
/obj/machinery/firealarm/directional/east,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/crew_quarters/bar/atrium)
"uJg" = (
@@ -81073,7 +80929,7 @@
/turf/open/floor/iron,
/area/engine/atmos)
"uLG" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/hallway/primary/port)
"uLI" = (
@@ -81171,9 +81027,7 @@
pixel_x = 4;
pixel_y = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","xeno","rd")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/grid/steel,
/area/science/xenobiology)
"uNj" = (
@@ -81795,7 +81649,7 @@
/obj/structure/noticeboard{
pixel_y = 26
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -81842,7 +81696,7 @@
"uWu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Science - Shuttle dock";
name = "science camera"
},
@@ -82082,7 +81936,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Science maintenance - Port";
name = "science camera"
},
@@ -82869,7 +82723,7 @@
/turf/open/floor/iron,
/area/hallway/primary/aft)
"vih" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Atmospherics - Plasma Cell"
},
/turf/open/floor/engine/o2/light,
@@ -83391,9 +83245,7 @@
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable/yellow{
icon_state = "0-4"
@@ -83419,7 +83271,7 @@
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"vod" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Chapel - Starboard";
name = "chapel camera"
},
@@ -83620,9 +83472,8 @@
/obj/effect/turf_decal/stripes/red/line,
/obj/structure/cable,
/obj/structure/window/plasma/reinforced,
-/obj/machinery/camera/autoname/directional/west{
- c_tag = "Supermatter Chamber";
- network = list("engine")
+/obj/machinery/camera/directional/west{
+ c_tag = "Supermatter Chamber"
},
/turf/open/floor/engine,
/area/engine/supermatter)
@@ -83800,10 +83651,9 @@
/turf/open/floor/iron,
/area/medical/cryo)
"vrW" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Xenobiology - Kill Room";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ name = "xenobiology camera"
},
/turf/open/floor/circuit/telecomms,
/area/science/xenobiology)
@@ -83960,10 +83810,9 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "AI Chamber - Antechamber";
name = "ai camera";
- network = list("aichamber");
start_active = 1
},
/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted,
@@ -84265,9 +84114,7 @@
/obj/effect/turf_decal/trimline/red/corner{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/hallway/primary/central)
"vvL" = (
@@ -84767,7 +84614,7 @@
/area/hallway/primary/central)
"vAj" = (
/obj/structure/window/reinforced,
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Locker Room - Holodeck";
name = "dormitories camera"
},
@@ -85852,7 +85699,7 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/engine/engine_smes)
"vNZ" = (
@@ -85883,10 +85730,9 @@
/obj/effect/turf_decal/trimline/purple/line{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Research Division - Nanite Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/iron/grid/steel,
/area/science/research)
@@ -85928,7 +85774,7 @@
/turf/open/floor/engine/light,
/area/science/explab)
"vOz" = (
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/sepia,
/area/science/shuttle)
"vOC" = (
@@ -86025,9 +85871,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"vPv" = (
@@ -86108,7 +85952,7 @@
"vQm" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/engine/atmos)
"vQp" = (
@@ -86199,7 +86043,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"vRu" = (
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Atmospherics - Carbon Dioxide Cell";
name = "atmospherics camera"
},
@@ -86706,9 +86550,7 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","tcomms")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/tcommsat/computer)
"vXT" = (
@@ -87239,7 +87081,7 @@
/obj/machinery/airalarm/directional/east{
pixel_x = 22
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Central Primary Hallway - Central Fore";
name = "hallway camera"
},
@@ -87441,10 +87283,9 @@
dir = 1
},
/obj/machinery/firealarm/directional/south,
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Science - Experimentor";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/iron/techmaint,
/area/science/nanite)
@@ -87971,7 +87812,7 @@
/turf/closed/wall,
/area/chapel/main)
"wov" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/engine{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
@@ -88032,7 +87873,7 @@
dir = 9
},
/obj/item/kirbyplants/random,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Bridge - Dock - Fore";
name = "command camera"
},
@@ -88150,7 +87991,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hos)
"wqP" = (
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Starboard Primary Hallway - Telecomm entrance";
name = "hallway camera"
},
@@ -88485,7 +88326,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"wuF" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/hallway/secondary/entry)
"wuK" = (
@@ -89252,7 +89093,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Atmospherics - Maintenace access";
name = "atmospherics camera"
},
@@ -89334,11 +89175,8 @@
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
+/obj/machinery/computer/security/telescreen/rd{
dir = 4;
- name = "Research Monitor";
- network = list("rd","minisat");
pixel_x = -26
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -89388,7 +89226,7 @@
},
/area/maintenance/starboard/aft)
"wHC" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Atmospherics - Plasma Cell"
},
/turf/open/floor/engine/n2/light,
@@ -89930,7 +89768,7 @@
dir = 8
},
/obj/item/paicard,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Bar";
name = "service camera"
},
@@ -90133,7 +89971,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 26
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Cargo Bay - Aft";
name = "cargo camera"
},
@@ -91173,7 +91011,7 @@
/area/engine/atmos)
"xbh" = (
/obj/machinery/firealarm/directional/north,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/sepia,
/area/science/shuttle)
"xbl" = (
@@ -91404,7 +91242,7 @@
pixel_x = -24
},
/obj/structure/cable/yellow,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Cargo Bay - Starboard";
name = "cargo camera"
},
@@ -91449,7 +91287,7 @@
/turf/open/floor/iron,
/area/hallway/secondary/entry)
"xdU" = (
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Port Primary Hallway - lounge";
name = "hallway camera"
},
@@ -91809,7 +91647,7 @@
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/trunk,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/crew_quarters/locker)
"xgX" = (
@@ -91979,7 +91817,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Chapel - Funeral Parlour";
name = "chapel camera"
},
@@ -92025,7 +91863,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Cargo - Office";
name = "cargo camera"
},
@@ -92272,7 +92110,7 @@
/obj/item/clothing/accessory/maidapron,
/obj/item/clothing/under/costume/maid,
/obj/item/grenade/clusterbuster/cleaner,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark/side{
dir = 5
},
@@ -92331,7 +92169,7 @@
/obj/effect/turf_decal/guideline/guideline_in_arrow_con/blue,
/obj/effect/turf_decal/guideline/guideline_mid_arrow_con/purple,
/obj/machinery/firealarm/directional/north,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Central Primary Hallway - Port";
name = "hallway camera"
},
@@ -92526,7 +92364,7 @@
dir = 4
},
/obj/machinery/firealarm/directional/east,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/central)
"xoU" = (
@@ -92869,7 +92707,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Engineering - Shared Storage";
name = "engineering camera"
},
@@ -93053,7 +92891,7 @@
name = "Cargo Checkpoint RC";
pixel_y = 30
},
-/obj/machinery/camera/autoname/directional/east{
+/obj/machinery/camera/directional/east{
c_tag = "Security Post - Cargo"
},
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -93182,10 +93020,9 @@
/obj/machinery/airalarm/directional/north{
pixel_y = 22
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Medbay - Sleepers";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/turf/open/floor/iron/white,
/area/medical/surgery)
@@ -93509,7 +93346,7 @@
"xzJ" = (
/obj/effect/turf_decal/bot,
/obj/structure/ore_box,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Cargo - Mining Dock";
name = "cargo camera"
},
@@ -93686,7 +93523,7 @@
/obj/effect/turf_decal/guideline/guideline_mid/purple{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/central)
"xBu" = (
@@ -94357,7 +94194,7 @@
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark/side,
/area/engine/atmos)
"xHi" = (
@@ -94996,7 +94833,7 @@
dir = 8
},
/obj/machinery/firealarm/directional/west,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/crew_quarters/locker)
"xMs" = (
@@ -95106,7 +94943,7 @@
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Theatre - Backstage";
name = "service camera"
},
@@ -95577,7 +95414,7 @@
"xSF" = (
/obj/effect/spawner/randomvend/snack,
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Locker Room - Arcade";
name = "dormitories camera"
},
@@ -95776,9 +95613,7 @@
dir = 1
},
/obj/machinery/airalarm/directional/south,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/prison)
"xVB" = (
@@ -95874,7 +95709,7 @@
/obj/item/radio/intercom{
pixel_y = 24
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/quartermaster/storage)
"xWO" = (
@@ -96142,7 +95977,7 @@
"xZz" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Engineering Maintenance - Engine Entrance";
name = "engineering camera"
},
@@ -96367,10 +96202,9 @@
dir = 1
},
/obj/effect/turf_decal/stripes/end,
-/obj/machinery/camera/autoname/directional/west{
+/obj/machinery/camera/directional/west{
c_tag = "Research Division - Nanite Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/plating,
/area/science/robotics/mechbay)
@@ -96846,7 +96680,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/library)
"yix" = (
@@ -96930,9 +96764,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/red/corner,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"yjd" = (
@@ -97120,7 +96952,7 @@
pixel_x = 24
},
/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/bridge)
"ykQ" = (
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 5ed4738f5998c..c707a0592649b 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -4022,8 +4022,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Xenobiology Entrance";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/light/small,
/obj/structure/cable/yellow{
@@ -4691,8 +4690,7 @@
"axZ" = (
/obj/machinery/camera/directional/west{
c_tag = "Xenobiology Cell 2";
- name = "xenobiology camera";
- network = list("ss13","rd","xeno")
+ name = "xenobiology camera"
},
/obj/machinery/light/small{
dir = 8
@@ -10908,8 +10906,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Toxins Burn Chamber";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/airalarm/mixingchamber{
dir = 4;
@@ -13811,8 +13808,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Satellite Transit Access";
- name = "satellite camera";
- network = list("minisat")
+ name = "satellite camera"
},
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -13890,9 +13886,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -14957,7 +14951,6 @@
/obj/machinery/camera{
c_tag = "Cloning Lab";
name = "medical camera";
- network = list("ss13","medical");
dir = 1
},
/turf/open/floor/iron/showroomfloor,
@@ -18490,8 +18483,7 @@
},
/obj/machinery/camera/motion/directional/south{
c_tag = "Vault";
- name = "vault camera";
- network = list("vault")
+ name = "vault camera"
},
/turf/open/floor/engine,
/area/security/nuke_storage)
@@ -19387,8 +19379,7 @@
"cln" = (
/obj/machinery/camera/directional/west{
c_tag = "Atmospherics Tank - Plasma";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -22629,7 +22620,7 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"cBH" = (
-/obj/machinery/computer/security/telescreen/turbine{
+/obj/machinery/computer/security/telescreen/engine{
dir = 1
},
/obj/structure/table,
@@ -24297,8 +24288,7 @@
luminosity = 2
},
/obj/machinery/camera/directional/west{
- c_tag = "Turbine Chamber";
- network = list("turbine")
+ c_tag = "Turbine Chamber"
},
/obj/structure/cable,
/obj/structure/cable{
@@ -25878,9 +25868,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/security/brig/aft)
"cRX" = (
@@ -26169,8 +26157,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "AI Chamber SMES";
- name = "core camera";
- network = list("aicore")
+ name = "core camera"
},
/turf/open/floor/engine,
/area/ai_monitored/turret_protected/ai)
@@ -27860,9 +27847,7 @@
/area/maintenance/port)
"dyX" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
- name = "Test Chamber Monitor";
- network = list("xeno");
+/obj/machinery/computer/security/telescreen/research{
pixel_y = 2
},
/obj/structure/window/reinforced{
@@ -28156,8 +28141,7 @@
"dDd" = (
/obj/machinery/camera/directional/west{
c_tag = "Atmospherics Tank - N2O";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -28864,8 +28848,7 @@
"dRx" = (
/obj/machinery/camera/directional/west{
c_tag = "Xenobiology Cell 1";
- name = "xenobiology camera";
- network = list("ss13","rd","xeno")
+ name = "xenobiology camera"
},
/obj/machinery/light/small{
dir = 8
@@ -29171,9 +29154,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
-/obj/machinery/camera/autoname{
- network = list("ss13","prison","security")
- },
+/obj/machinery/camera,
/turf/open/floor/iron,
/area/hallway/primary/aft)
"dVi" = (
@@ -29428,9 +29409,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/hos)
"dZN" = (
@@ -29798,8 +29777,7 @@
"eei" = (
/obj/machinery/flasher/portable,
/obj/machinery/camera/motion/directional/east{
- c_tag = "Armory Internal";
- network = list("ss13","security")
+ c_tag = "Armory Internal"
},
/obj/effect/turf_decal/box,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
@@ -29987,8 +29965,7 @@
"egA" = (
/obj/machinery/camera/directional/north{
c_tag = "Atmospherics Tank - Air";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/turf/open/floor/engine/air,
/area/engine/atmos)
@@ -30950,8 +30927,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Operating Theatre";
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
@@ -31192,8 +31168,7 @@
/obj/item/paper/monitorkey,
/obj/machinery/camera/directional/east{
c_tag = "Chief Engineer's Office";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 4
@@ -31637,7 +31612,7 @@
/turf/open/floor/iron,
/area/security/courtroom)
"eKG" = (
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 1
},
/obj/effect/turf_decal/tile/purple/half/contrasted{
@@ -31789,9 +31764,7 @@
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/captain)
"eMU" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
@@ -32614,8 +32587,7 @@
"fcE" = (
/obj/machinery/camera/directional/east{
c_tag = "Recovery Room";
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/obj/machinery/chem_master,
/turf/open/floor/iron/dark,
@@ -32972,8 +32944,7 @@
"fhg" = (
/obj/machinery/camera/directional/north{
c_tag = "Xenobiology Test Chamber";
- name = "xenobiology camera";
- network = list("ss13","rd","xeno")
+ name = "xenobiology camera"
},
/turf/open/floor/engine,
/area/science/xenobiology)
@@ -33450,8 +33421,7 @@
"fpR" = (
/obj/machinery/camera/directional/north{
c_tag = "Atmospherics Tank - N2";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
@@ -33575,8 +33545,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/east{
c_tag = "Vacant Commissary";
- name = "cargo camera";
- network = list("ss13","qm")
+ name = "cargo camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -33755,8 +33724,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Supermatter Terminal";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/machinery/light_switch{
pixel_x = -22;
@@ -34069,8 +34037,7 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/camera/directional/east{
c_tag = "Atmospherics Entrance";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -34655,8 +34622,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Satellite Maintenance";
- name = "satellite camera";
- network = list("minisat")
+ name = "satellite camera"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/engine,
@@ -35556,8 +35522,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Research Division";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -35981,8 +35946,7 @@
"gio" = (
/obj/machinery/camera/directional/east{
c_tag = "Xenobiology Cell 4";
- name = "xenobiology camera";
- network = list("ss13","rd","xeno")
+ name = "xenobiology camera"
},
/obj/machinery/light/small{
dir = 4
@@ -36331,11 +36295,8 @@
/obj/structure/chair{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the test chamber.";
+/obj/machinery/computer/security/telescreen/toxins{
dir = 8;
- name = "Test Chamber Telescreen";
- network = list("toxins");
pixel_x = 30
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -36795,9 +36756,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"gxo" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
@@ -36836,7 +36795,6 @@
/obj/machinery/camera{
c_tag = "Medbay Lobby";
name = "medical camera";
- network = list("ss13","medical");
dir = 1
},
/obj/item/kirbyplants{
@@ -36972,8 +36930,7 @@
"gDg" = (
/obj/machinery/camera/directional/west{
c_tag = "Atmospherics Tank - CO2";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -37043,7 +37000,6 @@
/obj/machinery/camera/directional/south{
c_tag = "Satellite External Fore";
name = "exterior camera";
- network = list("minisat");
start_active = 1
},
/obj/effect/turf_decal/sand/plating,
@@ -37639,9 +37595,7 @@
dir = 1
},
/obj/item/kirbyplants/random,
-/obj/machinery/camera/directional/north{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/wood,
/area/security/prison)
"gPk" = (
@@ -38094,8 +38048,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Engineering Desk";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38519,8 +38472,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "AI Upload Turrets";
- name = "upload camera";
- network = list("aiupload")
+ name = "upload camera"
},
/turf/open/floor/circuit/green{
luminosity = 2
@@ -39881,8 +39833,7 @@
},
/obj/machinery/camera{
c_tag = "Recovery Room";
- name = "geneticscamera";
- network = list("ss13","medical")
+ name = "geneticscamera"
},
/turf/open/floor/iron/showroomfloor,
/area/medical/genetics)
@@ -40084,8 +40035,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Laser Room Starboard";
- name = "laser room camera";
- network = list("ss13","engine")
+ name = "laser room camera"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -40734,8 +40684,7 @@
"hMo" = (
/obj/machinery/camera/directional/west{
c_tag = "Xenobiology Cell 5";
- name = "xenobiology camera";
- network = list("ss13","rd","xeno")
+ name = "xenobiology camera"
},
/obj/machinery/light/small{
dir = 8
@@ -41494,8 +41443,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Auxiliary Base Construction";
- name = "cargo camera";
- network = list("ss13","qm")
+ name = "cargo camera"
},
/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/tile/brown/half/contrasted,
@@ -42375,9 +42323,7 @@
/obj/structure/noticeboard{
pixel_y = 30
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/security/brig)
@@ -42469,8 +42415,7 @@
/area/crew_quarters/kitchen)
"ivw" = (
/obj/machinery/computer/security/qm{
- dir = 8;
- network = list("mine","auxbase","vault","qm")
+ dir = 8
},
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/corner,
@@ -42497,8 +42442,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Atmospherics Distribution Loop";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -43243,9 +43187,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/item/kirbyplants{
icon_state = "plant-02";
pixel_y = 3
@@ -43774,8 +43716,7 @@
"iPz" = (
/obj/machinery/camera/directional/east{
c_tag = "Xenobiology Cell 3";
- name = "xenobiology camera";
- network = list("ss13","rd","xeno")
+ name = "xenobiology camera"
},
/obj/machinery/light/small{
dir = 4
@@ -44450,7 +44391,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -45566,8 +45507,7 @@
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera/directional/south{
c_tag = "Atmospherics Desk";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -45844,8 +45784,7 @@
/obj/machinery/shieldgen,
/obj/machinery/camera/directional/west{
c_tag = "Secure Storage";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/turf/open/floor/iron/dark,
/area/engine/engineering)
@@ -45893,8 +45832,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Atmospherics Aft Tanks";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -46633,8 +46571,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Secure Tech Storage";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/turf/open/floor/engine,
/area/storage/tech)
@@ -48195,8 +48132,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/south{
c_tag = "Starboard Bow Solar";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/airalarm/directional/south{
@@ -48418,8 +48354,7 @@
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/camera/directional/east{
c_tag = "Incinerator";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/effect/turf_decal/box,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
@@ -48912,8 +48847,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Quartermaster's Office";
- name = "cargo camera";
- network = list("ss13","qm")
+ name = "cargo camera"
},
/obj/structure/disposalpipe/trunk,
/obj/structure/cable/yellow{
@@ -48936,8 +48870,7 @@
/obj/effect/turf_decal/sand/plating,
/obj/structure/lattice/catwalk,
/obj/machinery/camera/motion/directional/south{
- c_tag = "Armory - External";
- network = list("ss13","prison")
+ c_tag = "Armory - External"
},
/turf/open/floor/plating/airless{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -49005,8 +48938,7 @@
"krR" = (
/obj/machinery/camera/directional/south{
c_tag = "Medical Security Post";
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
@@ -49058,8 +48990,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/camera/directional/north{
c_tag = "Atmospherics Lockers";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -49209,8 +49140,7 @@
/obj/item/stock_parts/subspace/treatment,
/obj/machinery/camera/directional/north{
c_tag = "Telecomms Storage";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -49262,8 +49192,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Cargo Checkpoint Post";
- name = "cargo camera";
- network = list("ss13","qm")
+ name = "cargo camera"
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -49931,8 +49860,7 @@
/obj/machinery/camera{
c_tag = "Exploration Dock";
dir = 9;
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/purple{
@@ -50086,8 +50014,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Port Bow Solar";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/turf/open/floor/plating{
burnt = 1
@@ -51908,8 +51835,7 @@
"loS" = (
/obj/machinery/camera/directional/south{
c_tag = "Medical Security Post";
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/obj/machinery/light,
/obj/effect/turf_decal/tile/blue/half/contrasted{
@@ -52021,8 +51947,7 @@
/obj/machinery/airalarm/directional/east,
/obj/machinery/camera/directional/east{
c_tag = "Cargo Ramps";
- name = "cargo camera";
- network = list("ss13","qm")
+ name = "cargo camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -52408,7 +52333,7 @@
dir = 8
},
/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/green{
dir = 4
},
@@ -52836,8 +52761,6 @@
"lDE" = (
/obj/machinery/computer/security/telescreen/cmo{
dir = 8;
- name = "Chief Medical Officer's telescreen";
- network = list("medical");
pixel_x = 28
},
/obj/machinery/light{
@@ -53854,8 +53777,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Toxins Storage";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -53945,7 +53867,6 @@
/obj/machinery/camera{
c_tag = "Virology - Testing pens";
name = "virology camera";
- network = list("ss13","medbay");
dir = 10
},
/obj/structure/table/glass,
@@ -54056,9 +53977,7 @@
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/security/brig)
"lYs" = (
@@ -54429,8 +54348,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Cargo Office";
- name = "cargo camera";
- network = list("ss13","qm")
+ name = "cargo camera"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -54583,8 +54501,7 @@
"mgA" = (
/obj/machinery/camera/directional/west{
c_tag = "AI Upload Garden";
- name = "upload camera";
- network = list("aiupload")
+ name = "upload camera"
},
/obj/structure/lattice,
/turf/open/space/basic,
@@ -54636,8 +54553,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Gravity Generator Foyer";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/machinery/button/door{
id = "gravity";
@@ -55106,8 +55022,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Satellite Atmospherics";
- name = "satellite camera";
- network = list("minisat")
+ name = "satellite camera"
},
/turf/open/floor/engine,
/area/ai_monitored/turret_protected/aisat/atmos)
@@ -55296,8 +55211,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/machinery/camera/directional/east{
c_tag = "Recovery Room";
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
@@ -55355,8 +55269,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Tool Storage";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -56462,8 +56375,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/camera/directional/south{
c_tag = "Tech Storage";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -56498,7 +56410,6 @@
/obj/machinery/camera/directional/east{
c_tag = "Xenobiology Computers";
name = "xenobiology camera";
- network = list("ss13","rd","xeno");
dir = 8
},
/turf/open/floor/iron/showroomfloor,
@@ -56601,9 +56512,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/security/main)
"mRi" = (
@@ -56631,8 +56540,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "AI Chamber Door";
- name = "core camera";
- network = list("aicore")
+ name = "core camera"
},
/turf/open/floor/engine,
/area/ai_monitored/turret_protected/ai)
@@ -56714,8 +56622,7 @@
/obj/machinery/vending/wardrobe/science_wardrobe,
/obj/machinery/camera/directional/east{
c_tag = "Experimenter Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -57778,7 +57685,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 8
},
/obj/effect/turf_decal/stripes/corner{
@@ -58994,7 +58901,7 @@
/obj/effect/turf_decal/tile/green{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/quartermaster/exploration_dock)
"nKp" = (
@@ -59452,8 +59359,7 @@
"nRk" = (
/obj/machinery/camera/directional/west{
c_tag = "Telecomms Monitoring";
- name = "telecomms camera";
- network = list("ss13","tcomms")
+ name = "telecomms camera"
},
/obj/machinery/requests_console{
announcementConsole = 1;
@@ -59722,8 +59628,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Toxins Mixers";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/structure/extinguisher_cabinet{
pixel_x = 24
@@ -60694,8 +60599,7 @@
"ola" = (
/obj/machinery/camera/directional/south{
c_tag = "Satellite Antechamber";
- name = "satellite camera";
- network = list("minisat")
+ name = "satellite camera"
},
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable/yellow{
@@ -61398,11 +61302,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring medbay to ensure patient safety.";
- name = "Medbay Monitor";
- network = list("medical")
- },
+/obj/machinery/computer/security/telescreen/cmo,
/obj/machinery/requests_console{
department = "Security";
departmentType = 5;
@@ -62009,8 +61909,7 @@
"oGG" = (
/obj/machinery/camera/directional/east{
c_tag = "AI Upload Transit Exterior";
- name = "upload camera";
- network = list("aiupload")
+ name = "upload camera"
},
/obj/structure/lattice,
/turf/open/space/basic,
@@ -62670,8 +62569,6 @@
"oSS" = (
/obj/machinery/computer/security/telescreen{
dir = 8;
- name = "Station Monitor";
- network = list("ss13");
pixel_x = 24
},
/obj/structure/table/wood,
@@ -63213,8 +63110,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Atmospherics Scrubbers";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 4
@@ -63581,8 +63477,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Supermatter Cooler";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/firealarm{
@@ -63661,9 +63556,7 @@
/obj/machinery/light_switch{
pixel_x = 25
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/security/brig/aft)
"phw" = (
@@ -63871,8 +63764,7 @@
pixel_x = -26
},
/obj/machinery/camera/directional/west{
- c_tag = "Brig Cells";
- network = list("ss13","prison")
+ c_tag = "Brig Cells"
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -63900,7 +63792,7 @@
/obj/machinery/vending/wallmed/lite{
pixel_y = 26
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/showroomfloor,
/area/security/main)
"plt" = (
@@ -64018,8 +63910,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Telecomms Server Room";
- name = "telecomms camera";
- network = list("ss13","tcomms")
+ name = "telecomms camera"
},
/turf/open/floor/engine{
initial_gas_mix = "n2=100;TEMP=80";
@@ -64618,8 +64509,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/north{
c_tag = "Starboard Quarter Solar";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/structure/cable{
icon_state = "0-2"
@@ -64982,7 +64872,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
},
@@ -67223,8 +67113,7 @@
"qqx" = (
/obj/machinery/camera/directional/west{
c_tag = "Atmospherics Port Tanks";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/obj/structure/disposalpipe/segment{
dir = 6
@@ -67795,8 +67684,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Virology - Testing pens";
- name = "virology camera";
- network = list("ss13","medbay")
+ name = "virology camera"
},
/obj/item/food/cheese/wheel{
pixel_x = 18
@@ -70010,7 +69898,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 9
},
/turf/open/floor/iron/showroomfloor,
@@ -70392,8 +70280,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Server Room";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/corner{
@@ -70775,7 +70662,6 @@
/obj/machinery/camera/directional/east{
c_tag = "Satellite External Port";
name = "exterior camera";
- network = list("minisat");
start_active = 1
},
/obj/effect/turf_decal/sand/plating,
@@ -70804,9 +70690,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/rnd/production/techfab/department/security,
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron/dark,
@@ -71001,8 +70885,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/camera/directional/east{
c_tag = "Research Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
@@ -71646,8 +71529,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Xenobiology Closet";
- name = "xenobiology camera";
- network = list("ss13","rd","xeno")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -71738,8 +71620,7 @@
/obj/machinery/camera{
c_tag = "Recovery Room";
dir = 10;
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/obj/structure/extinguisher_cabinet{
pixel_x = -24
@@ -72398,8 +72279,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Xenobiology Labs";
- name = "xenobiology camera";
- network = list("ss13","rd","xeno")
+ name = "xenobiology camera"
},
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -72909,8 +72789,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Satellite Foyer";
- name = "satellite camera";
- network = list("minisat")
+ name = "satellite camera"
},
/turf/open/floor/engine,
/area/ai_monitored/turret_protected/aisat/foyer)
@@ -73709,9 +73588,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -73889,8 +73766,7 @@
/obj/machinery/computer/nanite_chamber_control,
/obj/machinery/camera/directional/north{
c_tag = "Nanite Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -73985,8 +73861,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Supermatter Waste Line";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/machinery/button/door{
id = "engineaccess";
@@ -74354,8 +74229,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/camera/directional/south{
c_tag = "Chemistry";
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/turf/open/floor/iron/dark,
/area/medical/chemistry)
@@ -74696,11 +74570,8 @@
/area/teleporter)
"sQq" = (
/obj/structure/table,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons from the safety of his office.";
- dir = 1;
- name = "Research Monitor";
- network = list("rd")
+/obj/machinery/computer/security/telescreen/rd{
+ dir = 1
},
/obj/machinery/newscaster{
pixel_y = -30
@@ -74965,7 +74836,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 8
},
/obj/effect/turf_decal/tile/purple/half/contrasted{
@@ -74996,8 +74867,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Telecomms Server SMES";
- name = "telecomms camera";
- network = list("ss13","tcomms")
+ name = "telecomms camera"
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
@@ -75010,8 +74880,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Cargo Lockers";
- name = "cargo camera";
- network = list("ss13","qm")
+ name = "cargo camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
@@ -75449,8 +75318,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/south{
c_tag = "Toxins Pumps";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -75607,8 +75475,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Toxins Launch Site";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/structure/extinguisher_cabinet{
pixel_y = 28
@@ -75815,7 +75682,7 @@
/obj/structure/sign/poster/official/random{
pixel_x = -32
},
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 10
},
/obj/effect/turf_decal/tile/purple/half/contrasted{
@@ -75915,8 +75782,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Supermatter Engine";
- name = "supermatter camera";
- network = list("engine")
+ name = "supermatter camera"
},
/obj/structure/cable{
icon_state = "4-8"
@@ -76209,8 +76075,7 @@
/obj/machinery/camera{
c_tag = "Port Quarter Solar";
dir = 9;
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating{
@@ -76256,8 +76121,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/camera/directional/north{
c_tag = "Engineering Lockers";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -76591,8 +76455,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Xenobiology Euthanization Chamber";
- name = "xenobiology camera";
- network = list("ss13","rd","xeno")
+ name = "xenobiology camera"
},
/turf/open/floor/circuit/telecomms,
/area/science/xenobiology)
@@ -76733,8 +76596,7 @@
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera/directional/south{
c_tag = "Gravity Generator";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/turf/open/floor/engine,
/area/engine/gravity_generator)
@@ -76801,8 +76663,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Research Director's Office";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -77129,8 +76990,7 @@
/obj/item/stock_parts/cell/high,
/obj/machinery/camera/directional/south{
c_tag = "Engineering Storage";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/machinery/light_switch{
pixel_x = 24
@@ -78203,8 +78063,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/camera/directional/north{
c_tag = "Chief Medical Officer's Office";
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -80338,8 +80197,7 @@
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera/directional/east{
c_tag = "Recovery Room";
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -81187,11 +81045,8 @@
dir = 1
},
/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the AI Upload.";
+/obj/machinery/computer/security/telescreen/aiupload{
dir = 4;
- name = "AI Upload Monitor";
- network = list("aiupload");
pixel_x = -28
},
/obj/machinery/light/small,
@@ -81472,8 +81327,7 @@
/area/crew_quarters/theatre)
"vgW" = (
/obj/machinery/computer/security/qm{
- dir = 1;
- network = list("mine","auxbase","vault","qm")
+ dir = 1
},
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/corner,
@@ -81609,8 +81463,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Mining Dock";
- name = "cargo camera";
- network = list("ss13","qm")
+ name = "cargo camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -81910,8 +81763,7 @@
/obj/machinery/camera{
c_tag = "Recovery Room";
dir = 8;
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -82868,7 +82720,6 @@
/obj/machinery/camera{
c_tag = "Recovery Room";
name = "cloning camera";
- network = list("ss13","medical");
dir = 4
},
/turf/open/floor/iron/showroomfloor,
@@ -83236,7 +83087,6 @@
/obj/machinery/camera/directional/west{
c_tag = "Satellite External Starboard";
name = "exterior camera";
- network = list("minisat");
start_active = 1
},
/obj/effect/turf_decal/sand/plating,
@@ -83259,8 +83109,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Robotics Lab";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/machinery/power/apc{
areastring = "/area/science/robotics/lab";
@@ -83506,7 +83355,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/box,
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -83934,8 +83783,7 @@
"vUg" = (
/obj/machinery/camera/directional/north{
c_tag = "Atmospherics Tank - O2";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
@@ -85078,8 +84926,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Laser Room Port";
- name = "laser room camera";
- network = list("ss13","engine")
+ name = "laser room camera"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -85482,8 +85329,7 @@
"wqi" = (
/obj/machinery/camera/directional/east{
c_tag = "Xenobiology Cell 6";
- name = "xenobiology camera";
- network = list("ss13","rd","xeno")
+ name = "xenobiology camera"
},
/obj/machinery/light/small{
dir = 4
@@ -85924,8 +85770,7 @@
/obj/effect/turf_decal/bot_white,
/obj/machinery/camera/directional/north{
c_tag = "Morgue";
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -86127,8 +85972,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Science Security Post";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -86221,9 +86065,7 @@
"wAf" = (
/obj/machinery/airalarm/directional/south,
/obj/structure/table/reinforced,
-/obj/machinery/camera/autoname{
- network = list("ss13","prison")
- },
+/obj/machinery/camera,
/turf/open/floor/iron/techmaint,
/area/security/prison)
"wAo" = (
@@ -86664,14 +86506,10 @@
},
/obj/machinery/camera/motion/directional/west{
c_tag = "AI Upload Foyer";
- name = "upload camera";
- network = list("aiupload")
+ name = "upload camera"
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the AI Upload.";
+/obj/machinery/computer/security/telescreen/aiupload{
dir = 4;
- name = "AI Upload Monitor";
- network = list("aiupload");
pixel_x = -28
},
/obj/effect/landmark/start/cyborg,
@@ -87111,7 +86949,7 @@
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname,
+/obj/machinery/camera,
/turf/open/floor/iron/showroomfloor,
/area/science/shuttledock)
"wOj" = (
@@ -87717,7 +87555,7 @@
/obj/structure/closet{
name = "Evidence Closet"
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/security/brig/aft)
"wWj" = (
@@ -87885,8 +87723,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Mech Bay";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -88151,8 +87988,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Recovery Room";
- name = "medical camera";
- network = list("ss13","medical")
+ name = "medical camera"
},
/turf/open/floor/iron/showroomfloor,
/area/medical/medbay/central)
@@ -88194,8 +88030,7 @@
},
/obj/machinery/camera/directional/west{
c_tag = "Engineering Foyer";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/corner{
@@ -88478,11 +88313,8 @@
pixel_x = 24;
pixel_y = -24
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the test chamber.";
+/obj/machinery/computer/security/telescreen/toxins{
dir = 8;
- name = "Test Chamber Telescreen";
- network = list("toxins");
pixel_x = 30
},
/obj/machinery/light/small,
@@ -88648,7 +88480,7 @@
/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 8
},
/turf/open/floor/iron/showroomfloor,
@@ -90354,8 +90186,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Virology - Testing pens";
- name = "virology camera";
- network = list("ss13","medbay")
+ name = "virology camera"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -91222,8 +91053,7 @@
"yaG" = (
/obj/machinery/camera/directional/west{
c_tag = "Atmospherics Tank - Mix";
- name = "atmospherics camera";
- network = list("ss13","engine")
+ name = "atmospherics camera"
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -91302,8 +91132,7 @@
},
/obj/machinery/camera/directional/south{
c_tag = "Delivery Office";
- name = "cargo camera";
- network = list("ss13","qm")
+ name = "cargo camera"
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -91486,9 +91315,7 @@
},
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/security/brig/aft)
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index c2e773cadfddd..3be297f41a99e 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -1065,8 +1065,7 @@
/area/engine/gravity_generator)
"akb" = (
/obj/machinery/camera/directional/west{
- c_tag = "Research Division Hallway - Robotics";
- network = list("ss13","rd")
+ c_tag = "Research Division Hallway - Robotics"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -1238,9 +1237,8 @@
/turf/open/floor/plating,
/area/maintenance/port)
"alD" = (
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 10
},
/obj/structure/table/reinforced,
/obj/item/storage/crayons,
@@ -2634,10 +2632,7 @@
/area/security/nuke_storage)
"azU" = (
/obj/structure/table/wood,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_y = 30
},
/obj/item/flashlight/lamp/green{
@@ -6330,11 +6325,8 @@
/obj/machinery/computer/secure_data{
dir = 8
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring the engine.";
+/obj/machinery/computer/security/telescreen/engine{
dir = 8;
- name = "Engine Monitor";
- network = list("engine");
pixel_x = 32
},
/obj/effect/turf_decal/tile/red/half,
@@ -6397,8 +6389,7 @@
/area/crew_quarters/locker)
"aWq" = (
/obj/machinery/camera/directional/west{
- c_tag = "Supermatter Chamber";
- network = list("engine")
+ c_tag = "Supermatter Chamber"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -6442,8 +6433,7 @@
/area/medical/exam_room)
"aWH" = (
/obj/machinery/camera/directional/east{
- c_tag = "Research and Development";
- network = list("ss13","rd")
+ c_tag = "Research and Development"
},
/obj/machinery/light_switch{
pixel_x = 27
@@ -8252,8 +8242,7 @@
/area/hallway/primary/central)
"bhC" = (
/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Lab - Pen #6";
- network = list("ss13","rd","xeno")
+ c_tag = "Xenobiology Lab - Pen #6"
},
/obj/machinery/light/small{
dir = 4
@@ -15129,8 +15118,7 @@
"bXv" = (
/obj/structure/tank_dispenser,
/obj/machinery/camera/directional/east{
- c_tag = "Toxins - Mixing Area";
- network = list("ss13","rd")
+ c_tag = "Toxins - Mixing Area"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -15358,8 +15346,7 @@
/area/security/checkpoint/science/research)
"bZu" = (
/obj/machinery/camera/directional/west{
- c_tag = "Engineering Supermatter Fore";
- network = list("ss13","engine")
+ c_tag = "Engineering Supermatter Fore"
},
/obj/machinery/firealarm{
dir = 4;
@@ -18813,8 +18800,7 @@
/area/science/test_area)
"cFB" = (
/obj/machinery/camera/directional/north{
- c_tag = "Toxins - Launch Area";
- network = list("ss13","rd")
+ c_tag = "Toxins - Launch Area"
},
/obj/machinery/suit_storage_unit/rd,
/obj/effect/turf_decal/bot{
@@ -21571,7 +21557,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/security/prison)
"dhy" = (
@@ -21752,11 +21738,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for the Auxillary Mining Base.";
+/obj/machinery/computer/security/telescreen/auxbase{
dir = 1;
- name = "Auxillary Base Monitor";
- network = list("auxbase");
pixel_y = -28
},
/obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -22055,10 +22038,7 @@
/area/maintenance/department/science/xenobiology)
"dmi" = (
/obj/machinery/computer/security,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_y = 30
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -22347,8 +22327,7 @@
dir = 4
},
/obj/machinery/camera/directional/north{
- c_tag = "AI Upload Foyer";
- network = list("aiupload")
+ c_tag = "AI Upload Foyer"
},
/obj/machinery/airalarm/directional/north{
pixel_y = 26
@@ -22606,8 +22585,7 @@
"duh" = (
/obj/machinery/telecomms/processor/preset_three,
/obj/machinery/camera/directional/north{
- c_tag = "Telecomms - Server Room - Fore-Starboard";
- network = list("ss13","tcomms")
+ c_tag = "Telecomms - Server Room - Fore-Starboard"
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
@@ -23532,8 +23510,7 @@
pixel_x = -23
},
/obj/machinery/camera/directional/west{
- c_tag = "Research Division Hallway - Mech Bay";
- network = list("ss13","rd")
+ c_tag = "Research Division Hallway - Mech Bay"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
@@ -23776,7 +23753,6 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Research Division - Server Room";
- network = list("ss13","rd");
pixel_x = 22
},
/turf/open/floor/iron/dark,
@@ -24453,8 +24429,7 @@
/area/library)
"eey" = (
/obj/machinery/camera/motion/directional/south{
- c_tag = "Vault";
- network = list("vault")
+ c_tag = "Vault"
},
/obj/machinery/light,
/obj/structure/cable/yellow{
@@ -25152,8 +25127,7 @@
pixel_x = -32
},
/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Lab - Euthanization Chamber";
- network = list("ss13","rd","xeno")
+ c_tag = "Xenobiology Lab - Euthanization Chamber"
},
/turf/open/floor/circuit/telecomms,
/area/maintenance/department/science/xenobiology)
@@ -25226,9 +25200,8 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/machinery/camera/autoname{
- dir = 9;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 9
},
/turf/open/floor/iron/white,
/area/medical/genetics)
@@ -25604,9 +25577,8 @@
/obj/structure/cable/yellow{
icon_state = "0-2"
},
-/obj/machinery/camera/autoname{
- dir = 9;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 9
},
/obj/machinery/vending/wardrobe/medi_wardrobe,
/turf/open/floor/iron,
@@ -26559,7 +26531,7 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/displaycase/trophy,
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -27230,8 +27202,7 @@
},
/obj/machinery/light,
/obj/machinery/camera/directional/south{
- c_tag = "Research Division - Break Room";
- network = list("ss13","rd")
+ c_tag = "Research Division - Break Room"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
@@ -30497,8 +30468,7 @@
/area/maintenance/aft)
"gxi" = (
/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Lab - Pen #4";
- network = list("ss13","rd","xeno")
+ c_tag = "Xenobiology Lab - Pen #4"
},
/obj/machinery/light/small{
dir = 4
@@ -30870,9 +30840,7 @@
/obj/effect/turf_decal/box,
/obj/item/circuitboard/machine/chem_heater,
/obj/machinery/firealarm/directional/west,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/medical/virology)
"gEX" = (
@@ -31222,8 +31190,7 @@
/area/crew_quarters/toilet/auxiliary)
"gMN" = (
/obj/machinery/camera/directional/south{
- c_tag = "Research Division Hallway - Starboard";
- network = list("ss13","rd")
+ c_tag = "Research Division Hallway - Starboard"
},
/obj/effect/turf_decal/trimline/purple/filled/line,
/turf/open/floor/iron/white,
@@ -31542,9 +31509,7 @@
/area/science/shuttledock)
"gSM" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/table,
/obj/item/hand_labeler,
/obj/item/clothing/gloves/color/latex,
@@ -32169,8 +32134,7 @@
dir = 4
},
/obj/machinery/camera/directional/east{
- c_tag = "Engineering Supermatter Port";
- network = list("ss13","engine")
+ c_tag = "Engineering Supermatter Port"
},
/obj/machinery/airalarm/engine{
dir = 4;
@@ -32473,8 +32437,7 @@
"hkK" = (
/obj/machinery/camera/directional/north{
c_tag = "Medbay - Break Room";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/machinery/airalarm/directional/north{
pixel_y = 23
@@ -32677,8 +32640,7 @@
pixel_y = 6
},
/obj/machinery/camera/directional/south{
- c_tag = "Research Director's Office";
- network = list("ss13","rd")
+ c_tag = "Research Director's Office"
},
/obj/machinery/light,
/obj/effect/turf_decal/tile/black/opposingcorners{
@@ -33741,8 +33703,7 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera/directional/north{
- c_tag = "Toxins - Mixing Area";
- network = list("ss13","rd")
+ c_tag = "Toxins - Mixing Area"
},
/turf/open/floor/iron,
/area/science/mixing)
@@ -34266,8 +34227,7 @@
pixel_x = 24
},
/obj/machinery/camera/directional/north{
- c_tag = "Research Division - Lobby";
- network = list("ss13","rd")
+ c_tag = "Research Division - Lobby"
},
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 4
@@ -34297,7 +34257,7 @@
/obj/effect/turf_decal/tile/red/anticorner{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/button/door{
desc = "A remote control-switch for the engineering security doors.";
id = "Engineering";
@@ -34734,8 +34694,7 @@
pixel_y = -30
},
/obj/machinery/camera/directional/south{
- c_tag = "Robotics - Aft";
- network = list("ss13","rd")
+ c_tag = "Robotics - Aft"
},
/turf/open/floor/iron/white/side{
dir = 1
@@ -34777,8 +34736,7 @@
dir = 8
},
/obj/machinery/camera/directional/east{
- c_tag = "Security Post - Research Division";
- network = list("ss13","rd")
+ c_tag = "Security Post - Research Division"
},
/turf/open/floor/iron/dark/smooth_half{
dir = 1
@@ -35055,8 +35013,7 @@
"ien" = (
/mob/living/simple_animal/slime,
/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Lab - Pen #5";
- network = list("ss13","rd","xeno")
+ c_tag = "Xenobiology Lab - Pen #5"
},
/obj/machinery/light/small{
dir = 8
@@ -35423,7 +35380,6 @@
/obj/machinery/camera/directional/west{
active_power_usage = 0;
c_tag = "Turbine Vent";
- network = list("turbine");
use_power = 0
},
/obj/structure/lattice,
@@ -36418,8 +36374,7 @@
dir = 8
},
/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Lab - Pen #3";
- network = list("ss13","rd","xeno")
+ c_tag = "Xenobiology Lab - Pen #3"
},
/turf/open/floor/engine,
/area/science/xenobiology)
@@ -37029,8 +36984,7 @@
pixel_y = -25
},
/obj/machinery/camera/motion/directional/south{
- c_tag = "AI Upload Chamber - Starboard";
- network = list("aiupload")
+ c_tag = "AI Upload Chamber - Starboard"
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
@@ -37275,8 +37229,7 @@
},
/obj/structure/cable/yellow,
/obj/machinery/camera/motion/directional/east{
- c_tag = "MiniSat Foyer";
- network = list("minisat")
+ c_tag = "MiniSat Foyer"
},
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -37387,10 +37340,8 @@
/turf/open/floor/iron,
/area/crew_quarters/dorms)
"iXO" = (
-/obj/machinery/computer/security/telescreen{
+/obj/machinery/computer/security/telescreen/tcomms{
dir = 8;
- name = "Telecomms Camera Monitor";
- network = list("tcomms");
pixel_x = 26
},
/obj/machinery/computer/telecomms/monitor{
@@ -38225,8 +38176,7 @@
"jsJ" = (
/obj/machinery/camera/directional/north{
c_tag = "Medbay - Recovery Room";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/structure/table,
/obj/item/clothing/suit/jacket/straight_jacket,
@@ -38461,8 +38411,7 @@
/area/medical/patients_rooms)
"jyk" = (
/obj/machinery/camera/directional/east{
- c_tag = "AI Chamber - Starboard";
- network = list("aicore")
+ c_tag = "AI Chamber - Starboard"
},
/obj/structure/showcase/cyborg/old{
dir = 8;
@@ -39023,8 +38972,7 @@
dir = 4
},
/obj/machinery/camera/directional/east{
- c_tag = "Telecomms - Server Room - Aft-Starboard";
- network = list("ss13","tcomms")
+ c_tag = "Telecomms - Server Room - Aft-Starboard"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -39570,7 +39518,7 @@
dir = 1;
pixel_y = -24
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/library)
@@ -39685,8 +39633,7 @@
icon_state = "0-8"
},
/obj/machinery/camera/directional/north{
- c_tag = "Research Division - Airlock";
- network = list("ss13","rd")
+ c_tag = "Research Division - Airlock"
},
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -41261,9 +41208,8 @@
name = "Psycology Shutters Control";
pixel_y = 37
},
-/obj/machinery/camera/autoname{
- dir = 9;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 9
},
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -41282,10 +41228,7 @@
/obj/item/book/manual/wiki/security_space_law,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/pen/red,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_y = 30
},
/obj/item/flashlight/lamp/green{
@@ -41415,8 +41358,7 @@
},
/obj/structure/table,
/obj/machinery/camera/directional/north{
- c_tag = "AI Upload Chamber - Fore";
- network = list("aiupload")
+ c_tag = "AI Upload Chamber - Fore"
},
/obj/item/kirbyplants/photosynthetic{
pixel_y = 10
@@ -42854,8 +42796,7 @@
/area/hallway/secondary/entry)
"lfV" = (
/obj/machinery/camera/directional/east{
- c_tag = "Interrogation room";
- network = list("interrogation")
+ c_tag = "Interrogation room"
},
/turf/open/floor/iron/dark/textured,
/area/security/brig)
@@ -43025,8 +42966,7 @@
req_access_txt = "16"
},
/obj/machinery/camera/directional/north{
- c_tag = "AI Chamber - Core";
- network = list("aicore")
+ c_tag = "AI Chamber - Core"
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -43052,8 +42992,7 @@
/area/ai_monitored/storage/satellite)
"ljB" = (
/obj/machinery/camera/directional/south{
- c_tag = "AI Chamber - Aft";
- network = list("aicore")
+ c_tag = "AI Chamber - Aft"
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai)
@@ -43295,7 +43234,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 10
},
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
@@ -43380,8 +43319,7 @@
dir = 1
},
/obj/machinery/camera/directional/north{
- c_tag = "Research Division Hallway - Xenobiology Lab Access";
- network = list("ss13","rd")
+ c_tag = "Research Division Hallway - Xenobiology Lab Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -43686,9 +43624,8 @@
/turf/open/floor/iron,
/area/engine/engineering)
"lwp" = (
-/obj/machinery/camera/autoname{
- dir = 9;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 9
},
/obj/structure/disposalpipe/segment{
dir = 8
@@ -44259,8 +44196,7 @@
pixel_y = -29
},
/obj/machinery/camera/directional/south{
- c_tag = "Experimentation Lab";
- network = list("ss13","rd")
+ c_tag = "Experimentation Lab"
},
/obj/machinery/light,
/obj/effect/turf_decal/trimline/purple/filled/line,
@@ -44750,8 +44686,7 @@
dir = 8
},
/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Lab - Pen #1";
- network = list("ss13","rd","xeno")
+ c_tag = "Xenobiology Lab - Pen #1"
},
/turf/open/floor/engine,
/area/science/xenobiology)
@@ -44951,8 +44886,7 @@
dir = 1
},
/obj/machinery/camera/directional/south{
- c_tag = "Research Division Testing Range";
- network = list("ss13","rd")
+ c_tag = "Research Division Testing Range"
},
/obj/structure/chair/stool/directional/west,
/obj/structure/sign/poster/contraband/random{
@@ -44964,8 +44898,7 @@
/area/science/shuttledock)
"lSu" = (
/obj/machinery/camera/directional/north{
- c_tag = "Xenobiology Lab - Fore";
- network = list("ss13","rd")
+ c_tag = "Xenobiology Lab - Fore"
},
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/science/xenobiology";
@@ -47926,9 +47859,7 @@
pixel_x = -32;
pixel_y = -1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/obj/item/kirbyplants/random,
/turf/open/floor/iron/white,
/area/medical/genetics/cloning)
@@ -48342,9 +48273,8 @@
/obj/effect/loot_jobscale/medical/medkits{
pixel_x = 5
},
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 10
},
/obj/item/book/manual/wiki/sopmedical,
/turf/open/floor/iron,
@@ -48603,8 +48533,7 @@
icon_state = "0-4"
},
/obj/machinery/camera/motion/directional/south{
- c_tag = "AI Upload Chamber - Port";
- network = list("aiupload")
+ c_tag = "AI Upload Chamber - Port"
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
@@ -48668,8 +48597,7 @@
"njs" = (
/obj/machinery/light/small,
/obj/machinery/camera/directional/south{
- c_tag = "MiniSat Exterior Access";
- network = list("minisat")
+ c_tag = "MiniSat Exterior Access"
},
/obj/machinery/power/apc{
areastring = "/area/aisat";
@@ -48861,9 +48789,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13, engine")
- },
+/obj/machinery/camera/directional/west,
/obj/structure/cable,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
@@ -48990,9 +48916,8 @@
pixel_x = -33;
pixel_y = 2
},
-/obj/machinery/camera/autoname{
- dir = 10;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 10
},
/turf/open/floor/iron,
/area/medical/patients_rooms)
@@ -49321,10 +49246,8 @@
/area/quartermaster/storage)
"nyg" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
+/obj/machinery/computer/security/telescreen/research{
dir = 8;
- name = "Test Chamber Monitor";
- network = list("xeno");
pixel_x = 3;
pixel_y = 2
},
@@ -50667,11 +50590,8 @@
/area/hallway/primary/central)
"nVt" = (
/obj/machinery/computer/secure_data,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring medbay to ensure patient safety.";
+/obj/machinery/computer/security/telescreen/cmo{
dir = 4;
- name = "Medbay Monitor";
- network = list("medbay");
pixel_x = 1;
pixel_y = 32
},
@@ -50986,9 +50906,7 @@
},
/area/security/brig)
"obs" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
/area/medical/medbay/aft)
@@ -51478,7 +51396,7 @@
/obj/structure/filingcabinet/chestdrawer,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/medical/morgue)
"ojZ" = (
@@ -51796,8 +51714,7 @@
dir = 10
},
/obj/machinery/camera/directional/west{
- c_tag = "Engineering Supermatter Starboard";
- network = list("ss13","engine")
+ c_tag = "Engineering Supermatter Starboard"
},
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/engine,
@@ -51805,8 +51722,7 @@
"opy" = (
/obj/machinery/telecomms/processor/preset_one,
/obj/machinery/camera/directional/north{
- c_tag = "Telecomms - Server Room - Fore-Port";
- network = list("ss13","tcomms")
+ c_tag = "Telecomms - Server Room - Fore-Port"
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
@@ -52300,9 +52216,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/south,
/obj/item/radio/intercom{
pixel_x = -2;
pixel_y = -28
@@ -52665,9 +52579,8 @@
"oCJ" = (
/obj/machinery/vending/cigarette,
/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/camera/autoname{
- dir = 6;
- network = list("ss13","medbay")
+/obj/machinery/camera{
+ dir = 6
},
/turf/open/floor/iron,
/area/medical/break_room)
@@ -53374,8 +53287,7 @@
pixel_x = -27
},
/obj/machinery/camera/directional/west{
- c_tag = "Science Shuttle Dock";
- network = list("ss13","rd")
+ c_tag = "Science Shuttle Dock"
},
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 9
@@ -54447,8 +54359,7 @@
pixel_x = -29
},
/obj/machinery/camera/directional/west{
- c_tag = "Research Division - Nanite Lab";
- network = list("ss13","rd")
+ c_tag = "Research Division - Nanite Lab"
},
/turf/open/floor/iron/dark,
/area/science/nanite)
@@ -54459,8 +54370,7 @@
pixel_y = -30
},
/obj/machinery/camera/directional/south{
- c_tag = "Medbay Foyer";
- network = list("ss13","medbay")
+ c_tag = "Medbay Foyer"
},
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
@@ -54565,8 +54475,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/pump,
/obj/machinery/camera/directional/east{
- c_tag = "Toxins Storage";
- network = list("ss13","rd")
+ c_tag = "Toxins Storage"
},
/turf/open/floor/iron/dark,
/area/science/storage)
@@ -54699,11 +54608,8 @@
/obj/structure/chair{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the test chamber.";
+/obj/machinery/computer/security/telescreen/toxins{
dir = 8;
- name = "Test Chamber Telescreen";
- network = list("toxins");
pixel_x = 30
},
/obj/effect/turf_decal/stripes/line{
@@ -54873,8 +54779,7 @@
/obj/item/folder,
/obj/item/folder,
/obj/machinery/camera/directional/south{
- c_tag = "Telecomms - Control Room";
- network = list("ss13","tcomms")
+ c_tag = "Telecomms - Control Room"
},
/obj/structure/table/wood,
/obj/item/pen,
@@ -55241,9 +55146,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/machinery/camera/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/grid/steel,
/area/medical/patients_rooms)
"pDG" = (
@@ -55350,8 +55253,7 @@
dir = 8
},
/obj/machinery/camera/directional/west{
- c_tag = "MiniSat - Antechamber";
- network = list("minisat")
+ c_tag = "MiniSat - Antechamber"
},
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -56272,11 +56174,8 @@
dir = 8
},
/obj/item/book/manual/wiki/security_space_law,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons from the safety of his office.";
+/obj/machinery/computer/security/telescreen/rd{
dir = 8;
- name = "Research Monitor";
- network = list("rd");
pixel_x = 28;
pixel_y = 2
},
@@ -56515,9 +56414,7 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"qby" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/obj/item/radio/intercom{
dir = 1;
pixel_x = -31;
@@ -56647,7 +56544,7 @@
/turf/open/floor/iron,
/area/maintenance/starboard)
"qdM" = (
-/obj/machinery/camera/autoname{
+/obj/machinery/camera{
dir = 9
},
/obj/effect/turf_decal/box/corners{
@@ -58244,8 +58141,7 @@
pixel_y = 32
},
/obj/machinery/camera/directional/north{
- c_tag = "Research Division Hallway - Central";
- network = list("ss13","rd")
+ c_tag = "Research Division Hallway - Central"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -58665,8 +58561,7 @@
/area/medical/surgery)
"qPS" = (
/obj/machinery/camera/directional/west{
- c_tag = "AI Chamber - Port";
- network = list("aicore")
+ c_tag = "AI Chamber - Port"
},
/obj/structure/showcase/cyborg/old{
dir = 4;
@@ -58986,9 +58881,7 @@
/area/maintenance/disposal/incinerator)
"qVZ" = (
/obj/structure/closet/secure_closet/genpop,
-/obj/machinery/camera/directional/north{
- network = list("minisat")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/light{
dir = 1
},
@@ -59566,9 +59459,7 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"rgM" = (
@@ -59619,10 +59510,7 @@
"rhx" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_x = 32
},
/obj/machinery/door/poddoor/preopen{
@@ -59715,7 +59603,7 @@
"rjO" = (
/obj/item/folder,
/obj/item/folder,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/table/wood,
/obj/item/taperecorder,
/obj/item/tape,
@@ -60547,8 +60435,7 @@
"rCU" = (
/obj/machinery/light/small,
/obj/machinery/camera/directional/south{
- c_tag = "MiniSat Exterior - Space Access";
- network = list("minisat")
+ c_tag = "MiniSat Exterior - Space Access"
},
/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
dir = 8
@@ -61690,8 +61577,7 @@
dir = 4
},
/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Lab - Central";
- network = list("ss13","rd")
+ c_tag = "Xenobiology Lab - Central"
},
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
@@ -62500,7 +62386,7 @@
/obj/structure/table,
/obj/item/analyzer,
/obj/item/healthanalyzer,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/light_switch{
pixel_y = -28
},
@@ -63910,8 +63796,7 @@
/area/security/nuke_storage)
"sMo" = (
/obj/machinery/camera/directional/east{
- c_tag = "Mech Bay";
- network = list("ss13","rd")
+ c_tag = "Mech Bay"
},
/turf/open/floor/circuit/green,
/area/science/robotics/mechbay)
@@ -64461,9 +64346,7 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/medical/chemistry)
"sWe" = (
@@ -64472,9 +64355,7 @@
dir = 8
},
/obj/item/book/manual/wiki/security_space_law,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark/smooth_half,
/area/security/checkpoint/medical)
"sWU" = (
@@ -64566,8 +64447,7 @@
},
/obj/machinery/camera/directional/north{
c_tag = "Medbay - Recovery Room";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/structure/sign/poster/official/cleanliness{
pixel_y = 32
@@ -64605,9 +64485,7 @@
pixel_x = -2;
pixel_y = 6
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/medical/surgery)
"sZM" = (
@@ -64646,8 +64524,7 @@
/area/science/mixing)
"taY" = (
/obj/machinery/camera/directional/north{
- c_tag = "AI Chamber - Fore";
- network = list("aicore")
+ c_tag = "AI Chamber - Fore"
},
/obj/structure/showcase/cyborg/old{
pixel_y = 20
@@ -64890,9 +64767,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/crew_quarters/heads/cmo)
"tgi" = (
@@ -65807,11 +65682,8 @@
pixel_y = 32
},
/obj/machinery/porta_turret/ai,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons from the safety of his office.";
+/obj/machinery/computer/security/telescreen/rd{
dir = 4;
- name = "Research Monitor";
- network = list("rd");
pixel_x = -28
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -65865,7 +65737,7 @@
/obj/structure/chair/stool{
pixel_y = 8
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
},
@@ -66756,9 +66628,7 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/obj/item/storage/backpack/duffelbag/med/implant{
pixel_y = 4
},
@@ -66982,8 +66852,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/east{
- c_tag = "Incinerator";
- network = list("ss13","turbine")
+ c_tag = "Incinerator"
},
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 10
@@ -67334,8 +67203,7 @@
"tWo" = (
/obj/machinery/modular_fabricator/exosuit_fab,
/obj/machinery/camera/directional/north{
- c_tag = "Robotics - Fore";
- network = list("ss13","rd")
+ c_tag = "Robotics - Fore"
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
@@ -67388,8 +67256,7 @@
dir = 8
},
/obj/machinery/camera/directional/west{
- c_tag = "Telecomms - Server Room - Aft-Port";
- network = list("ss13","tcomms")
+ c_tag = "Telecomms - Server Room - Aft-Port"
},
/turf/open/floor/iron/dark/telecomms,
/area/tcommsat/server)
@@ -67493,11 +67360,8 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the AI Upload.";
+/obj/machinery/computer/security/telescreen/aiupload{
dir = 4;
- name = "AI Upload Monitor";
- network = list("aiupload");
pixel_x = -29
},
/turf/open/floor/iron/dark,
@@ -69354,9 +69218,7 @@
pixel_x = 5;
pixel_y = -31
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/crew_quarters/heads/cmo)
"uIp" = (
@@ -69607,8 +69469,7 @@
"uMn" = (
/obj/machinery/light/small,
/obj/machinery/camera/directional/south{
- c_tag = "Telecomms - Server Room - Aft";
- network = list("ss13","tcomms")
+ c_tag = "Telecomms - Server Room - Aft"
},
/obj/machinery/ntnet_relay,
/turf/open/floor/iron/dark/telecomms,
@@ -70108,7 +69969,7 @@
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/chair/fancy/comfy,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/trimline/black/filled/line{
dir = 9
},
@@ -70508,7 +70369,7 @@
/turf/open/floor/iron,
/area/crew_quarters/locker)
"vei" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/item/book/manual/hydroponics_pod_people,
/obj/item/paper/guides/jobs/hydroponics,
/obj/machinery/requests_console{
@@ -70849,11 +70710,8 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring the engine.";
+/obj/machinery/computer/security/telescreen/engine{
dir = 8;
- name = "Engine Monitor";
- network = list("engine");
pixel_x = 32
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -70940,7 +70798,7 @@
/obj/structure/chair/stool{
pixel_y = 8
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
},
@@ -71446,7 +71304,7 @@
},
/area/science/research)
"vuD" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/rack,
/obj/item/storage/toolbox/electrical{
pixel_x = 1;
@@ -72124,8 +71982,7 @@
/area/maintenance/department/medical/central)
"vId" = (
/obj/machinery/camera/motion/directional/east{
- c_tag = "MiniSat Maintenance";
- network = list("minisat")
+ c_tag = "MiniSat Maintenance"
},
/obj/structure/rack,
/obj/item/storage/toolbox/electrical{
@@ -72589,9 +72446,7 @@
/obj/structure/disposalpipe/trunk{
dir = 2
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
"vOs" = (
@@ -72889,8 +72744,7 @@
"vVl" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera/directional/south{
- c_tag = "Engineering Supermatter Aft";
- network = list("ss13","engine")
+ c_tag = "Engineering Supermatter Aft"
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -73702,8 +73556,7 @@
/area/medical/medbay/central)
"wns" = (
/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Lab - Secure Pen";
- network = list("ss13","rd","xeno")
+ c_tag = "Xenobiology Lab - Secure Pen"
},
/turf/open/floor/engine,
/area/maintenance/department/science/xenobiology)
@@ -74495,8 +74348,7 @@
/area/medical/morgue)
"wCD" = (
/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Lab - Pen #2";
- network = list("ss13","rd","xeno")
+ c_tag = "Xenobiology Lab - Pen #2"
},
/obj/machinery/light/small{
dir = 4
@@ -75833,8 +75685,7 @@
},
/obj/machinery/camera/directional/east{
c_tag = "Medbay - Surgery";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable/yellow,
@@ -76038,7 +75889,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/carpet/green,
/area/library)
"xfz" = (
@@ -78385,7 +78236,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/structure/table/glass,
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -78481,10 +78332,7 @@
/turf/open/floor/iron,
/area/hallway/primary/starboard)
"xTR" = (
-/obj/machinery/computer/security{
- name = "Medbay camera console";
- network = list("medbay")
- },
+/obj/machinery/computer/security/medbay,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/cmo)
"xTV" = (
@@ -78549,11 +78397,8 @@
pixel_x = 24;
pixel_y = -24
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the test chamber.";
+/obj/machinery/computer/security/telescreen/toxins{
dir = 8;
- name = "Test Chamber Telescreen";
- network = list("toxins");
pixel_x = 30
},
/obj/effect/turf_decal/stripes/line{
@@ -78913,10 +78758,7 @@
/turf/open/floor/iron/dark/smooth_half,
/area/security/brig)
"ybO" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_x = 32
},
/turf/closed/wall/r_wall,
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 37401c756edcd..9605a5c1c33db 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -319,8 +319,7 @@
},
/obj/machinery/camera{
c_tag = "Crew Area Hallway East";
- dir = 5;
- network = list("mine")
+ dir = 5
},
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron,
@@ -599,8 +598,7 @@
/obj/item/folder/yellow,
/obj/item/multitool,
/obj/machinery/camera/directional/east{
- c_tag = "Communications Relay";
- network = list("mine")
+ c_tag = "Communications Relay"
},
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
@@ -636,8 +634,7 @@
"eZ" = (
/obj/machinery/camera{
c_tag = "Crew Area";
- dir = 9;
- network = list("mine")
+ dir = 9
},
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -1613,8 +1610,7 @@
/area/mine/eva)
"lt" = (
/obj/machinery/camera/directional/east{
- c_tag = "Sleeper Room";
- network = list("mine")
+ c_tag = "Sleeper Room"
},
/obj/structure/table,
/obj/item/storage/firstaid/medical,
@@ -2106,8 +2102,7 @@
/area/mine/science)
"pu" = (
/obj/machinery/camera/directional/south{
- c_tag = "Labor Camp Processing Area";
- network = list("labor")
+ c_tag = "Labor Camp Processing Area"
},
/turf/open/floor/iron,
/area/mine/laborcamp)
@@ -2149,8 +2144,7 @@
"pF" = (
/obj/machinery/camera{
c_tag = "Labor Camp External";
- dir = 5;
- network = list("labor")
+ dir = 5
},
/obj/structure/closet/emcloset,
/mob/living/simple_animal/bot/atmosbot{
@@ -2347,8 +2341,7 @@
"rq" = (
/obj/item/kirbyplants/random,
/obj/machinery/camera/directional/north{
- c_tag = "Labor Camp Monitoring";
- network = list("labor")
+ c_tag = "Labor Camp Monitoring"
},
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
@@ -2979,8 +2972,7 @@
dir = 8
},
/obj/machinery/camera/directional/west{
- c_tag = "Dormitories";
- network = list("mine")
+ c_tag = "Dormitories"
},
/turf/open/floor/wood,
/area/mine/living_quarters)
@@ -3527,8 +3519,7 @@
/obj/item/plant_analyzer,
/obj/machinery/camera{
c_tag = "Labor Camp Hydroponics";
- dir = 9;
- network = list("labor")
+ dir = 9
},
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
dir = 4
@@ -3716,8 +3707,7 @@
dir = 8
},
/obj/machinery/camera/directional/south{
- c_tag = "Labor Camp Foyer";
- network = list("labor")
+ c_tag = "Labor Camp Foyer"
},
/obj/item/radio/intercom{
pixel_y = -28
@@ -3815,8 +3805,7 @@
"Ch" = (
/obj/machinery/light/small,
/obj/machinery/camera/directional/south{
- c_tag = "Mining area External";
- network = list("labor")
+ c_tag = "Mining area External"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/mine/eva)
@@ -4314,8 +4303,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland,
/obj/structure/chair/office,
/obj/machinery/camera/directional/east{
- c_tag = "Communications Relay";
- network = list("mine")
+ c_tag = "Communications Relay"
},
/turf/open/floor/iron,
/area/mine/science)
@@ -4672,8 +4660,7 @@
},
/obj/machinery/camera{
c_tag = "Gateway";
- dir = 4;
- network = list("mine")
+ dir = 4
},
/turf/open/floor/iron/dark,
/area/mine/gateway)
@@ -4992,8 +4979,7 @@
/area/mine/science)
"Ki" = (
/obj/machinery/camera/directional/west{
- c_tag = "Infirmary";
- network = list("mine")
+ c_tag = "Infirmary"
},
/turf/open/floor/iron/white,
/area/mine/living_quarters)
@@ -5096,8 +5082,7 @@
},
/obj/item/toy/cards/deck,
/obj/machinery/camera/directional/west{
- c_tag = "Labor Camp Common area";
- network = list("labor")
+ c_tag = "Labor Camp Common area"
},
/turf/open/floor/iron/grid/steel,
/area/mine/laborcamp)
@@ -5421,8 +5406,7 @@
/obj/structure/closet/secure_closet/brig,
/obj/effect/turf_decal/bot,
/obj/machinery/camera/directional/east{
- c_tag = "Labor Camp Storage";
- network = list("labor")
+ c_tag = "Labor Camp Storage"
},
/turf/open/floor/iron,
/area/mine/laborcamp)
@@ -5769,8 +5753,7 @@
/obj/structure/bed,
/obj/item/bedsheet/medical,
/obj/machinery/camera/directional/east{
- c_tag = "Labor Camp Infirmary";
- network = list("labor")
+ c_tag = "Labor Camp Infirmary"
},
/turf/open/floor/iron/white,
/area/mine/laborcamp)
@@ -6303,8 +6286,7 @@
"UD" = (
/obj/structure/closet/secure_closet/miner,
/obj/machinery/camera/directional/north{
- c_tag = "Storage and Locker room";
- network = list("mine")
+ c_tag = "Storage and Locker room"
},
/turf/open/floor/iron/dark,
/area/mine/production)
@@ -6507,8 +6489,7 @@
"Vy" = (
/obj/machinery/camera{
c_tag = "Crew Area Hallway West";
- dir = 5;
- network = list("mine")
+ dir = 5
},
/turf/open/floor/iron,
/area/mine/living_quarters)
@@ -7145,8 +7126,7 @@
dir = 8
},
/obj/machinery/camera/directional/west{
- c_tag = "EVA";
- network = list("mine")
+ c_tag = "EVA"
},
/turf/open/floor/mech_bay_recharge_floor,
/area/mine/eva)
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index 29428939e5ed7..d501885f06ce4 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -129,9 +129,7 @@
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/captain/private)
"aaJ" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/bot,
/obj/machinery/requests_console{
department = "Science";
@@ -786,11 +784,8 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the turbine vent.";
+/obj/machinery/computer/security/telescreen/engine{
dir = 4;
- name = "turbine vent monitor";
- network = list("turbine");
pixel_x = -29
},
/obj/effect/decal/cleanable/dirt,
@@ -808,9 +803,8 @@
},
/area/hallway/secondary/exit/departure_lounge)
"amQ" = (
-/obj/machinery/camera/autoname/directional/west{
- c_tag = "Xenobiology Lab - Pen #3";
- network = list("ss13","rd","xeno")
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology Lab - Pen #3"
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/window/reinforced,
@@ -976,9 +970,8 @@
/turf/open/floor/engine/o2,
/area/ai_monitored/turret_protected/ai)
"aps" = (
-/obj/machinery/camera/autoname/directional/north{
- c_tag = "Xenobiology Lab - Pen #1";
- network = list("ss13","rd","xeno")
+/obj/machinery/camera/directional/north{
+ c_tag = "Xenobiology Lab - Pen #1"
},
/turf/open/floor/engine,
/area/science/xenobiology)
@@ -1120,9 +1113,7 @@
/turf/open/floor/iron/techmaint,
/area/maintenance/central)
"arv" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/status_display/evac{
pixel_x = 32
},
@@ -1295,9 +1286,8 @@
/obj/machinery/porta_turret/ai{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
- c_tag = "MiniSat Core Hallway 4";
- network = list("minisat")
+/obj/machinery/camera/directional/south{
+ c_tag = "MiniSat Core Hallway 4"
},
/turf/open/floor/plating,
/area/ai_monitored/storage/satellite)
@@ -1455,9 +1445,7 @@
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/obj/item/folder/yellow,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/east,
/obj/item/toy/figure/qm{
pixel_x = 9;
pixel_y = 4
@@ -1549,9 +1537,7 @@
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/obj/item/radio/intercom{
dir = 1;
pixel_x = 1;
@@ -1688,8 +1674,7 @@
pixel_y = -33
},
/obj/machinery/camera/motion/directional/south{
- c_tag = "Armory - Internal";
- network = list("ss13","security")
+ c_tag = "Armory - Internal"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -2737,9 +2722,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/guideline/guideline_edge/purple,
/obj/structure/extinguisher_cabinet{
pixel_y = -33
@@ -2790,7 +2773,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/quartermaster/office)
"aRy" = (
@@ -3092,7 +3075,6 @@
pixel_y = 21
},
/obj/machinery/computer/security/telescreen/entertainment{
- network = list("thunder","court");
pixel_y = -32
},
/obj/structure/table/wood,
@@ -3244,7 +3226,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/light,
/obj/item/radio/intercom{
frequency = 1423;
@@ -3452,9 +3434,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -3797,7 +3777,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/prison,
/area/security/prison)
"bhM" = (
@@ -4110,7 +4090,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/light{
dir = 4
},
@@ -4276,9 +4256,8 @@
departmentType = 5;
pixel_y = 30
},
-/obj/machinery/camera/autoname/directional/north{
- c_tag = "Security Post - Medbay";
- network = list("ss13","medbay")
+/obj/machinery/camera/directional/north{
+ c_tag = "Security Post - Medbay"
},
/obj/machinery/light{
dir = 1
@@ -4621,7 +4600,7 @@
/obj/machinery/light{
light_color = "#7AC3FF"
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Captain's Quarters"
},
/turf/open/floor/carpet/royalblack,
@@ -4717,9 +4696,7 @@
/turf/open/floor/iron/tech,
/area/engine/atmos)
"bwA" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/requests_console{
department = "Science";
departmentType = 2;
@@ -5213,7 +5190,7 @@
/area/hallway/primary/central)
"bHa" = (
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/techmaint,
/area/engine/gravity_generator)
"bHb" = (
@@ -5673,8 +5650,7 @@
},
/obj/machinery/camera/motion{
c_tag = "MiniSat Core Hallway 1";
- dir = 6;
- network = list("minisat")
+ dir = 6
},
/obj/structure/cable/yellow,
/turf/open/floor/circuit,
@@ -6330,9 +6306,7 @@
/obj/machinery/light,
/obj/machinery/suit_storage_unit/mining,
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/south,
/obj/item/radio/intercom{
pixel_x = 2;
pixel_y = -31
@@ -6596,9 +6570,7 @@
/obj/structure/sign/departments/minsky/medical/virology/virology1{
pixel_y = -30
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/guideline/guideline_edge/green,
/obj/machinery/light,
/turf/open/floor/iron/white/side{
@@ -6922,8 +6894,7 @@
},
/obj/machinery/light,
/obj/machinery/camera/motion/directional/west{
- c_tag = "MiniSat Core Hallway 3";
- network = list("minisat")
+ c_tag = "MiniSat Core Hallway 3"
},
/obj/machinery/flasher{
id = "aicore";
@@ -7292,7 +7263,7 @@
/area/storage/primary)
"cow" = (
/obj/effect/turf_decal/tile/neutral/half,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/light_switch{
pixel_x = -20;
pixel_y = -21
@@ -7642,7 +7613,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/hallway/secondary/entry)
@@ -7782,7 +7753,7 @@
/turf/open/floor/iron/dark,
/area/quartermaster/exploration_prep)
"cvT" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/airalarm/directional/east,
/obj/structure/closet/crate/coffin,
/turf/open/floor/iron/dark,
@@ -8055,7 +8026,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Teleporter Room"
},
/turf/open/floor/iron/white,
@@ -8132,9 +8103,7 @@
/area/hallway/secondary/exit/departure_lounge)
"czC" = (
/obj/structure/closet/secure_closet/RD,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/carpet/purple,
/area/crew_quarters/heads/hor)
"czL" = (
@@ -8911,9 +8880,7 @@
"cOF" = (
/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/science/storage)
"cOL" = (
@@ -9094,7 +9061,7 @@
},
/area/science/mixing)
"cRW" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -9214,9 +9181,7 @@
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/chief)
"cTF" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/conveyor{
dir = 8;
id = "MailConv"
@@ -9445,7 +9410,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/spawner/randomarcade{
dir = 4
},
@@ -9496,9 +9461,7 @@
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"cYS" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine/n2,
/area/engine/atmos)
"cYW" = (
@@ -9941,9 +9904,8 @@
},
/area/hallway/primary/central)
"dfB" = (
-/obj/machinery/camera/autoname/directional/west{
- c_tag = "Xenobiology Lab - Pen #6";
- network = list("ss13","rd","xeno")
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology Lab - Pen #6"
},
/turf/open/floor/engine,
/area/science/xenobiology)
@@ -10053,9 +10015,7 @@
/turf/open/floor/engine/o2,
/area/ai_monitored/turret_protected/ai)
"diq" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/guideline/guideline_edge/blue{
dir = 4
},
@@ -10087,9 +10047,8 @@
pixel_x = -1;
pixel_y = 30
},
-/obj/machinery/camera/autoname/directional/north{
- c_tag = "Incinerator";
- network = list("ss13","engine")
+/obj/machinery/camera/directional/north{
+ c_tag = "Incinerator"
},
/turf/open/floor/iron/dark,
/area/engine/atmos)
@@ -10325,7 +10284,7 @@
pixel_y = 5
},
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Starbird Security Checkpoint"
},
/obj/machinery/airalarm/directional/south,
@@ -10863,9 +10822,8 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname/directional/east{
- c_tag = "Interrogation room";
- network = list("interrogation")
+/obj/machinery/camera/directional/east{
+ c_tag = "Interrogation room"
},
/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
@@ -11122,9 +11080,7 @@
/turf/open/floor/carpet/grimy,
/area/chapel/office)
"dAa" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine/air,
/area/engine/atmos)
"dAd" = (
@@ -11381,7 +11337,7 @@
/obj/machinery/newscaster{
pixel_y = 33
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/effect/turf_decal/bot,
/obj/machinery/computer/warrant,
/turf/open/floor/carpet/royalblack,
@@ -11955,7 +11911,7 @@
/turf/closed/wall/r_wall,
/area/engine/engine_room)
"dMx" = (
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
@@ -12160,8 +12116,7 @@
"dNw" = (
/obj/item/kirbyplants/random,
/obj/machinery/firealarm/directional/west,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay");
+/obj/machinery/camera/directional/west{
view_range = 8
},
/turf/open/floor/iron/white,
@@ -12349,9 +12304,7 @@
/area/solar/starboard/fore)
"dSE" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/catwalk_floor/iron_dark,
/area/engine/engine_room)
@@ -12381,8 +12334,7 @@
/area/crew_quarters/cafeteria)
"dTu" = (
/obj/machinery/camera/motion/directional/east{
- c_tag = "MiniSat Exterior 2";
- network = list("minisat")
+ c_tag = "MiniSat Exterior 2"
},
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -12480,9 +12432,7 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"dUF" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine/airless,
/area/engine/atmos)
"dUZ" = (
@@ -12620,7 +12570,6 @@
pixel_y = 7
},
/obj/machinery/computer/security/telescreen/entertainment{
- network = list("thunder","court");
pixel_y = -32
},
/obj/structure/table/wood,
@@ -12642,9 +12591,8 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- c_tag = "MiniSat Core Hallway 5";
- network = list("minisat")
+/obj/machinery/camera/directional/west{
+ c_tag = "MiniSat Core Hallway 5"
},
/turf/open/floor/circuit,
/area/ai_monitored/storage/satellite)
@@ -13219,9 +13167,7 @@
"ehp" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/noslip/standard,
/area/quartermaster/storage)
"ehV" = (
@@ -13570,9 +13516,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/button/door{
desc = "A remote control switch for the medbay foyer.";
id = "RoboFoyer";
@@ -14187,9 +14131,7 @@
/turf/open/floor/wood,
/area/vacant_room/office)
"ewZ" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"exh" = (
@@ -14348,9 +14290,7 @@
/turf/open/floor/iron,
/area/engine/atmos)
"eyU" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/firealarm/directional/east,
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -14683,8 +14623,7 @@
/area/maintenance/department/bridge)
"eEL" = (
/obj/machinery/camera/motion/directional/west{
- c_tag = "MiniSat Exterior 4";
- network = list("minisat")
+ c_tag = "MiniSat Exterior 4"
},
/obj/structure/lattice,
/turf/open/space/basic,
@@ -14816,7 +14755,7 @@
/area/storage/primary)
"eHi" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/primary/aft)
"eHp" = (
@@ -14984,7 +14923,7 @@
dir = 4
},
/obj/machinery/firealarm/directional/north,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/machinery/washing_machine,
/obj/structure/window/reinforced{
dir = 8
@@ -15305,7 +15244,7 @@
/turf/open/floor/iron/sepia,
/area/quartermaster/sorting)
"eON" = (
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/machinery/firealarm/directional/north,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -15322,7 +15261,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/light,
/obj/machinery/requests_console{
department = "Genetics";
@@ -15949,9 +15888,7 @@
dir = 8
},
/obj/effect/turf_decal/guideline/guideline_edge/red,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/light_switch{
pixel_y = -25
},
@@ -16535,7 +16472,7 @@
/turf/closed/wall,
/area/maintenance/disposal)
"ffL" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -17058,8 +16995,7 @@
dir = 4
},
/obj/machinery/computer/security/mining{
- dir = 8;
- network = list("vault","cargo")
+ dir = 8
},
/turf/open/floor/carpet/orange,
/area/quartermaster/qm)
@@ -17351,9 +17287,7 @@
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
"fsi" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/newscaster{
pixel_y = 33
},
@@ -17513,9 +17447,7 @@
pixel_x = 32;
pixel_y = 1
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/medical/exam_room)
"fvE" = (
@@ -18352,7 +18284,7 @@
/obj/item/bedsheet/purple{
name = "Holy bedsheet"
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/wood,
/area/chapel/office)
@@ -18442,7 +18374,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/light_switch{
pixel_x = -20
},
@@ -18632,9 +18564,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
@@ -18712,9 +18642,7 @@
pixel_x = 1;
pixel_y = 30
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/engine/break_room)
"fOw" = (
@@ -19235,7 +19163,7 @@
dir = 1
},
/obj/machinery/firealarm/directional/west,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/hallway/primary/fore)
"fYn" = (
@@ -19317,8 +19245,7 @@
/area/maintenance/starboard/aft)
"fYN" = (
/obj/machinery/camera/motion/directional/south{
- c_tag = "MiniSat Exterior 3";
- network = list("minisat")
+ c_tag = "MiniSat Exterior 3"
},
/turf/open/space/basic,
/area/space)
@@ -20360,7 +20287,7 @@
/turf/closed/wall,
/area/engine/engineering)
"gnx" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/engine{
name = "Holodeck Projector Floor"
},
@@ -20815,9 +20742,7 @@
/turf/open/floor/iron,
/area/hallway/primary/port)
"gvA" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/airalarm/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -21029,7 +20954,7 @@
/turf/open/floor/iron/dark,
/area/gateway)
"gAB" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/bot,
/obj/machinery/light{
dir = 8
@@ -21067,10 +20992,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Science - Toxins Mixing Lab Burn Chamber";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/obj/structure/extinguisher_cabinet{
pixel_y = 32
@@ -21286,9 +21210,7 @@
dir = 8;
light_color = "#e8eaff"
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/button/door{
id = "QMLoaddoor2";
name = "Loading Doors";
@@ -22078,9 +22000,8 @@
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/quartermaster/exploration_prep)
"gRR" = (
-/obj/machinery/camera/autoname/directional/west{
- c_tag = "Xenobiology Lab - Pen #4";
- network = list("ss13","rd","xeno")
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology Lab - Pen #4"
},
/obj/structure/window/reinforced,
/turf/open/floor/engine,
@@ -22850,7 +22771,7 @@
/area/engine/engine_room)
"hea" = (
/obj/machinery/firealarm/directional/south,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
@@ -23367,7 +23288,7 @@
/turf/open/floor/iron,
/area/crew_quarters/heads/hop)
"hmt" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
@@ -23459,9 +23380,8 @@
pixel_x = -10;
pixel_y = -23
},
-/obj/machinery/camera/autoname/directional/south{
- c_tag = "MiniSat Core Hallway 3";
- network = list("minisat")
+/obj/machinery/camera/directional/south{
+ c_tag = "MiniSat Core Hallway 3"
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/aisat/foyer)
@@ -23810,9 +23730,7 @@
/obj/structure/chair/fancy/bench{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/guideline/guideline_edge/red,
/obj/machinery/light_switch{
pixel_x = 1;
@@ -23883,11 +23801,8 @@
/obj/machinery/computer/security{
pixel_y = -3
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/computer/security/telescreen{
- network = list("ss13");
pixel_y = 25
},
/obj/effect/turf_decal/siding/wood{
@@ -24653,9 +24568,7 @@
icon_state = "4-8"
},
/obj/machinery/firealarm/directional/north,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
@@ -24859,10 +24772,9 @@
/turf/open/floor/iron/tech,
/area/engine/atmos)
"hLI" = (
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Engineering - Secure Storage";
- name = "engineering camera";
- network = list("ss13","engine")
+ name = "engineering camera"
},
/obj/machinery/power/emitter{
dir = 1
@@ -24970,9 +24882,7 @@
/turf/open/floor/iron,
/area/engine/atmospherics_engine)
"hMK" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd","xeno")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/shower{
dir = 1;
name = "emergency shower"
@@ -25275,7 +25185,7 @@
/turf/open/floor/engine,
/area/engine/atmos)
"hRN" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/airalarm/directional/south,
/obj/structure/displaycase/captain,
/obj/machinery/light{
@@ -25536,9 +25446,8 @@
dir = 8;
luminosity = 2
},
-/obj/machinery/camera/autoname/directional/north{
- c_tag = "Turbine Chamber";
- network = list("turbine")
+/obj/machinery/camera/directional/north{
+ c_tag = "Turbine Chamber"
},
/turf/open/floor/engine/vacuum,
/area/engine/atmospherics_engine)
@@ -25913,9 +25822,7 @@
/turf/open/floor/iron,
/area/quartermaster/qm)
"ifv" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron,
@@ -26510,9 +26417,7 @@
/turf/open/floor/iron/white,
/area/medical/cryo)
"iqJ" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable/yellow,
/turf/open/floor/wood,
@@ -26566,7 +26471,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/bot,
/obj/machinery/deepfryer,
/turf/open/floor/iron/white,
@@ -27399,8 +27304,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay");
+/obj/machinery/camera/directional/east{
view_range = 8
},
/obj/effect/turf_decal/guideline/guideline_edge/green{
@@ -27545,9 +27449,7 @@
/area/security/prison)
"iLL" = (
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/sign/warning/nosmoking{
pixel_y = -32
},
@@ -27988,9 +27890,7 @@
/area/engine/atmos)
"iSf" = (
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/newscaster{
pixel_x = -38;
pixel_y = 2
@@ -28572,9 +28472,7 @@
pixel_y = -3
},
/obj/item/healthanalyzer,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/white,
/area/science/explab)
"jcv" = (
@@ -28584,9 +28482,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/circuit/telecomms/server,
/area/science/server)
"jcy" = (
@@ -28772,9 +28668,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
"jeN" = (
@@ -28796,9 +28690,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/medical/storage)
"jfb" = (
@@ -28951,7 +28843,7 @@
/area/crew_quarters/kitchen/coldroom)
"jht" = (
/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high{
@@ -29033,7 +28925,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/catwalk_floor,
/area/maintenance/department/bridge)
"jja" = (
@@ -29211,9 +29103,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/airalarm/directional/north{
pixel_y = 28
},
@@ -29653,11 +29543,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
+/obj/machinery/computer/security/telescreen/court{
dir = 1;
- name = "Court Monitor";
- network = list("court");
pixel_y = -30
},
/obj/machinery/light,
@@ -30552,9 +30439,7 @@
name = "Mech Bay Door Control";
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/science/robotics/mechbay)
"jIv" = (
@@ -30577,9 +30462,7 @@
/turf/open/floor/plating,
/area/engine/atmos)
"jIN" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -30592,9 +30475,8 @@
/obj/machinery/status_display/evac{
pixel_y = 32
},
-/obj/machinery/camera/autoname/directional/north{
- c_tag = "MiniSat Upload East";
- network = list("minisat","aiupload")
+/obj/machinery/camera/directional/north{
+ c_tag = "MiniSat Upload East"
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
@@ -30927,7 +30809,6 @@
"jPy" = (
/obj/machinery/modular_computer/console/preset/command,
/obj/machinery/computer/security/telescreen/minisat{
- network = list("minisat","aicore","aiupload");
pixel_x = 17;
pixel_y = 33
},
@@ -31290,9 +31171,7 @@
/area/hallway/primary/fore)
"jUk" = (
/obj/structure/table/glass,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/south,
/obj/item/stack/sheet/mineral/plasma{
pixel_x = -8;
pixel_y = 12
@@ -31482,7 +31361,7 @@
nightshift_light_color = "#FFB16E"
},
/obj/machinery/airalarm/directional/east,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"jXI" = (
@@ -31785,9 +31664,7 @@
/turf/open/floor/iron,
/area/crew_quarters/cafeteria)
"kfi" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
@@ -31944,9 +31821,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/security/brig)
"kht" = (
@@ -32020,9 +31895,7 @@
/area/medical/medbay/central)
"khS" = (
/obj/machinery/telecomms/processor/preset_exploration,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/quartermaster/exploration_prep)
"khT" = (
@@ -32143,7 +32016,7 @@
pixel_x = -8;
pixel_y = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/captain)
"kjs" = (
@@ -32316,7 +32189,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/hallway/primary/port)
"klA" = (
@@ -32479,9 +32352,7 @@
/area/science/storage)
"kos" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/security/brig/dock)
"koB" = (
@@ -32790,7 +32661,7 @@
/obj/effect/turf_decal/loading_area{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/teleporter)
"kuA" = (
@@ -33361,9 +33232,7 @@
/obj/structure/cable/yellow{
icon_state = "0-2"
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/crew_quarters/heads/hor)
"kDV" = (
@@ -33519,9 +33388,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/guideline/guideline_edge/red,
/obj/item/radio/intercom{
dir = 1;
@@ -33810,9 +33677,7 @@
},
/obj/structure/table/reinforced,
/obj/item/tank/internals/plasma,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/obj/item/pipe_dispenser,
/obj/item/pipe_dispenser,
/turf/open/floor/iron,
@@ -34198,9 +34063,7 @@
/area/bridge/meeting_room)
"kSE" = (
/obj/machinery/computer/security/mining{
- dir = 1;
- name = "Ion engine camera console";
- network = list("Ion")
+ dir = 1
},
/turf/open/floor/plating{
broken = 1
@@ -34483,10 +34346,7 @@
/turf/open/floor/engine,
/area/engine/atmos)
"kWP" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_x = -32
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -34612,7 +34472,7 @@
pixel_x = 1;
pixel_y = 2
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/chapel/main)
"kYx" = (
@@ -34934,7 +34794,7 @@
/obj/machinery/gateway{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/techmaint,
/area/gateway)
"lbY" = (
@@ -35028,7 +34888,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark/side{
dir = 1
@@ -35440,7 +35300,7 @@
/obj/structure/sign/painting/library{
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Captain's Quarters"
},
/turf/open/floor/iron,
@@ -35916,9 +35776,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/noslip/standard,
/area/quartermaster/storage)
"ltK" = (
@@ -35948,7 +35806,7 @@
alpha = 180;
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
c_tag = "Evac Security Checkpoint"
},
/turf/open/floor/iron,
@@ -35962,10 +35820,7 @@
/obj/structure/sign/painting/library{
pixel_y = 32
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_x = 32
},
/turf/open/floor/carpet/royalblack,
@@ -36200,7 +36055,7 @@
/obj/effect/turf_decal/siding/wideplating/dark/corner{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
view_range = 12
},
/obj/machinery/status_display/evac{
@@ -36231,9 +36086,7 @@
},
/obj/effect/turf_decal/bot,
/obj/structure/closet/secure_closet/security/engine,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/obj/item/radio/intercom{
pixel_x = -32;
pixel_y = -3
@@ -36804,9 +36657,7 @@
/turf/open/floor/iron,
/area/engine/atmos)
"lJP" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
@@ -36861,9 +36712,7 @@
/turf/open/floor/iron/tech,
/area/engine/atmos)
"lKP" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"lKT" = (
@@ -37156,7 +37005,7 @@
"lRa" = (
/obj/structure/chair,
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Teleporter Room"
},
/turf/open/floor/iron/dark,
@@ -37393,9 +37242,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/noslip/standard,
/area/engine/engineering)
"lVW" = (
@@ -38314,7 +38161,7 @@
/turf/open/floor/plating,
/area/security/brig)
"mkH" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/bot,
/obj/machinery/light{
dir = 4
@@ -38502,9 +38349,8 @@
/turf/open/floor/iron,
/area/medical/surgery)
"mnC" = (
-/obj/machinery/camera/autoname/directional/west{
- c_tag = "Xenobiology Lab - Pen #5";
- network = list("ss13","rd","xeno")
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology Lab - Pen #5"
},
/obj/structure/window/reinforced,
/turf/open/floor/engine,
@@ -38680,7 +38526,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/guideline/guideline_edge/darkblue{
dir = 1
},
@@ -39436,9 +39282,7 @@
dir = 9
},
/obj/effect/turf_decal/tile/black/fourcorners,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/techmaint,
/area/security/prison)
"mBz" = (
@@ -40501,7 +40345,7 @@
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 6
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/chapel/main)
"mRa" = (
@@ -40510,9 +40354,7 @@
icon_state = "0-2"
},
/obj/machinery/recharge_station,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/circuit,
/area/science/robotics/mechbay)
@@ -40916,9 +40758,7 @@
dir = 1
},
/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd","xeno")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/light{
dir = 1
},
@@ -41044,7 +40884,7 @@
pixel_x = 1;
pixel_y = 2
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/carpet/purple,
/area/chapel/main)
"mYz" = (
@@ -41117,9 +40957,7 @@
/turf/open/floor/plating,
/area/maintenance/port/central)
"mZO" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/light{
dir = 8
},
@@ -41389,7 +41227,7 @@
pixel_x = -23;
pixel_y = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/wood,
/area/library)
"neL" = (
@@ -41804,9 +41642,7 @@
dir = 1
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/engine/engine_room)
"nlm" = (
@@ -42779,9 +42615,7 @@
},
/obj/item/book/manual/wiki/plumbing,
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/medical/chemistry)
"nAr" = (
@@ -43353,9 +43187,8 @@
/obj/machinery/porta_turret/ai{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
- c_tag = "MiniSat Core Hallway 2";
- network = list("minisat")
+/obj/machinery/camera/directional/south{
+ c_tag = "MiniSat Core Hallway 2"
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
@@ -44461,9 +44294,7 @@
/turf/open/floor/catwalk_floor,
/area/maintenance/department/medical/morgue)
"obU" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/engine/o2,
/area/engine/atmos)
"ocl" = (
@@ -45264,8 +45095,7 @@
/obj/effect/turf_decal/bot{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay");
+/obj/machinery/camera/directional/north{
view_range = 10
},
/obj/structure/sink{
@@ -45575,9 +45405,7 @@
/obj/structure/sign/poster/random{
pixel_x = 32
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/east,
/obj/structure/chair{
dir = 8
},
@@ -45750,7 +45578,7 @@
dir = 10
},
/obj/structure/closet/crate/wooden/toy,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/machinery/light_switch{
pixel_x = 12;
@@ -45779,7 +45607,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Teleporter Room"
},
/turf/open/floor/iron,
@@ -46106,9 +45934,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/corner{
@@ -46127,7 +45953,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/security/prison)
"oGJ" = (
@@ -46369,7 +46195,7 @@
/obj/structure/chair/fancy/bench/pew/left{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/glass/reinforced,
/area/chapel/main)
"oJT" = (
@@ -46702,9 +46528,8 @@
},
/area/medical/sleeper)
"oOa" = (
-/obj/machinery/camera/autoname/directional/west{
- c_tag = "Incinerator";
- network = list("ss13","engine")
+/obj/machinery/camera/directional/west{
+ c_tag = "Incinerator"
},
/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/bot,
@@ -47068,9 +46893,7 @@
/obj/structure/closet/secure_closet/security/science,
/obj/machinery/firealarm/directional/east,
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/east,
/obj/item/radio/intercom{
dir = 1;
pixel_y = -28
@@ -47384,9 +47207,7 @@
dir = 4
},
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
@@ -47630,9 +47451,7 @@
/turf/open/floor/iron/white,
/area/medical/apothecary)
"oZO" = (
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/obj/structure/cable{
icon_state = "2-4"
},
@@ -47910,9 +47729,7 @@
/obj/machinery/newscaster{
pixel_y = 34
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron,
/area/medical/surgery)
"pep" = (
@@ -48053,7 +47870,7 @@
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/space/basic,
/area/solar/starboard/aft)
"pgK" = (
@@ -48435,9 +48252,7 @@
req_access_txt = "16"
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/autoname/directional/east{
- network = list("aiupload")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
"pmb" = (
@@ -48506,9 +48321,7 @@
pixel_x = 32;
pixel_y = -3
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark/side{
dir = 4
},
@@ -48595,7 +48408,7 @@
/obj/structure/sign/poster/random{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/hallway/primary/fore)
"poJ" = (
@@ -48612,9 +48425,7 @@
/turf/open/floor/iron/white,
/area/medical/sleeper)
"poL" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/airalarm/directional/south,
/obj/effect/decal/cleanable/dirt,
@@ -48832,7 +48643,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/catwalk_floor,
/area/maintenance/department/bridge)
"pun" = (
@@ -49079,9 +48890,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/dark,
/area/engine/storage)
@@ -49638,9 +49447,7 @@
/area/hallway/primary/central)
"pHZ" = (
/obj/structure/bodycontainer/morgue,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/medical/morgue)
"pIj" = (
@@ -49974,9 +49781,7 @@
/turf/open/floor/iron/dark,
/area/engine/engine_room)
"pMA" = (
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/turf_decal/guideline/guideline_edge/blue{
dir = 4
@@ -50030,9 +49835,8 @@
/turf/open/floor/engine/n2,
/area/engine/atmos)
"pOc" = (
-/obj/machinery/camera/autoname/directional/west{
- c_tag = "Xenobiology Lab - Pen #2";
- network = list("ss13","rd","xeno")
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology Lab - Pen #2"
},
/obj/structure/window/reinforced,
/turf/open/floor/engine,
@@ -50415,9 +50219,6 @@
dir = 8
},
/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "security camera console";
- network = list("ss13");
pixel_y = 31
},
/obj/structure/chair,
@@ -50445,7 +50246,7 @@
pixel_y = 10
},
/obj/machinery/digital_clock/directional/north,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"pTy" = (
@@ -50665,7 +50466,7 @@
/turf/open/floor/iron/white,
/area/medical/apothecary)
"pXa" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -50719,9 +50520,7 @@
dir = 4
},
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/ridged/steel,
/area/crew_quarters/heads/hos)
"pYw" = (
@@ -50950,9 +50749,7 @@
},
/obj/effect/turf_decal/bot,
/obj/machinery/power/port_gen/pacman,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -51871,9 +51668,8 @@
/obj/machinery/rnd/production/circuit_imprinter,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/autoname/directional/north{
- c_tag = "Incinerator";
- network = list("ss13","engine")
+/obj/machinery/camera/directional/north{
+ c_tag = "Incinerator"
},
/turf/open/floor/iron/dark,
/area/engine/atmos)
@@ -51917,9 +51713,7 @@
/turf/open/floor/grass,
/area/hallway/primary/central)
"qsw" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/engine/co2,
/area/engine/atmos)
"qsz" = (
@@ -52472,9 +52266,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/machinery/light_switch{
pixel_y = 28
},
@@ -52772,7 +52564,7 @@
/turf/open/floor/iron/dark,
/area/security/brig/dock)
"qFC" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
@@ -53133,7 +52925,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"qMM" = (
@@ -53346,9 +53138,7 @@
pixel_x = 24;
pixel_y = -3
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
"qRk" = (
@@ -53756,7 +53546,7 @@
/turf/open/floor/iron/white,
/area/security/brig/medbay)
"qXs" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark/side{
dir = 4
@@ -53855,7 +53645,7 @@
pixel_x = -25;
req_access_txt = "57"
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/cable/yellow{
icon_state = "2-4"
},
@@ -54276,9 +54066,7 @@
/obj/item/radio/intercom{
pixel_y = 29
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/science/robotics)
"rfI" = (
@@ -54458,9 +54246,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/guideline/guideline_edge/purple,
/obj/item/kirbyplants/random,
/turf/open/floor/iron/white/side{
@@ -54473,8 +54259,7 @@
/area/science/test_area)
"rif" = (
/obj/item/kirbyplants/random,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine");
+/obj/machinery/camera/directional/south{
view_range = 8
},
/obj/effect/turf_decal/tile/neutral{
@@ -54709,9 +54494,7 @@
icon_state = "0-2"
},
/obj/machinery/firealarm/directional/east,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/science/misc_lab)
"rlV" = (
@@ -54949,7 +54732,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/carpet/orange,
/area/quartermaster/qm)
"rpK" = (
@@ -55142,7 +54925,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/hallway/secondary/entry)
"rsc" = (
@@ -55503,7 +55286,6 @@
/obj/machinery/camera/motion{
c_tag = "vault";
dir = 10;
- network = list("ss13","security","cargo");
pixel_y = 8
},
/obj/machinery/airalarm/directional/west{
@@ -55872,9 +55654,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","security","court")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/wood,
/area/security/courtroom)
"rDS" = (
@@ -55949,10 +55729,9 @@
"rEn" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/portable_atmospherics/canister/nitrogen,
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Science - Toxins Mixing Lab Burn Chamber";
- name = "science camera";
- network = list("ss13","rd")
+ name = "science camera"
},
/turf/open/floor/iron/dark,
/area/science/misc_lab/range)
@@ -56004,7 +55783,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine{
initial_gas_mix = "n2=100;TEMP=80";
name = "mainframe floor"
@@ -56078,9 +55857,7 @@
/turf/open/floor/iron/tech,
/area/ai_monitored/storage/eva)
"rGC" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
@@ -56117,9 +55894,7 @@
pixel_x = -22;
pixel_y = 10
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
"rHa" = (
@@ -56147,9 +55922,7 @@
/turf/open/floor/iron,
/area/ai_monitored/security/armory)
"rHA" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","prison","security")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
@@ -56398,7 +56171,7 @@
dir = 4
},
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south{
+/obj/machinery/camera/directional/south{
pixel_x = 2
},
/obj/structure/cable/yellow{
@@ -56496,9 +56269,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/engine/atmos)
"rOF" = (
@@ -56581,7 +56352,7 @@
/area/maintenance/department/medical/morgue)
"rQC" = (
/obj/item/kirbyplants/random,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/bridge/meeting_room)
"rQG" = (
@@ -56645,8 +56416,7 @@
},
/obj/machinery/light,
/obj/machinery/camera/motion{
- c_tag = "MiniSat Upload Chamber";
- network = list("aiupload")
+ c_tag = "MiniSat Upload Chamber"
},
/obj/structure/cable,
/obj/machinery/power/smes{
@@ -56696,7 +56466,7 @@
/turf/open/floor/plating,
/area/maintenance/department/bridge)
"rSN" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/structure/sign/painting/library{
pixel_x = -32
},
@@ -56984,9 +56754,7 @@
/turf/open/floor/iron/white,
/area/crew_quarters/heads/hor)
"rXt" = (
-/obj/machinery/computer/security/qm{
- network = list("mine","auxbase","cargo")
- },
+/obj/machinery/computer/security/qm,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
@@ -57269,9 +57037,7 @@
/obj/effect/turf_decal/bot{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/tech,
/area/engine/atmos)
"sbt" = (
@@ -57321,9 +57087,7 @@
/obj/machinery/defibrillator_mount{
pixel_x = -32
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/white,
/area/security/brig/medbay)
"scT" = (
@@ -57495,7 +57259,6 @@
/obj/machinery/camera/motion/directional/east{
c_tag = "ion 2";
name = "Ion 2";
- network = list("Ion");
view_range = 8
},
/turf/open/space/basic,
@@ -57786,7 +57549,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/machinery/power/terminal{
dir = 8
},
@@ -58002,9 +57765,7 @@
color = "#edaa0c"
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/engine/engine_room)
@@ -58210,9 +57971,6 @@
},
/obj/machinery/computer/secure_data,
/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "security camera console";
- network = list("ss13");
pixel_y = 31
},
/turf/open/floor/iron,
@@ -58236,7 +57994,7 @@
/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/vehicle/ridden/janicart,
/obj/item/key/janitor,
/turf/open/floor/iron,
@@ -58301,7 +58059,6 @@
/area/science/misc_lab)
"sud" = (
/obj/machinery/computer/security/telescreen/entertainment{
- network = list("thunder","court");
pixel_y = -32
},
/obj/structure/table/wood,
@@ -58554,8 +58311,7 @@
/area/crew_quarters/cafeteria)
"syO" = (
/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","medbay");
+/obj/machinery/camera/directional/east{
view_range = 8
},
/obj/item/radio/intercom{
@@ -59177,9 +58933,7 @@
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 8
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine,
/area/science/mixing/chamber)
"sLf" = (
@@ -59260,9 +59014,7 @@
/obj/effect/turf_decal/bot{
dir = 1
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/dark,
/area/engine/atmos)
"sLX" = (
@@ -59655,9 +59407,7 @@
/turf/open/floor/plating,
/area/security/prison)
"sSF" = (
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
@@ -60366,7 +60116,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
},
@@ -61319,9 +61069,8 @@
"tsy" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/effect/turf_decal/bot,
-/obj/machinery/computer/security{
- dir = 8;
- network = list("security")
+/obj/machinery/computer/security/security{
+ dir = 8
},
/turf/open/floor/iron/dark,
/area/security/main)
@@ -61384,10 +61133,9 @@
/turf/open/floor/noslip/standard,
/area/crew_quarters/toilet)
"ttG" = (
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Medbay - Break Room";
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
@@ -61409,9 +61157,7 @@
pixel_x = -30
},
/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/dark,
/area/storage/tech)
"ttK" = (
@@ -62515,8 +62261,7 @@
},
/obj/machinery/camera/motion/directional/south{
c_tag = "Technical Storage";
- name = "motion-sensitive Technical Storage";
- network = list("ss13","engine")
+ name = "motion-sensitive Technical Storage"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
@@ -62850,9 +62595,7 @@
/turf/open/floor/plating,
/area/engine/atmos)
"tPx" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay")
- },
+/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -63296,9 +63039,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/north,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/security/main)
@@ -63467,7 +63208,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark/side,
/area/hallway/primary/central)
@@ -63571,9 +63312,7 @@
/obj/structure/sign/warning/securearea{
pixel_y = 30
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/engine/engine_room)
"uav" = (
@@ -64983,7 +64722,7 @@
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/fernybush,
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/grass/no_border,
/area/hallway/secondary/exit/departure_lounge)
"uAH" = (
@@ -65377,7 +65116,6 @@
/obj/machinery/camera/motion/directional/east{
c_tag = "ion 1";
name = "Ion 1";
- network = list("Ion");
view_range = 10
},
/turf/open/space/basic,
@@ -65423,9 +65161,8 @@
/obj/structure/cable/cyan{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/north{
- c_tag = "MiniSat Upload West";
- network = list("minisat","aiupload")
+/obj/machinery/camera/directional/north{
+ c_tag = "MiniSat Upload West"
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
@@ -65533,8 +65270,7 @@
"uJy" = (
/obj/structure/lattice,
/obj/machinery/camera/motion/directional/south{
- c_tag = "Armory - Internal";
- network = list("ss13","security")
+ c_tag = "Armory - Internal"
},
/turf/open/space/basic,
/area/space/nearstation)
@@ -65559,9 +65295,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/bot,
/obj/structure/disposalpipe/trunk{
@@ -65626,8 +65360,7 @@
dir = 8
},
/obj/effect/turf_decal/guideline/guideline_tri/blue,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","medbay");
+/obj/machinery/camera/directional/north{
view_range = 10
},
/obj/structure/cable/yellow{
@@ -65896,7 +65629,7 @@
/turf/closed/wall,
/area/maintenance/department/science)
"uOy" = (
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark/side{
dir = 8
@@ -65927,7 +65660,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -66032,9 +65765,7 @@
/obj/machinery/airalarm/directional/south{
pixel_y = -22
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/closet/crate/mail,
/turf/open/floor/iron,
/area/quartermaster/sorting)
@@ -66085,7 +65816,7 @@
/area/medical/sleeper)
"uRO" = (
/obj/effect/turf_decal/box/corners,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/engine,
/area/science/explab)
"uSu" = (
@@ -66408,9 +66139,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/obj/item/radio/intercom{
pixel_x = 33;
pixel_y = -2
@@ -66561,12 +66290,9 @@
},
/obj/machinery/light,
/obj/machinery/computer/security/telescreen/entertainment{
- network = list("thunder","court");
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/carpet,
/area/quartermaster/exploration_prep)
"vaU" = (
@@ -66690,8 +66416,7 @@
/turf/open/floor/iron/dark/side,
/area/hallway/secondary/exit/departure_lounge)
"vcU" = (
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","medbay");
+/obj/machinery/camera/directional/west{
view_range = 8
},
/obj/effect/turf_decal/guideline/guideline_edge/neutral{
@@ -67516,9 +67241,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
"vuo" = (
@@ -67655,7 +67378,7 @@
"vwR" = (
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/construction/mining/aux_base)
"vwY" = (
@@ -68094,9 +67817,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/guideline/guideline_in/purple{
dir = 1
},
@@ -68325,7 +68046,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
c_tag = "Teleporter Room"
},
/obj/structure/table/wood,
@@ -68448,9 +68169,7 @@
/obj/structure/disposalpipe/segment{
dir = 2
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","security")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/security/brig)
"vJE" = (
@@ -68906,7 +68625,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/dark,
/area/storage/primary)
"vRI" = (
@@ -69695,7 +69414,7 @@
/area/solar/port/fore)
"wfi" = (
/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/structure/cable/yellow{
icon_state = "1-8"
},
@@ -70063,7 +69782,6 @@
/area/security/main)
"wmz" = (
/obj/machinery/computer/security/telescreen/entertainment{
- network = list("thunder","court");
pixel_y = 32
},
/obj/structure/table/wood,
@@ -70253,7 +69971,7 @@
dir = 8
},
/obj/machinery/firealarm/directional/east,
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/iron/grid/steel,
/area/hydroponics)
"wqA" = (
@@ -70651,9 +70369,7 @@
/obj/item/prison_scanner,
/obj/item/prison_scanner,
/obj/item/prison_scanner,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/techmaint,
/area/security/prison)
"wzW" = (
@@ -70695,7 +70411,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/security/brig)
"wzY" = (
@@ -71123,7 +70839,7 @@
pixel_x = -8;
pixel_y = -30
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/machinery/button/door{
id = "Capoffice";
id_tag = "cmoprivacy";
@@ -71380,9 +71096,7 @@
pixel_y = 32
},
/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/prison,
/area/security/prison)
"wKp" = (
@@ -71679,7 +71393,7 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/machinery/camera/autoname/directional/north{
+/obj/machinery/camera/directional/north{
view_range = 12
},
/obj/effect/turf_decal/siding/wideplating/dark/corner{
@@ -71750,7 +71464,7 @@
color = "#267878";
dir = 8
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron,
/area/crew_quarters/dorms)
"wPU" = (
@@ -71893,11 +71607,8 @@
/area/engine/engine_room)
"wSs" = (
/obj/machinery/suit_storage_unit/cmo,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for monitoring medbay to ensure patient safety.";
+/obj/machinery/computer/security/telescreen/cmo{
dir = 4;
- name = "Medbay Monitor";
- network = list("medbay");
pixel_x = -31;
pixel_y = 1
},
@@ -72368,9 +72079,7 @@
/area/quartermaster/qm)
"xba" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","prison")
- },
+/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
alpha = 180;
color = "#DE3A3A"
@@ -72861,9 +72570,8 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- c_tag = "Xenobiology Lab - Pen #7";
- network = list("ss13","rd","xeno")
+/obj/machinery/camera/directional/east{
+ c_tag = "Xenobiology Lab - Pen #7"
},
/obj/machinery/sparker{
id = "Xenobio";
@@ -73344,7 +73052,7 @@
/area/ai_monitored/turret_protected/ai_upload)
"xrj" = (
/obj/machinery/chem_master/condimaster,
-/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/camera/directional/north,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -73911,9 +73619,7 @@
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high/plus,
/obj/machinery/light,
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/chief)
"xya" = (
@@ -74114,9 +73820,7 @@
/obj/machinery/newscaster{
pixel_y = 34
},
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","security","court")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/wood,
/area/security/courtroom)
"xzU" = (
@@ -74154,8 +73858,7 @@
/area/maintenance/starboard/aft)
"xAP" = (
/obj/machinery/camera/motion/directional/south{
- c_tag = "Armory - Internal";
- network = list("ss13","security")
+ c_tag = "Armory - Internal"
},
/turf/open/space/basic,
/area/space)
@@ -74763,9 +74466,8 @@
/area/hallway/primary/central)
"xNd" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/machinery/computer/security{
- dir = 8;
- network = list("security")
+/obj/machinery/computer/security/security{
+ dir = 8
},
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
@@ -75428,9 +75130,7 @@
/obj/structure/fireaxecabinet{
pixel_y = -32
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","engine")
- },
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron/tech,
/area/engine/atmos)
"xZJ" = (
@@ -75601,9 +75301,8 @@
/area/engine/engine_room)
"ycm" = (
/obj/structure/lattice/catwalk,
-/obj/machinery/camera/autoname/directional/west{
- c_tag = "AI Core";
- network = list("aicore")
+/obj/machinery/camera/directional/west{
+ c_tag = "AI Core"
},
/obj/machinery/porta_turret/ai{
dir = 4
@@ -75932,9 +75631,7 @@
dir = 4
},
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","rd")
- },
+/obj/machinery/camera/directional/west,
/obj/machinery/newscaster{
pixel_x = -31;
pixel_y = 1
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 34ea8d3916ae4..733e57dab0129 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -1101,7 +1101,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/light{
dir = 8
},
@@ -1111,12 +1111,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/construction)
"ea" = (
/obj/structure/table,
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/obj/item/gun/magic/wand/resurrection/debug,
/turf/open/floor/iron,
/area/storage/primary)
@@ -1558,7 +1558,7 @@
/turf/open/space/basic,
/area/space)
"fq" = (
-/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/camera/directional/west,
/obj/machinery/computer/bounty{
dir = 4
},
@@ -1908,7 +1908,7 @@
pixel_x = 32;
pixel_y = -7
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/plating,
/area/storage/primary)
"gh" = (
@@ -2058,7 +2058,7 @@
/turf/open/floor/iron,
/area/hallway/secondary/entry)
"gD" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/quartermaster/miningoffice)
"gE" = (
@@ -2067,7 +2067,7 @@
/turf/open/floor/iron,
/area/hallway/secondary/entry)
"gF" = (
-/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/camera/directional/south,
/turf/open/floor/iron,
/area/hallway/secondary/entry)
"gG" = (
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index c7e290a13da9f..a95bd400dfdce 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -25,10 +25,7 @@
/area/tdome/tdomeobserve)
"aj" = (
/obj/machinery/computer/card/centcom,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
- name = "Research Monitor";
- network = list("rd","minisat");
+/obj/machinery/computer/security/telescreen/rd{
pixel_y = 28
},
/turf/open/floor/carpet/grimy,
@@ -2735,7 +2732,6 @@
"jX" = (
/obj/machinery/camera/directional/north{
c_tag = "Red Team";
- network = list("thunder");
pixel_x = 11;
pixel_y = -9;
resistance_flags = 64
@@ -12816,7 +12812,6 @@
"Ws" = (
/obj/machinery/camera/directional/north{
c_tag = "Green Team";
- network = list("thunder");
pixel_x = 12;
pixel_y = -10;
resistance_flags = 64
diff --git a/_maps/shuttles/aux_base/aux_base_default.dmm b/_maps/shuttles/aux_base/aux_base_default.dmm
index 9acf1bd104cdc..724f9c046faa3 100644
--- a/_maps/shuttles/aux_base/aux_base_default.dmm
+++ b/_maps/shuttles/aux_base/aux_base_default.dmm
@@ -76,9 +76,7 @@
/turf/open/floor/plating,
/area/shuttle/auxillary_base)
"X" = (
-/obj/machinery/camera/directional/south{
- network = list("auxbase")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/mining_shuttle_beacon,
/turf/open/floor/plating,
/area/shuttle/auxillary_base)
diff --git a/_maps/shuttles/aux_base/aux_base_small.dmm b/_maps/shuttles/aux_base/aux_base_small.dmm
index 746034561caad..b1d3446bca4f0 100644
--- a/_maps/shuttles/aux_base/aux_base_small.dmm
+++ b/_maps/shuttles/aux_base/aux_base_small.dmm
@@ -34,9 +34,7 @@
/turf/open/floor/plating,
/area/shuttle/auxillary_base)
"h" = (
-/obj/machinery/camera/directional/south{
- network = list("auxbase")
- },
+/obj/machinery/camera/directional/south,
/obj/structure/mining_shuttle_beacon,
/turf/open/floor/plating,
/area/shuttle/auxillary_base)
diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm
index 4a215e9df7590..98fa24e0f6ac5 100644
--- a/_maps/shuttles/emergency/emergency_tiny.dmm
+++ b/_maps/shuttles/emergency/emergency_tiny.dmm
@@ -116,9 +116,7 @@
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
-/obj/machinery/camera/directional/north{
- network = list("evac")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/iron/white,
/area/shuttle/escape)
"iw" = (
@@ -205,9 +203,7 @@
dir = 10
},
/obj/effect/turf_decal/bot,
-/obj/machinery/camera/directional/north{
- network = list("evac")
- },
+/obj/machinery/camera/directional/north,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"pJ" = (
@@ -469,9 +465,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/autoname/directional/east{
- network = list("evac")
- },
+/obj/machinery/camera/directional/east,
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"HD" = (
@@ -531,8 +525,7 @@
pixel_x = 1;
pixel_y = -30
},
-/obj/machinery/computer/security/telescreen/entertainment{
- network = list("evac");
+/obj/machinery/computer/security/telescreen/evac{
pixel_x = 32;
pixel_y = -1
},
@@ -599,9 +592,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("evac")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/circuit/green{
luminosity = 2
},
diff --git a/_maps/shuttles/exploration/exploration_corg.dmm b/_maps/shuttles/exploration/exploration_corg.dmm
index db18b46c76329..d258595268095 100644
--- a/_maps/shuttles/exploration/exploration_corg.dmm
+++ b/_maps/shuttles/exploration/exploration_corg.dmm
@@ -152,9 +152,8 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/exploration)
"hc" = (
-/obj/machinery/camera/autoname/directional/east{
- name = "Exploration Shuttle";
- network = list("exploration shuttle")
+/obj/machinery/camera/directional/east{
+ name = "Exploration Shuttle"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
diff --git a/_maps/shuttles/exploration/exploration_rad.dmm b/_maps/shuttles/exploration/exploration_rad.dmm
index e4061a7a93ce7..70d4e205ba83b 100644
--- a/_maps/shuttles/exploration/exploration_rad.dmm
+++ b/_maps/shuttles/exploration/exploration_rad.dmm
@@ -407,9 +407,7 @@
},
/obj/structure/table,
/obj/machinery/recharger,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","sci")
- },
+/obj/machinery/camera/directional/east,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
diff --git a/_maps/shuttles/exploration/exploration_shuttle.dmm b/_maps/shuttles/exploration/exploration_shuttle.dmm
index b67dca8a646f0..035e00e75ea92 100644
--- a/_maps/shuttles/exploration/exploration_shuttle.dmm
+++ b/_maps/shuttles/exploration/exploration_shuttle.dmm
@@ -262,7 +262,7 @@
pixel_x = 32;
pixel_y = 1
},
-/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/camera/directional/east,
/turf/open/floor/mineral/titanium,
/area/shuttle/exploration)
"G" = (
diff --git a/_maps/shuttles/mining/mining_rad.dmm b/_maps/shuttles/mining/mining_rad.dmm
index 4d2c0e52e08cc..bbd39f032ba13 100644
--- a/_maps/shuttles/mining/mining_rad.dmm
+++ b/_maps/shuttles/mining/mining_rad.dmm
@@ -10,9 +10,7 @@
pixel_x = 1;
pixel_y = 2
},
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/west,
/turf/open/floor/iron/tech/grid,
/area/shuttle/mining)
"c" = (
diff --git a/_maps/shuttles/mining/mining_tiny.dmm b/_maps/shuttles/mining/mining_tiny.dmm
index 4893f2b8566a9..1e7acb783734b 100644
--- a/_maps/shuttles/mining/mining_tiny.dmm
+++ b/_maps/shuttles/mining/mining_tiny.dmm
@@ -23,9 +23,7 @@
pixel_x = -26;
unlocked = 1
},
-/obj/machinery/camera/autoname/directional/south{
- network = list("ss13","cargo")
- },
+/obj/machinery/camera/directional/south,
/obj/effect/turf_decal/loading_area{
dir = 4
},
diff --git a/_maps/shuttles/ruin/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin/ruin_syndicate_fighter_shiv.dmm
index 373fd5ddaae75..d20d2e3800f93 100644
--- a/_maps/shuttles/ruin/ruin_syndicate_fighter_shiv.dmm
+++ b/_maps/shuttles/ruin/ruin_syndicate_fighter_shiv.dmm
@@ -26,7 +26,6 @@
"fh" = (
/obj/machinery/camera/xray/directional/west{
c_tag = "External View";
- network = list("caravansyndicate1");
pixel_x = 32
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -56,9 +55,8 @@
req_access = null;
req_access_txt = "150"
},
-/obj/machinery/computer/security{
- dir = 1;
- network = list("caravansyndicate1")
+/obj/machinery/computer/security/caravansyndicate{
+ dir = 1
},
/obj/structure/cable/yellow,
/turf/open/floor/mineral/plastitanium/red,
From f3b52add648808136e457aae65245850d5d1c539 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Sat, 28 Sep 2024 16:29:19 -0400
Subject: [PATCH 24/43] removed duplicate log
---
code/datums/helper_datums/teleport.dm | 3 ---
1 file changed, 3 deletions(-)
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 102f25127304d..264534c1f9fb2 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -150,9 +150,6 @@
if(ismegafauna(teleatom))
message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_VERBOSEJMP(curturf)] to [ADMIN_VERBOSEJMP(destturf)].")
- if(ismegafauna(teleatom))
- message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_VERBOSEJMP(curturf)] to [ADMIN_VERBOSEJMP(destturf)].")
-
if(ismob(teleatom))
var/mob/M = teleatom
M.cancel_camera()
From 1f7de7c6d055865a0f2385915a6f170d6388cbbd Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Sun, 29 Sep 2024 15:10:52 -0400
Subject: [PATCH 25/43] Fixed boolean logic
---
code/datums/helper_datums/teleport.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 264534c1f9fb2..f3c25a6867ba3 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -24,7 +24,7 @@
for (var/obj/machinery/bluespace_anchor/anchor as() in GLOB.active_bluespace_anchors)
var/anchor_zlevel = anchor.get_virtual_z_level()
// Not in range of our current turf or destination turf
- if((cur_zlevel != anchor_zlevel && get_dist(cur_turf, anchor) > anchor.range) && (dest_zlevel != anchor_zlevel && get_dist(dest_turf, anchor) > anchor.range))
+ if((cur_zlevel == anchor_zlevel && get_dist(cur_turf, anchor) <= anchor.range) || (dest_zlevel == anchor_zlevel && get_dist(dest_turf, anchor) <= anchor.range))
continue
// Try to activate the anchor, this also does the effect
From c7b2ed4872ddefdaed317d6108dd8a73a443e9be Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Sun, 29 Sep 2024 15:45:46 -0400
Subject: [PATCH 26/43] okay now fixed for real
---
code/datums/helper_datums/teleport.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index f3c25a6867ba3..82b430bd6f24c 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -24,7 +24,7 @@
for (var/obj/machinery/bluespace_anchor/anchor as() in GLOB.active_bluespace_anchors)
var/anchor_zlevel = anchor.get_virtual_z_level()
// Not in range of our current turf or destination turf
- if((cur_zlevel == anchor_zlevel && get_dist(cur_turf, anchor) <= anchor.range) || (dest_zlevel == anchor_zlevel && get_dist(dest_turf, anchor) <= anchor.range))
+ if((!(cur_zlevel == anchor_zlevel && get_dist(cur_turf, anchor) <= anchor.range)) && (!(dest_zlevel == anchor_zlevel && get_dist(dest_turf, anchor) <= anchor.range)))
continue
// Try to activate the anchor, this also does the effect
From 6b0b1af395c4a46f5d3647e05042a135e8d269fa Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Sun, 29 Sep 2024 15:53:12 -0400
Subject: [PATCH 27/43] breakdown the NOT operation
---
code/datums/helper_datums/teleport.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 82b430bd6f24c..6ddeb55dae3e6 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -24,7 +24,7 @@
for (var/obj/machinery/bluespace_anchor/anchor as() in GLOB.active_bluespace_anchors)
var/anchor_zlevel = anchor.get_virtual_z_level()
// Not in range of our current turf or destination turf
- if((!(cur_zlevel == anchor_zlevel && get_dist(cur_turf, anchor) <= anchor.range)) && (!(dest_zlevel == anchor_zlevel && get_dist(dest_turf, anchor) <= anchor.range)))
+ if((cur_zlevel != anchor_zlevel || get_dist(cur_turf, anchor) > anchor.range) && (dest_zlevel != anchor_zlevel || get_dist(dest_turf, anchor) > anchor.range))
continue
// Try to activate the anchor, this also does the effect
From 08a6c265fa43b1c79e8d777177c0ca0d57c60274 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Tue, 1 Oct 2024 10:30:34 -0400
Subject: [PATCH 28/43] update access requirements
---
_maps/map_files/Mining/Lavaland.dmm | 112 ++++++++++++----------------
1 file changed, 46 insertions(+), 66 deletions(-)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index ad43c1fdcab47..221545ae7cf86 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -602,8 +602,7 @@
/obj/structure/barricade/wooden/crude,
/obj/effect/decal/cleanable/oil/slippery,
/obj/machinery/door/airlock/medical/glass{
- name = "Chemistry Lab";
- req_access_txt = "47,54,29"
+ name = "Chemistry Lab"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -1009,10 +1008,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/closeup,
-/obj/machinery/door/airlock/mining/glass{
- name = "Processing Area";
- req_access_txt = "48"
- },
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/iron/techmaint,
/area/mine/gateway)
"gG" = (
@@ -1103,8 +1099,7 @@
/area/mine/laborcamp)
"hn" = (
/obj/machinery/door/airlock/research/glass{
- name = "Research Division Atrium";
- req_one_access_txt = "47,54"
+ name = "Research Division Atrium"
},
/obj/structure/barricade/wooden/crude,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -1373,7 +1368,8 @@
/area/mine/science)
"jb" = (
/obj/machinery/door/airlock/mining/glass{
- name = "Mining Station"
+ name = "Mining Station";
+ req_one_access_txt = "54;18"
},
/obj/effect/turf_decal/stripes/closeup,
/obj/structure/fans/tiny,
@@ -1416,8 +1412,7 @@
/area/mine/eva)
"jo" = (
/obj/machinery/door/airlock/research/glass{
- name = "Research Division Atrium";
- req_one_access_txt = "47,54"
+ name = "Research Division Atrium"
},
/obj/effect/turf_decal/stripes/closeup,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -1850,15 +1845,13 @@
/turf/open/floor/plating/asteroid,
/area/mine/living_quarters)
"mO" = (
-/obj/machinery/door/airlock/external{
- glass = 1;
- name = "Mining Shuttle Airlock";
- opacity = 0
- },
/obj/effect/turf_decal/stripes/closeup{
dir = 1
},
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass{
+ name = "Mining Shuttle Airlock"
+ },
/turf/open/floor/iron/techmaint,
/area/mine/production)
"mR" = (
@@ -1911,16 +1904,16 @@
/turf/open/floor/iron,
/area/mine/living_quarters)
"nu" = (
-/obj/machinery/door/airlock/mining/glass{
- name = "Mining Station EVA";
- req_access_txt = "54"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/closeup,
+/obj/machinery/door/airlock/mining/glass{
+ name = "Mining Station EVA";
+ req_one_access_txt = "54;18"
+ },
/turf/open/floor/iron/techmaint,
/area/mine/eva)
"nw" = (
@@ -1940,8 +1933,7 @@
"nH" = (
/obj/structure/barricade/wooden/crude,
/obj/machinery/door/airlock/research{
- name = "tachyon-doppler Array Booth";
- req_access_txt = "7"
+ name = "tachyon-doppler Array Booth"
},
/obj/effect/turf_decal/stripes/closeup{
dir = 1
@@ -2071,8 +2063,7 @@
/obj/effect/decal/cleanable/oil/slippery,
/obj/structure/barricade/wooden/crude,
/obj/machinery/door/airlock/research{
- name = "Robotics Lab";
- req_access_txt = "47,54,29"
+ name = "Robotics Lab"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2127,15 +2118,12 @@
/area/mine/gateway)
"oY" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining/glass{
- name = "Processing Area";
- req_access_txt = "48"
- },
/obj/effect/turf_decal/stripes/closeup,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/iron/techmaint,
/area/mine/gateway)
"pb" = (
@@ -2603,8 +2591,7 @@
/obj/machinery/button/door{
id = "lavasci";
name = "Science shuttle shutters";
- pixel_y = 28;
- req_access_txt = "2"
+ pixel_y = 28
},
/turf/open/floor/iron,
/area/mine/science)
@@ -2625,7 +2612,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/airlock/mining{
name = "Mining Station Storage";
- req_access_txt = "48"
+ req_one_access_txt = "54;18"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/stripes/closeup,
@@ -2650,8 +2637,8 @@
/obj/effect/turf_decal/stripes/closeup,
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/external/glass{
- req_access_txt = "47";
- name = "Science Outpost Airlock"
+ name = "Science Outpost Airlock";
+ req_one_access_txt = "54;18;47"
},
/turf/open/floor/iron/techmaint,
/area/mine/science)
@@ -2893,8 +2880,7 @@
"vf" = (
/obj/structure/barricade/wooden/crude,
/obj/machinery/door/airlock/medical/glass{
- name = "Chemistry Lab";
- req_access_txt = "47,54,29"
+ name = "Chemistry Lab"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -3363,7 +3349,7 @@
"yn" = (
/obj/machinery/door/airlock/engineering/glass{
name = "mining Relay Room";
- req_access_txt = "48"
+ req_one_access_txt = "54;61"
},
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -4234,7 +4220,7 @@
},
/obj/machinery/door/airlock/maintenance{
name = "Mining Station Maintenance";
- req_access_txt = "48"
+ req_one_access_txt = "54;18"
},
/obj/machinery/atmospherics/pipe/layer_manifold,
/obj/effect/turf_decal/stripes/closeup,
@@ -4332,7 +4318,7 @@
/obj/effect/turf_decal/stripes/closeup,
/obj/machinery/door/airlock/external{
name = "Science Outpost Airlock";
- req_access_txt = "47"
+ req_one_access_txt = "54;18;47"
},
/turf/open/floor/iron/techmaint,
/area/mine/science)
@@ -4497,14 +4483,12 @@
/turf/open/floor/iron,
/area/mine/science)
"HA" = (
-/obj/machinery/door/airlock/external{
- glass = 1;
- name = "Mining Shuttle Airlock";
- opacity = 0
- },
/obj/effect/turf_decal/stripes/closeup{
dir = 1
},
+/obj/machinery/door/airlock/external/glass{
+ name = "Mining Shuttle Airlock"
+ },
/turf/open/floor/iron/techmaint,
/area/mine/production)
"HC" = (
@@ -4595,7 +4579,7 @@
"Is" = (
/obj/machinery/door/airlock/maintenance{
name = "Radioisotope Containment Room";
- req_access_txt = "48"
+ req_one_access_txt = "54;18;10"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -4662,8 +4646,7 @@
"IN" = (
/obj/structure/barricade/wooden/crude,
/obj/machinery/door/airlock/command{
- name = "Research Director's Office";
- req_access_txt = "30"
+ name = "Research Director's Office"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -4740,7 +4723,7 @@
/obj/effect/turf_decal/stripes/closeup,
/obj/machinery/door/airlock/mining/glass{
name = "Mining Station EVA";
- req_access_txt = "54"
+ req_one_access_txt = "54;18"
},
/turf/open/floor/iron/techmaint,
/area/mine/eva)
@@ -4990,7 +4973,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/airlock/maintenance{
name = "Mining Station Communications";
- req_access_txt = "48"
+ req_one_access_txt = "54;61"
},
/obj/effect/turf_decal/stripes/closeup,
/turf/open/floor/iron/techmaint,
@@ -5160,10 +5143,6 @@
/turf/open/floor/iron,
/area/mine/science)
"Lr" = (
-/obj/machinery/door/airlock/mining/glass{
- name = "Mining Station Bridge";
- req_access_txt = "48"
- },
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -5177,6 +5156,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/iron/techmaint,
/area/mine/production)
"LC" = (
@@ -5650,7 +5630,10 @@
/turf/open/floor/iron,
/area/mine/science)
"Pl" = (
-/obj/machinery/door/airlock/external/glass,
+/obj/machinery/door/airlock/external/glass{
+ name = "Science Shuttle Airlock";
+ req_one_access_txt = "54;18;47;49"
+ },
/obj/structure/fans/tiny,
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -5705,8 +5688,7 @@
/area/lavaland/surface/outdoors/explored)
"PL" = (
/obj/machinery/door/airlock/research/glass{
- name = "EVA Atrium";
- req_one_access_txt = "47,54"
+ name = "EVA Atrium"
},
/obj/structure/barricade/wooden/crude,
/obj/effect/turf_decal/stripes/closeup{
@@ -6131,8 +6113,7 @@
/area/mine/science)
"SI" = (
/obj/machinery/door/airlock/research{
- name = "Subspace Listening Lab";
- req_access_txt = "47"
+ name = "Subspace Listening Lab"
},
/obj/structure/barricade/wooden/crude,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -6238,7 +6219,8 @@
/area/mine/laborcamp)
"TC" = (
/obj/machinery/door/airlock/medical/glass{
- name = "Infirmary"
+ name = "Infirmary";
+ req_one_access_txt = "54;5"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -6489,8 +6471,7 @@
/obj/effect/decal/cleanable/oil/slippery,
/obj/structure/barricade/wooden/crude,
/obj/machinery/door/airlock/medical/glass{
- name = "Chemistry Lab";
- req_access_txt = "47,54,29"
+ name = "Chemistry Lab"
},
/obj/effect/turf_decal/stripes/closeup,
/turf/open/floor/iron/techmaint,
@@ -6513,7 +6494,7 @@
"VK" = (
/obj/machinery/door/airlock/mining/glass{
name = "Mining Station EVA";
- req_access_txt = "54"
+ req_one_access_txt = "54;18"
},
/obj/effect/turf_decal/stripes/closeup,
/turf/open/floor/iron/techmaint,
@@ -6590,7 +6571,8 @@
/obj/structure/fans/tiny,
/obj/effect/turf_decal/stripes/closeup,
/obj/machinery/door/airlock/mining/glass{
- name = "Mining Station"
+ name = "Mining Station";
+ req_one_access_txt = "54;18"
},
/turf/open/floor/iron/techmaint,
/area/mine/eva)
@@ -6771,8 +6753,7 @@
/area/mine/laborcamp/security)
"Xm" = (
/obj/machinery/door/airlock/research/glass{
- name = "Research Division Atrium";
- req_one_access_txt = "47,54"
+ name = "Research Division Atrium"
},
/obj/structure/barricade/wooden/crude,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -6920,8 +6901,7 @@
"Yi" = (
/obj/effect/decal/cleanable/oil/slippery,
/obj/machinery/door/airlock/research/glass{
- name = "Research Division Atrium";
- req_one_access_txt = "47,54"
+ name = "Research Division Atrium"
},
/obj/effect/turf_decal/stripes/closeup,
/turf/open/floor/iron/techmaint,
From 06d62be435d80640400bd71bc0f1155c5ac9b545 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Tue, 1 Oct 2024 10:36:08 -0400
Subject: [PATCH 29/43] Closet -> Mining Station Gateway Maintenance
---
_maps/map_files/Mining/Lavaland.dmm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 221545ae7cf86..c489c76719de2 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -4663,12 +4663,13 @@
/turf/open/floor/iron/freezer,
/area/mine/laborcamp)
"IS" = (
-/obj/machinery/door/airlock{
- name = "Closet"
- },
/obj/structure/cable/yellow{
icon_state = "4-8"
},
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Mining Station Gateway Maintenance";
+ req_one_access_txt = "54;64;12"
+ },
/turf/open/floor/iron/techmaint,
/area/mine/gateway)
"IT" = (
From 10d4f58985aa5155cadcf6e2d3d503bf18cc9bf3 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Sun, 20 Oct 2024 23:02:32 -0400
Subject: [PATCH 30/43] holy shit this is pissing me off
---
_maps/map_files/FlandStation/FlandStation.dmm | 4 ++--
_maps/map_files/MetaStation/MetaStation.dmm | 4 ++--
_maps/map_files/RadStation/RadStation.dmm | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 79b46044a575c..80150bbdbaefe 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -52978,12 +52978,12 @@
/obj/structure/table,
/obj/machinery/firealarm/directional/west,
/obj/machinery/vending/wallmed{
- contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate=1,/obj/item/storage/box/hug/medical=1,/obj/item/reagent_containers/glass/bottle/random_virus=1);
+ contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate=1,/obj/item/storage/box/hug/medical=1,/obj/item/reagent_containers/cup/bottle/random_virus=1);
name = "Upgraded NanoMed";
pixel_x = -1;
pixel_y = -32;
premium = list(/obj/item/storage/firstaid/regular=3,/obj/item/storage/belt/medical=3,/obj/item/sensor_device=2,/obj/item/pinpointer/crew=2,/obj/item/healthanalyzer=2,/obj/item/wrench/medical=1);
- products = list(/obj/item/reagent_containers/syringe=12,/obj/item/reagent_containers/dropper=3,/obj/item/reagent_containers/medspray=6,/obj/item/storage/pill_bottle=6,/obj/item/reagent_containers/glass/bottle=10,/obj/item/reagent_containers/spray/cleaner=1,/obj/item/stack/medical/gauze=8,/obj/item/reagent_containers/hypospray/medipen=8,/obj/item/reagent_containers/hypospray/medipen/dexalin=8,/obj/item/reagent_containers/glass/bottle/epinephrine=4,/obj/item/reagent_containers/glass/bottle/charcoal=4,/obj/item/reagent_containers/glass/bottle/salglu_solution=4,/obj/item/reagent_containers/glass/bottle/tricordrazine=1,/obj/item/reagent_containers/glass/bottle/spaceacillin=1,/obj/item/reagent_containers/glass/bottle/morphine=2,/obj/item/reagent_containers/glass/bottle/toxin=4,/obj/item/reagent_containers/medspray/sterilizine=4)
+ products = list(/obj/item/reagent_containers/syringe=12,/obj/item/reagent_containers/dropper=3,/obj/item/reagent_containers/medspray=6,/obj/item/storage/pill_bottle=6,/obj/item/reagent_containers/cup/bottle=10,/obj/item/reagent_containers/spray/cleaner=1,/obj/item/stack/medical/gauze=8,/obj/item/reagent_containers/hypospray/medipen=8,/obj/item/reagent_containers/hypospray/medipen/dexalin=8,/obj/item/reagent_containers/cup/bottle/epinephrine=4,/obj/item/reagent_containers/cup/bottle/charcoal=4,/obj/item/reagent_containers/cup/bottle/salglu_solution=4,/obj/item/reagent_containers/cup/bottle/tricordrazine=1,/obj/item/reagent_containers/cup/bottle/spaceacillin=1,/obj/item/reagent_containers/cup/bottle/morphine=2,/obj/item/reagent_containers/cup/bottle/toxin=4,/obj/item/reagent_containers/medspray/sterilizine=4)
},
/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = 2;
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 6273963642fc8..5a4e8ce0a58a2 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -53986,12 +53986,12 @@
pixel_y = 2
},
/obj/machinery/vending/wallmed{
- contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate=1,/obj/item/storage/box/hug/medical=1,/obj/item/reagent_containers/glass/bottle/random_virus=1);
+ contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate=1,/obj/item/storage/box/hug/medical=1,/obj/item/reagent_containers/cup/bottle/random_virus=1);
name = "Upgraded NanoMed";
pixel_x = -1;
pixel_y = -32;
premium = list(/obj/item/storage/firstaid/regular=3,/obj/item/storage/belt/medical=3,/obj/item/sensor_device=2,/obj/item/pinpointer/crew=2,/obj/item/healthanalyzer=2,/obj/item/wrench/medical=1);
- products = list(/obj/item/reagent_containers/syringe=12,/obj/item/reagent_containers/dropper=3,/obj/item/reagent_containers/medspray=6,/obj/item/storage/pill_bottle=6,/obj/item/reagent_containers/glass/bottle=10,/obj/item/reagent_containers/spray/cleaner=1,/obj/item/stack/medical/gauze=8,/obj/item/reagent_containers/hypospray/medipen=8,/obj/item/reagent_containers/hypospray/medipen/dexalin=8,/obj/item/reagent_containers/glass/bottle/epinephrine=4,/obj/item/reagent_containers/glass/bottle/charcoal=4,/obj/item/reagent_containers/glass/bottle/salglu_solution=4,/obj/item/reagent_containers/glass/bottle/tricordrazine=1,/obj/item/reagent_containers/glass/bottle/spaceacillin=1,/obj/item/reagent_containers/glass/bottle/morphine=2,/obj/item/reagent_containers/glass/bottle/toxin=4,/obj/item/reagent_containers/medspray/sterilizine=4)
+ products = list(/obj/item/reagent_containers/syringe=12,/obj/item/reagent_containers/dropper=3,/obj/item/reagent_containers/medspray=6,/obj/item/storage/pill_bottle=6,/obj/item/reagent_containers/cup/bottle=10,/obj/item/reagent_containers/spray/cleaner=1,/obj/item/stack/medical/gauze=8,/obj/item/reagent_containers/hypospray/medipen=8,/obj/item/reagent_containers/hypospray/medipen/dexalin=8,/obj/item/reagent_containers/cup/bottle/epinephrine=4,/obj/item/reagent_containers/cup/bottle/charcoal=4,/obj/item/reagent_containers/cup/bottle/salglu_solution=4,/obj/item/reagent_containers/cup/bottle/tricordrazine=1,/obj/item/reagent_containers/cup/bottle/spaceacillin=1,/obj/item/reagent_containers/cup/bottle/morphine=2,/obj/item/reagent_containers/cup/bottle/toxin=4,/obj/item/reagent_containers/medspray/sterilizine=4)
},
/obj/item/reagent_containers/dropper{
pixel_x = 2;
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index f72924d60fac6..7a0ddc060bbb8 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -48411,7 +48411,7 @@
},
/obj/machinery/vending/wallmed{
pixel_y = -32;
- products = list(/obj/item/stack/medical/gauze=4,/obj/item/reagent_containers/hypospray/medipen=3,/obj/item/reagent_containers/hypospray/medipen/dexalin=3,/obj/item/reagent_containers/glass/bottle/epinephrine=2,/obj/item/reagent_containers/glass/bottle/charcoal=2)
+ products = list(/obj/item/stack/medical/gauze=4,/obj/item/reagent_containers/hypospray/medipen=3,/obj/item/reagent_containers/hypospray/medipen/dexalin=3,/obj/item/reagent_containers/cup/bottle/epinephrine=2,/obj/item/reagent_containers/cup/bottle/charcoal=2)
},
/obj/machinery/newscaster{
pixel_x = -32;
From 50aa0ba873b973d45926f9449a860d62b75fe96e Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Sun, 20 Oct 2024 23:15:17 -0400
Subject: [PATCH 31/43] fix this shit
---
_maps/map_files/FlandStation/FlandStation.dmm | 18 ++++++-------
_maps/map_files/RadStation/RadStation.dmm | 25 ++++++++++++-------
2 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 80150bbdbaefe..c7c06cfe8c7c2 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -52976,15 +52976,6 @@
"nCg" = (
/obj/effect/turf_decal/bot,
/obj/structure/table,
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/vending/wallmed{
- contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate=1,/obj/item/storage/box/hug/medical=1,/obj/item/reagent_containers/cup/bottle/random_virus=1);
- name = "Upgraded NanoMed";
- pixel_x = -1;
- pixel_y = -32;
- premium = list(/obj/item/storage/firstaid/regular=3,/obj/item/storage/belt/medical=3,/obj/item/sensor_device=2,/obj/item/pinpointer/crew=2,/obj/item/healthanalyzer=2,/obj/item/wrench/medical=1);
- products = list(/obj/item/reagent_containers/syringe=12,/obj/item/reagent_containers/dropper=3,/obj/item/reagent_containers/medspray=6,/obj/item/storage/pill_bottle=6,/obj/item/reagent_containers/cup/bottle=10,/obj/item/reagent_containers/spray/cleaner=1,/obj/item/stack/medical/gauze=8,/obj/item/reagent_containers/hypospray/medipen=8,/obj/item/reagent_containers/hypospray/medipen/dexalin=8,/obj/item/reagent_containers/cup/bottle/epinephrine=4,/obj/item/reagent_containers/cup/bottle/charcoal=4,/obj/item/reagent_containers/cup/bottle/salglu_solution=4,/obj/item/reagent_containers/cup/bottle/tricordrazine=1,/obj/item/reagent_containers/cup/bottle/spaceacillin=1,/obj/item/reagent_containers/cup/bottle/morphine=2,/obj/item/reagent_containers/cup/bottle/toxin=4,/obj/item/reagent_containers/medspray/sterilizine=4)
- },
/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = 2;
pixel_y = 12
@@ -53005,6 +52996,15 @@
pixel_x = 2;
pixel_y = -1
},
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/vending/wallmed{
+ contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1);
+ name = "Upgraded NanoMed";
+ pixel_x = -1;
+ pixel_y = -32;
+ premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
+ products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+ },
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
"nCp" = (
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index 7a0ddc060bbb8..e75b4a880176b 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -9503,6 +9503,7 @@
/obj/machinery/gateway{
dir = 10
},
+/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/box/corners{
dir = 8
},
@@ -14070,6 +14071,7 @@
/obj/machinery/gateway{
dir = 1
},
+/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/techmaint,
/area/gateway)
"exi" = (
@@ -27647,12 +27649,13 @@
/obj/machinery/gateway{
dir = 9
},
-/obj/effect/turf_decal/box/corners{
- dir = 1
- },
/obj/item/radio/intercom{
pixel_y = 29
},
+/obj/effect/turf_decal/bot_white/right,
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
/turf/open/floor/iron/techmaint,
/area/gateway)
"iNV" = (
@@ -31445,7 +31448,7 @@
/area/science/xenobiology)
"jYB" = (
/obj/machinery/smartfridge/sci{
- initial_contents = list(/obj/item/stock_parts/capacitor=2,/obj/item/stock_parts/manipulator=2,/obj/item/stock_parts/micro_laser=2,/obj/item/stock_parts/matter_bin=2,/obj/item/stock_parts/scanning_module=2);
+ initial_contents = list(/obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/micro_laser = 2, /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/scanning_module = 2);
name = "Science vender"
},
/turf/open/floor/iron,
@@ -34942,6 +34945,7 @@
dir = 4
},
/obj/machinery/camera/directional/east,
+/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/techmaint,
/area/gateway)
"lbY" = (
@@ -35266,7 +35270,7 @@
/area/medical/medbay/central)
"lir" = (
/obj/machinery/smartfridge/sci{
- initial_contents = list(/obj/item/stock_parts/capacitor=2,/obj/item/stock_parts/manipulator=2,/obj/item/stock_parts/micro_laser=2,/obj/item/stock_parts/matter_bin=2,/obj/item/stock_parts/scanning_module=2);
+ initial_contents = list(/obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/micro_laser = 2, /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/scanning_module = 2);
name = "Science vender"
},
/turf/open/floor/iron,
@@ -41157,6 +41161,7 @@
/obj/machinery/gateway{
dir = 5
},
+/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/box/corners{
dir = 4
},
@@ -48406,19 +48411,19 @@
/turf/open/floor/iron/dark,
/area/security/execution/education)
"pnc" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/fancy/sofa/old/right{
dir = 4
},
/obj/machinery/vending/wallmed{
pixel_y = -32;
- products = list(/obj/item/stack/medical/gauze=4,/obj/item/reagent_containers/hypospray/medipen=3,/obj/item/reagent_containers/hypospray/medipen/dexalin=3,/obj/item/reagent_containers/cup/bottle/epinephrine=2,/obj/item/reagent_containers/cup/bottle/charcoal=2)
+ products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2)
},
/obj/machinery/newscaster{
pixel_x = -32;
pixel_y = 2
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/green,
/area/crew_quarters/cafeteria)
"pnj" = (
@@ -52066,6 +52071,7 @@
/obj/machinery/gateway{
dir = 8
},
+/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/techmaint,
/area/gateway)
"qvO" = (
@@ -66779,8 +66785,9 @@
/obj/machinery/gateway{
dir = 6
},
-/obj/effect/turf_decal/box/corners,
/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/bot_white/right,
+/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/techmaint,
/area/gateway)
"vjz" = (
From 5298e8452e0b1d43a8fcc8cb43f9def8c8896013 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Mon, 21 Oct 2024 08:43:16 -0400
Subject: [PATCH 32/43] move the plating
---
_maps/map_files/Mining/Lavaland.dmm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index b8b96e0dbcbb3..1e527f28a0f63 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -641,6 +641,7 @@
"eq" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/portable_thermomachine,
+/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/mine/gateway)
"er" = (
@@ -3545,6 +3546,7 @@
"Ab" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/decal/cleanable/cobweb,
+/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/mine/gateway)
"Ah" = (
@@ -3890,6 +3892,7 @@
"Cv" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/mine/gateway)
"CC" = (
@@ -4287,7 +4290,6 @@
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/mine/gateway)
"FI" = (
@@ -4832,6 +4834,7 @@
/obj/structure/closet/crate,
/obj/item/toy/plush/moth/bluespace,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/mine/gateway)
"Jr" = (
From e843344ba27c658e5e22bb7f045724af23e97c49 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Mon, 21 Oct 2024 09:19:42 -0400
Subject: [PATCH 33/43] address comments
---
_maps/map_files/CorgStation/CorgStation.dmm | 3 +-
.../map_files/Deltastation/DeltaStation2.dmm | 31 +----
_maps/map_files/EchoStation/EchoStation.dmm | 1 +
_maps/map_files/FlandStation/FlandStation.dmm | 29 +---
_maps/map_files/KiloStation/KiloStation.dmm | 22 +--
_maps/map_files/MetaStation/MetaStation.dmm | 18 ++-
_maps/map_files/Mining/Lavaland.dmm | 128 +++++++++++++++---
_maps/map_files/RadStation/RadStation.dmm | 2 +-
8 files changed, 134 insertions(+), 100 deletions(-)
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index e200290e3d3a5..a944d1f3e06b4 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -361,10 +361,10 @@
pixel_x = 1;
pixel_y = -1
},
-/obj/machinery/camera/directional/west,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
},
+/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark,
/area/gateway)
"adt" = (
@@ -72193,6 +72193,7 @@
/obj/machinery/gateway{
dir = 10
},
+/obj/machinery/camera/directional/west,
/turf/open/floor/circuit,
/area/gateway)
"xsn" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 2d7a270860656..ee4f3ba7955b5 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -19710,9 +19710,6 @@
/area/gateway)
"cAj" = (
/obj/machinery/gateway/centerstation,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/gateway)
@@ -20591,9 +20588,6 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/command/glass{
name = "Gateway Chamber";
req_access_txt = "62"
@@ -20608,15 +20602,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/gateway)
-"cEY" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/gateway)
"cFa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -21394,7 +21379,7 @@
id = "gatewayshutters";
name = "Gateway Shutters";
pixel_x = -26;
- req_access_txt = "19"
+ req_access_txt = "62"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line,
@@ -29747,9 +29732,6 @@
/area/hallway/secondary/exit/departure_lounge)
"dVp" = (
/obj/machinery/holopad,
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -55290,12 +55272,6 @@
/area/maintenance/starboard)
"lNf" = (
/obj/machinery/gateway,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box,
@@ -57907,9 +57883,6 @@
/turf/open/floor/iron,
/area/quartermaster/qm)
"mFt" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -137719,7 +137692,7 @@ vRb
riC
epQ
mXa
-cEY
+cAd
cGD
cHQ
cIF
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
index 856caaa653dee..23b40f75984e4 100644
--- a/_maps/map_files/EchoStation/EchoStation.dmm
+++ b/_maps/map_files/EchoStation/EchoStation.dmm
@@ -38099,6 +38099,7 @@
dir = 6
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/firealarm/directional/east,
/turf/open/floor/circuit,
/area/gateway)
"sWP" = (
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index c7c06cfe8c7c2..aa6be0470d74c 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -2962,17 +2962,6 @@
/obj/effect/turf_decal/stripes/full,
/turf/open/floor/iron/techmaint,
/area/gateway)
-"aKP" = (
-/obj/machinery/door/poddoor/shutters{
- id = "gateshutter";
- name = "Gateway Access Shutter"
- },
-/obj/effect/turf_decal/stripes/full,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/iron/techmaint,
-/area/gateway)
"aKR" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -17947,7 +17936,7 @@
id = "gateshutter";
name = "Gateway Access Shutters Control";
pixel_y = -24;
- req_access_txt = "57"
+ req_access_txt = "62"
},
/turf/open/floor/iron/dark,
/area/gateway)
@@ -36128,15 +36117,6 @@
},
/turf/open/floor/vault,
/area/engine/supermatter)
-"jlM" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/turf/open/floor/iron/dark,
-/area/gateway)
"jlY" = (
/obj/machinery/door/airlock/maintenance{
name = "Storage Room";
@@ -69008,9 +68988,6 @@
/area/crew_quarters/locker)
"rML" = (
/obj/machinery/gateway,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
@@ -113867,8 +113844,8 @@ vDW
eSm
hpY
rML
-aKP
-jlM
+aKC
+sYV
aTQ
vDW
suE
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index d3bd8b95a727e..c3673d48a1702 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -5032,9 +5032,6 @@
"azH" = (
/obj/machinery/gateway/centerstation,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
/turf/open/floor/circuit/green{
luminosity = 2
},
@@ -5648,7 +5645,7 @@
/obj/structure/barricade/wooden/crude,
/obj/machinery/door/airlock/maintenance{
name = "Gateway Maintenance";
- req_access_txt = "17";
+ req_access_txt = "62";
security_level = 6
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -21058,6 +21055,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
/area/gateway)
"cvR" = (
@@ -21250,7 +21248,7 @@
id = "gatewayshutters";
name = "Gateway Shutters";
pixel_x = -26;
- req_access_txt = "19"
+ req_access_txt = "62"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
@@ -34913,9 +34911,6 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
@@ -35211,10 +35206,6 @@
/obj/effect/decal/cleanable/greenglow,
/obj/machinery/gateway,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/structure/cable/yellow,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
@@ -56008,6 +55999,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
+/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/gateway)
"mGA" = (
@@ -57540,9 +57532,6 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
@@ -62330,9 +62319,6 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 5a4e8ce0a58a2..8b53c0b366df0 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -13678,8 +13678,8 @@
"bQx" = (
/obj/machinery/door/airlock/maintenance{
name = "Gateway Maintenance";
- req_access_txt = "17";
- security_level = 6
+ security_level = 6;
+ req_one_access_txt = "62"
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -13987,7 +13987,7 @@
id = "gateshutter";
name = "Gateway Shutter Control";
pixel_y = -26;
- req_access_txt = "19"
+ req_access_txt = "62"
},
/obj/effect/turf_decal/bot{
dir = 1
@@ -14394,7 +14394,7 @@
id = "gateshutter";
name = "Gateway Shutter Control";
pixel_y = 26;
- req_access_txt = "19"
+ req_access_txt = "62"
},
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -41615,10 +41615,11 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"kHk" = (
-/obj/machinery/light{
- dir = 4
- },
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"kHK" = (
@@ -65614,6 +65615,9 @@
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners,
+/obj/machinery/light{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/gateway)
"ttk" = (
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 1e527f28a0f63..1cf6a81d8caed 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -516,6 +516,12 @@
"dt" = (
/turf/open/floor/carpet/royalblue,
/area/mine/science)
+"dA" = (
+/obj/structure/sign/poster/official/science{
+ pixel_x = 32
+ },
+/turf/open/floor/iron,
+/area/mine/living_quarters)
"dG" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
@@ -623,14 +629,12 @@
/turf/open/floor/iron/dark,
/area/mine/science)
"ei" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -26
- },
/obj/structure/table,
/obj/item/hand_labeler,
/obj/item/stack/package_wrap,
/obj/item/stack/package_wrap,
/obj/item/stack/package_wrap,
+/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/dark,
/area/mine/eva)
"ek" = (
@@ -641,7 +645,9 @@
"eq" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/portable_thermomachine,
-/obj/structure/lattice/catwalk/over,
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = -32
+ },
/turf/open/floor/plating,
/area/mine/gateway)
"er" = (
@@ -724,6 +730,9 @@
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
dir = 4
},
+/obj/structure/sign/poster/official/random{
+ pixel_y = 32
+ },
/turf/open/floor/iron,
/area/mine/gateway)
"eC" = (
@@ -961,6 +970,7 @@
/area/mine/science)
"gb" = (
/obj/machinery/recharge_station,
+/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/dark,
/area/mine/eva)
"ge" = (
@@ -999,6 +1009,10 @@
"go" = (
/turf/closed/mineral/random/high_chance/volcanic,
/area/lavaland/surface/outdoors/unexplored/danger)
+"gp" = (
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron,
+/area/mine/living_quarters)
"gs" = (
/obj/machinery/button/door{
id = "miningdorm3";
@@ -1016,6 +1030,7 @@
"gu" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/bot,
+/obj/item/toy/plush/moth/punished,
/turf/open/floor/iron,
/area/mine/laborcamp)
"gx" = (
@@ -1067,6 +1082,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/structure/sign/poster/official/safety_internals{
+ pixel_x = -32
+ },
/turf/open/floor/iron/techmaint,
/area/mine/eva)
"gR" = (
@@ -1314,10 +1332,16 @@
dir = 4;
id = "gulag"
},
+/obj/structure/sign/poster/official/random{
+ pixel_y = -32
+ },
/turf/open/floor/iron,
/area/mine/laborcamp)
"iC" = (
/obj/structure/tank_dispenser/oxygen,
+/obj/structure/sign/poster/official/random{
+ pixel_y = 32
+ },
/turf/open/floor/iron/dark,
/area/mine/eva)
"iF" = (
@@ -1334,6 +1358,9 @@
/turf/open/floor/carpet/purple,
/area/mine/living_quarters)
"iP" = (
+/obj/structure/sign/poster/official/help_others{
+ pixel_x = 32
+ },
/turf/open/floor/iron/white,
/area/mine/living_quarters)
"iQ" = (
@@ -1361,6 +1388,12 @@
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"iW" = (
+/obj/structure/sign/poster/official/nanotrasen_logo{
+ pixel_y = -32
+ },
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
"iY" = (
/obj/machinery/firealarm{
dir = 1;
@@ -2364,6 +2397,11 @@
"qt" = (
/turf/closed/mineral/random/volcanic,
/area/lavaland/surface/outdoors/unexplored)
+"qw" = (
+/obj/machinery/vendor/mining,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/dark,
+/area/mine/gateway)
"qy" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/chem_heater,
@@ -2510,6 +2548,9 @@
pixel_x = -4
},
/obj/item/book/granter/crafting_recipe/cooking_sweets_101,
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
+ },
/turf/open/floor/iron/grid/steel,
/area/mine/laborcamp)
"rN" = (
@@ -2984,6 +3025,13 @@
"vy" = (
/turf/closed/wall/r_wall,
/area/mine/maintenance)
+"vz" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/light_switch/directional/south,
+/turf/open/floor/iron,
+/area/mine/gateway)
"vG" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -3209,6 +3257,7 @@
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
},
+/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/mine/gateway)
"xl" = (
@@ -3546,7 +3595,6 @@
"Ab" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/decal/cleanable/cobweb,
-/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/mine/gateway)
"Ah" = (
@@ -3701,6 +3749,9 @@
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
dir = 8
},
+/obj/structure/sign/poster/official/random{
+ pixel_y = -32
+ },
/turf/open/floor/iron/techmaint,
/area/mine/laborcamp)
"Bq" = (
@@ -3735,6 +3786,9 @@
"By" = (
/obj/structure/closet/secure_closet/brig,
/obj/effect/turf_decal/bot,
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
+ },
/turf/open/floor/iron,
/area/mine/laborcamp)
"BA" = (
@@ -3843,6 +3897,9 @@
/obj/machinery/camera/directional/south{
c_tag = "Mining area External"
},
+/obj/structure/sign/poster/official/nanotrasen_logo{
+ pixel_y = -32
+ },
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/mine/eva)
"Cj" = (
@@ -3876,6 +3933,9 @@
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
dir = 1
},
+/obj/structure/sign/poster/official/random{
+ pixel_y = 32
+ },
/turf/open/floor/iron,
/area/mine/gateway)
"Ct" = (
@@ -3892,7 +3952,6 @@
"Cv" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/mine/gateway)
"CC" = (
@@ -3979,6 +4038,9 @@
/area/mine/living_quarters)
"Di" = (
/obj/machinery/light/small,
+/obj/structure/sign/poster/official/nanotrasen_logo{
+ pixel_y = -32
+ },
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/mine/eva)
"Dj" = (
@@ -4290,7 +4352,7 @@
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor/iron,
/area/mine/gateway)
"FI" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -4408,6 +4470,7 @@
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
dir = 8
},
+/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron,
/area/mine/gateway)
"Gw" = (
@@ -4521,6 +4584,9 @@
/area/mine/production)
"Hl" = (
/obj/machinery/iv_drip,
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
+ },
/turf/open/floor/iron/white,
/area/mine/living_quarters)
"Ho" = (
@@ -4652,9 +4718,19 @@
},
/turf/open/floor/iron,
/area/mine/science)
+"HV" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 1
+ },
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/dark,
+/area/mine/eva)
"Ic" = (
/obj/machinery/deepfryer,
/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/sign/poster/official/moth1{
+ pixel_y = -32
+ },
/turf/open/floor/iron/checker,
/area/mine/production)
"Ih" = (
@@ -4834,7 +4910,7 @@
/obj/structure/closet/crate,
/obj/item/toy/plush/moth/bluespace,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/lattice/catwalk/over,
+/obj/item/poster/random_official,
/turf/open/floor/plating,
/area/mine/gateway)
"Jr" = (
@@ -5100,8 +5176,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/lattice/catwalk/over,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor/iron,
/area/mine/gateway)
"KX" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -5434,6 +5509,9 @@
},
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/sign/poster/official/random{
+ pixel_x = 32
+ },
/turf/open/floor/iron/checker,
/area/mine/production)
"NJ" = (
@@ -5719,6 +5797,13 @@
},
/turf/open/floor/iron/techmaint,
/area/mine/production)
+"PH" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/sign/poster/official/random{
+ pixel_x = 32
+ },
+/turf/open/floor/iron/techmaint,
+/area/mine/laborcamp)
"PI" = (
/obj/machinery/airalarm/directional/south{
pixel_y = -22
@@ -6724,6 +6809,10 @@
},
/turf/open/floor/iron,
/area/mine/science)
+"Xd" = (
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron,
+/area/mine/production)
"Xh" = (
/obj/structure/toilet{
dir = 4
@@ -6999,6 +7088,9 @@
pixel_x = 3
},
/obj/item/reagent_containers/condiment/flour,
+/obj/structure/sign/poster/official/random{
+ pixel_x = 32
+ },
/turf/open/floor/iron/grid/steel,
/area/mine/laborcamp)
"YM" = (
@@ -33866,7 +33958,7 @@ fM
jG
tL
RN
-uI
+PH
nE
bO
CL
@@ -37720,7 +37812,7 @@ Ku
Ku
Ku
lw
-HM
+vz
tI
DX
AE
@@ -38234,9 +38326,9 @@ jm
LX
DO
qO
-qO
+qw
tI
-DN
+Xd
uF
DN
aT
@@ -40546,7 +40638,7 @@ wS
iC
Yl
sE
-Wn
+HV
AF
wS
jw
@@ -44143,7 +44235,7 @@ kV
YN
oN
ZH
-MZ
+gp
Wg
QV
wz
@@ -45687,7 +45779,7 @@ xy
vy
gl
EK
-MZ
+dA
Fa
ZH
IJ
@@ -51582,7 +51674,7 @@ Zd
Zd
Zd
Zd
-Zd
+iW
jh
mp
jh
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index e75b4a880176b..b6e05eb528a4a 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -45589,7 +45589,7 @@
name = "Gateway Shutters";
pixel_x = -4;
pixel_y = 31;
- req_access_txt = "19"
+ req_access_txt = "62"
},
/turf/open/floor/iron,
/area/gateway)
From 339e7ed28d8566e610418c6e6271c4d01f28c6ae Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Mon, 21 Oct 2024 09:23:10 -0400
Subject: [PATCH 34/43] mechanics fixes
---
_maps/map_files/Mining/Lavaland.dmm | 4 ++--
code/modules/awaymissions/gateway.dm | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 1cf6a81d8caed..b60f7ea73ae9f 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -4352,7 +4352,7 @@
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/catwalk_floor/iron,
+/turf/open/floor/catwalk_floor,
/area/mine/gateway)
"FI" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -5176,7 +5176,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/catwalk_floor/iron,
+/turf/open/floor/catwalk_floor,
/area/mine/gateway)
"KX" = (
/obj/effect/decal/cleanable/dirt/dust,
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 51dac967f7b1d..6095bdd3e4361 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -82,6 +82,8 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
to_chat(M, "[user] is pushing you into [src]!")
if(!do_after(user, 5 SECONDS, src))
return // failed do_after, we don't teleport
+ if(!active)
+ return
user.visible_message("[user] shoves [M] into [src].", "You shove [M] into [src].")
else
user.visible_message("[AM] is pushed into [src].", "You push [AM] into [src].")
@@ -146,6 +148,8 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
"You begin climbing into [src]...")
if(!do_after(M, 5 SECONDS, src, timed_action_flags = IGNORE_HELD_ITEM))
return
+ if(!active)
+ return
else
AM.visible_message("[AM] enters the gateway.") // oooo~ ominous
@@ -165,7 +169,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
user.visible_message("[user] switches [src] on.", "You switch [src] on.")
return TRUE
if(active)
- to_chat(user, "You need a multitool to turn it on!")
+ to_chat(user, "You need a multitool to turn it off!")
return TRUE
return ..()
From 09cbf1af994ffc7b10f27fb6e4400dc55150905a Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Mon, 21 Oct 2024 09:38:02 -0400
Subject: [PATCH 35/43] mapping changes
---
_maps/map_files/Mining/Lavaland.dmm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index b60f7ea73ae9f..4dd470ab0f1c2 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -613,8 +613,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/lattice/catwalk/over,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
/area/mine/science)
"eg" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -2089,9 +2088,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/lattice/catwalk/over,
/obj/item/stack/rods,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
/area/mine/science)
"nV" = (
/obj/machinery/light_switch{
@@ -5590,7 +5588,7 @@
},
/obj/item/stack/cable_coil/cut/yellow,
/obj/item/stack/rods,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
/area/mine/science)
"Oq" = (
/obj/machinery/door/airlock{
From 8ea136961ea2f20012f4bec7b243f3abe3a572ab Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Mon, 21 Oct 2024 09:44:18 -0400
Subject: [PATCH 36/43] one more poster
---
_maps/map_files/Mining/Lavaland.dmm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 4dd470ab0f1c2..b4984109c12f5 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -5975,6 +5975,9 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
+ },
/turf/open/floor/iron,
/area/mine/living_quarters)
"Rj" = (
From a8dca266a87cc18df3727a98f9b0f69432a5a1ae Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:35:16 -0400
Subject: [PATCH 37/43] Delete
tools/UpdatePaths/Scripts/11577_remove_excess_gateways.txt
---
tools/UpdatePaths/Scripts/11577_remove_excess_gateways.txt | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 tools/UpdatePaths/Scripts/11577_remove_excess_gateways.txt
diff --git a/tools/UpdatePaths/Scripts/11577_remove_excess_gateways.txt b/tools/UpdatePaths/Scripts/11577_remove_excess_gateways.txt
deleted file mode 100644
index 35896ddb1fc04..0000000000000
--- a/tools/UpdatePaths/Scripts/11577_remove_excess_gateways.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-/obj/machinery/gateway : @DELETE
-/obj/machinery/gateway/centeraway : @DELETE
From 2689a2626c7c693cd4c5b8d1a2739fa85d7620a9 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Sat, 26 Oct 2024 19:52:32 -0400
Subject: [PATCH 38/43] fix ruko spelling mistakes
---
code/modules/awaymissions/pamphlet.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/awaymissions/pamphlet.dm b/code/modules/awaymissions/pamphlet.dm
index 2a9df7ced0797..b68a557e6879f 100644
--- a/code/modules/awaymissions/pamphlet.dm
+++ b/code/modules/awaymissions/pamphlet.dm
@@ -12,7 +12,7 @@
default_raw_text = "Hello valued Nanotrasen employee!
\
You have volunteered and/or been selected to join our crew working, living, and \
enjoying our premier plasma resourcing planet endearingly named “Lavaland”!
\
- Here are a few things to expect with your new work enviroment:
\
+ Here are a few things to expect with your new work environment:
\
Sweet natural atmosphere!
\
Is the station just not your style? Are you partial to warmer climates? Is a lower than \
average barometric pressure a comfortable and welcome thing to you? Well by Jiminy, Lavaland \
@@ -23,7 +23,7 @@
sorts of hearty creatures that float and stomp about the ashen plains. Get \
your dinner plates and wooden plaques ready for the next beast; be they goliath, watcher, \
ashwalker or even bigger and more exotic creatures! And the best part: you do it on company time!
\
- Wild enviroment!
\
+ Wild environment!
\
Are you the frontier type? Do you embrace the challenge of maintaining a building with your \
peers? Lavaland and its base are perfect for you! Sometimes the unexpected happens: some \
of the walls, pipework, and floors may need your expertise. Working in space on places like \
From e98ac8147ab2042f54aeb3c52f1e58b9ea4ecfb9 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Sat, 26 Oct 2024 19:57:01 -0400
Subject: [PATCH 39/43] implement some recommendations
---
code/modules/awaymissions/gateway.dm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 6095bdd3e4361..75076cfcd95a9 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -205,13 +205,15 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
return FALSE
for(var/obj/machinery/gateway/G in adjacent_parts)
- G.active = 1
+ G.active = TRUE
G.update_icon()
- active = 1
+ active = TRUE
update_icon()
return TRUE
/obj/machinery/gateway/proc/toggleoff(telegraph = FALSE)
+ if(!centerpiece)
+ return FALSE
if(!active)
return FALSE
for(var/obj/machinery/gateway/G in adjacent_parts)
From 0981169ac75769c920da26f24eec79891606afaf Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Sat, 26 Oct 2024 19:58:48 -0400
Subject: [PATCH 40/43] deletes 5x9 gateway
---
_maps/RuinGeneration/5x9_gateway.dmm | 153 ------------------
.../ruin_generator/ruin_part_types.dm | 5 -
2 files changed, 158 deletions(-)
delete mode 100644 _maps/RuinGeneration/5x9_gateway.dmm
diff --git a/_maps/RuinGeneration/5x9_gateway.dmm b/_maps/RuinGeneration/5x9_gateway.dmm
deleted file mode 100644
index 8807d48207f85..0000000000000
--- a/_maps/RuinGeneration/5x9_gateway.dmm
+++ /dev/null
@@ -1,153 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"d" = (
-/obj/effect/abstract/open_area_marker,
-/turf/open/floor/iron,
-/area/ruin/unpowered)
-"h" = (
-/turf/closed/wall/r_wall,
-/area/ruin/unpowered)
-"j" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
-"k" = (
-/obj/machinery/gateway{
- dir = 8
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
-"l" = (
-/obj/machinery/gateway,
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
-"t" = (
-/obj/machinery/gateway{
- dir = 6
- },
-/obj/effect/turf_decal/bot_white/right,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
-"B" = (
-/obj/machinery/gateway{
- dir = 9
- },
-/obj/effect/turf_decal/bot_white/right,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
-"C" = (
-/obj/machinery/door/poddoor/shutters{
- id = "gateshutter";
- name = "Gateway Access Shutter"
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/iron,
-/area/ruin/unpowered)
-"G" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
-"L" = (
-/obj/machinery/gateway{
- dir = 5
- },
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
-"M" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
-/area/ruin/unpowered)
-"S" = (
-/obj/machinery/gateway/centeraway,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
-"V" = (
-/turf/open/floor/iron,
-/area/ruin/unpowered)
-"W" = (
-/obj/machinery/gateway{
- dir = 10
- },
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
-"Y" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/obj/machinery/status_display/evac{
- pixel_y = 32
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
-
-(1,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-"}
-(2,1,1) = {"
-h
-B
-k
-W
-G
-M
-C
-V
-V
-"}
-(3,1,1) = {"
-h
-Y
-S
-l
-G
-M
-C
-V
-d
-"}
-(4,1,1) = {"
-h
-L
-j
-t
-G
-M
-C
-V
-V
-"}
-(5,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-"}
diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_part_types.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_part_types.dm
index ae9c4b97318b3..05ffe18620438 100644
--- a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_part_types.dm
+++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_part_types.dm
@@ -157,11 +157,6 @@
weight = 4
max_occurrences = 1
-/datum/map_template/ruin_part/gateway
- file_name = "5x9_gateway"
- weight = 1
- max_occurrences = 1
-
/datum/map_template/ruin_part/shower
file_name = "5x5_shower"
weight = 2
From 60f2f89732bf38754cb3695238c801d58793cbd7 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Tue, 29 Oct 2024 00:33:11 -0400
Subject: [PATCH 41/43] slightly tested
---
_maps/map_files/BoxStation/BoxStation.dmm | 29 +-
_maps/map_files/CorgStation/CorgStation.dmm | 24 +-
.../map_files/Deltastation/DeltaStation2.dmm | 32 +--
_maps/map_files/EchoStation/EchoStation.dmm | 24 +-
_maps/map_files/FlandStation/FlandStation.dmm | 31 +--
_maps/map_files/KiloStation/KiloStation.dmm | 24 +-
_maps/map_files/MetaStation/MetaStation.dmm | 31 +--
_maps/map_files/Mining/Lavaland.dmm | 38 +--
_maps/map_files/RadStation/RadStation.dmm | 30 +--
code/_onclick/observer.dm | 2 -
code/controllers/subsystem/mapping.dm | 53 ----
code/modules/admin/admin_verbs.dm | 1 -
code/modules/awaymissions/gateway.dm | 253 ++++++------------
icons/obj/machines/gateway.dmi | Bin 7269 -> 16139 bytes
14 files changed, 94 insertions(+), 478 deletions(-)
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 89182be19a5d8..ef39b07056702 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -857,9 +857,6 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"alz" = (
-/obj/machinery/gateway{
- dir = 9
- },
/obj/effect/turf_decal/box/corners{
dir = 1
},
@@ -8698,9 +8695,6 @@
/turf/open/floor/iron,
/area/crew_quarters/heads/hos)
"bRl" = (
-/obj/machinery/gateway{
- dir = 8
- },
/turf/open/floor/engine,
/area/gateway)
"bRn" = (
@@ -18433,9 +18427,6 @@
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"ece" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/structure/window/reinforced{
dir = 4
},
@@ -19292,7 +19283,7 @@
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
"euh" = (
-/obj/machinery/gateway/centerstation,
+/obj/machinery/gateway/station,
/turf/open/floor/engine,
/area/gateway)
"euG" = (
@@ -22276,7 +22267,6 @@
/turf/open/floor/iron/techmaint,
/area/security/brig)
"fDu" = (
-/obj/machinery/gateway,
/obj/effect/landmark/xeno_spawn,
/obj/effect/turf_decal/box,
/turf/open/floor/engine,
@@ -33955,12 +33945,6 @@
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
-"kka" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/gateway)
"kll" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
@@ -52732,9 +52716,6 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"rNx" = (
-/obj/machinery/gateway{
- dir = 10
- },
/obj/machinery/light{
dir = 8
},
@@ -54890,9 +54871,6 @@
/turf/open/floor/carpet,
/area/crew_quarters/theatre)
"sHc" = (
-/obj/machinery/gateway{
- dir = 4
- },
/obj/structure/window/reinforced{
dir = 4
},
@@ -60040,9 +60018,6 @@
/turf/open/floor/iron/white,
/area/science/research)
"uIS" = (
-/obj/machinery/gateway{
- dir = 5
- },
/obj/structure/window/reinforced{
dir = 4
},
@@ -95452,7 +95427,7 @@ wkt
bCs
aaa
ayG
-kka
+bRl
euh
fDu
eFM
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index a944d1f3e06b4..1052e3abaecf4 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -18188,9 +18188,6 @@
/turf/open/floor/iron/freezer,
/area/security/prison)
"fLv" = (
-/obj/machinery/gateway{
- dir = 5
- },
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -29360,9 +29357,6 @@
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAP)
"jnI" = (
-/obj/machinery/gateway{
- dir = 9
- },
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -34154,9 +34148,6 @@
/turf/open/floor/iron/dark,
/area/security/main)
"kSq" = (
-/obj/machinery/gateway{
- dir = 4
- },
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -41619,9 +41610,6 @@
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"niw" = (
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -43255,7 +43243,6 @@
/turf/open/floor/iron,
/area/security/brig)
"nLX" = (
-/obj/machinery/gateway,
/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/gateway)
@@ -66754,9 +66741,6 @@
/turf/open/floor/iron,
/area/hallway/primary/aft)
"vAy" = (
-/obj/machinery/gateway{
- dir = 1
- },
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -66779,8 +66763,8 @@
/turf/open/floor/iron,
/area/security/brig)
"vAQ" = (
-/obj/machinery/gateway/centerstation,
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/gateway/station,
/turf/open/floor/iron/dark,
/area/gateway)
"vAR" = (
@@ -72190,9 +72174,6 @@
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
"xrR" = (
-/obj/machinery/gateway{
- dir = 10
- },
/obj/machinery/camera/directional/west,
/turf/open/floor/circuit,
/area/gateway)
@@ -73065,9 +73046,6 @@
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
"xGI" = (
-/obj/machinery/gateway{
- dir = 6
- },
/turf/open/floor/circuit,
/area/gateway)
"xGR" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index a2708e3724adf..2f01067ebac72 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -44827,7 +44827,6 @@
/turf/open/floor/glass/reinforced,
/area/hallway/secondary/entry)
"ilM" = (
-/obj/machinery/gateway,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box,
@@ -55222,9 +55221,6 @@
/turf/open/floor/iron,
/area/engine/atmospherics_engine)
"lMi" = (
-/obj/machinery/gateway{
- dir = 5
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -55367,8 +55363,8 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
"lOl" = (
-/obj/machinery/gateway/centerstation,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/gateway/station,
/turf/open/floor/iron/dark,
/area/gateway)
"lOn" = (
@@ -56095,9 +56091,6 @@
/turf/open/floor/plating,
/area/security/warden)
"lYP" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/east{
c_tag = "Bridge - Gateway Chamber";
@@ -61556,9 +61549,6 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai)
"nHQ" = (
-/obj/machinery/gateway{
- dir = 10
- },
/obj/machinery/light{
dir = 8
},
@@ -65261,15 +65251,6 @@
},
/turf/open/floor/iron,
/area/medical/surgery)
-"oTV" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/gateway)
"oUc" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -72367,9 +72348,6 @@
/turf/open/floor/iron,
/area/maintenance/port/aft)
"riC" = (
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -94275,9 +94253,6 @@
/turf/open/floor/iron/dark,
/area/bridge)
"xVd" = (
-/obj/machinery/gateway{
- dir = 1
- },
/obj/machinery/status_display/evac{
pixel_y = 32
},
@@ -94509,9 +94484,6 @@
/turf/open/floor/iron,
/area/crew_quarters/dorms)
"xXV" = (
-/obj/machinery/gateway{
- dir = 9
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -138201,7 +138173,7 @@ jBK
cvE
cvz
lMi
-oTV
+riC
lYP
cDm
cFa
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
index 259bd7a8252c1..2091b20f8316b 100644
--- a/_maps/map_files/EchoStation/EchoStation.dmm
+++ b/_maps/map_files/EchoStation/EchoStation.dmm
@@ -438,9 +438,6 @@
/turf/open/floor/iron,
/area/janitor)
"akD" = (
-/obj/machinery/gateway{
- dir = 5
- },
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -5823,9 +5820,6 @@
/turf/open/floor/iron,
/area/security/brig)
"cDH" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/circuit,
@@ -7511,9 +7505,6 @@
/turf/open/floor/plating/asteroid/planetary,
/area/quartermaster/storage)
"dzu" = (
-/obj/machinery/gateway{
- dir = 4
- },
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -8918,9 +8909,6 @@
/turf/open/openspace,
/area/maintenance/department/chapel)
"eiO" = (
-/obj/machinery/gateway{
- dir = 1
- },
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -22157,8 +22145,8 @@
/turf/open/floor/iron/sepia,
/area/quartermaster/warehouse)
"kYW" = (
-/obj/machinery/gateway/centerstation,
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/gateway/station,
/turf/open/floor/iron/dark,
/area/gateway)
"kZz" = (
@@ -25083,9 +25071,6 @@
/turf/open/floor/wood,
/area/crew_quarters/cafeteria)
"mzX" = (
-/obj/machinery/gateway{
- dir = 10
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/structure/extinguisher_cabinet{
pixel_x = -28
@@ -34642,9 +34627,6 @@
/turf/open/floor/iron/dark,
/area/medical/morgue)
"rlC" = (
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -41376,7 +41358,6 @@
/turf/open/floor/plating,
/area/maintenance/department/bridge)
"uGD" = (
-/obj/machinery/gateway,
/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/gateway)
@@ -48024,9 +48005,6 @@
/turf/open/floor/carpet/green,
/area/crew_quarters/cafeteria)
"xVa" = (
-/obj/machinery/gateway{
- dir = 9
- },
/obj/effect/turf_decal/stripes/line{
dir = 9
},
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index aa6be0470d74c..13ecfa1815885 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -3403,14 +3403,6 @@
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/maintenance/port/central)
-"aPj" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/gateway)
"aPp" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/junction,
/turf/closed/wall,
@@ -18768,9 +18760,6 @@
/turf/open/floor/iron/dark,
/area/library/lounge)
"eSm" = (
-/obj/machinery/gateway{
- dir = 1
- },
/obj/effect/turf_decal/bot_white,
/obj/machinery/light{
dir = 1
@@ -22044,9 +22033,6 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai_upload)
"fHg" = (
-/obj/machinery/gateway{
- dir = 5
- },
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners{
@@ -28530,7 +28516,7 @@
/turf/closed/wall,
/area/vacant_room/commissary/commissary1)
"hpY" = (
-/obj/machinery/gateway/centerstation,
+/obj/machinery/gateway/station,
/turf/open/floor/iron/dark,
/area/gateway)
"hpZ" = (
@@ -31316,9 +31302,6 @@
/turf/open/floor/iron,
/area/quartermaster/sorting)
"ibK" = (
-/obj/machinery/gateway{
- dir = 10
- },
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners{
@@ -36564,9 +36547,6 @@
/turf/open/floor/engine,
/area/science/storage)
"jui" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners,
@@ -65146,9 +65126,6 @@
/turf/open/floor/plating,
/area/engine/engine_room)
"qOh" = (
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -68604,9 +68581,6 @@
/turf/open/floor/iron,
/area/maintenance/disposal)
"rIw" = (
-/obj/machinery/gateway{
- dir = 9
- },
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners{
@@ -68987,7 +68961,6 @@
/turf/open/floor/iron,
/area/crew_quarters/locker)
"rML" = (
-/obj/machinery/gateway,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
@@ -114099,7 +114072,7 @@ nnx
csJ
vDW
fHg
-aPj
+qOh
jui
aKC
qfK
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index c3673d48a1702..a2e8a093929d7 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -5030,8 +5030,8 @@
/turf/open/floor/plating,
/area/hallway/primary/fore)
"azH" = (
-/obj/machinery/gateway/centerstation,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/gateway/station,
/turf/open/floor/circuit/green{
luminosity = 2
},
@@ -29921,9 +29921,6 @@
/area/space/nearstation)
"efN" = (
/obj/effect/decal/cleanable/greenglow,
-/obj/machinery/gateway{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
@@ -35204,7 +35201,6 @@
/area/quartermaster/warehouse)
"fSq" = (
/obj/effect/decal/cleanable/greenglow,
-/obj/machinery/gateway,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -36830,9 +36826,6 @@
/obj/effect/turf_decal/box/corners{
dir = 1
},
-/obj/machinery/gateway{
- dir = 9
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 1
@@ -43734,9 +43727,6 @@
/area/engine/break_room)
"iLe" = (
/obj/effect/turf_decal/box/corners,
-/obj/machinery/gateway{
- dir = 6
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron/dark,
@@ -49015,9 +49005,6 @@
/area/hallway/primary/port)
"kpg" = (
/obj/effect/decal/cleanable/greenglow,
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -72610,9 +72597,6 @@
/turf/open/floor/iron,
/area/engine/atmos)
"sdY" = (
-/obj/machinery/gateway{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/status_display/evac{
pixel_y = 32
@@ -74441,9 +74425,6 @@
/obj/effect/turf_decal/box/corners{
dir = 4
},
-/obj/machinery/gateway{
- dir = 5
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/north{
c_tag = "Gateway";
@@ -82588,9 +82569,6 @@
/obj/effect/turf_decal/box/corners{
dir = 8
},
-/obj/machinery/gateway{
- dir = 10
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/west{
pixel_x = -23
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 8b53c0b366df0..fb948bd4e5fa1 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -12874,7 +12874,7 @@
/turf/open/floor/plating,
/area/gateway)
"bLE" = (
-/obj/machinery/gateway/centerstation,
+/obj/machinery/gateway/station,
/turf/open/floor/iron/dark,
/area/gateway)
"bLG" = (
@@ -22321,9 +22321,6 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"dtL" = (
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -25571,14 +25568,6 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/aft)
-"eGM" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/gateway)
"eGR" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -33061,9 +33050,6 @@
/turf/open/floor/iron,
/area/quartermaster/office)
"hAT" = (
-/obj/machinery/gateway{
- dir = 5
- },
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners{
@@ -47496,9 +47482,6 @@
/turf/open/floor/carpet/red,
/area/medical/exam_room)
"mQd" = (
-/obj/machinery/gateway{
- dir = 9
- },
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners{
@@ -50024,9 +50007,6 @@
/turf/open/floor/iron/dark,
/area/chapel/office)
"nOg" = (
-/obj/machinery/gateway{
- dir = 1
- },
/obj/machinery/status_display/evac{
pixel_y = 32
},
@@ -55308,7 +55288,6 @@
/turf/open/floor/catwalk_floor/iron_dark,
/area/tcommsat/server)
"pKj" = (
-/obj/machinery/gateway,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -65609,9 +65588,6 @@
/turf/open/floor/iron,
/area/crew_quarters/fitness/recreation)
"tta" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners,
@@ -66787,9 +66763,6 @@
/turf/open/floor/iron/dark,
/area/bridge)
"tOn" = (
-/obj/machinery/gateway{
- dir = 10
- },
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners{
@@ -110501,7 +110474,7 @@ lKt
igA
bGM
hAT
-eGM
+dtL
tta
kHk
bQw
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index b4984109c12f5..37c6fed74298a 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -1961,9 +1961,6 @@
/turf/open/floor/plating/lavaland,
/area/mine/laborcamp)
"nb" = (
-/obj/machinery/gateway{
- dir = 10
- },
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners{
@@ -2208,9 +2205,6 @@
/turf/open/floor/iron,
/area/mine/science)
"pr" = (
-/obj/machinery/gateway{
- dir = 5
- },
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners{
@@ -2691,9 +2685,6 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/mine/laborcamp)
"sQ" = (
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -2875,7 +2866,7 @@
/turf/open/floor/wood,
/area/mine/living_quarters)
"uw" = (
-/obj/machinery/gateway/centeraway/mining,
+/obj/machinery/gateway/away,
/turf/open/floor/iron/dark,
/area/mine/gateway)
"uA" = (
@@ -3499,9 +3490,6 @@
/turf/open/floor/iron,
/area/mine/science)
"zx" = (
-/obj/machinery/gateway{
- dir = 9
- },
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners{
@@ -3692,14 +3680,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/iron,
/area/mine/science)
-"AY" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/mine/gateway)
"Ba" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -5012,9 +4992,6 @@
/turf/open/floor/iron,
/area/mine/science)
"JP" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box/corners,
@@ -5442,7 +5419,6 @@
/turf/open/floor/iron,
/area/mine/science)
"Nj" = (
-/obj/machinery/gateway,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
@@ -5512,14 +5488,6 @@
},
/turf/open/floor/iron/checker,
/area/mine/production)
-"NJ" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/mine/gateway)
"NL" = (
/obj/machinery/button/door{
id = "miningdorm1";
@@ -37295,7 +37263,7 @@ Bq
Bq
tI
lf
-NJ
+sQ
uw
Nj
Ku
@@ -37553,7 +37521,7 @@ Zd
yP
ka
pr
-AY
+sQ
JP
ue
aW
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index b6e05eb528a4a..a34b73873ee99 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -9500,9 +9500,6 @@
/turf/open/floor/wood,
/area/security/prison)
"dap" = (
-/obj/machinery/gateway{
- dir = 10
- },
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/box/corners{
dir = 8
@@ -14067,13 +14064,6 @@
/obj/machinery/camera/directional/north,
/turf/open/floor/engine/plasma,
/area/engine/atmos)
-"exh" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/iron/techmaint,
-/area/gateway)
"exi" = (
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
@@ -27646,9 +27636,6 @@
/turf/open/floor/iron,
/area/engine/break_room)
"iNB" = (
-/obj/machinery/gateway{
- dir = 9
- },
/obj/item/radio/intercom{
pixel_y = 29
},
@@ -34941,9 +34928,6 @@
/turf/open/floor/iron,
/area/hallway/primary/fore)
"lbX" = (
-/obj/machinery/gateway{
- dir = 4
- },
/obj/machinery/camera/directional/east,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/techmaint,
@@ -41158,9 +41142,6 @@
/turf/open/floor/iron,
/area/science/shuttledock)
"naW" = (
-/obj/machinery/gateway{
- dir = 5
- },
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/box/corners{
dir = 4
@@ -52068,9 +52049,6 @@
/turf/open/floor/plating,
/area/science/research)
"qvG" = (
-/obj/machinery/gateway{
- dir = 8
- },
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/techmaint,
/area/gateway)
@@ -54087,7 +54065,6 @@
/turf/open/floor/iron,
/area/ai_monitored/security/armory)
"rcK" = (
-/obj/machinery/gateway,
/obj/effect/turf_decal/box,
/turf/open/floor/iron/techmaint,
/area/gateway)
@@ -58445,7 +58422,7 @@
/turf/open/floor/iron,
/area/hallway/primary/fore)
"szf" = (
-/obj/machinery/gateway/centerstation,
+/obj/machinery/gateway/station,
/turf/open/floor/iron/techmaint,
/area/gateway)
"szF" = (
@@ -66782,9 +66759,6 @@
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"vjx" = (
-/obj/machinery/gateway{
- dir = 6
- },
/obj/machinery/airalarm/directional/east,
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/box/corners,
@@ -101130,7 +101104,7 @@ wRO
iEI
luw
dst
-exh
+qvG
szf
rcK
vof
diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index 30e5a593ebc1d..042327df0bd61 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -73,8 +73,6 @@
if(.)
return
- if(!centerpiece)
- return FALSE
if(linked_gateway)
user.abstract_move(get_turf(linked_gateway))
return TRUE
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index c45c1cfb1777d..add3bf18afaa8 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -530,59 +530,6 @@ GLOBAL_LIST_EMPTY(the_station_areas)
holodeck_templates[holo_template.template_id] = holo_template
-//Manual loading of away missions.
-/client/proc/admin_away()
- set name = "Load Away Mission"
- set category = "Fun"
-
- if(!holder ||!check_rights(R_FUN))
- return
-
-
- if(!GLOB.the_gateway)
- if(alert("There's no home gateway on the station. You sure you want to continue ?", "Uh oh", "Yes", "No") != "Yes")
- return
-
- var/list/possible_options = GLOB.potentialRandomZlevels + "Custom"
- var/away_name
- var/datum/space_level/away_level
-
- var/answer = input("What kind ? ","Away") as null|anything in possible_options
- switch(answer)
- if("Custom")
- var/mapfile = input("Pick file:", "File") as null|file
- if(!mapfile)
- return
- away_name = "[mapfile] custom"
- to_chat(usr,"Loading [away_name]...")
- var/datum/map_template/template = new(mapfile, "Away Mission")
- away_level = template.load_new_z()
- else
- if(answer in GLOB.potentialRandomZlevels)
- away_name = answer
- to_chat(usr,"Loading [away_name]...")
- var/datum/map_template/template = new(away_name, "Away Mission")
- away_level = template.load_new_z()
- else
- return
-
- message_admins("Admin [key_name_admin(usr)] has loaded [away_name] away mission.")
- log_admin("Admin [key_name(usr)] has loaded [away_name] away mission.")
- if(!away_level)
- message_admins("Loading [away_name] failed!")
- return
-
-
- if(GLOB.the_gateway)
- //Link any found away gate with station gate
- var/obj/machinery/gateway/centeraway/new_gate
- for(var/obj/machinery/gateway/centeraway/G in GLOB.machines)
- if(G.z == away_level.z_value) //I'll have to refactor gateway shitcode before multi-away support.
- new_gate = G
- break
- //Link station gate with away gate and remove wait time.
- GLOB.the_gateway.linked_gateway = new_gate
-
/datum/controller/subsystem/mapping/proc/RequestBlockReservation(width, height, z, type = /datum/turf_reservation, turf_type_override)
UNTIL((!z || reservation_ready["[z]"]) && !clearing_reserved_turfs)
var/datum/turf_reservation/reserve = new type
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index dc41806cf71cd..26b46dab28dcb 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -105,7 +105,6 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list(
/client/proc/polymorph_all,
/client/proc/show_tip,
/client/proc/smite,
- /client/proc/admin_away,
/client/proc/load_circuit,
/client/proc/healall,
/client/proc/spawn_floor_cluwne,
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 75076cfcd95a9..19790c2803c8e 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -1,4 +1,18 @@
-GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
+GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/station)
+
+/* Dense invisible object starting the teleportation. Created by gateways on activation. */
+/obj/effect/gateway_portal_bumper
+ var/obj/machinery/gateway/parent_gateway
+ density = TRUE
+ invisibility = INVISIBILITY_ABSTRACT
+
+/obj/effect/gateway_portal_bumper/Bumped(atom/movable/AM)
+ if(get_dir(src, AM) == SOUTH)
+ parent_gateway.try_teleport(AM)
+
+/obj/effect/gateway_portal_bumper/Destroy()
+ parent_gateway = null
+ return ..()
/obj/machinery/gateway
name = "gateway"
@@ -8,10 +22,23 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
density = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
move_resist = INFINITY
+
+ // 3x2 offset by one row
+ pixel_x = -32
+ pixel_y = -32
+ bound_height = 64
+ bound_width = 96
+ bound_x = -32
+ bound_y = 0
+ density = TRUE
+
+ use_power = IDLE_POWER_USE
+ idle_power_usage = 100
+ active_power_usage = 1000
+
+ var/obj/effect/gateway_portal_bumper/bumper
+
var/active = FALSE
- var/checkparts = TRUE
- var/list/adjacent_parts = list()
- var/centerpiece = FALSE //Is this the centerpiece?
/// The gateway this machine is linked to
var/obj/machinery/gateway/linked_gateway
@@ -19,84 +46,35 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
/// Cooldown for says and buzz-sigh
COOLDOWN_DECLARE(telegraph_cooldown)
-/obj/machinery/gateway/Initialize(mapload)
- . = ..()
- if(!centerpiece)
- switch(dir)
- if(SOUTH,SOUTHEAST,SOUTHWEST)
- density = FALSE
-
/obj/machinery/gateway/Destroy()
if(GLOB.the_gateway == src)
GLOB.the_gateway = null
if(linked_gateway)
linked_gateway.linked_gateway = null
linked_gateway = null
+ if(!isnull(bumper))
+ QDEL_NULL(bumper)
return ..()
/obj/machinery/gateway/examine(mob/user)
. = ..()
- if(!centerpiece)
- . += "It appears to be a part of an overall structure."
- return
-
- . += "It appears to be [active ? (istype(linked_gateway) ? "on, and connected to a destination" : "on, and not linked") : "off"]."
+ . += "It appears to be [active ? (istype(linked_gateway) ? "on, and connected to a destination" : "on, but not linked") : "off"]."
if(active)
. += ""
. += "Use a multi-tool to turn it off."
-/obj/machinery/gateway/Bumped(atom/movable/AM)
- if(!centerpiece)
- return
- self_teleport(AM)
-
/obj/machinery/gateway/MouseDrop_T(atom/movable/AM, mob/user)
- if(!centerpiece)
- return
. = ..()
if(AM == user)
- self_teleport(AM) // This is so that if you're drag-clicking yourself into the gateway it'll appear as if you're entering it
- return
-
- if(isnull(linked_gateway))
- return
- if(AM.anchored)
- return
-
- var/turf/dest_turf = get_step(get_turf(linked_gateway), SOUTH)
- if(!pre_check_teleport(AM, dest_turf))
- to_chat(user, "You can't seem to push [AM] into [src]...")
- return
-
- if(ismob(AM))
- var/mob/M = AM
- if(src in M.do_afters)
- return // Don't enter if we're already trying to enter
-
- user.visible_message(\
- "[user] tries to shove [M] into [src]...",\
- "You try to shove [M] into [src]...",
- ignored_mobs = list(M))
- to_chat(M, "[user] is pushing you into [src]!")
- if(!do_after(user, 5 SECONDS, src))
- return // failed do_after, we don't teleport
- if(!active)
- return
- user.visible_message("[user] shoves [M] into [src].", "You shove [M] into [src].")
+ try_teleport(AM) // This is so that if you're drag-clicking yourself into the gateway it'll appear as if you're entering it
else
- user.visible_message("[AM] is pushed into [src].", "You push [AM] into [src].")
-
- actually_teleport(AM, dest_turf)
+ try_teleport(AM, user)
/obj/machinery/gateway/proc/pre_check_teleport(atom/movable/AM, turf/dest_turf)
- if(!centerpiece)
- return FALSE
if(!active)
return FALSE
- if(!check_parts())
- return FALSE
if(!linked_gateway || QDELETED(linked_gateway))
say_cooldown("Target destination not found.")
return FALSE
@@ -106,62 +84,56 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
return check_teleport(AM, dest_turf, channel = TELEPORT_CHANNEL_GATEWAY)
-/obj/machinery/gateway/proc/check_parts()
- . = TRUE
- if(!checkparts)
- return
-
- for(var/i in GLOB.alldirs)
- var/turf/T = get_step(src, i)
- var/obj/machinery/gateway/G = locate(/obj/machinery/gateway) in T
- if(G)
- adjacent_parts.Add(G)
- continue
-
- // Failed to link to a piece of the gateway
- . = FALSE
- toggleoff()
- break
-
/obj/machinery/gateway/proc/say_cooldown(words, sound)
if(COOLDOWN_FINISHED(src, telegraph_cooldown))
COOLDOWN_START(src, telegraph_cooldown, 5 SECONDS)
say(words)
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
-/// Do a teleport initiated by the target
-/obj/machinery/gateway/proc/self_teleport(atom/movable/AM)
+/// Try to teleport
+/obj/machinery/gateway/proc/try_teleport(atom/movable/target_movable, atom/movable/assailant)
if(isnull(linked_gateway))
return
+ var/self = isnull(assailant) || !ismob(assailant)
+
var/turf/dest_turf = get_step(get_turf(linked_gateway), SOUTH)
- if(!pre_check_teleport(AM, dest_turf))
+ if(!pre_check_teleport(target_movable, dest_turf))
return // Gateway off/broken
- if(ismob(AM))
- var/mob/M = AM
- if(src in M.do_afters)
+ if(ismob(target_movable))
+ var/mob/target_mob = target_movable
+ if(src in target_mob.do_afters)
return // Don't enter if we're already trying to enter
- M.visible_message( \
- "[AM] tries to climb into [src]...", \
- "You begin climbing into [src]...")
- if(!do_after(M, 5 SECONDS, src, timed_action_flags = IGNORE_HELD_ITEM))
- return
+ if(!self)//Let the assailant know
+ to_chat(assailant, "You try to push [target_mob] into [src]...")
+ target_mob.visible_message( \
+ self ? "[target_mob] tries to climb into [src]..." : "[assailant] tries to shove [target_mob] into [src]...", \
+ self ? "You begin climbing into [src]..." : "You're being shoved into [src] by [assailant]!")
+
+ // Try the actual teleport
+ if(!do_after(self ? target_movable : assailant, 5 SECONDS, src, timed_action_flags = IGNORE_HELD_ITEM))
+ return // failed do_after, we don't teleport
if(!active)
- return
- else
- AM.visible_message("[AM] enters the gateway.") // oooo~ ominous
+ return // Its not on dummy!
- actually_teleport(AM, dest_turf)
+ actually_teleport(target_movable, dest_turf)
+
+/obj/machinery/gateway/proc/actually_teleport(atom/movable/AM, turf/dest_turf, rough_landing = FALSE)
+ if(!do_teleport(AM, dest_turf, no_effects = TRUE, channel = TELEPORT_CHANNEL_GATEWAY, ignore_check_teleport = TRUE)) // We've already done the check_teleport() hopefully
+ return
+ AM.visible_message("[AM] passes through [linked_gateway]!", "You pass through [src].")
+ AM.setDir(SOUTH)
-/obj/machinery/gateway/proc/actually_teleport(atom/movable/AM, turf/dest_turf)
- if(do_teleport(AM, dest_turf, no_effects = TRUE, channel = TELEPORT_CHANNEL_GATEWAY, ignore_check_teleport = TRUE)) // We've already done the check_teleport() hopefully
- AM.visible_message("[AM] passes through [linked_gateway]!", "You pass through.")
- AM.setDir(SOUTH)
+ if(rough_landing && isliving(AM))
+ var/mob/living/victim = AM
+ victim.Knockdown(3 SECONDS)
+ to_chat(victim, "You fall onto \the [get_turf(AM)]!")
-/obj/machinery/gateway/update_icon()
+/obj/machinery/gateway/update_icon_state()
icon_state = active ? "on" : "off"
+ return ..()
// Try to turn it on
/obj/machinery/gateway/attack_hand(mob/living/user)
@@ -192,11 +164,6 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
return ..()
/obj/machinery/gateway/proc/toggleon(mob/user)
- if(!centerpiece)
- return FALSE
- if(!check_parts())
- to_chat(user, "It seems incomplete...")
- return
if(!powered())
to_chat(user, "It has no power!")
return FALSE
@@ -204,104 +171,40 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
to_chat(user, "No destination found!")
return FALSE
- for(var/obj/machinery/gateway/G in adjacent_parts)
- G.active = TRUE
- G.update_icon()
active = TRUE
+ use_power = ACTIVE_POWER_USE
update_icon()
+ bumper = new(get_turf(src))
+ bumper.parent_gateway = src
return TRUE
/obj/machinery/gateway/proc/toggleoff(telegraph = FALSE)
- if(!centerpiece)
- return FALSE
if(!active)
return FALSE
- for(var/obj/machinery/gateway/G in adjacent_parts)
- G.active = FALSE
- G.update_icon()
active = FALSE
+ use_power = IDLE_POWER_USE
+ QDEL_NULL(bumper)
update_icon()
if(telegraph)
playsound(src, 'sound/machines/terminal_off.ogg', 50, 0)
return TRUE
-/obj/machinery/gateway/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG)
- return
-
//this is da important part wot makes things go
-/obj/machinery/gateway/centerstation
- density = TRUE
- icon_state = "offcenter"
- use_power = IDLE_POWER_USE
- centerpiece = TRUE
+/obj/machinery/gateway/station
-/obj/machinery/gateway/centerstation/Initialize(mapload)
+/obj/machinery/gateway/station/Initialize(mapload)
. = ..()
if(isnull(GLOB.the_gateway))
GLOB.the_gateway = src
update_icon()
- linked_gateway = locate(/obj/machinery/gateway/centeraway)
-
-/obj/machinery/gateway/centerstation/update_icon()
- if(active)
- icon_state = "oncenter"
- return
- icon_state = "offcenter"
+ linked_gateway = locate(/obj/machinery/gateway/away)
-/obj/machinery/gateway/centerstation/process()
- if((machine_stat & (NOPOWER)) && use_power)
- if(active)
- toggleoff(TRUE)
- return
+/obj/machinery/gateway/away
- if(!is_operational)
- toggleoff(TRUE)
- return
-
- if(active)
- use_power(5000)
-
-/////////////////////////////////////Away////////////////////////
-
-
-/obj/machinery/gateway/centeraway
- density = TRUE
- icon_state = "offcenter"
- use_power = NO_POWER_USE
- centerpiece = TRUE
-
-/obj/machinery/gateway/centeraway/Initialize(mapload)
+/obj/machinery/gateway/away/Initialize(mapload)
. = ..()
update_icon()
- linked_gateway = locate(/obj/machinery/gateway/centerstation)
-
-/obj/machinery/gateway/centeraway/update_icon()
- if(active)
- icon_state = "oncenter"
- return
- icon_state = "offcenter"
-
-/obj/machinery/gateway/centeraway/mining
- use_power = IDLE_POWER_USE
-
-/obj/machinery/gateway/centeraway/mining/process()
- if((machine_stat & NOPOWER) && use_power)
- if(active)
- toggleoff(TRUE)
- return
-
- if(!is_operational)
- toggleoff(TRUE)
- return
-
- if(active)
- use_power(5000)
-
-/obj/machinery/gateway/centeraway/admin
- desc = "A mysterious gateway built by unknown hands, this one seems more compact."
-
-/obj/machinery/gateway/centeraway/admin/check_parts()
- return TRUE
+ linked_gateway = locate(/obj/machinery/gateway/station)
/obj/item/paper/fluff/gateway
diff --git a/icons/obj/machines/gateway.dmi b/icons/obj/machines/gateway.dmi
index 78826106e8dffe7e616dcca6c4bf9860bf5757f8..fc45145ae86f3ca8f5e2c974637b25a628b280cd 100644
GIT binary patch
literal 16139
zcmbum1yoew+x9y&0@9^)ill^ew@8_ENOw!akkX}eqXH`3ATcP?CDI@ajYteb$1wZb
z~zC0)gCqq^bH80>NSh|KClB5B~eH
zwyPQZhzxvg=%Z@uZSCdg;p6D;27&nJCk@vTeSbiXzjAqSKXjofmXd37k5oX(qw@jR==oIFr%{RM;zg^y
zY-K^32&!lN=+89RJ=7uMX;$-eF0zw~i*?t?&BA&*p*p8MzT
zcZRr_Y!_@_r*XYy7f36!iGM2)6K{P#&g8S_WFGfBYOg@QGQakBI-d73m@Lys%6L}z
zQyt^4xbY8WDs=R_NvUn@IvE&Dd^{$ZTwGFGmfRAQEPS1I&C5MS-+A)3`?_wcRleAb
zuCsYUdH?O(06;RBl!dv_TUG1hqetU(lEujv`Ny)`*Qg6Q*!FqHbiR}~J{}%kw3ekx
zDRFUeacyV`uBMVwiIqO~$Kqmr;Ywbtg~=8Pvw?EufZ~f9{uy@QVFeqZKc+h+aO=Hj(#6JtWI(KyP#If$~xV7YYNV??6Qxj37^grT$2l@T=weyST%1z(j
z0x|N$=kPoo|4X8d>+yJi(pqi~YF0|DPYB+Yii!%-y5tsozF$0+CUB+fgcWvpNvzn+
zPOXKL1MQzJ`o@y-Ohf#4?a$X_K1(VW?f|JiD(kNEJbL&5D+jMH{>dh$z$N;z9+HWR
z`({SYp*!tp0y&+K&V-p3fFdl-Z=B;7UEa9XkWm#67m!?|pu(EN8GtyGMVoMc
zfc*A9Ze6p8sD}onn}#Klt(^wOseiaCU)<+rPBD?sM+T-b7r!=;AhrmJsN03EY(0*V
zEP8Y-M9T7$@72cAvDD>I?eMb=YkqgOSp%w}LFh2-lDEar*Z2r7a%ZzIuiyJ9qvXQi
z%w6?S`zl_5d5wVr1Unou;gGJ#s;HuZBex_Mpo-X8%v%N)y(P;Pmq9VN&ABTM#NY*f(qMjdFD6Gix!Kdw4BL*8>S(BSy
ztEYjU?Ms0_YZlt2h6iE0#3}j)Cc}oeGf}hC)2mnCIgA5)Vf6sEz6cg2FK;^L3a_@q
z>l=SrX5|uc=9HM`8SyuQB%5Zt=hw*V8!?H8R4%vvIxZM5LQYx~Ef1L>!3P6qm2Njb
z8wJIs2?_6Cal7F8byXn@-!fUhS(3xxMH(AFquHeWeAbZugt*w?on@KH1hW#}yup7v
z$Z1|fS3YUfq!8hCT%^f4=W$6CehkB_ywu~Ql$yPd&bV1D;naCxbZI6?$DBe?G;5#h
z`{%oUvdOKL
z`B6A7r;h_FMVr+J1t|1)F5Nxo6J*UEjJ47*Eb2&xk@WopPl-NZ(QH=v5q3oIDsM#D
zf)#m&naqpl-G6qTU1N>?z`2DdLPEpZ`a@~LHhjJ}v$=}@Ob)Bt8`%wU$bi%y{%&wtX6%MF
z4A)mCB_(lE-s&)~aeF`-gVVBDML>ubCBsCBOaJvj)c7t3HPOV+pT%T^6+Yf8$w%9?pYR2@G5X}B)
zf*cmjMlL(NW2wDXOBpi4m2QV^VAf{Pi#
zp7Y{aEXRF^zqj8!Wnjpb5%@X$g~+AyX^mMsQE|mt7dp}rVfwvM8Lx0}
z=~5tUM|<%c;vq&Adp)sIIy-Vir_}gI-9XnIQcz%)2!n=$Gvn;;bfj0b>^rkunQ&Vq
z^jzH7#N^iA+}OatYelNecaht0^LU_Z*({|@bH8(R|CK1(taYq_Q5I+xhH?NQo$bu7
zf#}`_$o~FfZ15q4wY9ZB^!(exw#7V@^yP0{;%Mbe_~5=x4(ejIaLd3X_l{hM6D;-*
zv9kEVpW0Eq)V<+UH;t}4s`Bgz3s*;ObW{1QXl2z8Pww8mdm`R$c0F^@hTx1}Q{a$q
zQJC$yyde3YVLmSu*mzbD$TwP!uy_k4NM27JhY`=VaS>ndTsH+Pj$a1{zgaBWEoo}X
z_!A;CBMuCqk89bnDBa3(h=!KlsUNu~CLf(V@t7(%UA!!1);|^)QT_g%7>B*z)8$$L%pX+K=N$
zpFKIthjWf0o(p$(IR2u{3Bm^L4y}#>7r`n=aJ+7R;D7f7?=qE1>j0ehz`jw_EarV&
zs-oC+%`+A7xw*3YU8fA}MdcC8F0@VE*P6_x3piNCK}{s(CBkY(d6Ijrz+t+?Rn=HW
zhr@^Ngr4DUuZxzU+C2)KF%4ka(ZTtzIq)=7{pWOpZ3xHhF`bu7Qiq`(K=ExO;hzAu+UT?#UUA<-_l)&&T=N=Vj=RA89k5_*lZ_omB(~oZ}7cw
z8eS47qEZq~TegAE<-}|7Keq(9&&h$j~U1?R^6^HCT+{dd3*~1A#u4DR&s3dt!tK4qp6|
z#nC$wjAKtdrGkaLF;`Z|2R#@bdeHH4P61@Nu$4^!&!hF6<|i_27&=%<>R8pAsY-`=7uI<$kl(#p0iWCOhp
zQHw{O_lE388g?$}#+&cat*&jJep47i+ot=-6<3+G{B_R3L|b-FPVqT8cW#0ZrV-+K
zQhXVzCMFEaZBf5W(G$+8F|Omig#O*hO)Em1
zA}!dSFQ60RvF2}oqgCk|eUr-YqT%i$@^MDp&uzZ#hWlt5U{ksDLdY=e$I2IQl@2j_
zB-Jpjc;xl!+~vL1o1UJF8}xfW4xTcSc89ve{F7@S$iU$-#E@}$s^BN6(add}=t4{Ooq#;hzq<7l_T6(5`5&7rIF
ztsb!uww6U#wruAZU+6RQaa_3H%mTc5hwHlmv(*M@Tl1~$?bVs*W0Lpis=YBYn1Fgz
z`i(PB%S|4B$z~h-B(l5vyZ1Qu-ESmre^!*@H4n2D%JwX)Zbgn}k+Siss`F;BGcwN*KdD+O?NyfT2ScQ1Jvc$;BmVrj
zWhjNYs?B#4oOgC}p$z6)U|)w$it*J!A7d@-C+{hwh+ESY*E!2*Zcpa8%G$i|W$1Pa
zN|`1qK_4-6&xwn#KN@K=(k)a+=WT6y9pxm9-bc3wWhZPNu^&Iz0;i^|ezXprX5+kX
zJI8g(SB`6(NW{vH!@UO=q#8?UH&#?)t|=U3ZY|9oulZ?vwoj{bAdCaU`hllsRg3#2
z&CM^#x~7>zs6-2W>Dmm_!?GD{2Z5jk5~5z{8{k}U?#SY&l_O>Pjr|k1Yat$d>Yb3N
zxkJLVWsTIuAK;+;u`WzYM;F&`E!BzZOp!K#3;vPDME3To-RRs~=uj`rq{4}C83B_8
z?Pn^;qE!W|72%cDu
zQ^}8Caxosg2CL^G05X>j+rc+d{+1hVqs8zhgvXm14Ef|DA!|r_q<>=b%*^*fI~wI6
zbuV6}*3t;NoO=V+{sughoOYIu=j!tMzGrOC
zXSqt|-t*~zHi;%uL7O+@{Xr*jGfGGT|KpxQ0@zDjN&aZdJ~%WjbEUhn%mzbP*(^t#
z@v*VB(<@DGD$aLt`MaayFHNfEz<`&D==Fxn-%M?8Lqp9~@ObG{e%W*Wi1PWA(3)c(
zyJ%t7$7q(lvAx#M7Z!$wmaE^~Owd^jI8Vvf5(OI8BU3M7JIHP`
zlLi#LtLh>}w}A(FdvhI}L<9EVzKp5Cg}U&vgFksvfKFY8{GXW
z?%%E)Hs(=d-r0WmaDhX}
zFAd3Z+x%`|y`R0_a>~}yx!3YnaDv=9aixWiJ>|NPI5OCC@yGOHS3s?bV8ciHR2;sx
zw#H;aX6uI-0~+R>$4Jbtls+F>ILW1d{aTqU#Lu7ZDwnH;1U5u2fV4H3jqSy{?IDox
z;yd))b;OGLzJv~Jc)$s4rdP;QNMc>ai0T`}Y+d_2agwsCNrA))FR-D!`
zaNGYv=}!n5J{EJ-vdM$1tiv0Ca2&-I44Vt0HCFFc=)fj}-s(CEYCWM22FxT+L@!t%
z@HgHy-92#g=rfCY*MPH=eVyxId1b$7aJ=}e$3^Ets)fernz#=RmJ5n_n`Q0sg>IUE
zHb$6+?>MA`9clYc;MXAfqHN3H;F0tVt@huW8?fKZscUfN&9gAxLFgm8QVF*uw)7`H
zI=UJkv^74sR8$H1n!F7n>uFF3N1$-Kyy*+^4sLD*YXlSgc9tai4hFnCF@>mSw8pvF
z$?D#jOb@zf_GmY&-<*Zsx!k@!{3WsS>JkCISnT*_W&r$i3pIeZLgRlyE$dBGNCCyk
zf0LzK6$KD2LI<1e#=crTyi%;Rtj);D`P5bMo;Ae!F;(I+&(@iNc?4e{6n!5BhuFbs
zBIoCg)HU3@)yvV0VD>aME#;NTl%1PfNu(m7qJ%06dri9HDcSL>-ryG)3`wB+dsrst<_0b<499?!Q2|&V4eq#ZfhKF>4
z8g)y3?FJa8Ib%ZPkmGlH*_fOqB(>qJQAh7dp~j`3$DfKfQnBAvhE~)X7&iA47ut7)
z&7tf3MZxuFmlj<&+pA!Er~Ux=+J56uPvKTH-elRjU-b2<+u7M228Q@VDJzDyw`6zL
zC3RXVhb8WiKF&D2{Pws^A*}R>Hpp5}t)FQ^@sD?K-qAs7Jw(GV)sH;+Mgy
zJp>-++J}Hi`tOw6o%8y*Uo;H>Ui)xyx=dz@M>C>>A`z5aRG
zT|PexeIOTjl`b#xbVU4&M#}i~l_Y;cDtVz$j{#bKQnZ%3Fo6L7tT<_kn&#Kp#WS4$
zWH@Oa{)QHz-I5z!xv%+s@=f%vJKlQdEEh1`2s~TCsz#BZDO=fPi&%Orf^YTx>|k9_i*#xNXoyqi>v8Vs
zGS`4>^2pd2D2l}PT1EBrOp%z`J~m+(jUn@Z%)NUAeE9abW`9>9+s%1V+1}p3oNm+3
z0p}vFq#gM{mS5HWK5}Po?|qdk@%0s1SUk8bX*AA0(GacK8oP^=o#!iYa@N|Lpj%F^{F>C?VqZudRINj
zlXR(wqGO@^j&6y`^*;fDkosKKC7CS#o$t$D5>`GRXa^N$0Iwv6^O;kacx`Fb?ep_x
zc1F_OFA6d;&X2p6yy5q$M}d&@p9>2^`{Sn@hlua5t1)pswm!W5Q
zouH$=J>7B}XBPTZs$y~Ub6z!(oPowAmCSL@vqwjPAvDfJ{CNO8WMB?J1v!Ntib_)@
z_;AxY2BP8`Jhm^~F`w-2h#F`QfqQUDcR$B&B$zr%8Kx14$;c3AyZ>q~cXwadJ$-6n
zp$D$9<~3P1B1)he8Y#
zbBgVmzm`3kWhjU{K(tv)1!-Z#gEmN}Nx{+Lq{L(#$*J$V!xh6cIU_DiD(~-lNP<)M
zcf|QFmXI*T*gEnLR(t6}=4XY(NfZ=?_(*c>o|tOC8;|t@4C1bsbxZVPm^~&_xzjZN
z+LA>}pV(7w#PsxBF?{%i5z6C%j90x%4nNO`og5q>#Z^r&Sc37$6GnH)IPf3Foumy!
zF`vY%auec5CZ?pAytNp>m9J=S^o-(lSQq>8eL?wV9hq(ZGHW=xf1QnyS^Z_Gurf8T
z%&n)$nhOc5CM0a_GriT6z4#EkL<2d>%KS8unr8OaX^ZjWUf46|hOY}%=Vn@oiJtol
zFUkZRJA3WUDc!N2+_KwXc=bHAojF40b}!Vnk^Zmw!?jncYLLK1L)^bM
zTn|m2&8{PBTU#~R(^%vo9H_febJU@K3juA_a2=KXypV)SmHWAPg4w`ST;y!x4nLu?W;UP)XYG
z-Ms~*msEkS!E$oevX?LY6&W;8;)k&-;m~G&x+6#k|!Q@2iF7Nf5nB#4GAg^
zhwmj5WzqZugM^BPxKpRicuE>V=bmf?D0gJ^2Cl&>hdrqymfHPbf<<}v>)>$J2XpbW
zyK0GouIQ7HD>n7qz)tgsZ!bIF|6ta&JAb&bhrahUt*IIY2$X7K{zjxV!@#1Q#qHHn6$?#{06{Zmt6@AQ{di&QMKI+Dy$|*|H
zX)pn_tt-5&$>laQE5P|VWz-m_w)leFBzD&!13i)>3jaOXa*p>Thp6peK{J3a6veLl
z`+;=tJt+JT%Qs)sd}Pk+QcwK+e!EIN@sPue6^v%k+uWHFWF
zoCdt8hyh$z
z*L~X^54ut=Yfz8-ssSavXBJ>WwhzU%1l_aPlisa{w_Y##v<6}8yW`}V+>e&qp9|nSF=(M*@eX>Cx{7MV5P4EUlNn
z*v9OCp%QusPPFI)&VzNkMD~uTFX@L(22Q7=ypG^U?p;Is1qGR?7H#!5%W
zMi`#_a`RUz1T}K9Fwl|{yURsR`19va%daN
zgI=Iz31D)KrE61d_6L|jUtZ$s#?0vAd$gHCKnZE({Q4GtWFT{2u$sA-6li6Et{295
zx%twW*N~5D?>Z!W-PDvgZ8-=vGh?b2l6_xlfa1Frf^bo>mb_QSTp^f641=eDs{}RC
zD$?J<*|n$jUzr@iU*U-Iw$C}1kM;E?XBO~_VR+b)2*`@J#u*DXM&iNxo7|Q2PS;ez
z=T)rh{vu&BE?5{)!;@u?5hR&t`#_b_ufj^+y^dT#`hx`qrNdNhZe(DmWWm^%8;bNi
zK$ZR5n_&aOd_cf*6w019(54G|U~p0{$B4lp1ZWrf%U*QIPd2L1z47|31t}WWkY(QP
z3PMcA(H$&fs*UPi%IqE}54u4e=)4=eRRdWj;MkDUZ-rQ4`zfJ?Da+`G?47}6KbP?h
zs?9-xDbtX@Y+EQ%z2jD5cCzm74o8}%?&TLOzbGKwU~>Os&Teah=5bjtn&pb$?=@oM
zoKDcw3P`|MGn7B_Jv=uHox@0rx$Tx@$D8!~|BR}mee14Cuu2-}`=E2QO
zPwpOeWjP*ZiuLjwd~Hx{SIv3$`MK`mED0!6X={|9Di-s2KSU88&;vL%Wi7wqYO>7s
zCj)$!TwP9h5D2pbh6O+=Ah&VqAx0T5z&f$$i_f)GHew37){uj5`bLl-lTD
z_hcj`0Amnvc!GkmfSD{XCfMBQYFmf61;OMoiWRtFpu}iKRAuj%1mDu+D!#JDWg0IRnmsJdB1_-()g-xJKq_HK8g=Liw$ty
zQXU?HVy0S5D}%8uXd9R4Ym(V1ow>4MdxHgC!C8WQe0m=;X&zyHBQ$H;?wc`%WC26%
zq|8}BuK2Z*o1-(wYZL+I0C>W7YqVFo1+J!Aj+&+Z3H`t(F)p^$`h8u{2DCoq{v>vQ
z3%t`X4{@>Ckp7&IC2+}dr)_K_&4A@y%`AKK;jvWRL8Opdn
zO41YqMDjm%4#VB5&Dy^xd^8K~zp|*tm{UN~#1rnWOBTq5g%HzP-ya@~aVPQCJ!)Y6
zYOSMC!Xdl~tm_*At|1r35iSGl)MuU<-343!aSB;3$Ds9Va2|Q}f73@Dn1fXQdVIU`
z?I7J3C>WJN%$m+mS+s+;Da&Yh4{Z=*?pWIP3ta?ZA956br{D{9+GWBB->XS{^*X}-
zv$to3x*-PZ5Hx3*)A=@X_I~}o#h(DQw@fT7Xj%6As;gJyO8
zJxbT@-tb00>`V-{@M{F)Rja95kk@-^#BAOK1_cGVQC#$ve{#O&IG=KsV^{%R>vf*p
z|GNPGtmf`s6QJ-OH!Wr08ua(#z}yOKbC6*GYpHY8ZMLf^=s+g!{RJq&fC-a_ynN4}
zG=sAQ=BkkLWv%0#Yu8J_`8Qc-`1uD7PoI$akX;z+kpM}X`%M=3oymG~AJ%u1>iS9{
z1eQtmC!i>0+~e9?uCck9veUhPVGFu>2HT|tb@*p3r^4q`yY1rLM&QTNlxwHjN>*oQ
zXL}~Ed(%7+kE_|5W5>(mr+0S{IJ=S)RD7@gz!U673hK^6?rt1PsEGsz1+edN-U*y8*U2iM#_b
zd-`7BEDiSF(5BLyJRv6Rqa}@!F-#Xu>$sEC#5jK=J+X{fV-m9wsxk1OvGnlp(Clj2
z>ti0^ME&<%Mg9xm-N?SLW=j{|A!))Q1f4s7;QrGCYlXt8#{QSf+h0(~14+pX@6}6f
zj7yCh7sFNrm>sCU2X6Yi7dBv;*AjuEw|b<=L@&3u9j>4sp*i@r_yh#w1{F71uOH3$
z%j$AcP7K0)_npQFby>Fs{yF!<D
zip^G=je<3Qd&F4a!I6T9*HR%+URd209C-Nn4st$C%I#4<$%A9UrmV0*_n!|4we802
zMPl+p32HyIw4Cb+vPhkkTIP=;b(x+qhQKkSU=fWz+wjV0Ksog!nSD4
z_@O7d_|7~lc6M#(B9=d|l&e_P-g66#8=;n*#Ns0bJD
zVIKMVKicy)h%B^te40b9*^=r;%BIl9a^(M$gW5mm6C_0X>OxuaD2l+LelYac1~e&W
zTnEzssO`*?um9M0Rk|FGLf#vzeu2)a1uX2)>Af1Uas1NJM^MpYsqhlV=C}d6&10i)Qy))O!7%z9aVP)gVkM_+zLPo5rvDm2j{ywNBe>r3$26
zb~$D}r3=6m*x)p!m=&$pnPC@1@D7e@8ONei++8B7d$r3k6{_0&nM+0dO2<&;EH}|=
ziqIu6rg#698?ego13vAJzGASybfBM5HJL=^Ey5;_g^B(>>`*Am!5IDYEQ;3=;7Y*)
z6S;$f*1XHh092>~sMcQj9nIk&&neeL)w(Xk<{3qPG}WJT9>BSBgD?`48X}B`$|156
zE(=YIaeIzY%+k
zd2imR2b&j}zidNcTZvdSS>>P-!Wy0gCk7Lzwb^>pM{8D-VX-O8DDDO@T<(m|iUN=0
zQl9v4xsdX))l-*fEkd6Nv$nI%Sq-$zlY4z|Dg-@mb*DfOBsgNAuUFC$jb%w=1!&vq
z2o)}cODe$Oq+(}lI(D2Ps{X_Zt!B_JyyCK9`h#3my1mQDee0PiJTbs*Abf`moK2uz
zq?d5D(C&HdVAamp<(^S-H5BJ@oAB|xX7!5p`)PY!%Rmp0!{GnBja|yzO-O}htQBmt
zn#0QCWl-u*9M(y=gKcB*vfZAFMig}N5a)EA3`!+DI6ysQ5Ukj74O$i>|B;CIBK_t^
zYJW1>%sAdc<}+R=9SITZv#oIuk3U60zyD(Y7^LZ?xIhA09IXFfOD4ib@;DpldHvmZ
zMAO43jakLhHqsAhSO#cV`H&QNt&ilR67EM0XhrdNvNqJ)-8*)K!3_D;IYmkoT2_=4
z4;$aIC}Eg~&EwpAh4Sr=?}|(m0D>DR-v;zPqF*aG(Ua|tdUzcr+hd`D%F5w2;K28n
zLMWfTU6pCTdL4tCXUQOn9<~8#n==h#lZWqED^!uI=}ox=OoI*zh7hp
zF`@4ikTN4(fu%
zIfRJE*+=$pBenV0C`Yy8g`BhEecYy-RRoC)eR1z^RFWI$gnHh*P^=#BP9~3a@eB8
z1P2I_j9|K?eVc4AKzO~5Jo^Z+Y{}G9Pqm@`1~c00Cp{v@sto!bbx6l?5tx$wN;51u
z;-Y1>^dl;(51mw3RBCymUH*Ut$A-E@`C`_B=;h;p^hLA)op
zXWxuWjiYskRP4*~Thd+&2P)8a5eW3LlGbuBjS!3Y4lgQyf}!vqG$)PvQ+m4+jcU9}
z1IpUk@`Jamyi37hHfcB+src*&y%I-(5#wq@omG
zy-_vYAoDOVho5{Ruk7L<1sdxEu4{z{%peH>y5B$6>+;PbM85OLKfZz4fD8-x2dZcM
zf`WhDr6;x?9yR9EliOI+W}@tK@6xQnof!4!XWeQy{=o^bY39y8&pqC*#`6c2kapQS}$74Jp5xrD1WVJr0
z=1BK1)cE-Lc4b|y`6Zp`*yCP+w*jCzb)iY{ngd~if$ikIbK3>q)5T_T`e1^hDSXnH
z7*FY@qHxeH-#y*@WR;_z#@+pAE_->osHmvCdQ1s4{@K%tLE}Cfxnc5(WB>#)NIof}
z3_jj+>4pBEfQ9F!XYg2B`*-at?oYe3zho4fp1CvNNK=uKfXKq4ngTuduWQ0_+lB6i
zh6d32e>(^|AP3lPb_^8)R92}o+>PIyqj8n)iSFdxugsgI4Z1ojQz=Q#*I5G3BqqM!
zVb1dTc|4dDs~w76Pas|wj#WOuw;2Q?mvWdShR0wl!MQGSVIlXz=09!QTHi<0(b5|F
z*DhuPn|)zly3w|I=kH`#o-#*r{pi>5WvZ0<4ruLz?b4V~$@lPbk&m@NNKlY6Nq1ZI
z`oo0d_tn+>l6gE<#Z0mJmC*<%bqWz*oIDD_uPpmz)^i}J!+o~^M8J324KRxs_{GlC
zlVae=>-x;~CYX*dL1_R5Kk;9wt};Tq!v$#oOF=O^=AhpDPLN6DLb|8!=0X7SwNut3m≧Ecu1nF|ZX
zf4i>Xb1ObMFBL&rMC|KYYxexp!qjWuha7(I9!ZNL?2X9XA6j$$?h0WjpNu{Z>i@Q5
z<>{&9O!c^(g_;59`v5=&mF|9HEbj8D_Y`gG#Hf358Wcd65er?#+i4jM9#X&-)w5sV
zESR`960f}2o<%%4za;p~@D-c%-i|k*xwMAe1)Hllws0Yd9a@0>ZaBR)j}_N4u+W-Q
z9+|G&wfyIXpLi3T6tRXzqIc4S7I1KOe56&rZh5)RrS8g3&&;g(d<8ka{!OnsP*eRH
z`_1sZlnvwHeWwO;_dYlAj>Px57FK1)Q&Z2EMI+Dbw7H*M1?VK54Gfbrc`p3~8P1@i
zP%%VTmh}nO28<%9qLe#D5U+jy(ChBHi@yo=cVKPN=nF2OjwUL&ZGm;2)ycZvtyEEF
zSl6&>n?3fXMY(Ms_USY%U$=aD%f!_5`7V}iS4G9}-;3|xmFH(Z+!qF%?c|DI3<0@D
zWDZ;?x(*N{Gww3t?yV%We;YkP{1!e?e{V9jN#prmd@NqZ|ABmn918_09d&%P6SICe
z=FxH#yZ2HRmjPj4aO}Q?cWWY>ZI)^w@gXp5OyT)iB=a5c)^)f6?gle_H0
zM7}LSqB~x@S{t7u3VV11Ua2vX=q`+$s3g!nxaHi}A&={W#BwdFe?11P)6hQ1jBydl
z`r`$6@QxKbI^eWqlh+Tp7RrGXU_i{^;Cy7p
zuoCiR$GudxnWk~~(Hs47?;h|U9)x`9&s3a?i^~s$`;d{ZrIS-VFUb-K9>x+Tzd_l@
zhO9y(_24ONXI9+Gsi*#l$~L|O?ZVjsCCb5&5KRckha`$$gQCpknUIyx<2X>JOq+j2
z&0I^tk_P44hix!WVF$~iguxsJOq_PS)mYn)*Z%yuedF$EN}ipNnn9k!1ZEb^G9Q>h
zg4hn^MszPBAg}?tnA203cvXJ*@XCs-%i)<2peYFnAS
zDMaE!*_c1g4;QD6jC}$#!3fput3W?FX^fxk7RbZg(800L$!^w!xUImH^q1Hpp|h*vbf2#$8JKRAKpAg9AMW3V
zmR|_9LBi+0|A+)PD}Zw;^mifC(wI-ALX*VvF
z3Zz`%h&?D}{25#>fCmaP)6c0KXpUkW^Z#gN31A-_7_YsXXwm%^Y9IiT;=-Ho=-uCv
z<`h5D{YJtzs~&O$Jq;YWr|Bc8wD#&5x(GN^w72ryKY}&hB-lQodSf!w+2zZ3XK0cy
z>RtwiJeY%QR}7+uf8kQq-lgFcddW$qm};fW{=ik-jKk8Kp6#F{A>~4OSfC6$P2Go5I5VP#_|6V{h-6-%>)DlF(k@1)EpHmdO`pJ?$$psS23Qsb=&1!0%H^4^Btj?w1
zs`Ts$nAPV=xR;66@mv6HO0kJnHn0Ee^va!q_0iJe{vqJlE*C_VDm`J(5+*2kMD#KG?>M7PwfuR~8I&zh>TC2f0&_#=M>`Dkx~;f`eNSsN=VQ
zt{?|j*Uhu-K(C8`MMWjpV|BpLNlZYQ$@ahl-HL%#;J66O5`*2xv9_*2dlYU9i;JtT
ztW#Jf9l^Y=C6=T$-gp|TH7!EFJrk~cAm=J~E#a5l+-&D2$;f@u*)q30**mhX=Xl@%
z4A(II+Xz50T050rrOX=0zM#6?z11u(7~QiF?>jkph5gKTV?pk`K=la@62d;eiQCFWHrt{~dp
zB1!a!1B6ag~9iY(pt`EVXKi6T^cLvX{X;nmY=bb2mk*a5ki?Wf}ufn
zm@ll{$J%Iq+^8~xdk0QC*xFlO%Q6q|A=AfD3hC$CM|Lh5Z$Oh+A63K1=N7?5d5b;m
zR)~h?lNF4N`~LR)EnMuY+>1g#x`0(mp2_4B*`!68H{B?)gYgeu*>z2I@x
zJo6I7*>=9%#n2$@r&qD+<){BE5E9#N?^h+OOw;Ij*XosP2^#6IEmSeQ`F$NpPD;kX
z2cu_m%7Pb!tyv)5e>kl}dpSx*)kETWy6*f?iQjkWeXTrLHS-jS*t0Tm?HpwC_6+eX
z{QP)fN~9qut|jafuIN$H174UJ*|&nef;ES;Fnt)
zmEr8HXOo#MGpime9+GpOXs2U?%of
zlM^H$?y#^-BH(kaCq5r@a`rkNd3N@%f7|?G@1&K-?=m7m?!X56X5bF3h0Ws5`?$zH
z=L&F(0*I1qB+cOd(lm{%
zp_mIndY5TFt-VznUkmH5-G4TJ=dlG1b1Eyx+^;L_?u#FD7I+}h0a}(It$KBJ6%m95
zZfd|(hDK=obzBe*xC3}AZ!_rq^nV_AX@Pv6_>>L2IHG5D;LfrDwdo0NEHk#u+>57W
zbgOtzZV`c$6bL>HL3{HoQ(vq<=Z)4*o+CC(Ed6-~_g!Ev9t}vVA<(&03u-le%*p+5_e0urst|QQCv2TC>GKQ6n
zz1QJisE(LZHr1#&u^-F7+yWh8q1d740~kgh18^ikT%Fx#+sUI7T7%9HW|KZHwxvXW
zgtf1`4aY_7-oYRboktclotDLIB_;YAO3o$x=V&X3z^3H5Pn`eYlua0~l_IuXL(Jni
z%i+JvTcyAM0VZh}zy#w;l9iFLxB!EK8@A~(mv~6#|-R+P^YPzb`%9auT1NW87kN^Mx
literal 7269
zcmcIp`6E<)+dpS!7+Z}{NSv|6pe#w0%#5;@Jw-*MBugb*k!9vsLQ<5ZMVap6Rthb5
zMD7_Xq}y`KmMjw?gh7~LX3l$bKhOI<&mZufAI|rCEuZVU&iP*FJD)S>qN}srDyj8S
z0069Vu(x&x01%ymfCLsDPCoJSK!-aq9$t~w{toVI`3{~l@!KU!Fr;%
zRO#Fon~al3vu&T-r}r@=M(S`|r5#)avC`6RIB1xix83p5WSNQl&%p10y?(dd>S(ps
zwF+xbtisaTi|iTMam(w$`n&Jnsvd}VoTnmZFoF?ts11l6#9X+SJoKP?m({uF*)AOH
z=eX2|l>K9#`-Gtr1xxfJ?w5|XwLZA767|zJYQ6pb%V^Cbu8tlyY&LtNmX6{&C3T_(
ziAr|zKkktbr=|+o?6%!zYQ9O|fCy=9P*Jry=(Q(0f`E)0Y&Ih4=xJ$glxIW%3rNcX
z61{+IcXL(U0BNXeu2)vs9d=4bo3we80eU00nVJzHbwfKF6GsOV$36Oa*HlvJD(h7(
zf{t(0(l)fS-E3pM#n{APv*9NF&D-5vNIJUO8+BASs3|EbD=V!Bka0Al7&5-`#wC^Y
z8!jT_FOhLNGX4x1zmJTkA>%E-=9_P3p`Pn5(BJ*?Z$QRBp&~LSwId`%@odROLBL2N09Wg^bcj}J!ObK@Za<>$9c@2?g#Rz<$gi2f
zzvb+eNnpegC)yeMrL)Hlojj~Z-RFP6f$V-f(%8=<(Jm&~z&0!+1G)bkxrIE9dgy-z
zNnhS>JPH6x!w%L~9??CMcQd2D*oN2V`f+htSJfpI-WFZ?@O>)o$6e+6YWvF%t)G3_
zQNQ;vZQp@s>(fTPpM2c@+%Q=GBSm-bIf3TRjX8n82Yq_zu$;fpG}Ro7Q>zhsMzmTw
zKYK(={$U#b*tutygg<2b;$JCj00ol14;fmUPQ%ebGVYJc7t5wP$pH~2_B2RT`Z8QDs1gmAkX5V9N?>?S5NUdX-Hhp+>#96{o8C-ol&%5~n
ze0nt8S$u;UsQWQk5l(fkYozMkNkgKg?CN|mKw$&mi@D;s5NQQ#us>`kv0vK3V;dM9
zR$z3)r#0fYJjA!$a@3QSYq|#ID+1h^@a;?R|a5Eso!9%#tQix8-2=ZcBJmN@)0~
z?Q2y7fev40hJgC75{|7t0Q)v<%+CG5P~iB(ZTc@>yeNH>C`YB@yt+Gt6@EB@QkC7w
zZVmX^5Eru{)i@*3I0*2Db%|grOXKG}A{|l#GA>%%&{*el&&qI=vlW+cdENJxi7l1#b{ylq-{|n&Jlk6zb
zn;{?0sB`~^LO@FQWYI3baO(~Wn^n}v1m5~p*BD`K$x_!(s9NOazq;$W*A<*=cgV!?
zp2@SBoNsygQ5*1iq2bQpz}3joX+>W-B~KuJoi^Prh|7Dl&)j`0cw*I;=Fi*SG$Q`D
zbzIIX7)g5rp&aXavafh1$0Fs4WSYT63+L)Y!Cfe!%lXo4Owz%(HO7{28tZqNdz!bA
zA7a@PvA?;J{))_#{_C&2EV-Jjc@R{@X>;f0TAlLk*jqCJey!5=#-AY#c_b!a0&o>o
z@q1V}m^SEIk=1DJ#+g4i2OZC7`r{5l^gH!upFmw!VSPr9K5^9AcFAy3@bl&5!&T!u
z8~t5y+;wwxDrazl>Q5#n)H4|x?ApQFK@Aaw3Ky8=-sq1zIrWqX-WVX8APcjzg6A$U
zAoi`;HCgeUq{`R}X9LP)-dYUjsr%N|W3utY2Fno!Epvxpf7N?sFxo)XB^MzTCfFLJ
zge{cLH6MJ-3?tlpuR*pq+AN|T#eBVnKz9At~T|8Dn!Nwi7cn7$AbaXTqJ>JrF{kEB8L_Nyp3<2XB=_xg*
zcK-F{#rExM4gfbfE#68dwLBLZNsM~f%Zr&5xIZ0^7;P3#zK&p|YKw8|t1+7lvw^|6
z$J6EK^Gp!DHP6H%71_oO>h|(N_(IK%JAjTwle+Lp3=<`>M_Z5)0iO}=q7+Z2JYAxnzx?5Q=?vM;I{Ea&%?*VyG4vZw2|0DT`<&+w
z*!l&(Vpp-E)~#FDuMXb4>=&ZTmScei!X8cF@`v-dHc^g25^6N)WbMJO3+APy#F-l`${o=*bG*10Mt#;W<
zYbRK_Sh2tKm`YAQ#e}uV0$2mi&K+H5!b#_vw;#so?~^bSXGT%CWhV?CwClk68}7pl-hdT<8sKDsv!52c)I@M>BTGWlnx&}7z9058GAVu<^%H5j}(&Z_%{Ym0Lpx8
z1?T(}Ouv)|BY(zUZ~bv)eZ=uLNc;2oroN#{3@6M^gnbTl8{*S+U+Lj6w1S*BqeJaOwnn#0Aa
zb@C8<_!aNkj_)N!3rU2cu8ETd{r4QeI{Kw@zo@52O6zO!RCQ_P4GsrSY;aNZ8^Ib>
zUa6|fm&yj>+;4o`ezIifNX7*MKsp|#b>a5==SFfmQ0U(uwx3+xrE)$ChdL`G9wY*vr%p_=@>}y9Blbk<1>z
z6Cqb9jLa5t-xB(!{sBTnKD-n-2eOvGw-xM#;@fiwUYcYW=bQ0V9^yQiPa>psrhMOb
zln;<2s=CotUcyDJ^@^%(v_kLbKitTmjMa!?NtIIfJQ1<7Qh=gL#
z(o^r6@Z9<3=Xp+R?|US=cCknS*&9hYwX)hZx0u@x6XvFgZk|xYm+J~{2C*HLa
zUV5Hoy4UyjG)@qP!zE+4lz4fOnXmNtaL4+~YWPMx&P!}939GRCJ>Y|A0Eo938jS>h
z!zKesBiO_zUbk!uGSMC=y3X9?;;+B<
z0x;NFzZMP`OMm?P^Pe8KU4ld;9vqxg^5Cj-m-u@;?qFqF&4%IEI~QqZ#bvrwwIEmF
z0}l3a2I}cLwzIXWNk9`6tN<={B_E**;}
z-S~ia^^@_Xmf7adQo6F|PG1oaUTh2SJXu^U-ZU{LYVKO+$?x&|>yvNM+80vUl
z$7jt(p9kcG?ZQ?i+;e7n4`PxBv5B{J6#+hsf;pdD2_ut7*!Cr#k}7`qJXyD&-V{
z>#eJ{&Sy?Z;cJhInFrNA(*5?ctrEMYE?BX*D2`g!C-8_O!k9OQuWLTbQU_RBn$HHS
zDlsyNXwfEZgUHHVi;
zCn$BIia~6ODT9qZjOtDQVY1)Bpk}SQMpzl)Rq4OREOhjB7$rzNx0(Te)8D%lH9ZZf
zbmPP6Rj(h%7*ICxv57K#*vU)-k`4CP9ut6iyU84y<}7%>bL3hx#N6@?djOS+zw+SZ
zIrJ8mw%83}gHb7D9IYO1w07;(m<3H^6=v~8jz&AK@?h5t=Qcjpqb{v2y%yizkC^%F
zDIP!-DZoh&GOS$pcxpC|HHS}@<7|hxd4%X@eA#Fm)x+=b;jUNZr2`dVbDdAWlutAJ
z{*0gKY*H~RIdg{grKcyD^YUJQQW`7aoN#Gjq3`b9JG?8leo@o?!sUF+XfF5f
z2lbg0yI2A5?+2*_wYYPLsJgmOdj=1rIIO!s3G6aDKn8?%im#V5TPtwAmLAli7ZJHt
z4Ef7@L!;~h+o{MjV}Yao+HhlZ8m5<3-u075eP;-)}R63xlhV60y
zrYNF{*GcEHp-TPTR2*;wX`vtjm%t*n=6!Z`^$Bl5f|>Z>Al4p`fh}tB^o6L9WieUN
zfQ`JAJ@^WRBjnqzRH-sWMFwYj8g*0>V^3Oqf2&A~O9*gLFN;5Y2?HY)Rn^t;o|Og+
zS77Ieh`}Gu^#-L9Vq-UHiT5i427Wr@tzuX2ZROdX(7V8wdk
z0~;obNfHIWpPW|Y%uyy8pSwSQ4vHI7B&vygt#Q047H~vF_0kggdT0_2M8v6nnA|Z<
z_BAvRF(-yLtCE=mQ3(~iB;u!G?2_f`?n{>_5?g#wt!52+fmT^#vtaA=YwEwI1@sp2
zp+Q2TV=e*Stc)pQKm8I|-oQ}sW!0!EN}ZzFebGkT;3OZ^1emIiQN*bxXwHU6KG3Zp
z7Sd}i*&1>UIZUGN-iE1^o?Qk^;kp_FT`uSATf17dYe;Mr2{vFbjeN+y`3g*J1C`f5
z5iZke_D9+sAd0r9-8^t|YD!WJU0Ai9JVzd@>l^0#3|t2_Fy5Gu-uN-bzOy1d5q182p8%};O4cRbsR*U~Sf$vB
zoD*@l+~QKvP;u#Mf~6p#F>(&y{mRvMVtr6q{N<`l(cBWwW%cUys~E|?NEA02vP0{C
zSYsKoenVLhR>2CHs;
zh&z5+{1xLM3)U~IsyD5uuO9d^EJ}S!^EH~Xq)#xU#%4ag^=EZ8LG0I}-O9M*gR_vk
z5Yt(E1=h-%f?gi-V8Nyin4ntWiS8va9~MOhV&+iTQDUzIp44_js-!FSD85&?uq5X6
z2rMrQrJNEbhOD_MolU11GJp<9_O$EGQ%U!h#5R{ClpQD@E~T+=ACW%Hf*&mrJ4VmW
z;a_$cnrr#poltz);5E7=_AM@Z-kn7aQ*^%-B7z@IC>nK`Tl-h?v2pX#fq4oZ`OL1N
z$5%HOt#p8F@5=zQ+&xH&5Y+1=!|joR15Sq7qSoO~FU_MDP0&8#XnSCjm07F1gS8H(BWY~=%T#72?es4P>5%-ko$&~TBxXr?j>
zgQP(%r-PEMrx~Icwnz|-v#`or&?%)?)*}Hwo$vG`OlWc*p*8z)u*=2OLyPzl!tu4
zl;7wHog%?*AMjcUjlFeobV4dCQkb}PZw!NudU>@i&*As8VB>{vAIt^>i)I5m&({{w
z!H`L(7>0;BuE^;b`tu0&F;@H
z{RkD={zjrk$*rg>1qpkA!edua!@%@s(!RgHC-vt~n;~;)YJ6-Cknw0ivn*+yQ~pH)
z(7@B*F-Yk%r9fJ-cY4~iE6gy44=DJy^WhW^mYm3^PLAwY2XO}9~WOCQAkwc{VE
zO6_}#X95qJe&
zs8&fFM0WknN9n0XAV5sS!M%=hyXd52k@%(`S3zd|9+IApHw3g)j+ut8Wkh^
zAA}jzu3K5oR`P1j@Z`n+mu?GkcCx2DR(5coI{5#DRmDfiKG<}f}
zsQP`ScQBo8F&Yo_*{(JjVw9&TPmnmLpz$cGi*xxz5B=&gI)+gs`E;r(j_cpnl#beMg%*NfpVukAS{l^%ge<^qc4evZmu1&ds2J-HknAO(5)I)Ype~y;y98jE1oI<4
z`860hj4u+iZiHHU`#RQAb5RzY4srhyi)s2dLO}pX%5G-BCBQQ-s5j9}C@W-;`{kk5
z_7!)DPvVuc*e8$Xt!+JFFCH8y)mnTzj=IkiHb>d|*&#gI*WaaD&!Ct3<6sLUYnu?T
zLL2YRqfFDUB}N3~JPWWy72PkgC`6{d)aTuoQKj|-f#=i?Nqm;hJSPG)NkV#stP%>T
zoX6W*GN_*pGkpF13*w8Q!fWkmbD)!p5cCrxX}|4+>~9lV?_QpY87C+~N|0-7>Jv)V
zzZa{uw_pkT#_YQ7P>0bxzV>!11eXZ_zfD1OW|ztL9z>oZON8?wrj=iz~3ai;*V@kN0RCK5d~
z7h3@}3Pe?^_O~I4`SQetu5yaaumIM>1kOjl+Z4!%uL2UG?*?!xq_i1C&9R!masm-7
zyYtf46!T6LGnIUXVW~WW?Gxj2u}Q%-mHEF3=Sv&3Iej#jX>~fY7&t;Fsv*lwgjP`u
z`t5646ceL3gSEo2C13yPon}UHWbqRgg!5W(z^^#FBv{7JN`4IC2bJsRZ$V7qd3(-Kj?GVe&Kwt8JE1j;~PFw*foszm>5M>
z{mZ4@G|IRD9+!#!#!?}|-q8-%A@;(C9Eg-Mk@8No6k=#Mj6b$s(qUxx{bUVu2>DeTCA2frqquKRX$*tkPk
aKykD1DPL#)C<*;M131_?TbJzeP5d7n{{vV6
From 5a1d91a8924924c2f58a92694fe68056cce593c1 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Tue, 29 Oct 2024 08:26:35 -0400
Subject: [PATCH 42/43] Gets rid of dead code
---
code/game/machinery/droneDispenser.dm | 22 ---------------------
code/modules/antagonists/swarmer/swarmer.dm | 4 ----
2 files changed, 26 deletions(-)
diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm
index b28f12dc17ee3..31dbebaa62958 100644
--- a/code/game/machinery/droneDispenser.dm
+++ b/code/game/machinery/droneDispenser.dm
@@ -106,28 +106,6 @@
recharge_sound = null
recharge_message = null
-/obj/machinery/droneDispenser/swarmer
- name = "swarmer fabricator"
- desc = "An alien machine of unknown origin. It whirs and hums with green-blue light, the air above it shimmering."
- icon = 'icons/obj/machines/gateway.dmi'
- icon_state = "toffcenter"
- icon_off = "toffcenter"
- icon_on = "toffcenter"
- icon_recharging = "toffcenter"
- icon_creating = "offcenter"
- iron_cost = 0
- glass_cost = 0
- cooldownTime = 300 //30 seconds
- maximum_idle = 0 // Swarmers have no restraint
- dispense_type = /obj/effect/mob_spawn/swarmer
- begin_create_message = "hums softly as an interface appears above it, scrolling by at unreadable speed."
- end_create_message = "materializes a strange shell, which drops to the ground."
- recharging_text = "Its lights are slowly increasing in brightness."
- work_sound = 'sound/effects/empulse.ogg'
- create_sound = 'sound/effects/phasein.ogg'
- break_sound = 'sound/effects/empulse.ogg'
- break_message = "slowly falls dark, lights stuttering."
-
/obj/machinery/droneDispenser/examine(mob/user)
. = ..()
if((mode == DRONE_RECHARGING) && !machine_stat && recharging_text)
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
index 5c3360ec324c7..6a7d79f0fb1d0 100644
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ b/code/modules/antagonists/swarmer/swarmer.dm
@@ -393,10 +393,6 @@
to_chat(S, "This biological resource is somehow resisting our bluespace transceiver. Aborting.")
return FALSE
-/obj/machinery/droneDispenser/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This object is receiving unactivated swarmer shells to help us. Aborting.")
- return FALSE
-
/obj/structure/lattice/catwalk/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
var/turf/here = get_turf(src)
for(var/A in here.contents)
From f26ad954d0322a6bc1388fa1493ac4ec8629c974 Mon Sep 17 00:00:00 2001
From: mystery3525 <30960302+mystery3525@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:20:27 -0400
Subject: [PATCH 43/43] Update code/modules/awaymissions/gateway.dm
Co-authored-by: Dejaku51 <40302913+Dejaku51@users.noreply.github.com>
---
code/modules/awaymissions/gateway.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 19790c2803c8e..d7f99f599774f 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -159,7 +159,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/station)
user.visible_message("[user] switches [src] off.", "You switch [src] off.")
return TRUE
else if(!active)
- to_chat(user, "Its already on!")
+ to_chat(user, "Its already off!")
return TRUE
return ..()