Energy weapon gameplay enhancement

_maps/map_files/Aetherwhisp/job_changes.dm

@@ -1,19 +1,6 @@
 
 // If you continue to complain that munitechs have nothing to do, then I guess you really have nothing to do now don't you?
 // I'm replacing your job with bridge officers who are perfectly capable of pushing a button on lasers 
-// MAP_REMOVE_JOB(master_at_arms)
-MAP_REMOVE_JOB(munitions_tech)
-
-/datum/job/munitions_tech/New()
-	..()
-	MAP_JOB_CHECK
-	total_positions = 0
-	spawn_positions = 0
-
-/datum/job/master_at_arms/New()
-    ..()
-    MAP_JOB_CHECK
-    total_positions = 0
-    spawn_positions = 0
+// this file should be obsolete
 
 #undef JOB_MODIFICATION_MAP_NAME

nsv13.dme

@@ -3998,6 +3998,7 @@
 #include "nsv13\code\modules\munitions\ship_weapons\energy_weapons\laser_ams.dm"
 #include "nsv13\code\modules\munitions\ship_weapons\energy_weapons\laser_pd.dm"
 #include "nsv13\code\modules\munitions\ship_weapons\energy_weapons\phaser.dm"
+#include "nsv13\code\modules\munitions\ship_weapons\energy_weapons\subspacecooling.dm"
 #include "nsv13\code\modules\munitions\ship_weapons\hybrid_weapons\hybrid_railgun.dm"
 #include "nsv13\code\modules\overmap\ai-skynet.dm"
 #include "nsv13\code\modules\overmap\ai_interiors.dm"

nsv13/code/game/objects/items/nsv_circuitboards.dm

@@ -477,3 +477,29 @@
 	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"
+	materials = list(/datum/material/glass=1000, /datum/material/copper=15000)
+	build_path = /obj/machinery/cooling/cooler
+	req_components = list(
+		/obj/item/stack/cable_coil = 30,
+		/obj/item/stock_parts/matter_bin = 1,
+		/obj/item/stock_parts/capacitor = 4,
+		/obj/item/stock_parts/micro_laser = 4,
+		/obj/item/stock_parts/subspace/ansible = 1,
+		/obj/item/stock_parts/subspace/crystal =1)
+
+
+/obj/item/circuitboard/machine/cooling/storage
+	name = "subspace heatsink unit circuit board"
+	materials = list(/datum/material/glass=1000, /datum/material/copper=15000)
+	build_path = /obj/machinery/cooling/storage
+	req_components = list(
+		/obj/item/stack/cable_coil = 30,
+		/obj/item/stock_parts/matter_bin = 4,
+		/obj/item/stock_parts/capacitor = 2,
+		/obj/item/stock_parts/micro_laser = 2,
+		/obj/item/stock_parts/subspace/ansible = 1,
+		/obj/item/stock_parts/subspace/crystal =1)

nsv13/code/modules/munitions/ship_weapons/_ship_weapon.dm

@@ -47,6 +47,7 @@
 
 	var/malfunction_sound = 'sound/effects/alert.ogg'
 
+
 	//Various traits that probably won't change
 	var/maintainable = TRUE //Does the weapon require maintenance?
 	var/bang = TRUE //Is firing loud?
@@ -72,11 +73,7 @@
 	var/obj/item/ammo_box/magazine/magazine //Magazine if we have one
 	var/obj/chambered //Chambered round if we have one. Extrapolate ammo type from this
 	var/list/ammo = list() //All loaded ammo
-
-	// These variables only pertain to energy weapons, but need to be checked later in /proc/fire
-	var/charge = 0
-	var/charge_rate = 0 //How quickly do we charge?
-	var/charge_per_shot = 0 //How much power per shot do we have to use?
+	//energy weapon vars used to be here, they aren't anymore
 
 /**
  * Constructor for /obj/machinery/ship_weapon
@@ -521,6 +518,7 @@
 			local_fire()
 			overmap_fire(target)
 			charge -= charge_per_shot
+			heat += heat_per_shot
 			after_fire()
 			. = TRUE
 			if(shots > 1)

nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm

@@ -227,3 +227,10 @@
 		var/mob/living/goodbye = target
 		goodbye.dust(TRUE, FALSE)
 	explosion(get_turf(target), 6, 8, 9, 12, ignorecap = TRUE, flame_range = 6) //I have to keep myself from letting it just truncate ships because thats a bit annoying to fix for the receiving side, even if accurate to appearance.
+
+
+/obj/machinery/ship_weapon/energy/beam/bsa/after_fire()  //NT gets to cheat and have no degadation or heating on their weapon because muni has enough to do and the BSA doesn't need buffs/nerfs
+	. = ..()
+	heat = 0
+	alignment = 100
+	freq = 100

nsv13/code/modules/munitions/ship_weapons/energy_weapons/laser_ams.dm

@@ -14,9 +14,14 @@
 	idle_power_usage = 2500
 	active = FALSE
 	charge = 0
+	max_heat = 800
+	heat_per_shot = 200
+	heat_rate = 30
+	storage_rate = 50
+
 
 	// Hitscan antimissile laser, charges relatively quickly, but can't hold a decent buffer!
-	charge_rate = 1000000 // 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
 

nsv13/code/modules/munitions/ship_weapons/energy_weapons/laser_pd.dm

@@ -64,8 +64,8 @@
 	fire_mode = FIRE_MODE_LASER_PD
 	energy_weapon_type = /datum/ship_weapon/phaser_pd
 	charge = 0
-	charge_rate = 500000
-	charge_per_shot = 1000000 // requires 2 MW to fire a burst
+	charge_rate = 700000
+	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
@@ -76,6 +76,11 @@
 	var/gunning_component_type = /datum/component/overmap_gunning/laser_pd
 	var/mob/gunner = null
 	var/gun_id = 0 // Used for map linkage
+	max_heat = 1000
+	heat_per_shot = 80
+	heat_rate = 15
+	storage_rate = 100
+
 
 /obj/machinery/ship_weapon/energy/laser_pd/proc/start_gunning(mob/user)
 	if(gunner)