diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 08caa7d4bba..d055a3efca7 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -32437,13 +32437,10 @@ /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "clH" = ( -/obj/machinery/camera{ - c_tag = "Research Toxins Test Chamber North"; - network = list("Toxins","Research","SS13") - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/camera/toxins, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "clL" = ( @@ -34893,10 +34890,8 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "cvv" = ( -/obj/machinery/camera{ - c_tag = "Research Toxins Test Chamber East"; - dir = 8; - network = list("Toxins","Research","SS13") +/obj/machinery/camera/toxins{ + dir = 8 }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) @@ -37229,12 +37224,10 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/incinerator) "cDN" = ( -/obj/machinery/camera{ - c_tag = "Research Toxins Test Chamber South"; - dir = 1; - network = list("Toxins","Research","SS13") - }, /obj/machinery/light, +/obj/machinery/camera/toxins{ + dir = 1 + }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "cDO" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index f8372e0b3b5..0ab35dd199f 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -26867,13 +26867,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dQT" = ( -/obj/machinery/camera{ - c_tag = "Research Toxins Test Chamber North"; - network = list("Toxins","Research","SS13") - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/camera/toxins, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "dQV" = ( @@ -53928,12 +53925,10 @@ /turf/simulated/floor/plating/airless, /area/station/maintenance/disposal/westalt) "kth" = ( -/obj/machinery/camera{ - c_tag = "Research Toxins Test Chamber South"; - dir = 1; - network = list("Toxins","Research","SS13") - }, /obj/machinery/light, +/obj/machinery/camera/toxins{ + dir = 1 + }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "ktk" = ( @@ -61866,10 +61861,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Research Toxins Test Chamber West"; - dir = 4; - network = list("Toxins","Research","SS13") +/obj/machinery/camera/toxins{ + dir = 4 }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index b58a83dbefe..9231cdeaea8 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -52032,10 +52032,8 @@ /area/station/science/toxins/test) "dCz" = ( /obj/item/target, -/obj/machinery/camera{ - c_tag = "Research Toxins Test Chamber East"; - dir = 4; - network = list("Toxins","Research","SS13") +/obj/machinery/camera/toxins{ + dir = 4 }, /turf/simulated/floor/plasteel/airless/indestructible, /area/station/science/toxins/test) diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 69abb45c45e..7fc0ee2abdf 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -74676,12 +74676,8 @@ "oQC" = ( /obj/effect/turf_decal/stripes, /obj/item/beacon, -/obj/machinery/camera{ - c_tag = "Research Toxins Test Chamber Center"; - dir = 8; - invuln = 1; - name = "Hardened Bomb-Test Security Camera"; - network = list("Toxins","Research","SS13") +/obj/machinery/camera/toxins{ + dir = 8 }, /turf/simulated/floor/indestructible/airless, /area/station/science/toxins/test) diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 76992009669..c410b966adc 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -38262,16 +38262,11 @@ }, /area/station/medical/surgery/observation) "cZa" = ( -/obj/machinery/camera{ - c_tag = "Bomb Test Site"; - desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top."; - dir = 10; - invuln = 1; - name = "Hardened Bomb-Test Camera"; - network = list("Toxins","Research","SS13") - }, /obj/effect/turf_decal/stripes/line, /obj/item/target/alien, +/obj/machinery/camera/toxins{ + dir = 1 + }, /turf/simulated/floor/indestructible/airless, /area/station/science/toxins/test) "cZc" = ( diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index b0c39713080..87e38267bdc 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -449,3 +449,13 @@ SEND_SIGNAL(src, COMSIG_CAMERA_MOVED, prev_turf) GLOB.cameranet.update_portable_camera(src, prev_turf) prev_turf = get_turf(src) + + +/obj/machinery/camera/toxins // cameras to be used in toxins + c_tag = "Research Toxins Test Chamber East"; + c_tag = "Bomb Test Site"; + desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top."; + invuln = 1; + name = "Hardened Bomb-Test Camera"; + network = list("Toxins","Research","SS13") +