From e69abca9ab7eaef0ba7aad7e1cfa8a8bb1a2478b Mon Sep 17 00:00:00 2001 From: Bobbanz1 <59128051+Bobbanz1@users.noreply.github.com> Date: Fri, 29 Mar 2024 22:39:14 +0100 Subject: [PATCH] Makes it so the Aetherwhisp lasers have circuit boards and don't get deleted upon deconstruction. (#2612) --- .../game/objects/items/nsv_circuitboards.dm | 36 +++++++++++++++++++ .../ship_weapons/energy_weapons/laser_ams.dm | 1 + .../ship_weapons/energy_weapons/phaser.dm | 2 ++ 3 files changed, 39 insertions(+) diff --git a/nsv13/code/game/objects/items/nsv_circuitboards.dm b/nsv13/code/game/objects/items/nsv_circuitboards.dm index a320b716c03..2191f4ded8d 100644 --- a/nsv13/code/game/objects/items/nsv_circuitboards.dm +++ b/nsv13/code/game/objects/items/nsv_circuitboards.dm @@ -399,6 +399,42 @@ /obj/item/stock_parts/cell = 5, /obj/item/stack/ore/bluespace_crystal = 5) +// Laser AMS +/obj/item/circuitboard/machine/laser_ams + name = "laser AMS (circuitboard)" + build_path = /obj/machinery/ship_weapon/energy/ams + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF + req_components = list( + /obj/item/stack/sheet/glass = 5, + /obj/item/stock_parts/micro_laser = 5, + /obj/item/stock_parts/capacitor = 5, + /obj/item/stock_parts/cell = 5, + /obj/item/stack/ore/bluespace_crystal = 5) + +// Phase Cannon +/obj/item/circuitboard/machine/phase_cannon + name = "phase cannon (circuitboard)" + build_path = /obj/machinery/ship_weapon/energy/beam + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF + req_components = list( + /obj/item/stack/sheet/glass = 5, + /obj/item/stock_parts/micro_laser = 5, + /obj/item/stock_parts/capacitor = 5, + /obj/item/stock_parts/cell = 5, + /obj/item/stack/ore/bluespace_crystal = 5) + +// Burst Phaser +/obj/item/circuitboard/machine/burst_phaser + name = "burst phaser MK2 (circuitboard)" + build_path = /obj/machinery/ship_weapon/energy + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF + req_components = list( + /obj/item/stack/sheet/glass = 3, + /obj/item/stock_parts/micro_laser = 3, + /obj/item/stock_parts/capacitor = 3, + /obj/item/stock_parts/cell = 3, + /obj/item/stack/ore/bluespace_crystal = 3) + // Smelter and console /obj/item/circuitboard/machine/processing_unit name = "furnace (Machine Board)" diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/laser_ams.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/laser_ams.dm index 0f7df94b0fd..3fed59003d7 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/laser_ams.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/laser_ams.dm @@ -5,6 +5,7 @@ icon_state = "missile_cannon" fire_mode = FIRE_MODE_AMS_LASER //Shot automatically ammo_type = /obj/item/ship_weapon/ammunition/railgun_ammo + circuit = /obj/item/circuitboard/machine/laser_ams bound_width = 64 pixel_x = -32 pixel_y = -32 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 55f78f10201..cd041f433e3 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm @@ -5,6 +5,7 @@ icon_state = "phase_cannon" fire_mode = FIRE_MODE_RED_LASER //Shot by the pilot. ammo_type = /obj/item/ship_weapon/ammunition/railgun_ammo + circuit = /obj/item/circuitboard/machine/burst_phaser bound_width = 64 pixel_x = -32 pixel_y = -32 @@ -27,6 +28,7 @@ icon_state = "ion_cannon" fire_mode = FIRE_MODE_BLUE_LASER energy_weapon_type = /datum/ship_weapon/phaser + circuit = /obj/item/circuitboard/machine/phase_cannon charge_rate = 600000 // At power level 5, requires 3MW per tick to charge charge_per_shot = 4000000 // At power level 5, requires 20MW total to fire, takes about 12 seconds to gain 1 charge max_charge = 8000000 // Store 2 charges