diff --git a/nsv13/code/game/objects/items/nsv_circuitboards.dm b/nsv13/code/game/objects/items/nsv_circuitboards.dm index 2191f4ded8d..7196fd366b5 100644 --- a/nsv13/code/game/objects/items/nsv_circuitboards.dm +++ b/nsv13/code/game/objects/items/nsv_circuitboards.dm @@ -477,3 +477,33 @@ icon_state = "science" build_path = /obj/machinery/navbeacon req_components = list() + +//energy weapon cooling +/obj/item/circuitboard/machine/cooling + name = "subspace cooling unit circuit board" + icon = 'icons/obj/module.dmi' + icon_state = "command" + materials = list(/datum/material/glass=1000) + w_class = WEIGHT_CLASS_SMALL + req_components = list( + /obj/item/stack/cable_coil = 30, + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stack/sheet/mineral/copper = 15, + /obj/item/stock_parts/capacitor = 4, + /obj/item/stock_parts/micro_laser = 4, + /obj/item/stack/ore/bluespace_crystal = 1) + + +/obj/item/circuitboard/machine/cooling/storage + name = "subspace heatsink unit circuit board" + icon = 'icons/obj/module.dmi' + icon_state = "command" + materials = list(/datum/material/glass=1000) + w_class = WEIGHT_CLASS_SMALL + req_components = list( + /obj/item/stack/cable_coil = 30, + /obj/item/stock_parts/matter_bin = 4, + /obj/item/stack/sheet/mineral/copper = 30, + /obj/item/stock_parts/capacitor = 2, + /obj/item/stock_parts/micro_laser = 2, + /obj/item/stack/ore/bluespace_crystal = 1) 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 0538dd4cfd6..ff385b8f702 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 @@ -21,7 +21,7 @@ // Hitscan antimissile laser, charges relatively quickly, but can't hold a decent buffer! - charge_rate = 1500000 // At power level 2, requires 2MW per tick to charge + charge_rate = 1500000 // At power level 2, requires 3MW per tick to charge charge_per_shot = 3000000 // At power level 2, requires 6MW total to fire, takes about 3 seconds to gain 1 charge max_charge = 3000000 // Store 1 charge diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/laser_pd.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/laser_pd.dm index 7b0d448148d..85c498d6bbc 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/laser_pd.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/laser_pd.dm @@ -65,7 +65,7 @@ energy_weapon_type = /datum/ship_weapon/phaser_pd charge = 0 charge_rate = 700000 - charge_per_shot = 1000000 // requires 2 MW to fire a burst + charge_per_shot = 1000000 // requires 1 MW to fire a burst max_charge = 4000000 // Stores 1 burst base power_modifier_cap = 1 // PL cap of 2 static_charge = TRUE 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 1ff6f8ed1ba..d630cc28985 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm @@ -56,8 +56,8 @@ fire_mode = FIRE_MODE_BLUE_LASER energy_weapon_type = /datum/ship_weapon/phaser circuit = /obj/item/circuitboard/machine/phase_cannon - charge_rate = 800000 // 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 + charge_rate = 800000 // At power level 5, requires 3MW per tick to charge(this is wrong. but I don't have the proper numbers) + charge_per_shot = 4000000 // At power level 5, requires 20MW total to fire, takes about 12 seconds to gain 1 charge (ditto) max_charge = 8000000 // Store 2 charges power_modifier_cap = 5 //Allows you to do insanely powerful oneshot lasers. Maximum theoretical damage of 500. max_heat = 2000 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 94ec66cad00..f38e5b10b69 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm @@ -18,19 +18,7 @@ desc = "A cooling unit that dumps the massive amounts of heat energy weapons generate into subspace." circuit = /obj/item/circuitboard/machine/cooling -/obj/item/circuitboard/machine/cooling - name = "subspace cooling unit circuit board" - icon = 'icons/obj/module.dmi' - icon_state = "command" - materials = list(/datum/material/glass=1000) - w_class = WEIGHT_CLASS_SMALL - -/obj/item/circuitboard/machine/cooling/storage - name = "subspace heatsink unit circuit board" - icon = 'icons/obj/module.dmi' - icon_state = "command" - materials = list(/datum/material/glass=1000) - w_class = WEIGHT_CLASS_SMALL + /obj/machinery/cooling/cooler/Initialize(mapload) . = ..() diff --git a/nsv13/code/modules/research/designs/ship_weapon_designs.dm b/nsv13/code/modules/research/designs/ship_weapon_designs.dm index d6b8b6d2dce..1d9af9bfe4d 100644 --- a/nsv13/code/modules/research/designs/ship_weapon_designs.dm +++ b/nsv13/code/modules/research/designs/ship_weapon_designs.dm @@ -200,3 +200,25 @@ build_path = /obj/item/ship_weapon/ammunition/railgun_ammo/uranium category = list("Advanced Munitions") departmental_flags = DEPARTMENTAL_FLAG_MUNITIONS + + +//subspace cooling stuff +/datum/design/board/subspace_cooler + name = "Machine Design (Experemental Subspace Cooling Unit)" + desc = "Allows for the construction of a Subspace Cooling Unit." + id = "subspace_cooler" + build_type = PROTOLATHE|IMPRINTER + materials = list(/datum/material/glass = 2000, /datum/material/copper = 2000, /datum/material/gold = 5000) + build_path = /obj/item/circuitboard/machine/cooling + category = list("Advanced Munitions") + departmental_flags = DEPARTMENTAL_FLAG_MUNITIONS + +/datum/design/board/subspace_storage + name = "Machine Design (Experemental Subspace Storage Unit)" + desc = "Allows for the construction of a Subspace Storage Unit." + id = "subspace_storage" + build_type = PROTOLATHE|IMPRINTER + materials = list(/datum/material/glass = 2000, /datum/material/copper = 2000, /datum/material/gold = 5000) + build_path = /obj/item/circuitboard/machine/cooling/storage + category = list("Advanced Munitions") + departmental_flags = DEPARTMENTAL_FLAG_MUNITIONS diff --git a/nsv13/code/modules/research/techweb/all_nsv_nodes.dm b/nsv13/code/modules/research/techweb/all_nsv_nodes.dm index af5aabeaa06..420ba531d79 100644 --- a/nsv13/code/modules/research/techweb/all_nsv_nodes.dm +++ b/nsv13/code/modules/research/techweb/all_nsv_nodes.dm @@ -261,3 +261,15 @@ design_ids = list("borg_upgrade_muniapp") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) export_price = 5000 + +/// Munitions Upgrade for Energy Weapons +/datum/techweb_node/Weapon_Cooling + id = "Weapon_Cooling" + tech_tier = 4 + display_name = "Subspace Manipulation" + description = "Experemental uses of subspace for more than just communications" + prereq_ids = list("comptech" , "adv_engi" , "adv_power") + design_ids = list("subspace_storage" , "subspace_cooler") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000) + export_price = 5000 + hidden = FALSE //Todo, make this specific