Engineering notice: There are three wire colors used on the Aetherwhisp 6 ship model. White cable is wired to the Stormdrive MK-4 and the supermatter crystal near atmospherics. These lead to their own SMES located nearby. Yellow wires are department distribution wires, which deliver power from the engines SMES to deparment SMES. Red wires deliver power from department SMES to department APCs.
" + }, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/engine, /area/nsv/weapons/fore) "dhb" = ( @@ -5849,16 +5857,9 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/auxiliary) "ecq" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "0-10" }, -/obj/machinery/computer/monitor{ - dir = 8; - name = "department distribution monitoring console" - }, /turf/open/floor/carpet/ship/orange_carpet, /area/nsv/weapons/fore) "ecu" = ( @@ -5915,6 +5916,7 @@ /obj/structure/cable/white{ icon_state = "2-4" }, +/obj/machinery/cooling/cooler, /turf/open/floor/carpet/ship/orange_carpet, /area/nsv/weapons/fore) "eex" = ( @@ -6144,9 +6146,10 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "emk" = ( -/obj/machinery/cooling/cooler, -/turf/open/floor/engine, -/area/nsv/weapons/port) +/obj/machinery/atmospherics/pipe/simple/purple/hidden, +/obj/machinery/cooling/storage, +/turf/open/floor/carpet/ship/orange_carpet, +/area/nsv/weapons/fore) "emS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6548,6 +6551,7 @@ /obj/structure/cable/white{ icon_state = "1-4" }, +/obj/machinery/cooling/cooler, /turf/open/floor/carpet/ship/orange_carpet, /area/nsv/weapons/fore) "ezz" = ( @@ -6989,6 +6993,12 @@ /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/machinery/modular_computer/console/preset/engineering{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/engine, /area/nsv/weapons/fore) "eKM" = ( @@ -7794,20 +7804,17 @@ /turf/open/floor/plating, /area/science/server) "fmj" = ( -/obj/structure/window/reinforced{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/cable/white{ - icon_state = "0-8" - }, -/obj/machinery/computer/monitor{ +/obj/machinery/computer/ship/navigation/public{ dir = 8; - name = "stormdrive power monitoring console" + name = "starmap console" }, -/obj/item/paper{ - default_raw_text = "Engineering notice: There are three wire colors used on the Aetherwhisp 6 ship model. White cable is wired to the Stormdrive MK-4 and the supermatter crystal near atmospherics. These lead to their own SMES located nearby. Yellow wires are department distribution wires, which deliver power from the engines SMES to deparment SMES. Red wires deliver power from department SMES to department APCs.
" +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/open/floor/carpet/ship/orange_carpet, +/turf/open/floor/engine, /area/nsv/weapons/fore) "fms" = ( /obj/machinery/dna_scannernew, @@ -7976,7 +7983,6 @@ /area/maintenance/nsv/hangar) "fqG" = ( /obj/machinery/light, -/obj/machinery/cooling/cooler, /turf/open/floor/engine, /area/nsv/weapons/port) "frq" = ( @@ -8814,6 +8820,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, +/obj/machinery/cooling/cooler, /turf/open/floor/carpet/ship/orange_carpet, /area/nsv/weapons/fore) "fTg" = ( @@ -10675,8 +10682,11 @@ /turf/open/floor/plating, /area/maintenance/fore) "hgV" = ( -/obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start/munitions_tech, /turf/open/floor/engine, /area/nsv/weapons/fore) "hgZ" = ( @@ -13315,15 +13325,6 @@ }, /turf/open/floor/engine, /area/gateway) -"jaM" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/computer/cargo/request{ - dir = 8 - }, -/turf/open/floor/carpet/ship/orange_carpet, -/area/nsv/weapons/fore) "jaQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -14570,7 +14571,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/cooling/storage, /turf/open/floor/engine, /area/nsv/weapons/fore) "jQc" = ( @@ -19081,6 +19081,7 @@ /obj/structure/sign/solgov_seal{ pixel_y = 26 }, +/obj/machinery/cooling/storage, /turf/open/floor/plating, /area/nsv/weapons/fore) "njC" = ( @@ -20486,6 +20487,16 @@ icon_state = "1-2" }, /obj/structure/chair/office/light, +/obj/machinery/computer/monitor{ + dir = 8; + name = "department distribution monitoring console" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/engine, /area/nsv/weapons/fore) "nZu" = ( @@ -20580,7 +20591,7 @@ /turf/open/floor/wood, /area/maintenance/fore) "ocW" = ( -/obj/machinery/cooling/storage, +/obj/effect/landmark/event_spawn, /turf/open/floor/engine, /area/nsv/weapons/fore) "odg" = ( @@ -20594,16 +20605,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) -"oec" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/computer/ship/navigation/public{ - dir = 8; - name = "starmap console" - }, -/turf/open/floor/carpet/ship/orange_carpet, -/area/nsv/weapons/fore) "ofC" = ( /obj/machinery/camera/autoname{ dir = 8 @@ -20947,6 +20948,7 @@ /obj/structure/cable/white{ icon_state = "1-4" }, +/obj/machinery/cooling/cooler, /turf/open/floor/carpet/ship/orange_carpet, /area/nsv/weapons/fore) "otN" = ( @@ -25806,10 +25808,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/chair/office/light{ +/obj/machinery/computer/ship/dradis/minor{ + dir = 8 + }, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/landmark/start/munitions_tech, /turf/open/floor/engine, /area/nsv/weapons/fore) "rxR" = ( @@ -28313,15 +28317,6 @@ /obj/machinery/light_switch/east, /turf/open/floor/carpet/ship/purple_carpet, /area/science/mixing) -"tbQ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/computer/ship/dradis/minor{ - dir = 8 - }, -/turf/open/floor/carpet/ship/orange_carpet, -/area/nsv/weapons/fore) "tcI" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/structure/disposalpipe/segment{ @@ -31386,10 +31381,6 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/purple_carpet, /area/science/research) -"vCS" = ( -/obj/machinery/cooling/cooler, -/turf/open/floor/carpet/ship/orange_carpet, -/area/nsv/weapons/fore) "vCZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -77390,7 +77381,7 @@ cqn pes kOb neY -emk +pZx lJn mjR nJz @@ -78677,7 +78668,7 @@ dlB pGn gBC jPM -ocW +wsl hWF hIh qyc @@ -79189,7 +79180,7 @@ qqd iIw dnp oqH -wsl +ocW ccH ddg hWF @@ -79704,8 +79695,8 @@ nZt dgj gdL rxx -mNk -mNk +fmj +cFY mNk pqG ozk @@ -79954,15 +79945,15 @@ nZT aKK vnw aKK -aAA fDP -cFY +fDP +fDP ecq -fmj +fDP fQY -tbQ -oec -jaM +fDP +fDP +fDP fDP fDP fDP @@ -80223,7 +80214,7 @@ fzt ezt fDP wow -vCS +fDP hIh tWA wMe @@ -80735,7 +80726,7 @@ imE fDP mUo fDP -vCS +qjG fDP qjG hIh @@ -80985,7 +80976,7 @@ aKK aQt kJD cGU -kJD +emk cII hfr aKK diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm index 790c10008ea..09fbde8801c 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm @@ -75,7 +75,7 @@ /obj/machinery/ship_weapon/energy/examine(mob/user) . = ..() - . += "The Thermal Transceiver supports 10 connections." + . += "The Thermal Transceiver is currently at [length(storages)+length(coolers)]0% connection capacity." if(in_range(user, src) || isobserver(user)) . += "The heatsink display reads [(heat)] out of [(max_heat)]." if(maint_state != MSTATE_CLOSED) @@ -403,6 +403,7 @@ return TRUE return ..() - - - +/obj/machinery/ship_weapon/energy/Destroy() + for(var/obj/machinery/cooling/E in storages & coolers) + E.parent = null + . = ..() diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm index 91cc72c56c5..a1da2b1ee0e 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm @@ -91,7 +91,7 @@ .=TRUE parent.storages |= src to_chat(user, "-% Successfully linked [P.buffer] with [src] %-") - if(length(parent.storages)+length(parent.coolers) >= 10) + if(length(parent.storages)+length(parent.coolers) >= 11) var/E = pick(parent.storages+parent.coolers) explosion(get_turf(E), 0, 1, 3, 5, flame_range = 4) return @@ -104,4 +104,3 @@ desc = "A cooling unit that stores the massive amounts of heat energy weapons generate in subspace." icon_state = "storage" circuit = /obj/item/circuitboard/machine/cooling/storage -