From e57cdbb9dd0d477819cb79613fc3a3a6565189fa Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Thu, 2 Jul 2020 12:28:52 -0400 Subject: [PATCH] fixes EVA --- _maps/map_files/cyberiad/cyberiad.dmm | 4 ++++ code/game/machinery/camera/presets.dm | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 06115f9b175..2846574c878 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -78169,6 +78169,10 @@ pixel_x = -22 }, /obj/item/stack/tape_roll, +/obj/machinery/camera/motion{ + c_tag = "EVA Motion Sensor"; + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index ac0ea56f814..33c970639e5 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -16,12 +16,16 @@ upgradeXRay() // MOTION +/obj/machinery/camera/motion + name = "motion-sensitive security camera" /obj/machinery/camera/motion/Initialize(mapload) . = ..() upgradeMotion() // ALL UPGRADES +/obj/machinery/camera/all + icon_state = "xraycamera" //mapping icon. /obj/machinery/camera/all/Initialize(mapload) . = ..() @@ -78,6 +82,10 @@ // If you are upgrading Motion, and it isn't in the camera's New(), add it to the machines list. /obj/machinery/camera/proc/upgradeMotion() + if(isMotion()) + return + if(name == initial(name)) + name = "motion-sensitive security camera" assembly.upgrades.Add(new /obj/item/assembly/prox_sensor(assembly)) setPowerUsage() // Add it to machines that process