From 005647d4f61f3e6e72a2158cf5ec6f35b4d712ab Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Wed, 22 May 2019 12:12:06 -0400
Subject: [PATCH 1/2] Update magweapon_energy.dm

---
 .../projectiles/guns/ballistic/magweapon_energy.dm        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm
index 8af0dc2013..634d60390b 100644
--- a/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm
+++ b/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm
@@ -53,7 +53,6 @@
 	ammo_type = /obj/item/ammo_casing/caseless/mag_e/amagm_e
 	max_ammo = 24
 
-
 /obj/item/ammo_box/magazine/mmag_e/small
 	name = "magpistol magazine (non-lethal disabler)"
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
@@ -73,12 +72,12 @@
 
 /obj/item/stock_parts/cell/magrifle_e
 	name = "magrifle power supply"
-	maxcharge = 14400
+	maxcharge = 21600
 	chargerate = 3520
 
 /obj/item/stock_parts/cell/magpistol_e
 	name = "magpistol power supply"
-	maxcharge = 6000
+	maxcharge = 9000
 	chargerate = 1000
 
 ///sci designs///
@@ -218,7 +217,6 @@
 	pin = null
 	spawnwithmagazine = FALSE
 
-
 ///magpistol///
 
 /obj/item/gun/ballistic/automatic/pistol/mag_e
@@ -278,7 +276,6 @@
 	if(!dead_cell)
 		cell.give(cell.maxcharge)
 
-
 /obj/item/gun/ballistic/automatic/pistol/mag_e/update_icon()
 	..()
 	if(magazine)
@@ -288,7 +285,6 @@
 		cut_overlays()
 	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
 
-
 /obj/item/gun/ballistic/automatic/pistol/mag_e/nopin
 	pin = null
 	spawnwithmagazine = FALSE

From 3bf667ba36d02d700900e5a76a995a250a7d1de9 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Wed, 22 May 2019 12:42:28 -0400
Subject: [PATCH 2/2] Update magweapon_energy.dm

---
 .../guns/ballistic/magweapon_energy.dm            | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm
index 634d60390b..8d08937f55 100644
--- a/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm
+++ b/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm
@@ -9,7 +9,7 @@
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "mag-casing-live"
 	projectile_type = /obj/item/projectile/bullet/magrifle
-	energy_cost = 300
+	energy_cost = 200
 
 /obj/item/ammo_casing/caseless/mag_e/anlmagm_e
 	desc = "A large, specialized ferromagnetic slug designed with a less-than-lethal payload."
@@ -17,7 +17,7 @@
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "mag-casing-live"
 	projectile_type = /obj/item/projectile/bullet/nlmagrifle
-	energy_cost = 300
+	energy_cost = 200
 
 /obj/item/ammo_casing/caseless/mag_e/amags
 	desc = "A ferromagnetic slug intended to be launched out of a compatible weapon."
@@ -25,7 +25,7 @@
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "mag-casing-live"
 	projectile_type = /obj/item/projectile/bullet/mags
-	energy_cost = 200
+	energy_cost = 125
 
 /obj/item/ammo_casing/caseless/mag_e/anlmags
 	desc = "A specialized ferromagnetic slug designed with a less-than-lethal payload."
@@ -33,7 +33,7 @@
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "mag-casing-live"
 	projectile_type = /obj/item/projectile/bullet/nlmags
-	energy_cost = 200
+	energy_cost = 125
 
 ///magazines///
 
@@ -59,7 +59,7 @@
 	icon_state = "nlmagmag"
 	ammo_type = /obj/item/ammo_casing/caseless/mag_e/anlmags
 	caliber = "mag_e"
-	max_ammo = 15
+	max_ammo = 16
 	multiple_sprites = 2
 
 /obj/item/ammo_box/magazine/mmag_e/small/lethal
@@ -67,17 +67,18 @@
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "smallmagmag"
 	ammo_type = /obj/item/ammo_casing/caseless/mag_e/amags
+	max_ammo = 16
 
 ///cells///
 
 /obj/item/stock_parts/cell/magrifle_e
 	name = "magrifle power supply"
-	maxcharge = 21600
+	maxcharge = 14400
 	chargerate = 3520
 
 /obj/item/stock_parts/cell/magpistol_e
 	name = "magpistol power supply"
-	maxcharge = 9000
+	maxcharge = 6000
 	chargerate = 1000
 
 ///sci designs///