diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index ff7c694fba7..84b932e9d4d 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -856,6 +856,7 @@ /obj/machinery/power/apc{ cell_type = 5000; dir = 4; + areastring = "/area/ai_monitored/security/armory"; name = "Armory APC"; pixel_x = 24 }, @@ -1580,6 +1581,7 @@ "adN" = ( /obj/machinery/power/apc{ dir = 8; + areastring = "/area/crew_quarters/heads/hos"; name = "Head of Security's Office APC"; pixel_x = -24 }, @@ -1909,6 +1911,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Prison Wing APC"; + areastring = "/area/security/prison"; pixel_x = 24 }, /obj/structure/cable{ @@ -2739,6 +2742,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Prisoner Transfer Centre"; + areastring = "/area/security/transfer"; pixel_y = -27 }, /turf/open/floor/plasteel/black, @@ -3320,6 +3324,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Brig Control APC"; + areastring = "/area/security/warden"; pixel_x = -24 }, /obj/structure/cable{ @@ -3582,6 +3587,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Security Office APC"; + areastring = "/area/security/main"; pixel_x = 24 }, /obj/structure/cable{ @@ -4367,6 +4373,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Brig APC"; + areastring = "/area/security/brig"; pixel_y = 24 }, /obj/structure/cable{ @@ -5440,6 +5447,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Courtroom APC"; + areastring = "/area/security/courtroom"; pixel_x = -24 }, /obj/structure/cable{ @@ -6081,6 +6089,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Port Bow Solar APC"; + areastring = "/area/maintenance/solars/port/fore"; pixel_x = -25; pixel_y = 3 }, @@ -6746,6 +6755,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Fitness Room APC"; + areastring = "/area/crew_quarters/fitness"; pixel_y = -24 }, /obj/structure/cable{ @@ -6976,6 +6986,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Fore Maintenance APC"; + areastring = "/area/maintenance/fore/secondary"; pixel_y = 24 }, /obj/structure/disposalpipe/segment{ @@ -7086,6 +7097,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Starboard Bow Solar APC"; + areastring = "/area/maintenance/solars/starboard/fore"; pixel_x = -25; pixel_y = 3 }, @@ -7324,6 +7336,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Dormitory APC"; + areastring = "/area/crew_quarters/dorms"; pixel_y = -24 }, /obj/structure/cable{ @@ -7581,6 +7594,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Port Bow Maintenance APC"; + areastring = "/area/maintenance/port/fore"; pixel_x = -1; pixel_y = 26 }, @@ -7612,6 +7626,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Labor Shuttle Dock APC"; + areastring = "/area/security/processing"; pixel_x = -24 }, /obj/structure/cable, @@ -7802,6 +7817,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Starboard Bow Maintenance APC"; + areastring = "/area/maintenance/starboard/fore"; pixel_y = 24 }, /obj/structure/cable{ @@ -9278,6 +9294,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Vacant Office B APC"; + areastring = "/area/security/vacantoffice/b"; pixel_x = -24 }, /turf/open/floor/plating, @@ -9286,6 +9303,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Law Office APC"; + areastring = "/area/lawoffice"; pixel_y = 24 }, /obj/structure/cable{ @@ -9517,6 +9535,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Electrical Maintenance APC"; + areastring = "/area/maintenance/department/electrical"; pixel_y = 24 }, /obj/structure/cable{ @@ -9662,6 +9681,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Fore Maintenance APC"; + areastring = "/area/maintenance/fore"; pixel_y = 24 }, /obj/structure/cable{ @@ -10909,6 +10929,7 @@ /obj/machinery/power/apc{ dir = 1; name = "EVA Storage APC"; + areastring = "/area/ai_monitored/storage/eva"; pixel_y = 24 }, /obj/structure/cable{ @@ -11488,6 +11509,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Security Checkpoint APC"; + areastring = "/area/security/checkpoint/checkpoint2"; pixel_x = 1; pixel_y = -24 }, @@ -11629,6 +11651,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Garden APC"; + areastring = "/area/hydroponics/garden"; pixel_x = 27; pixel_y = 2 }, @@ -11762,6 +11785,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Primary Tool Storage APC"; + areastring = "/turf/open/floor/plating"; pixel_x = 1; pixel_y = -24 }, @@ -11948,6 +11972,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Gateway APC"; + areastring = "/area/gateway"; pixel_x = -24; pixel_y = -1 }, @@ -12238,6 +12263,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Vault APC"; + areastring = "/area/ai_monitored/nuke_storage"; pixel_y = 25 }, /obj/structure/cable{ @@ -13257,6 +13283,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Chapel APC"; + areastring = "/area/chapel/main"; pixel_y = -24 }, /obj/structure/cable{ @@ -13385,6 +13412,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Entry Hall APC"; + areastring = "/area/hallway/secondary/entry"; pixel_x = 24 }, /obj/structure/cable, @@ -13706,6 +13734,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Dormitory Bathrooms APC"; + areastring = "/area/crew_quarters/toilet"; pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -13839,6 +13868,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Chapel Office APC"; + areastring = "/area/chapel/office"; pixel_y = -24 }, /obj/structure/cable, @@ -15036,6 +15066,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Theatre APC"; + areastring = "/area/crew_quarters/theatre"; pixel_x = -25 }, /obj/structure/cable, @@ -15048,6 +15079,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Bar APC"; + areastring = "/area/crew_quarters/bar"; pixel_y = -24 }, /obj/structure/cable, @@ -15100,6 +15132,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Kitchen APC"; + areastring = "/area/crew_quarters/kitchen"; pixel_y = -24 }, /obj/structure/cable, @@ -15179,6 +15212,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Hydroponics APC"; + areastring = "/area/hydroponics"; pixel_y = -24 }, /obj/structure/cable{ @@ -15947,6 +15981,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Auxillary Base Construction APC"; + areastring = "/area/construction/mining/aux_base"; pixel_x = -24 }, /obj/structure/cable{ @@ -16547,6 +16582,7 @@ }, /obj/machinery/power/apc{ name = "Port Hall APC"; + areastring = "/area/hallway/primary/port"; dir = 1; pixel_y = 26 }, @@ -18820,6 +18856,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Library APC"; + areastring = "/area/library"; pixel_x = 24 }, /obj/structure/cable, @@ -18892,6 +18929,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Auxiliary Tool Storage APC"; + areastring = "/area/storage/tools"; pixel_y = 24 }, /obj/machinery/firealarm{ @@ -20045,6 +20083,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Fore Primary Hallway APC"; + areastring = "/area/hallway/primary/fore"; pixel_x = -24 }, /obj/structure/cable{ @@ -20623,6 +20662,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Art Storage"; + areastring = "/area/storage/art"; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -20661,6 +20701,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Port Emergency Storage APC"; + areastring = "/area/storage/emergency/port"; pixel_y = 24 }, /obj/structure/cable{ @@ -20887,7 +20928,7 @@ /area/bridge) "aWV" = ( /obj/machinery/turretid{ - control_area = "AI Upload Chamber"; + control_area = "/area/ai_monitored/turret_protected/ai_upload"; name = "AI Upload turret control"; pixel_y = -25 }, @@ -20907,6 +20948,7 @@ cell_type = 5000; dir = 2; name = "Bridge APC"; + areastring = "/area/bridge"; pixel_y = -24 }, /obj/structure/cable, @@ -21381,6 +21423,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Port Maintenance APC"; + areastring = "/area/maintenance/port"; pixel_x = -27; pixel_y = 2 }, @@ -21661,6 +21704,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Central Hall APC"; + areastring = "/area/hallway/primary/central"; pixel_y = -24 }, /obj/structure/cable, @@ -22385,6 +22429,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Escape Hallway APC"; + areastring = "/area/hallway/secondary/exit"; pixel_x = -25 }, /obj/structure/cable{ @@ -22461,6 +22506,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Locker Restrooms APC"; + areastring = "/area/crew_quarters/toilet/locker"; pixel_x = 27; pixel_y = 2 }, @@ -22703,6 +22749,7 @@ cell_type = 2500; dir = 1; name = "Captain's Office APC"; + areastring = "/area/crew_quarters/heads/captain"; pixel_y = 24 }, /obj/structure/cable{ @@ -22805,6 +22852,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Vacant Office APC"; + areastring = "/area/security/vacantoffice"; pixel_x = -24 }, /obj/structure/cable{ @@ -23669,6 +23717,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Disposal APC"; + areastring = "/area/maintenance/disposal"; pixel_x = -24 }, /obj/structure/cable{ @@ -23758,6 +23807,7 @@ cell_type = 5000; dir = 2; name = "Upload APC"; + areastring = "/area/ai_monitored/turret_protected/ai_upload"; pixel_y = -24 }, /obj/structure/cable, @@ -24202,6 +24252,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Locker Room APC"; + areastring = "/area/crew_quarters/locker"; pixel_y = 24 }, /obj/structure/cable{ @@ -24270,6 +24321,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Cargo Bay APC"; + areastring = "/area/quartermaster/storage"; pixel_x = 1; pixel_y = -24 }, @@ -24467,6 +24519,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Starboard Primary Hallway APC"; + areastring = "/area/hallway/primary/starboard"; pixel_y = -24 }, /obj/structure/cable, @@ -24642,6 +24695,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Mech Bay APC"; + areastring = "/area/science/robotics/mechbay"; pixel_x = 26 }, /obj/structure/cable{ @@ -24927,6 +24981,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Chemistry APC"; + areastring = "/area/medical/chemistry"; pixel_y = 24 }, /obj/structure/cable{ @@ -25052,6 +25107,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Morgue APC"; + areastring = "/area/medical/morgue"; pixel_y = 24 }, /obj/structure/cable{ @@ -26084,6 +26140,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Bridge Maintenance APC"; + areastring = "/area/maintenance/department/bridge"; pixel_y = 24 }, /obj/structure/cable{ @@ -26740,6 +26797,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Conference Room APC"; + areastring = "/area/bridge/meeting_room"; pixel_x = 24 }, /obj/structure/cable{ @@ -26914,6 +26972,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Starboard Emergency Storage APC"; + areastring = "/area/storage/emergency/starboard"; pixel_y = 24 }, /obj/structure/cable{ @@ -26929,6 +26988,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Medbay Security APC"; + areastring = "/area/security/checkpoint/medical"; pixel_x = -25 }, /obj/structure/cable{ @@ -27816,6 +27876,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Research Lab APC"; + areastring = "/area/science/lab"; pixel_x = 26 }, /obj/structure/cable{ @@ -28342,6 +28403,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Robotics Lab APC"; + areastring = "/area/science/robotics/lab"; pixel_x = -25 }, /obj/structure/cable, @@ -28923,6 +28985,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Genetics APC"; + areastring = "/area/medical/genetics"; pixel_y = 24 }, /obj/structure/cable{ @@ -29325,6 +29388,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Gravity Generator APC"; + areastring = "/area/engine/gravity_generator"; pixel_x = -25; pixel_y = 1 }, @@ -30373,6 +30437,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Experimentation Lab APC"; + areastring = "/area/science/explab"; pixel_x = 26 }, /obj/structure/cable, @@ -30800,6 +30865,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Teleporter APC"; + areastring = "/area/teleporter"; pixel_x = -24 }, /obj/structure/cable{ @@ -30982,6 +31048,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Cargo Office APC"; + areastring = "/area/quartermaster/office"; pixel_x = 1; pixel_y = -24 }, @@ -33068,6 +33135,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Quartermaster APC"; + areastring = "/area/quartermaster/qm"; pixel_y = 24 }, /obj/structure/cable{ @@ -33107,6 +33175,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Mining Dock APC"; + areastring = "/area/quartermaster/miningdock"; pixel_y = 24 }, /obj/structure/cable{ @@ -33485,6 +33554,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Server Room APC"; + areastring = "/area/science/server"; pixel_y = 25 }, /obj/structure/cable{ @@ -33841,6 +33911,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Cargo Security APC"; + areastring = "/area/security/checkpoint/supply"; pixel_x = 1; pixel_y = 24 }, @@ -34654,6 +34725,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Science Security APC"; + areastring = "/area/security/checkpoint/science"; pixel_y = -24 }, /obj/structure/cable, @@ -34704,6 +34776,7 @@ /obj/machinery/power/apc{ dir = 8; name = "RD Office APC"; + areastring = "/area/crew_quarters/heads/hor"; pixel_x = -25 }, /obj/structure/cable, @@ -35304,6 +35377,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Tech Storage APC"; + areastring = "/area/storage/tech"; pixel_y = 24 }, /obj/structure/cable{ @@ -35323,6 +35397,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Treatment Center APC"; + areastring = "/area/medical/sleeper"; pixel_x = 26 }, /obj/structure/cable{ @@ -35672,6 +35747,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Misc Research APC"; + areastring = "/area/science/research"; pixel_x = -25 }, /obj/structure/cable{ @@ -36108,6 +36184,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Custodial Closet APC"; + areastring = "/area/janitor"; pixel_x = -24 }, /obj/structure/cable{ @@ -36923,6 +37000,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Toxins Storage APC"; + areastring = "/area/science/storage"; pixel_x = -25 }, /obj/structure/cable{ @@ -37303,6 +37381,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Aft Maintenance APC"; + areastring = "/area/maintenance/aft"; pixel_x = -24 }, /obj/structure/cable{ @@ -38414,6 +38493,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Toxins Lab APC"; + areastring = "/area/science/mixing"; pixel_x = 26 }, /obj/structure/cable, @@ -38731,6 +38811,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Medbay APC"; + areastring = "/area/medical/medbay/central"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -38815,6 +38896,7 @@ /obj/machinery/power/apc{ dir = 1; name = "CM Office APC"; + areastring = "/area/crew_quarters/heads/cmo"; pixel_y = 24 }, /obj/structure/cable{ @@ -39175,6 +39257,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Delivery Office APC"; + areastring = "/area/quartermaster/sorting"; pixel_x = 1; pixel_y = -24 }, @@ -39398,6 +39481,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Xenobiology APC"; + areastring = "/area/science/xenobiology"; pixel_x = -25 }, /obj/structure/cable{ @@ -40502,6 +40586,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Engineering Security APC"; + areastring = "/area/security/checkpoint/engineering"; pixel_x = -24 }, /obj/structure/cable{ @@ -42280,6 +42365,7 @@ cell_type = 5000; dir = 1; name = "Virology APC"; + areastring = "/area/medical/virology"; pixel_y = 24 }, /obj/structure/cable{ @@ -42618,6 +42704,7 @@ "bTJ" = ( /obj/machinery/power/apc{ name = "Aft Hall APC"; + areastring = "/area/hallway/primary/aft"; dir = 8; pixel_x = -25; pixel_y = 1 @@ -43013,6 +43100,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Construction Area APC"; + areastring = "/area/construction"; pixel_y = 24 }, /obj/structure/cable{ @@ -43028,6 +43116,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Telecomms Monitoring APC"; + areastring = "/area/tcommsat/computer"; pixel_y = -24 }, /obj/structure/cable{ @@ -43859,6 +43948,7 @@ cell_type = 5000; dir = 1; name = "Telecomms Server APC"; + areastring = "/area/tcommsat/server"; pixel_y = 25 }, /obj/structure/cable{ @@ -45175,6 +45265,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Atmospherics APC"; + areastring = "/area/engine/atmos"; pixel_x = -24 }, /obj/structure/cable{ @@ -45903,6 +45994,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Testing Lab APC"; + areastring = "/area/science/misc_lab"; pixel_x = 26 }, /obj/structure/cable{ @@ -46013,6 +46105,7 @@ cell_type = 5000; dir = 4; name = "CE Office APC"; + areastring = "/area/crew_quarters/heads/chief"; pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -46076,6 +46169,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Engineering Foyer APC"; + areastring = "/area/engine/break_room"; pixel_x = -24 }, /obj/structure/cable{ @@ -46960,6 +47054,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Starboard Quarter Maintenance APC"; + areastring = "/area/maintenance/starboard/aft"; pixel_x = -25 }, /obj/structure/cable{ @@ -47226,6 +47321,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Port Quarter Maintenance APC"; + areastring = "/area/maintenance/port/aft"; pixel_x = -25; pixel_y = 1 }, @@ -48029,6 +48125,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Incinerator APC"; + areastring = "/area/maintenance/disposal/incinerator"; pixel_y = -24 }, /obj/structure/cable, @@ -49063,6 +49160,7 @@ cell_type = 15000; dir = 1; name = "Engineering APC"; + areastring = "/area/engine/engineering"; pixel_y = 25 }, /obj/structure/cable{ @@ -49100,6 +49198,7 @@ cell_type = 15000; dir = 1; name = "Engineering APC"; + areastring = "/area/engine/engineering"; pixel_y = 25 }, /obj/structure/cable{ @@ -49427,6 +49526,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Port Quarter Solar APC"; + areastring = "/area/maintenance/solars/port/aft"; pixel_x = 23; pixel_y = 2 }, @@ -50071,6 +50171,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Starboard Quarter Solar APC"; + areastring = "/area/maintenance/solars/starboard/aft"; pixel_x = -26; pixel_y = 3 }, @@ -52701,6 +52802,7 @@ /obj/machinery/power/apc{ dir = 2; name = "SMES room APC"; + areastring = "/area/engine/engine_smes"; pixel_y = -24 }, /obj/effect/turf_decal/stripes/line{ @@ -54382,6 +54484,7 @@ /obj/machinery/power/apc{ dir = 4; name = "MiniSat Foyer APC"; + areastring = "/area/ai_monitored/turret_protected/aisat_interior"; pixel_x = 27 }, /obj/structure/chair, @@ -54847,6 +54950,7 @@ /obj/machinery/power/apc{ dir = 8; name = "MiniSat Atmospherics APC"; + areastring = "/area/ai_monitored/turret_protected/aisat/atmos"; pixel_x = -27 }, /obj/structure/cable{ @@ -54999,6 +55103,7 @@ /obj/machinery/power/apc{ dir = 4; name = "MiniSat Service Bay APC"; + areastring = "/area/ai_monitored/turret_protected/aisat/service"; pixel_x = 27 }, /obj/structure/cable{ @@ -55459,6 +55564,7 @@ /obj/machinery/power/apc{ dir = 4; name = "MiniSat Chamber Hallway APC"; + areastring = "/area/ai_monitored/turret_protected/aisat/hallway"; pixel_x = 27 }, /turf/open/floor/circuit, @@ -55747,6 +55853,7 @@ cell_type = 5000; dir = 2; name = "AI Chamber APC"; + areastring = "/area/ai_monitored/turret_protected/ai"; pixel_y = -24 }, /obj/machinery/flasher{ @@ -57362,6 +57469,7 @@ /obj/machinery/power/apc{ dir = 2; name = "Head of Personnel APC"; + areastring = "/area/crew_quarters/heads/hop"; pixel_y = -24 }, /obj/structure/cable{ @@ -58091,6 +58199,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Detective's Office APC"; + areastring = "/area/security/detectives_office"; pixel_x = 24 }, /obj/structure/cable, @@ -62438,6 +62547,7 @@ cell_type = 2500; dir = 1; name = "Central Maintenance APC"; + areastring = "/area/maintenance/central"; pixel_y = 24 }, /obj/structure/cable{ @@ -62501,6 +62611,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Starboard Maintenance APC"; + areastring = "/area/maintenance/starboard"; pixel_x = 26 }, /obj/structure/cable{ @@ -63844,6 +63955,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Central Maintenance APC"; + areastring = "/area/maintenance/central/secondary"; pixel_x = -24 }, /obj/structure/cable{ diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm index 1dcf1a4e8cf..23db15c4589 100644 --- a/_maps/map_files/Cerestation/cerestation.dmm +++ b/_maps/map_files/Cerestation/cerestation.dmm @@ -61252,7 +61252,7 @@ "cln" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/turretid{ - control_area = "AI Upload Chamber"; + control_area = "/area/ai_monitored/turret_protected/ai_upload"; name = "AI Upload turret control"; pixel_y = 25 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 951be3f7b32..ffcc88aef23 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -52094,7 +52094,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "bVK" = ( /obj/machinery/turretid{ - control_area = "AI Upload Chamber"; + control_area = "/area/ai_monitored/turret_protected/ai_upload"; icon_state = "control_stun"; name = "AI Upload turret control"; pixel_y = -32 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index df9c58ed1a7..3208e5a239d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -24148,7 +24148,7 @@ "aUy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/turretid{ - control_area = "AI Upload Chamber"; + control_area = "/area/ai_monitored/turret_protected/ai_upload"; icon_state = "control_stun"; name = "AI Upload turret control"; pixel_y = 28 diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index bec56f2173d..e2299b4f59f 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -795,7 +795,7 @@ /area/space) "abO" = ( /turf/closed/wall/r_wall, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "abP" = ( /obj/item/weapon/cautery, /obj/item/weapon/scalpel, @@ -840,20 +840,20 @@ "abV" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "abW" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "abX" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "abY" = ( /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "abZ" = ( /obj/structure/shuttle/engine/propulsion/left, /obj/effect/turf_decal/stripes/line, @@ -874,16 +874,16 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acd" = ( /obj/machinery/porta_turret/ai{ dir = 4 }, /turf/open/floor/plasteel/black, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "ace" = ( /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acf" = ( /obj/machinery/camera/motion{ c_tag = "MiniSat AI Chamber North"; @@ -896,19 +896,19 @@ pixel_y = -24 }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "ach" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "aci" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -916,7 +916,7 @@ /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acj" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -937,7 +937,7 @@ pixel_y = 26 }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "ack" = ( /obj/machinery/power/smes{ charge = 5e+006 @@ -962,7 +962,7 @@ pixel_y = 32 }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acl" = ( /obj/structure/cable{ d2 = 8; @@ -984,7 +984,7 @@ pixel_x = 27 }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acm" = ( /obj/machinery/camera/motion{ c_tag = "MiniSat External Port"; @@ -1006,7 +1006,7 @@ dir = 8 }, /turf/open/floor/plasteel/black, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "aco" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -1014,7 +1014,7 @@ icon_state = "2-4" }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acp" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -1027,7 +1027,7 @@ req_access_txt = "65" }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acq" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -1041,7 +1041,7 @@ pixel_y = -24 }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acr" = ( /obj/machinery/ai_slipper{ uses = 8 @@ -1051,7 +1051,7 @@ }, /obj/machinery/holopad, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acs" = ( /obj/machinery/turretid{ control_area = "AI Satellite Antechamber"; @@ -1060,7 +1060,7 @@ pixel_y = -24 }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "act" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/door/airlock/glass_command{ @@ -1068,7 +1068,7 @@ req_access_txt = "65" }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acu" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -1082,7 +1082,7 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acv" = ( /obj/machinery/camera/motion{ c_tag = "MiniSat External Starboard"; @@ -1096,7 +1096,7 @@ dir = 1 }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acx" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -1104,7 +1104,7 @@ icon_state = "1-2" }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acy" = ( /obj/effect/landmark/start/ai, /obj/item/device/radio/intercom{ @@ -1142,7 +1142,7 @@ pixel_y = -28 }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acz" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -1150,7 +1150,7 @@ icon_state = "1-4" }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acA" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -1158,17 +1158,17 @@ icon_state = "2-8" }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acB" = ( /obj/machinery/door/firedoor/heavy, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acC" = ( /obj/machinery/airalarm{ pixel_y = 22 }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acD" = ( /obj/machinery/camera/motion{ c_tag = "MiniSat AI Chamber South"; @@ -1186,7 +1186,7 @@ pixel_y = 37 }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acE" = ( /obj/item/device/radio/intercom{ broadcasting = 1; @@ -1196,7 +1196,7 @@ pixel_y = 24 }, /turf/open/floor/circuit, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, /turf/open/floor/plating/airless, @@ -1211,7 +1211,7 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acH" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -1222,7 +1222,7 @@ dir = 1 }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acI" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -1240,7 +1240,7 @@ /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acJ" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -1249,7 +1249,7 @@ }, /obj/machinery/door/firedoor/heavy, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acK" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -1257,7 +1257,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acL" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -1268,11 +1268,11 @@ uses = 8 }, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acM" = ( /obj/machinery/door/firedoor/heavy, /turf/open/floor/plasteel/white, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acN" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -1296,7 +1296,7 @@ "acR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/black, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acS" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -1304,11 +1304,11 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/black, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/black, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "acU" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/AIsatextAS) @@ -1335,14 +1335,14 @@ dir = 6 }, /turf/open/floor/plating, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "ada" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "adb" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -1357,21 +1357,21 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "adc" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, /turf/open/floor/plating, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "add" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, /turf/open/floor/plating, -/area/wreck/ai) +/area/ai_monitored/turret_protected/ai) "ade" = ( /obj/structure/table/glass, /obj/item/stack/sheet/metal, @@ -11446,7 +11446,7 @@ /area/bridge) "azk" = ( /obj/machinery/turretid{ - control_area = "AI Upload Chamber"; + control_area = "/area/ai_monitored/turret_protected/ai_upload"; name = "AI Upload turret control"; pixel_y = -25 }, diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 0a212c11f80..2660ce697f3 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -672,15 +672,11 @@ ..() if(!mapload) return - if(control_area && istext(control_area)) - for(var/V in GLOB.sortedAreas) - var/area/A = V - if(A.name == control_area) - control_area = A - break - + if(!control_area) control_area = get_area(src) + else + control_area = locate(text2path(control_area)) for(var/obj/machinery/porta_turret/T in control_area) turrets |= T diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e36c639eb9e..704028afd4e 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -180,7 +180,7 @@ if(isarea(A) && src.areastring == null) src.area = A else - src.area = get_area_by_name(areastring) + src.area = locate(text2path(areastring)) update_icon() make_terminal()