HERE WE GO AGAIN.

code/modules/power/cell.dm

@@ -201,7 +201,7 @@
 
 /obj/item/stock_parts/cell/lascarbine
 	name = "laser carbine power supply"
-	maxcharge = 2500
+	maxcharge = 1670			//20 laser shots.
 
 /obj/item/stock_parts/cell/pulse //200 pulse shots
 	name = "pulse rifle power cell"

code/modules/projectiles/gun.dm

@@ -63,6 +63,8 @@
 	var/zoom_out_amt = 0
 	var/datum/action/toggle_scope_zoom/azoom
 
+	var/dualwield_spread_mult = 1		//dualwield spread multiplier
+
 /obj/item/gun/Initialize()
 	. = ..()
 	if(pin)
@@ -184,7 +186,7 @@
 			if(G == src || G.weapon_weight >= WEAPON_MEDIUM)
 				continue
 			else if(G.can_trigger_gun(user))
-				bonus_spread += 24 * G.weapon_weight
+				bonus_spread += 24 * G.weapon_weight * G.dualwield_spread_mult
 				loop_counter++
 				addtimer(CALLBACK(G, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread), loop_counter)
 

modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm

@@ -57,10 +57,9 @@
 	icon_state = "magjectile-nl"
 	damage = 2
 	knockdown = 0
-	stamina = 25
-	armour_penetration = -10
+	stamina = 20
 	light_range = 2
-	speed = 0.7
+	speed = 0.6
 	range = 25
 	light_color = LIGHT_COLOR_BLUE
 
@@ -109,9 +108,9 @@
 	fire_sound = 'sound/weapons/magpistol.ogg'
 	mag_type = /obj/item/ammo_box/magazine/mmag/small
 	can_suppress = 0
-	casing_ejector = 0
+	casing_ejector = FALSE
 	fire_delay = 2
-	recoil = 0.2
+	recoil = 0.1
 
 /obj/item/gun/ballistic/automatic/pistol/mag/update_icon()
 	..()
@@ -123,7 +122,6 @@
 	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
 
 ///research memes///
-/*
 /obj/item/gun/ballistic/automatic/pistol/mag/nopin
 	pin = null
 	spawnwithmagazine = FALSE
@@ -155,7 +153,7 @@
 	materials = list(MAT_METAL = 3000, MAT_SILVER = 250, MAT_TITANIUM = 250)
 	build_path = /obj/item/ammo_box/magazine/mmag/small
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-*/
+
 //////toy memes/////
 
 /obj/item/projectile/bullet/reusable/foam_dart/mag
@@ -200,10 +198,10 @@
 /obj/item/projectile/bullet/magrifle
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magjectile-large"
-	damage = 20
-	armour_penetration = 25
+	damage = 17.5
+	armour_penetration = 20
 	light_range = 3
-	speed = 0.7
+	speed = 0.6
 	range = 35
 	light_color = LIGHT_COLOR_RED
 
@@ -212,10 +210,10 @@
 	icon_state = "magjectile-large-nl"
 	damage = 2
 	knockdown = 0
-	stamina = 25
-	armour_penetration = -10
+	stamina = 20
+	armour_penetration = 10
 	light_range = 3
-	speed = 0.65
+	speed = 0.6
 	range = 35
 	light_color = LIGHT_COLOR_BLUE
 
@@ -227,6 +225,8 @@
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "mag-casing-live"
 	projectile_type = /obj/item/projectile/bullet/magrifle
+	click_cd_override = 3
+	delay = 3
 
 /obj/item/ammo_casing/caseless/anlmagm
 	desc = "A large, specialized ferromagnetic slug designed with a less-than-lethal payload."
@@ -234,6 +234,8 @@
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "mag-casing-live"
 	projectile_type = /obj/item/projectile/bullet/nlmagrifle
+	click_cd_override = 3
+	delay = 3
 
 ///magazines///
 
@@ -261,17 +263,18 @@
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magrifle"
 	item_state = "arg"
-	slot_flags = 0
+	slot_flags = NONE
 	mag_type = /obj/item/ammo_box/magazine/mmag
 	fire_sound = 'sound/weapons/magrifle.ogg'
 	can_suppress = 0
-	burst_size = 3
-	fire_delay = 2
-	spread = 5
-	recoil = 0.15
-	casing_ejector = 0
+	burst_size = 1
+	fire_delay = 3
+	spread = 0
+	recoil = 0.1
+	casing_ejector = FALSE
+	weapon_weight = WEAPON_MEDIUM
+	dualwield_spread_mult = 1.4
 
-/*
 //research///
 
 /obj/item/gun/ballistic/automatic/magrifle/nopin
@@ -305,7 +308,7 @@
 	materials = list(MAT_METAL = 6000, MAT_SILVER = 500, MAT_TITANIUM = 500)
 	build_path = /obj/item/ammo_box/magazine/mmag
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-*/
+
 ///foamagrifle///
 
 /obj/item/ammo_box/magazine/toy/foamag
@@ -327,7 +330,6 @@
 	spread = 60
 	w_class = WEIGHT_CLASS_BULKY
 	weapon_weight = WEAPON_HEAVY
-/*
 // TECHWEBS IMPLEMENTATION
 //
 
@@ -339,7 +341,6 @@
 	design_ids = list("magrifle", "magpisol", "mag_magrifle", "mag_magrifle_nl", "mag_magpistol", "mag_magpistol_nl")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000
-*/
 
 //////Hyper-Burst Rifle//////
 

modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm

@@ -143,6 +143,7 @@
 // TECHWEBS IMPLEMENTATION
 */
 
+/*
 /datum/techweb_node/magnetic_weapons
 	id = "magnetic_weapons"
 	display_name = "Magnetic Weapons"
@@ -151,6 +152,7 @@
 	design_ids = list("magrifle_e", "magpistol_e", "mag_magrifle_e", "mag_magrifle_e_nl", "mag_magpistol_e", "mag_magpistol_e_nl")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000
+*/
 
 ///magrifle///
 

modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm

@@ -1,13 +1,6 @@
 /obj/item/gun/energy/e_gun
 	name = "blaster carbine"
 	desc = "A high powered particle blaster carbine with varitable setting for stunning or lethal applications."
-	icon = 'modular_citadel/icons/obj/guns/OVERRIDE_energy.dmi'
-	lefthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi'
-	righthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi'
-	ammo_x_offset = 2
-	flight_x_offset = 17
-	flight_y_offset = 11
-	
 
 /*/////////////////////////////////////////////////////////////////////////////////////////////
 							The Recolourable Energy Gun