From 6874cc03d14923f1694fb3b252f02adfd8755015 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Thu, 8 Mar 2012 00:46:24 -0500 Subject: [PATCH] cleaned up the paths of a few ported things --- .../WorkInProgress/Ported/ZeroPoint/Laser2.dm | 32 +++++++++---------- .../Ported/ZeroPoint/SuperMatter.dm | 2 +- code/defines/obj/decal.dm | 4 +-- code/modules/chemical/Chemistry-Tools.dm | 2 +- code/modules/flufftext/Hallucination.dm | 4 +-- maps/tgstation.2.0.8.dmm | 26 +++++++-------- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/code/WorkInProgress/Ported/ZeroPoint/Laser2.dm b/code/WorkInProgress/Ported/ZeroPoint/Laser2.dm index 8b764b91be4..86ab1a2333e 100644 --- a/code/WorkInProgress/Ported/ZeroPoint/Laser2.dm +++ b/code/WorkInProgress/Ported/ZeroPoint/Laser2.dm @@ -3,7 +3,7 @@ desc = "A super-powerful laser" var/visible = 1 var/state = 1.0 - var/obj/beam/e_beam/first + var/obj/effect/beam/e_beam/first var/power = 500 icon = 'engine.dmi' icon_state = "laser" @@ -17,7 +17,7 @@ /obj/machinery/engine/laser/process() if(on) if(!first) - src.first = new /obj/beam/e_beam(src.loc) + src.first = new /obj/effect/beam/e_beam(src.loc) src.first.master = src src.first.dir = src.dir src.first.power = src.power @@ -39,25 +39,25 @@ first.setpower(src.power) -/obj/beam/e_beam +/obj/effect/beam/e_beam name = "Laser beam" icon = 'projectiles.dmi' icon_state = "u_laser" var/obj/machinery/engine/laser/master = null - var/obj/beam/e_beam/next = null + var/obj/effect/beam/e_beam/next = null var/power var/freq = 50000 var/phase = 0 var/phase_variance = 0 anchored = 1 -/obj/beam/e_beam/New() +/obj/effect/beam/e_beam/New() src.sd_SetLuminosity(4) -/obj/beam/e_beam/proc/updatebeam() +/obj/effect/beam/e_beam/proc/updatebeam() if(!next) if(get_step(src.loc,src.dir)) - var/obj/beam/e_beam/e = new /obj/beam/e_beam(src.loc) + var/obj/effect/beam/e_beam/e = new /obj/effect/beam/e_beam(src.loc) e.dir = src.dir src.next = e e.master = src.master @@ -82,10 +82,10 @@ else next.updatebeam() -/atom/proc/laser_act(var/obj/beam/e_beam/b) +/atom/proc/laser_act(var/obj/effect/beam/e_beam/b) return -/mob/living/carbon/laser_act(var/obj/beam/e_beam/b) +/mob/living/carbon/laser_act(var/obj/effect/beam/e_beam/b) for(var/t in organs) var/datum/organ/external/affecting = organs["[t]"] if (affecting.take_damage(0, b.power/400,0,0)) @@ -93,23 +93,23 @@ else UpdateDamage() -/obj/beam/e_beam/Bump(atom/Obstacle) +/obj/effect/beam/e_beam/Bump(atom/Obstacle) Obstacle.laser_act(src) del(src) return -/obj/beam/e_beam/proc/setpower(var/powera) +/obj/effect/beam/e_beam/proc/setpower(var/powera) src.power = powera if(src.next) src.next.setpower(powera) -/obj/beam/e_beam/Bumped() +/obj/effect/beam/e_beam/Bumped() src.hit() return -/obj/beam/e_beam/HasEntered(atom/movable/AM as mob|obj) - if (istype(AM, /obj/beam)) +/obj/effect/beam/e_beam/HasEntered(atom/movable/AM as mob|obj) + if (istype(AM, /obj/effect/beam)) return spawn( 0 ) AM.laser_act(src) @@ -117,12 +117,12 @@ return return -/obj/beam/e_beam/Del() +/obj/effect/beam/e_beam/Del() if(next) del(next) ..() return -/obj/beam/e_beam/proc/hit() +/obj/effect/beam/e_beam/proc/hit() del src return \ No newline at end of file diff --git a/code/WorkInProgress/Ported/ZeroPoint/SuperMatter.dm b/code/WorkInProgress/Ported/ZeroPoint/SuperMatter.dm index 75d236f10ee..cc0817d78fc 100644 --- a/code/WorkInProgress/Ported/ZeroPoint/SuperMatter.dm +++ b/code/WorkInProgress/Ported/ZeroPoint/SuperMatter.dm @@ -76,7 +76,7 @@ //Get the collective laser power for(var/dir in cardinal) var/turf/T = get_step(L, dir) - for(var/obj/beam/e_beam/item in T) + for(var/obj/effect/beam/e_beam/item in T) power += item.power //Ok, 100% oxygen atmosphere = best reaction diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm index be32ee06ce2..684e5324e7b 100644 --- a/code/defines/obj/decal.dm +++ b/code/defines/obj/decal.dm @@ -294,11 +294,11 @@ icon = 'tomatodecal.dmi' random_icon_states = list("smashed_pie") -/obj/decal/warning_stripes +/obj/effect/decal/warning_stripes icon = 'decal_warning_stripes.dmi' layer = 2 -/obj/decal/warning_stripes/New() +/obj/effect/decal/warning_stripes/New() ..() loc.overlays += src diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index f6c919c7d94..9d0f10e6031 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -250,7 +250,7 @@ HasProximity(atom/movable/AM as mob|obj) if(istype(attached_device, /obj/item/device/assembly/prox_sensor)) var/obj/item/device/assembly/prox_sensor/D = attached_device - if (istype(AM, /obj/beam)) + if (istype(AM, /obj/effect/beam)) return if (AM.move_speed < 12) D.sense() diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 47def3ab556..968a2b7d93b 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -213,7 +213,7 @@ proc/check_panel(mob/M) return 1 return 0 */ -/obj/fake_attacker +/obj/effect/fake_attacker icon = null icon_state = null name = "" @@ -355,7 +355,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite if(!possible_clones.len) return clone = pick(possible_clones) //var/obj/fake_attacker/F = new/obj/fake_attacker(outside_range(target)) - var/obj/fake_attacker/F = new/obj/fake_attacker(target.loc) + var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(target.loc) if(clone.l_hand) if(!(locate(clone.l_hand) in non_fakeattack_weapons)) clone_weapon = clone.l_hand.name diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 6972bedb805..093f6711e3e 100755 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -2673,7 +2673,7 @@ "aZu" = (/obj/machinery/light/small{dir = 8},/obj/machinery/turret{desc = "aicore"; dir = 4},/turf/simulated/floor/grid,/area/turret_protected/ai) "aZv" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "aZw" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/grid,/area/turret_protected/ai) -"aZx" = (/obj/machinery/ai_slipper,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/decal/warning_stripes{tag = "icon-U-S"; icon_state = "U-S"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) +"aZx" = (/obj/machinery/ai_slipper,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/effect/decal/warning_stripes{tag = "icon-U-S"; icon_state = "U-S"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "aZy" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "aZz" = (/obj/machinery/light/small{dir = 4},/obj/machinery/turret{dir = 8; id = "aicore"},/turf/simulated/floor/grid,/area/turret_protected/ai) "aZA" = (/obj/structure/disposalpipe/trunk,/obj/machinery/disposal,/turf/simulated/floor,/area/crew_quarters/heads) @@ -2758,7 +2758,7 @@ "bbb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai) "bbc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/telecomms/allinone{frequency = 144.7},/turf/simulated/floor/grid,/area/turret_protected/ai) "bbd" = (/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = -32},/obj/machinery/camera{c_tag = "AI Chamber South-2"; dir = 1; network = "Command"},/turf/simulated/floor/grid,/area/turret_protected/ai) -"bbe" = (/obj/machinery/door/airlock/secure{name = "AI Core Access"; req_access_txt = "16"},/obj/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) +"bbe" = (/obj/machinery/door/airlock/secure{name = "AI Core Access"; req_access_txt = "16"},/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "bbf" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/obj/machinery/camera{c_tag = "AI Chamber South-1"; dir = 1; network = "Command"},/turf/simulated/floor/grid,/area/turret_protected/ai) "bbg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/grid,/area/turret_protected/ai) "bbh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai) @@ -2854,7 +2854,7 @@ "bcT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/crew_quarters/captain) "bcU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/crew_quarters/captain) "bcV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai) -"bcW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/turretid{id = "upload"; pixel_x = -24; pixel_y = -7},/obj/machinery/turretid{id = "aicore"; pixel_x = -24; pixel_y = 7},/obj/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) +"bcW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/turretid{id = "upload"; pixel_x = -24; pixel_y = -7},/obj/machinery/turretid{id = "aicore"; pixel_x = -24; pixel_y = 7},/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "bcX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/crew_quarters/heads) "bcY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/disposalpipe/sortjunction{backsort = 1; backType = list("Captain"); dir = 4; icon_state = "pipe-j2s"; sortType = list("HoP Office")},/turf/simulated/wall/r_wall,/area/crew_quarters/heads) "bcZ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/command{name = "Conference Room"; req_access = null; req_access_txt = "19"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads) @@ -2932,7 +2932,7 @@ "bet" = (/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) "beu" = (/obj/machinery/computer/aistatus,/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) "bev" = (/obj/machinery/computer/borgupload/mainframe,/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) -"bew" = (/obj/machinery/door/airlock/secure{name = "AI Core Access"; req_access_txt = "16"},/obj/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"bew" = (/obj/machinery/door/airlock/secure{name = "AI Core Access"; req_access_txt = "16"},/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "bex" = (/obj/machinery/computer/aiupload/mainframe,/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) "bey" = (/obj/structure/aiuploadcloset,/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) "bez" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/lattice,/turf/space,/area) @@ -3005,7 +3005,7 @@ "bfO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/lattice,/turf/space,/area) "bfP" = (/obj/machinery/turret{dir = 4; id = "upload"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/grid,/area/turret_protected/ai_upload) "bfQ" = (/turf/simulated/floor/grid,/area/turret_protected/ai_upload) -"bfR" = (/obj/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"bfR" = (/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "bfS" = (/obj/machinery/turret{dir = 8; id = "upload"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/grid,/area/turret_protected/ai_upload) "bfT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall,/area/bridge/meeting_room) "bfU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/bridge/meeting_room) @@ -3074,10 +3074,10 @@ "bhf" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/obj/structure/lattice,/turf/space,/area) "bhg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) "bhh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/camera{c_tag = "AI Upload"; dir = 4; network = "Command"},/turf/simulated/floor/grid,/area/turret_protected/ai_upload) -"bhi" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) -"bhj" = (/obj/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) -"bhk" = (/obj/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/obj/decal/warning_stripes{tag = "icon-NE-out"; icon_state = "NE-out"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) -"bhl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"bhi" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"bhj" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"bhk" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/obj/effect/decal/warning_stripes{tag = "icon-NE-out"; icon_state = "NE-out"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"bhl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "bhm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/decal/cleanable/oil,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/grid,/area/turret_protected/ai_upload) "bhn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) "bho" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 4; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/space,/area) @@ -3136,10 +3136,10 @@ "bip" = (/obj/structure/closet/crate,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/teleporter) "biq" = (/obj/item/weapon/crowbar,/turf/simulated/floor/plating,/area/teleporter) "bir" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/teleporter) -"bis" = (/obj/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"bis" = (/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "bit" = (/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "biu" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) -"biv" = (/obj/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/oil,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"biv" = (/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/oil,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "biw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/bridge/meeting_room) "bix" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/bridge/meeting_room) "biy" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor,/area/bridge/meeting_room) @@ -3191,10 +3191,10 @@ "bjs" = (/turf/simulated/floor,/area/teleporter) "bjt" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor,/area/teleporter) "bju" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/teleporter) -"bjv" = (/obj/machinery/power/apc{dir = 2; name = "Upload APC"; pixel_y = -24},/obj/machinery/light/small,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/obj/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"bjv" = (/obj/machinery/power/apc{dir = 2; name = "Upload APC"; pixel_y = -24},/obj/machinery/light/small,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/obj/effect/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "bjw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "bjx" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/effect/decal/cleanable/oil,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) -"bjy" = (/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_y = -25},/obj/machinery/light/small,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/obj/decal/warning_stripes{tag = "icon-NE-out"; icon_state = "NE-out"},/obj/effect/decal/cleanable/oil,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"bjy" = (/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_y = -25},/obj/machinery/light/small,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/obj/effect/decal/warning_stripes{tag = "icon-NE-out"; icon_state = "NE-out"},/obj/effect/decal/cleanable/oil,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "bjz" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/space,/area) "bjA" = (/obj/machinery/power/apc{dir = 8; name = "Meeting Room APC"; pixel_x = -25},/obj/structure/cable,/turf/simulated/floor,/area/bridge/meeting_room) "bjB" = (/turf/simulated/floor,/area/bridge/meeting_room)