diff --git a/html/changelogs/missing_cameras.yml b/html/changelogs/missing_cameras.yml
new file mode 100644
index 00000000000..bcb2757c9c8
--- /dev/null
+++ b/html/changelogs/missing_cameras.yml
@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+ - bugfix: "Adds missing cameras to deck 3 and deck 2."
\ No newline at end of file
diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
index 2180268b4ac..09b3fef21d1 100644
--- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -1987,7 +1987,7 @@
input_tag = "ph_in";
name = "Phoron Supply Monitor";
output_tag = "ph_out";
- sensors = list("ph_sensor" = "Tank")
+ sensors = list("ph_sensor"="Tank")
},
/obj/effect/floor_decal/corner/yellow{
dir = 1
@@ -3639,17 +3639,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/horizon/custodial/disposals)
-"cSz" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/simulated/floor/tiled/full,
-/area/maintenance/engineering)
"cSQ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/green{
@@ -9156,23 +9145,6 @@
},
/turf/simulated/floor/plating,
/area/engineering/atmos/air)
-"gYZ" = (
-/obj/machinery/alarm{
- pixel_y = -28;
- dir = 1
- },
-/obj/machinery/camera/network/telecom{
- c_tag = "Telecomms - First Deck Relay";
- dir = 8
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/effect/floor_decal/corner_wide/yellow/full{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark/full,
-/area/tcommsat/mainlvl_tcomms__relay)
"gZP" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -11318,7 +11290,7 @@
frequency = 1442;
input_tag = "port_prop_in";
output_tag = "port_prop_out";
- sensors = list("port_prop_sensor" = "Port Propulsion Sensor")
+ sensors = list("port_prop_sensor"="Port Propulsion Sensor")
},
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos/propulsion)
@@ -12943,7 +12915,7 @@
input_tag = "co2_in";
name = "Carbon Dioxide Supply Monitor";
output_tag = "co2_out";
- sensors = list("co2_sensor" = "Tank")
+ sensors = list("co2_sensor"="Tank")
},
/obj/effect/floor_decal/corner/yellow{
dir = 1
@@ -14508,7 +14480,7 @@
input_tag = "h_in";
name = "Hydrogen Supply Monitor";
output_tag = "h_out";
- sensors = list("h_sensor" = "Tank")
+ sensors = list("h_sensor"="Tank")
},
/obj/effect/floor_decal/corner/yellow{
dir = 1
@@ -14565,9 +14537,8 @@
/obj/structure/closet/crate/bin,
/obj/random/loot,
/obj/effect/floor_decal/industrial/warning{
- dir = 6
+ dir = 4
},
-/obj/structure/railing/mapped,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"lup" = (
@@ -14580,7 +14551,7 @@
name = "Nitrogen Supply Monitor";
output_tag = "n_out";
pixel_x = -32;
- sensors = list("n_sensor" = "Tank")
+ sensors = list("n_sensor"="Tank")
},
/obj/machinery/light{
dir = 8
@@ -14799,7 +14770,7 @@
frequency = 1442;
input_tag = "starboard_prop_in";
output_tag = "starboard_prop_out";
- sensors = list("starboard_prop_sensor" = "Starboard Propulsion Sensor")
+ sensors = list("starboard_prop_sensor"="Starboard Propulsion Sensor")
},
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos/propulsion/starboard)
@@ -15132,7 +15103,6 @@
dir = 4
},
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 1 - Operations Substation";
dir = 4
},
@@ -15315,7 +15285,6 @@
dir = 8
},
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 1 - Security Substation";
dir = 8
},
@@ -16550,12 +16519,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research_port)
-"mVX" = (
-/obj/effect/floor_decal/corner_wide/yellow/full{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark/full,
-/area/tcommsat/mainlvl_tcomms__relay)
"mWV" = (
/obj/machinery/atmospherics/portables_connector{
dir = 1;
@@ -16774,7 +16737,7 @@
name = "Air Supply Monitor";
output_tag = "air_out";
pixel_x = 32;
- sensors = list("air_sensor" = "Tank")
+ sensors = list("air_sensor"="Tank")
},
/obj/machinery/light{
dir = 4
@@ -17290,9 +17253,6 @@
},
/turf/simulated/floor/tiled/full,
/area/hangar/intrepid)
-"nyY" = (
-/turf/simulated/wall/r_wall,
-/area/tcommsat/mainlvl_tcomms__relay)
"nzj" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -17688,11 +17648,9 @@
pixel_x = -32
},
/obj/machinery/camera/motion{
- alarm_on = 1;
- c_tag = "Engineering - Secure Technical Storage";
+ c_tag = "Secure Technical Storage";
dir = 4;
- name = "engineering";
- network = list("Engineering")
+ network = list("Command","Security","Engineering")
},
/turf/simulated/floor/tiled/dark/full,
/area/engineering/storage/tech)
@@ -18945,14 +18903,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/wing/starboard/deck1)
-"paY" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/ramp{
- dir = 4
- },
-/area/maintenance/engineering)
"pbJ" = (
/turf/simulated/floor/shuttle/dark_blue,
/area/shuttle/escape_pod/pod4)
@@ -19310,7 +19260,7 @@
name = "Nitrous Oxide Supply Monitor";
output_tag = "n2o_out";
pixel_x = 32;
- sensors = list("n2o_sensor" = "Tank")
+ sensors = list("n2o_sensor"="Tank")
},
/obj/machinery/light{
dir = 4
@@ -19999,7 +19949,7 @@
input_tag = null;
name = "Phoron Supply Monitor";
output_tag = "ph_out_engines";
- sensors = list("ph_sensor" = "Tank")
+ sensors = list("ph_sensor"="Tank")
},
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos/propulsion)
@@ -21073,10 +21023,10 @@
/obj/effect/floor_decal/corner/yellow{
dir = 6
},
-/obj/machinery/camera/network/engineering{
- alarm_on = 1;
- c_tag = "Engineering - Technical Storage";
- dir = 8
+/obj/machinery/camera/motion{
+ c_tag = "Technical Storage";
+ dir = 8;
+ network = list("Command","Security","Engineering")
},
/turf/simulated/floor/tiled/dark,
/area/engineering/storage/tech)
@@ -24044,16 +23994,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/wing/starboard/deck1)
-"taF" = (
-/obj/machinery/door/airlock/highsecurity{
- name = "First Deck Telecommunications Relay";
- req_access = list(61)
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/full,
-/area/tcommsat/mainlvl_tcomms__relay)
"tbP" = (
/obj/effect/floor_decal/corner/blue{
dir = 9
@@ -26476,7 +26416,6 @@
dir = 8
},
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 1 - Second Deck Civilian Substation";
dir = 8
},
@@ -26621,15 +26560,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos)
-"uZe" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 5
- },
-/obj/structure/railing/mapped{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/maintenance/engineering)
"uZk" = (
/obj/random/junk,
/obj/structure/railing/mapped{
@@ -27031,11 +26961,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/teleporter)
-"vpe" = (
-/obj/machinery/firealarm/south,
-/obj/effect/floor_decal/corner_wide/yellow/full,
-/turf/simulated/floor/tiled/dark/full,
-/area/tcommsat/mainlvl_tcomms__relay)
"vpl" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -27144,10 +27069,6 @@
/turf/simulated/floor/tiled/dark,
/area/shuttle/intrepid/rotary)
"vrQ" = (
-/obj/machinery/camera/network/command{
- c_tag = "Command - Deck 1 - Teleporter";
- dir = 1
- },
/obj/effect/floor_decal/corner/blue/full{
dir = 4
},
@@ -27163,6 +27084,11 @@
pixel_y = -24;
dir = 1
},
+/obj/machinery/camera/motion{
+ c_tag = "Deck 1 - Teleporter";
+ network = list("Command","Security");
+ dir = 1
+ },
/turf/simulated/floor/tiled/dark,
/area/teleporter)
"vse" = (
@@ -27757,7 +27683,7 @@
name = "Oxygen Supply Monitor";
output_tag = "o2_out";
pixel_x = -32;
- sensors = list("o2_sensor" = "Tank")
+ sensors = list("o2_sensor"="Tank")
},
/obj/machinery/light{
dir = 8
@@ -29110,7 +29036,7 @@
name = "Mixed Gas Tank Monitor";
output_tag = "mixed_out";
pixel_y = -3;
- sensors = list("mixed_sensor" = "Tank")
+ sensors = list("mixed_sensor"="Tank")
},
/turf/simulated/wall/r_wall,
/area/engineering/atmos)
@@ -29703,19 +29629,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/intrepid/crew_compartment)
-"xrE" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/apc{
- dir = 1;
- pixel_y = 24
- },
-/obj/effect/floor_decal/corner_wide/yellow/full{
- dir = 1
- },
-/turf/simulated/floor/tiled/dark/full,
-/area/tcommsat/mainlvl_tcomms__relay)
"xst" = (
/obj/structure/window/shuttle/scc_space_ship,
/obj/structure/grille,
@@ -30140,7 +30053,6 @@
/area/engineering/atmos)
"xJE" = (
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 1 - Hangar Substation";
dir = 4
},
@@ -30550,7 +30462,6 @@
dir = 4
},
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 1 - Atmospherics Substation";
dir = 8
},
@@ -46669,10 +46580,10 @@ xYW
sBd
gtS
mMR
-nyY
-nyY
-nyY
-nyY
+jsV
+rNH
+rNH
+rNH
rNH
rNH
nnw
@@ -46871,10 +46782,10 @@ xYW
nBK
edm
mMR
-nyY
-mVX
-vpe
-nyY
+jsV
+rNH
+rNH
+rNH
rNH
rNH
nnw
@@ -47073,10 +46984,10 @@ xYW
usF
nNE
mMR
-nyY
-xrE
-gYZ
-nyY
+jsV
+rNH
+rNH
+rNH
rNH
rNH
nnw
@@ -47275,10 +47186,10 @@ xYW
ars
oFx
vqW
-nyY
-taF
-nyY
-nyY
+jsV
+jsV
+jsV
+jsV
jsV
jsV
nnw
@@ -47478,8 +47389,8 @@ fBg
nNE
rQC
ltM
-paY
-uZe
+dgT
+dgT
dgT
dgT
dgT
@@ -47680,7 +47591,7 @@ pHI
nTm
rtJ
tTT
-cSz
+xhE
xhE
xhE
xhE
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index 66ba8f47565..6bf8ce8f9bb 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -490,13 +490,6 @@
/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
/turf/simulated/floor/tiled/dark/full,
/area/security/prison)
-"anb" = (
-/obj/structure/lattice/catwalk/indoor/grate/damaged,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/wing/port/far)
"anJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 10
@@ -1747,7 +1740,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/full,
/area/horizon/zta)
"aNp" = (
/obj/effect/floor_decal/corner/green/full,
@@ -5072,7 +5065,6 @@
},
/obj/machinery/light/small/emergency,
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 2 - Research Substation";
dir = 1
},
@@ -6081,15 +6073,11 @@
/turf/simulated/floor/plating,
/area/maintenance/wing/port)
"cXq" = (
-/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/light/small/emergency{
dir = 8
},
-/obj/machinery/porta_turret/stationary{
- req_access = list(19);
- req_one_access = null
- },
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/industrial/hatch/red,
+/turf/simulated/floor/tiled/dark/full,
/area/horizon/zta)
"cXU" = (
/obj/structure/cable{
@@ -7347,7 +7335,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark/full,
/area/horizon/zta)
"dDO" = (
/obj/effect/shuttle_landmark/horizon/decktwo/port_fore,
@@ -10339,6 +10327,14 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/tiled/dark,
/area/horizon/zta)
+"fhw" = (
+/obj/machinery/camera/motion{
+ c_tag = "ZTA Aft Port";
+ dir = 8;
+ network = list("Command","Security")
+ },
+/turf/simulated/floor/tiled/dark,
+/area/horizon/zta)
"fhD" = (
/obj/machinery/door/airlock/multi_tile/glass{
dir = 1;
@@ -10664,16 +10660,6 @@
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/full,
/area/hallway/engineering/tesla)
-"fsF" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/alarm{
- pixel_y = 28
- },
-/turf/simulated/floor/plating,
-/area/maintenance/wing/port/far)
"fsL" = (
/obj/machinery/light/small{
dir = 4
@@ -11701,16 +11687,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/operations/office)
-"fRN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/alarm{
- pixel_y = 28
- },
-/turf/simulated/floor/plating,
-/area/tcommsat/mainlvl_tcomms__relay/second)
"fSg" = (
/obj/effect/floor_decal/spline/plain/corner,
/obj/effect/floor_decal/spline/fancy{
@@ -11925,10 +11901,10 @@
/turf/simulated/floor/plating,
/area/engineering/smes/tesla)
"fWG" = (
-/obj/structure/lattice/catwalk/indoor/grate,
/obj/structure/cable{
- icon_state = "1-8"
+ icon_state = "1-2"
},
+/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/maintenance/wing/port/far)
"fWI" = (
@@ -14134,13 +14110,16 @@
/turf/simulated/floor/tiled/dark,
/area/horizon/hydroponics)
"gRU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
/turf/simulated/floor/plating,
/area/maintenance/wing/port/far)
"gRY" = (
@@ -16088,6 +16067,19 @@
},
/turf/simulated/floor/tiled/dark,
/area/horizon/hallway/deck_two/fore)
+"hRK" = (
+/obj/structure/railing/mapped{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/pink/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/camera/motion{
+ c_tag = "ZTA Fore Starboard";
+ dir = 4;
+ network = list("Command","Security")
+ },
+/turf/simulated/floor/tiled/dark,
+/area/horizon/zta)
"hRY" = (
/obj/machinery/camera/network/command{
c_tag = "AI Core - Second Deck Airlock"
@@ -16122,7 +16114,6 @@
dir = 1
},
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 2 - Engineering Substation Access"
},
/turf/simulated/floor/tiled,
@@ -16958,10 +16949,6 @@
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology/xenoflora)
"ipL" = (
-/obj/machinery/camera/network/command{
- c_tag = "Command - Deck 2 - Secure Ammunition Storage";
- dir = 8
- },
/obj/structure/cable/green,
/obj/machinery/power/apc/critical{
pixel_y = -24
@@ -16971,6 +16958,11 @@
/obj/structure/sign/nosmoking_1{
pixel_x = 32
},
+/obj/machinery/camera/motion{
+ c_tag = "Secure Ammunition Storage";
+ network = list("Command","Security");
+ dir = 8
+ },
/turf/simulated/floor/reinforced,
/area/horizon/secure_ammunition_storage)
"iqg" = (
@@ -17171,6 +17163,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/tiled/white,
/area/rnd/conference)
"iwX" = (
@@ -18040,14 +18035,6 @@
/obj/structure/bed/stool/chair/office/dark,
/turf/simulated/floor/carpet/rubber,
/area/crew_quarters/heads/hor)
-"iTh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/network/telecom{
- c_tag = "Telecomms - Second Deck Relay";
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/tcommsat/mainlvl_tcomms__relay/second)
"iTL" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -18541,7 +18528,11 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/camera/motion{
+ c_tag = "ZTA Access Fore";
+ network = list("Command","Security")
+ },
+/turf/simulated/floor/tiled/dark/full,
/area/horizon/zta)
"jgm" = (
/obj/machinery/door/window/eastright,
@@ -19152,15 +19143,11 @@
/turf/simulated/floor/reinforced,
/area/turret_protected/ai_upload)
"jsR" = (
-/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/light/small/emergency{
dir = 4
},
-/obj/machinery/porta_turret/stationary{
- req_access = list(19);
- req_one_access = null
- },
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/industrial/hatch/red,
+/turf/simulated/floor/tiled/dark/full,
/area/horizon/zta)
"jsS" = (
/obj/machinery/recharger{
@@ -20203,10 +20190,16 @@
/turf/simulated/floor/tiled,
/area/storage/primary)
"jVc" = (
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/maintenance/wing/port/far)
"jVn" = (
@@ -21672,13 +21665,6 @@
},
/turf/simulated/floor/plating,
/area/engineering/engine_room)
-"kPu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/tcommsat/mainlvl_tcomms__relay/second)
"kPz" = (
/obj/structure/table/stone/marble,
/obj/item/crowbar/red,
@@ -23238,13 +23224,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/tiled,
/area/hallway/engineering/tesla)
-"lFv" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/corner/mauve{
- dir = 10
- },
-/turf/simulated/floor/tiled/white,
-/area/rnd/conference)
"lFE" = (
/obj/effect/floor_decal/corner/mauve/full,
/obj/structure/table/standard,
@@ -24240,6 +24219,13 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/research)
+"mch" = (
+/obj/effect/floor_decal/industrial/hatch/red,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/zta)
"mcV" = (
/obj/effect/floor_decal/spline/plain/corner{
dir = 1
@@ -26567,6 +26553,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/camera/motion{
+ c_tag = "ZTA Access Aft";
+ network = list("Command","Security");
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/horizon/zta)
"nge" = (
@@ -27234,7 +27225,6 @@
icon_state = "0-8"
},
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 2 - Medical Substation"
},
/turf/simulated/floor/plating,
@@ -27739,8 +27729,12 @@
/turf/simulated/floor/plating,
/area/maintenance/wing/starboard)
"nLg" = (
-/obj/structure/girder,
-/turf/simulated/floor/plating,
+/obj/machinery/porta_turret/stationary{
+ req_access = list(19);
+ req_one_access = null
+ },
+/obj/effect/floor_decal/industrial/warning/full,
+/turf/simulated/floor/tiled/dark/full,
/area/horizon/zta)
"nLC" = (
/obj/machinery/hologram/holopad,
@@ -27856,6 +27850,11 @@
/obj/machinery/zta_lever{
pixel_x = 28
},
+/obj/machinery/camera/motion{
+ c_tag = "ZTA Fore Port";
+ dir = 8;
+ network = list("Command","Security")
+ },
/turf/simulated/floor/reinforced,
/area/horizon/zta)
"nOu" = (
@@ -31518,6 +31517,10 @@
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/camera/network/research{
+ c_tag = "Research - Meeting Room";
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/rnd/conference)
"pJE" = (
@@ -33841,7 +33844,6 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 2 - Starboard Pod Substation";
dir = 1
},
@@ -33883,6 +33885,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/machinery/light,
/turf/simulated/floor/tiled/white,
/area/rnd/conference)
"qSa" = (
@@ -36414,6 +36417,7 @@
/obj/effect/floor_decal/corner/mauve/full{
dir = 4
},
+/obj/machinery/light,
/turf/simulated/floor/tiled/white,
/area/rnd/conference)
"scx" = (
@@ -38046,6 +38050,11 @@
dir = 1
},
/obj/item/hoist_kit,
+/obj/machinery/camera/motion{
+ c_tag = "ZTA Aft Starboard";
+ dir = 4;
+ network = list("Command","Security")
+ },
/turf/simulated/floor/tiled/dark,
/area/horizon/zta)
"sYY" = (
@@ -38295,7 +38304,6 @@
req_one_access = list(19,43);
specialfunctions = 4
},
-/obj/effect/floor_decal/industrial/hatch/red,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -39448,8 +39456,9 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
-/obj/machinery/camera/network/supply{
+/obj/machinery/camera/motion{
c_tag = "Operations - Secure Storage";
+ network = list("Command","Security","Operations");
dir = 4
},
/turf/simulated/floor/reinforced,
@@ -39653,6 +39662,11 @@
/obj/effect/floor_decal/corner/blue{
dir = 6
},
+/obj/machinery/camera/motion{
+ c_tag = "Grauwolf";
+ network = list("Command","Security");
+ dir = 8
+ },
/turf/simulated/floor/tiled/dark,
/area/horizon/grauwolf)
"tND" = (
@@ -41870,17 +41884,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/checkpoint2)
-"uNq" = (
-/obj/machinery/door/airlock/highsecurity{
- name = "Second Deck Telecommunications Relay";
- req_access = list(61)
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/tcommsat/mainlvl_tcomms__relay/second)
"uNs" = (
/obj/structure/kitchenspike,
/turf/simulated/floor/tiled/freezer{
@@ -42403,16 +42406,6 @@
},
/turf/simulated/open/airless,
/area/horizon/exterior)
-"vbe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/power/apc{
- name = "south bump";
- pixel_y = -24
- },
-/obj/machinery/firealarm/west,
-/turf/simulated/floor/plating,
-/area/tcommsat/mainlvl_tcomms__relay/second)
"vbk" = (
/obj/structure/railing/mapped{
dir = 4
@@ -42692,7 +42685,6 @@
req_one_access = list(24,11,55)
},
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 2 - Engineering Substation";
dir = 8
},
@@ -43427,7 +43419,6 @@
icon_state = "0-8"
},
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 2 - Port Pod Substation";
dir = 1
},
@@ -44078,7 +44069,7 @@
input_tag = "cooling_in";
name = "Engine Cooling Control";
output_tag = "cooling_out";
- sensors = list("engine_sensor" = "Engine Core")
+ sensors = list("engine_sensor"="Engine Core")
},
/obj/machinery/camera/network/engineering{
c_tag = "Engineering - Supermatter Reactor Monitoring";
@@ -45049,7 +45040,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark/full,
/area/horizon/zta)
"wmT" = (
/obj/structure/railing/mapped,
@@ -45594,9 +45585,6 @@
},
/turf/simulated/floor/wood,
/area/horizon/hydroponics/garden)
-"wBF" = (
-/turf/simulated/wall/r_wall,
-/area/tcommsat/mainlvl_tcomms__relay/second)
"wCm" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -47978,15 +47966,15 @@
/turf/simulated/floor/tiled/dark,
/area/security/warden)
"xHX" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/maintenance/wing/port/far)
@@ -78119,7 +78107,7 @@ jnF
ouk
ncA
wlF
-lFv
+vVL
dOi
aTd
bGp
@@ -81954,10 +81942,10 @@ lBd
lBd
sEu
vqk
-yjg
-oNE
-oNE
-gRU
+lBd
+lBd
+lBd
+lBd
xHX
wrc
jmj
@@ -82154,13 +82142,13 @@ lBd
pVs
pVs
pVs
-lBd
-wBF
-uNq
-wBF
-wBF
-anb
-yhm
+pVs
+pVs
+pVs
+pVs
+pVs
+pVs
+jVc
fuu
vES
xSP
@@ -82356,13 +82344,13 @@ lBd
pVs
pVs
pVs
-lBd
-wBF
-fRN
-vbe
-wBF
+pVs
+pVs
+pVs
+pVs
+pVs
+pVs
jVc
-yhm
wox
ulr
auL
@@ -82558,13 +82546,13 @@ ebQ
hoi
duk
pVs
-lBd
-wBF
-iTh
-kPu
-wBF
-fsF
-yhm
+pVs
+pVs
+pVs
+pVs
+pVs
+pVs
+jVc
lGm
upS
gdT
@@ -82760,13 +82748,13 @@ lBd
pVs
hoi
qQs
-lBd
-wBF
-wBF
-wBF
-wBF
+pVs
+pVs
+pVs
+pVs
+pVs
+pVs
jVc
-yhm
xpX
jkC
wEC
@@ -82966,9 +82954,9 @@ yjg
jeo
oNE
oNE
-oNE
fWG
-yhm
+fWG
+gRU
aPN
aPN
qMW
@@ -83592,7 +83580,7 @@ kwC
kwC
dyP
woe
-kwC
+hRK
lpK
aPN
fmk
@@ -84382,7 +84370,7 @@ aPN
aPN
aPN
jgj
-jgj
+mch
dDt
aPN
kkq
@@ -84995,7 +84983,7 @@ hkt
yjr
aPN
rdZ
-qSN
+fhw
reZ
vFr
qSN
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index 98731b85404..da56a89290c 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -245,6 +245,10 @@
dir = 5
},
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/camera/motion{
+ c_tag = "Longbow";
+ network = list("Command","Security")
+ },
/turf/simulated/floor/tiled/dark,
/area/horizon/longbow)
"ais" = (
@@ -3195,7 +3199,6 @@
},
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 3 - Telecommunications Substation";
dir = 4
},
@@ -4241,10 +4244,9 @@
"dNF" = (
/obj/machinery/anti_bluespace,
/obj/machinery/camera/motion{
- alarm_on = 1;
- c_tag = "Scuttling Device - Motion";
+ c_tag = "Scuttling Device";
dir = 4;
- network = list("Secure")
+ network = list("Command","Security")
},
/obj/structure/sign/flag/scc{
pixel_x = -32
@@ -4867,7 +4869,7 @@
dir = 10
},
/obj/machinery/camera/network/third_deck{
- c_tag = "Third Deck - Cryogenics Fore Entrance";
+ c_tag = "Third Deck - Dormitories Entrance";
dir = 1
},
/turf/simulated/floor/tiled,
@@ -5131,11 +5133,9 @@
pixel_y = -10
},
/obj/machinery/camera/motion{
- alarm_on = 1;
- c_tag = "Third Deck - Crew Armoury Starboard";
+ c_tag = "Deck 3 - Crew Armoury Starboard";
dir = 4;
- name = "security";
- network = list("Command, Security")
+ network = list("Command","Security")
},
/obj/effect/floor_decal/corner/red{
dir = 9
@@ -5325,8 +5325,9 @@
dir = 8;
pixel_x = 28
},
-/obj/machinery/camera/network/telecom{
- c_tag = "Telecomms - Control Room";
+/obj/machinery/camera/motion{
+ c_tag = "Telecommunications - Control Room";
+ network = list("Command","Security","Telecommunications");
dir = 8
},
/turf/simulated/floor/carpet/rubber,
@@ -6111,7 +6112,7 @@
},
/obj/structure/closet/walllocker/emerglocker/south,
/obj/machinery/camera/network/third_deck{
- c_tag = "Third Deck - Starboard Dock Port";
+ c_tag = "Third Deck - Port Dock Starboard";
dir = 1
},
/turf/simulated/floor/tiled,
@@ -9146,7 +9147,7 @@
dir = 8
},
/obj/machinery/camera/network/telecom{
- c_tag = "Telecomms - Aft Airlock";
+ c_tag = "Telecommunications - Aft Airlock";
dir = 4
},
/obj/machinery/button/remote/blast_door{
@@ -9172,11 +9173,9 @@
pixel_y = -10
},
/obj/machinery/camera/motion{
- alarm_on = 1;
- c_tag = "Third Deck - Crew Armoury Port";
+ c_tag = "Deck 3 - Crew Armoury Port";
dir = 8;
- name = "security";
- network = list("Command, Security")
+ network = list("Command","Security")
},
/obj/effect/floor_decal/corner/red{
dir = 6
@@ -12055,7 +12054,6 @@
icon_state = "0-4"
},
/obj/machinery/camera/network/engineering{
- alarm_on = 1;
c_tag = "Engineering - Deck 3 - Civilian Substation";
dir = 1
},
@@ -13341,6 +13339,16 @@
},
/turf/simulated/floor/tiled,
/area/horizon/crew_quarters/cryo/dormitories)
+"kTg" = (
+/obj/effect/floor_decal/corner/green{
+ dir = 10
+ },
+/obj/machinery/camera/network/third_deck{
+ c_tag = "Third Deck - Port Main Hallway Starboard";
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/central)
"kTE" = (
/obj/effect/floor_decal/corner/green{
dir = 8
@@ -13371,6 +13379,9 @@
dir = 1;
pixel_y = 41
},
+/obj/machinery/camera/network/third_deck{
+ c_tag = "Third Deck - Port Main Hallway Port"
+ },
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/port)
"kUj" = (
@@ -14149,10 +14160,11 @@
/obj/effect/floor_decal/spline/plain{
dir = 1
},
-/obj/machinery/camera/network/telecom{
- c_tag = "Telecomms - Spare Parts Room"
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/camera/motion{
+ c_tag = "Telecommunications - Spare Parts Room";
+ network = list("Command","Security","Telecommunications")
+ },
/turf/simulated/floor/carpet/rubber,
/area/tcommsat/entrance)
"lzn" = (
@@ -16830,6 +16842,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/machinery/camera/network/third_deck{
+ c_tag = "Third Deck - Port Dock Port";
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/port/docks)
"nLc" = (
@@ -19095,6 +19111,10 @@
dir = 4
},
/obj/effect/floor_decal/industrial/outline/emergency_closet,
+/obj/machinery/camera/network/third_deck{
+ c_tag = "Third Deck - Starboard Dock Port";
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/port/docks)
"pBE" = (
@@ -20298,14 +20318,15 @@
/turf/simulated/floor/tiled,
/area/bridge/bridge_crew)
"qDx" = (
-/obj/machinery/camera/network/telecom{
- c_tag = "Telecomms - Starboard";
- dir = 4
- },
/obj/machinery/firealarm/west,
/obj/effect/floor_decal/spline/plain/cee{
dir = 8
},
+/obj/machinery/camera/motion{
+ c_tag = "Telecommunications - Starboard";
+ network = list("Command","Security","Telecommunications");
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
"qEj" = (
@@ -22842,7 +22863,7 @@
dir = 8
},
/obj/machinery/computer/security/telescreen{
- name = "Telecomms Cameras";
+ name = "Telecommunications Cameras";
network = list("Tcomsat");
pixel_x = -32;
pixel_y = -4
@@ -24052,15 +24073,16 @@
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/central)
"tyQ" = (
-/obj/machinery/camera/network/telecom{
- c_tag = "Telecomms - Port"
- },
/obj/effect/floor_decal/spline/plain/cee{
dir = 1
},
/obj/machinery/alarm/tcom{
pixel_y = 28
},
+/obj/machinery/camera/motion{
+ c_tag = "Telecommunications - Port";
+ network = list("Command","Security","Telecommunications")
+ },
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
"tzM" = (
@@ -24838,10 +24860,8 @@
},
/obj/structure/table/steel,
/obj/machinery/camera/motion{
- alarm_on = 1;
- c_tag = "Third Deck - Crew Armoury Desk";
- name = "security";
- network = list("Command, Security")
+ c_tag = "Deck 3 - Crew Armoury Desk";
+ network = list("Command","Security")
},
/turf/simulated/floor/tiled/dark,
/area/horizon/crew_armoury)
@@ -26698,11 +26718,10 @@
dir = 4;
pixel_x = -24
},
-/obj/machinery/camera/network/command{
- alarm_on = 1;
+/obj/machinery/camera/motion{
c_tag = "Bridge - Deck 3 - Bunker";
dir = 4;
- network = list("Command","Bunker")
+ network = list("Command","Security")
},
/turf/simulated/floor/tiled/dark,
/area/bridge/aibunker)
@@ -54554,7 +54573,7 @@ sVV
nGI
eIH
hnj
-seF
+kTg
viN
fSW
fMW