diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index e446946827e..816b7af9022 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -1958,7 +1958,7 @@ /turf/simulated/floor/plating, /area/shuttle/syndicate_sit) "hm" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/no_cyborg{ pixel_y = 24; req_access_txt = "114"; name = "Engineering Storage Shutters"; @@ -2925,7 +2925,6 @@ /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "ko" = ( -/obj/structure/closet/secure_closet/guncabinet, /obj/item/gun/energy/bsg/prebuilt{ pixel_x = 3; pixel_y = -3 @@ -2935,6 +2934,7 @@ pixel_x = -3; pixel_y = 3 }, +/obj/structure/closet/secure_closet/guncabinet/cc, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -3209,7 +3209,6 @@ /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "ln" = ( -/obj/structure/closet/secure_closet/guncabinet, /obj/item/gun/energy/immolator/multi{ pixel_x = -4; pixel_y = 4 @@ -3219,6 +3218,7 @@ pixel_x = 3; pixel_y = -3 }, +/obj/structure/closet/secure_closet/guncabinet/cc, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -4673,7 +4673,6 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "pT" = ( -/obj/structure/closet/secure_closet/guncabinet, /obj/item/gun/energy/pulse/pistol{ pixel_x = -3; pixel_y = 3 @@ -4683,6 +4682,7 @@ pixel_x = 3; pixel_y = -3 }, +/obj/structure/closet/secure_closet/guncabinet/cc, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -7279,6 +7279,15 @@ /obj/effect/landmark/spawner/aroomwarp, /turf/simulated/floor/plasteel, /area/admin) +"zK" = ( +/obj/machinery/door_control/no_emag/no_cyborg{ + pixel_x = 24; + req_access_txt = "114"; + name = "Specops Teleporter Shutters"; + id = "CCTELE" + }, +/turf/simulated/floor/plasteel/dark, +/area/centcom/specops) "zL" = ( /obj/machinery/economy/arcade/claw, /turf/simulated/floor/carpet/arcade, @@ -13948,10 +13957,11 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Xo" = ( -/obj/machinery/door_control/no_emag{ - id = "SPECOPS"; +/obj/machinery/door_control/no_emag/no_cyborg{ name = "Nanotrasen Asset Protection Shutters"; - pixel_y = -24 + req_access_txt = "114"; + pixel_y = -24; + id = "SPECOPS" }, /turf/simulated/floor/plasteel{ dir = 10; @@ -14495,16 +14505,6 @@ "Ze" = ( /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/transport) -"Zg" = ( -/obj/machinery/door_control/no_emag{ - id = "CCTELE"; - name = "Specops Teleporter Shutters"; - pixel_x = 24; - pixel_y = null; - req_access_txt = "114" - }, -/turf/simulated/floor/plasteel/dark, -/area/centcom/specops) "Zi" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plasteel{ @@ -14559,7 +14559,6 @@ /turf/simulated/wall/indestructible/riveted, /area/centcom/specops) "Zt" = ( -/obj/structure/closet/secure_closet/guncabinet, /obj/item/ammo_box/magazine/smgm9mm/toxin, /obj/item/ammo_box/magazine/smgm9mm/toxin, /obj/item/ammo_box/magazine/smgm9mm/toxin, @@ -14581,6 +14580,7 @@ pixel_x = 6; pixel_y = -6 }, +/obj/structure/closet/secure_closet/guncabinet/cc, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -14594,7 +14594,6 @@ /turf/simulated/floor/beach/coastline, /area/holodeck/source_beach) "Zw" = ( -/obj/structure/closet/secure_closet/guncabinet, /obj/item/gun/energy/plasma_pistol{ pixel_x = -3; pixel_y = 3 @@ -14604,6 +14603,7 @@ pixel_x = 3; pixel_y = -3 }, +/obj/structure/closet/secure_closet/guncabinet/cc, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -14624,7 +14624,6 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/control) "ZD" = ( -/obj/structure/closet/secure_closet/guncabinet, /obj/item/gun/energy/mindflayer{ pixel_x = -3; pixel_y = 3 @@ -14634,6 +14633,7 @@ pixel_x = 3; pixel_y = -3 }, +/obj/structure/closet/secure_closet/guncabinet/cc, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -35739,7 +35739,7 @@ Ra Xz Zr Zm -Zg +zK Ra Ra Ra diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 732fd224277..f09c7b56e69 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -133,3 +133,11 @@ /obj/machinery/door_control/no_emag/emag_act(user as mob) to_chat(user, "The electronic systems in this button are far too advanced for your primitive hacking peripherals.") return + +/obj/machinery/door_control/no_emag/no_cyborg + desc = "A remote control-switch for a door. Looks strangely analog in design." + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + +/obj/machinery/door_control/no_emag/no_cyborg/attack_ai(mob/user) + to_chat(user, "Error, no route to host.") + return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index 710979b6f83..5ceea3aadf7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -51,3 +51,6 @@ . += "off" else if(locked) . += "locked" + +/obj/structure/closet/secure_closet/guncabinet/cc + req_access = list(ACCESS_CENT_SPECOPS_COMMANDER)