PulseRifleVarients+ArmouryRooms+FixesAndRefinements

code/game/machinery/suit_storage_unit.dm

@@ -81,6 +81,12 @@
 	MASK_TYPE = /obj/item/clothing/mask/gas/syndicate
 	STORAGE_TYPE = /obj/item/weapon/tank/jetpack/oxygen/harness
 
+/obj/machinery/suit_storage_unit/ertCom
+	SUIT_TYPE = /obj/item/clothing/suit/space/ert
+	HELMET_TYPE = /obj/item/clothing/head/helmet/space/ert
+	MASK_TYPE = /obj/item/clothing/mask/breath
+	STORAGE_TYPE = /obj/item/weapon/tank/oxygen
+
 /obj/machinery/suit_storage_unit/ertSec
 	SUIT_TYPE = /obj/item/clothing/suit/space/ert/sec
 	HELMET_TYPE = /obj/item/clothing/head/helmet/space/ert/sec

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -6,7 +6,8 @@
 	icon_opened = "syndicateopen"
 
 /obj/structure/closet/syndicate/ertSec/New()
-	new /obj/item/weapon/gun/energy/gun/militarypistol(src)
+	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
+	new /obj/item/device/radio/headset/headset_com(src)
 	new /obj/item/weapon/card/id/ertsSecurity(src)
 	new /obj/item/clothing/shoes/combat/swat(src)
 	new /obj/item/clothing/under/rank/centcom_officer(src)
@@ -15,7 +16,8 @@
 	return
 
 /obj/structure/closet/syndicate/ertMed/New()
-	new /obj/item/weapon/gun/energy/gun/militarypistol(src)
+	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
+	new /obj/item/device/radio/headset/headset_com(src)
 	new /obj/item/weapon/card/id/ertsMedical(src)
 	new /obj/item/clothing/shoes/combat/swat(src)
 	new /obj/item/clothing/under/rank/centcom_officer(src)
@@ -24,7 +26,8 @@
 	return
 
 /obj/structure/closet/syndicate/ertEngi/New()
-	new /obj/item/weapon/gun/energy/gun/militarypistol(src)
+	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
+	new /obj/item/device/radio/headset/headset_com(src)
 	new /obj/item/weapon/card/id/ertsEngineer(src)
 	new /obj/item/clothing/shoes/combat/swat(src)
 	new /obj/item/clothing/under/rank/centcom_officer(src)

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -116,7 +116,7 @@
 	strip_delay = 40
 	put_on_delay = 20
 
-/obj/item/clothing/head/helmet/space/ert/com
+/obj/item/clothing/head/helmet/space/ert
 	name = "emergency response unit helmet"
 	desc = "Standard issue command helmet for the ERT"
 	icon_state = "ert_command_helmet"
@@ -125,30 +125,21 @@
 	strip_delay = 130
 
 /obj/item/clothing/head/helmet/space/ert/sec
-	name = "emergency response unit helmet"
 	desc = "Standard issue security helmet for the ERT"
 	icon_state = "ert_security_helmet"
 	item_state = "ert_security_helmet"
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
-	strip_delay = 130
 
 /obj/item/clothing/head/helmet/space/ert/engi
-	name = "emergency response unit helmet"
 	desc = "Standard issue engineer helmet for the ERT"
 	icon_state = "ert_engineer_helmet"
 	item_state = "ert_engineer_helmet"
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
-	strip_delay = 130
 
 /obj/item/clothing/head/helmet/space/ert/med
-	name = "emergency response unit helmet"
 	desc = "Standard issue medical helmet for the ERT"
 	icon_state = "ert_medical_helmet"
 	item_state = "ert_medical_helmet"
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
-	strip_delay = 130
 
-/obj/item/clothing/suit/space/ert/com
+/obj/item/clothing/suit/space/ert
 	name = "emergency response team suit"
 	desc = "Standard issue command suit for the ERT."
 	icon_state = "ert_command"
@@ -159,31 +150,16 @@
 	strip_delay = 130
 
 /obj/item/clothing/suit/space/ert/sec
-	name = "emergency response team suit"
 	desc = "Standard issue security suit for the ERT."
 	icon_state = "ert_security"
 	item_state = "ert_security"
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
-	slowdown = 1
-	strip_delay = 130
 
 /obj/item/clothing/suit/space/ert/engi
-	name = "emergency response team suit"
 	desc = "Standard issue engineer suit for the ERT."
 	icon_state = "ert_engineer"
 	item_state = "ert_engineer"
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
-	slowdown = 1
-	strip_delay = 130
 
 /obj/item/clothing/suit/space/ert/med
-	name = "emergency response team suit"
 	desc = "Standard issue medical suit for the ERT."
 	icon_state = "ert_medical"
-	item_state = "ert_medical"
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
-	slowdown = 1
-	strip_delay = 130
+	item_state = "ert_medical"

code/modules/projectiles/ammunition/energy.dm

@@ -17,17 +17,6 @@
 	e_cost = 83
 	select_name = "kill"
 
-/obj/item/ammo_casing/energy/militarykill
-	projectile_type = /obj/item/projectile/beam
-	e_cost = 33
-	select_name = "kill"
-
-/obj/item/ammo_casing/energy/electrode/militarystun
-	projectile_type = /obj/item/projectile/energy/electrode
-	e_cost = 33
-	select_name = "stun"
-	fire_sound = 'sound/weapons/taser.ogg'
-
 /obj/item/ammo_casing/energy/laser/practice
 	projectile_type = /obj/item/projectile/practice
 	select_name = "practice"
@@ -49,6 +38,24 @@
 	select_name = "DESTROY"
 	fire_sound = 'sound/weapons/pulse.ogg'
 
+/obj/item/ammo_casing/energy/laser/pulse/carbine
+	e_cost = 1000
+
+/obj/item/ammo_casing/energy/laser/carbine
+	e_cost = 1000
+
+/obj/item/ammo_casing/energy/electrode/carbine
+	e_cost = 1000
+
+/obj/item/ammo_casing/energy/laser/pulse/pistol
+	e_cost = 2000
+
+/obj/item/ammo_casing/energy/laser/pistol
+	e_cost = 1000
+
+/obj/item/ammo_casing/energy/electrode/pistol
+	e_cost = 1000
+
 /obj/item/ammo_casing/energy/laser/bluetag
 	projectile_type = /obj/item/projectile/lasertag/bluetag
 	select_name = "bluetag"

code/modules/projectiles/guns/energy/nuclear.dm

@@ -7,21 +7,6 @@
 	origin_tech = "combat=3;magnets=2"
 	modifystate = 2
 
-/obj/item/weapon/gun/energy/gun/militarypistol
-	name = "energy pistol"
-	desc = "A military grade sidearm."
-	icon_state = "energypistol"
-	item_state = "laser"
-	w_class = 3.0
-	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
-
-/obj/item/weapon/gun/energy/gun/militaryegun
-	name = "assault energy gun"
-	desc = "A military grade energy gun."
-	icon_state = "militarygun"
-	item_state = "laser"
-	ammo_type = list(/obj/item/ammo_casing/energy/electrode/militarystun, /obj/item/ammo_casing/energy/militarykill)
-
 /obj/item/weapon/gun/energy/gun/attack_self(mob/living/user as mob)
 	select_fire(user)
 	update_icon()

code/modules/projectiles/guns/energy/pulse.dm

@@ -10,10 +10,23 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
 	cell_type = "/obj/item/weapon/stock_parts/cell/super"
 
-
 /obj/item/weapon/gun/energy/pulse_rifle/attack_self(mob/living/user as mob)
 	select_fire(user)
 
+/obj/item/weapon/gun/energy/pulse_rifle/pulse_carbine
+	name = "pulse carbine"
+	desc = "A ligther weight varient of the pulse rifle, a multifaceted energy carbine with three modes."
+	icon_state = "pulse_carbine"
+	item_state = "pulse"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse/carbine, /obj/item/ammo_casing/energy/electrode/carbine, /obj/item/ammo_casing/energy/laser/carbine)
+
+/obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol
+	name = "pulse carbine"
+	desc = "A ligther weight varient of the pulse rifle, a multifaceted energy pistol with three modes."
+	icon_state = "pulse_pistol"
+	item_state = "pulse"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse/pistol, /obj/item/ammo_casing/energy/electrode/pistol, /obj/item/ammo_casing/energy/laser/pistol)
+
 /obj/item/weapon/gun/energy/pulse_rifle/destroyer
 	name = "pulse destroyer"
 	desc = "A heavy-duty energy rifle built for pure destruction."
@@ -23,12 +36,8 @@
 /obj/item/weapon/gun/energy/pulse_rifle/destroyer/attack_self(mob/living/user as mob)
 	user << "<span class='danger'>[src.name] has three settings, and they are all DESTROY.</span>"
 
-
-
 /obj/item/weapon/gun/energy/pulse_rifle/M1911
 	name = "m1911-P"
 	desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people."
 	icon_state = "m1911-p"
-	cell_type = "/obj/item/weapon/stock_parts/cell/infinite"
-
-
+	cell_type = "/obj/item/weapon/stock_parts/cell/infinite"