manual check of all files

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

@@ -94,21 +94,6 @@
 /*
  * Alien Pistol
  */
-/obj/item/weapon/gun/energy/alien
-	name = "alien pistol"
-	desc = "A weapon that works very similarly to a traditional energy weapon. How this came to be will likely be a mystery for the ages."
-	catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_pistol)
-	icon_state = "alienpistol"
-	item_state = "alienpistol"
-	fire_delay = 9 //CHOMPedit changed cooldown from 10 to 9.
-	charge_cost = 380 // CHOMPedit changed from 480 to 380. Aka five shots to six shots.
-
-	projectile_type = /obj/item/projectile/beam/precursor //CHOMPedit changed beam type
-	cell_type = /obj/item/weapon/cell/device/weapon/recharge/alien // Self charges.
-	origin_tech = list(TECH_COMBAT = 8, TECH_MAGNET = 7)
-	modifystate = "alienpistol"
-	battery_lock = 1 //CHOMPedit adds battery lock.
-	move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
 
 /datum/category_item/catalogue/anomalous/precursor_a/alien_pistol
 	name = "Precursor Alpha Weapon - Appendageheld Laser"
@@ -378,6 +363,9 @@
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 1, TECH_MATERIAL = 4)
 
 	projectile_type = /obj/item/projectile/scatter/laser
+	w_class = ITEMSIZE_HUGE //CHOMP Edit.
+	slot_flags = SLOT_BELT|SLOT_BACK //CHOMP Edit because you can still holster it despite it not fitting in a backpack.
+
 
 /*
  * Imperial Pistol
@@ -481,18 +469,4 @@
 	charge_cost = 1200
 	force = 12
 	accuracy = 0
-	scoped_accuracy = 20
+	scoped_accuracy = 20
-
-// Laser scattergun, proof of concept.
-
-/obj/item/weapon/gun/energy/lasershotgun
-	name = "laser scattergun"
-	icon = 'icons/obj/energygun.dmi'
-	item_state = "laser"
-	icon_state = "scatter"
-	desc = "A strange Almachi weapon, utilizing a refracting prism to turn a single laser blast into a diverging cluster."
-	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 1, TECH_MATERIAL = 4)
-
-	projectile_type = /obj/item/projectile/scatter/laser
-	w_class = ITEMSIZE_HUGE //CHOMP Edit.
-	slot_flags = SLOT_BELT|SLOT_BACK //CHOMP Edit because you can still holster it despite it not fitting in a backpack.

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

@@ -1,3 +1,320 @@
+// ////////////////////////////////
+// /// used to be old energy_vr.dm
+// ////////////////////////////////
+
+// For general use
+/obj/item/weapon/gun/energy/imperial
+	name = "imperial energy pistol"
+	desc = "An elegant weapon developed by the Imperium Auream. Their weaponsmiths have cleverly found a way to make a gun that is only about the size of an average energy pistol, yet with the fire power of a laser carbine."
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_override = 'icons/obj/gun_vr.dmi'
+	icon_state = "ge_pistol"
+	item_state = "ge_pistol"
+	slot_flags = SLOT_BELT
+	w_class = ITEMSIZE_NORMAL
+	force = 10
+	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2)
+	matter = list(MAT_STEEL = 2000)
+	fire_sound = 'sound/weapons/mandalorian.ogg'
+	projectile_type = /obj/item/projectile/beam/imperial
+
+// Removed because gun64_vr.dmi guns don't work.
+/*
+//-----------------------G44 Energy Variant--------------------
+/obj/item/weapon/gun/energy/gun/burst/g44e
+	name = "G44 Energy Rifle"
+	desc = "The G44 Energy is a laser variant of the G44 lightweight assault rifle manufactured by the National Armory of Gaia. Though almost exclusively to the United Federation's Military Assault Command Operations Department (MACOs) and Starfleet, it is occassionally sold to security departments for their stun capabilities."
+	icon = 'icons/obj/gun64_vr.dmi'
+	icon_state = "g44estun100"
+	item_state = "energystun100" //This is temporary.
+	fire_sound = 'sound/weapons/Taser.ogg'
+	charge_cost = 100
+	force = 8
+	w_class = ITEMSIZE_LARGE
+	fire_delay = 6
+	pixel_x = -16
+
+	projectile_type = /obj/item/projectile/beam/stun/weak
+	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_ILLEGAL = 3)
+	modifystate = "g44estun"
+
+	one_handed_penalty = 60
+
+	firemodes = list(
+		list(mode_name="stun", burst=1, projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="g44estun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 100),
+		list(mode_name="stun burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="g44estun", fire_sound='sound/weapons/Taser.ogg'),
+		list(mode_name="lethal", burst=1, projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="g44ekill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 200),
+		list(mode_name="lethal burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="g44ekill", fire_sound='sound/weapons/Laser.ogg'),
+		)
+*/
+
+//////////////////// Energy Weapons ////////////////////
+
+// ------------ Energy Luger ------------
+//MOVED TO nuclear.dm
+
+//////////////////// Eris Ported Guns ////////////////////
+//HoP gun
+/obj/item/weapon/gun/energy/gun/martin
+	name = "holdout energy gun"
+	desc = "The FS PDW E \"Martin\" is small holdout e-gun. Don't miss!"
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "PDW"
+	item_state = "gun"
+	w_class = ITEMSIZE_SMALL
+	projectile_type = /obj/item/projectile/beam/stun
+	charge_cost = 1200
+	charge_meter = 0
+	modifystate = null
+	battery_lock = 1
+	fire_sound = 'sound/weapons/Taser.ogg'
+	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
+	firemodes = list(
+		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg', charge_cost = 600),
+		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg', charge_cost = 1200),
+		)
+
+/obj/item/weapon/gun/energy/gun/martin/proc/update_mode()
+	var/datum/firemode/current_mode = firemodes[sel_mode]
+	switch(current_mode.name)
+		if("stun") add_overlay("taser_pdw")
+		if("lethal") add_overlay("lazer_pdw")
+
+/obj/item/weapon/gun/energy/gun/martin/update_icon()
+	cut_overlays()
+	update_mode()
+
+//Gun Locking Mechanism
+/obj/item/weapon/gun/energy/locked
+	req_access = list(access_armory) //for toggling safety
+	var/locked = 1
+	var/lockable = 1
+
+/obj/item/weapon/gun/energy/locked/attackby(obj/item/I, mob/user)
+	var/obj/item/weapon/card/id/id = I.GetID()
+	if(istype(id) && lockable)
+		if(check_access(id))
+			locked = !locked
+			to_chat(user, "<span class='warning'>You [locked ? "enable" : "disable"] the safety lock on \the [src].</span>")
+		else
+			to_chat(user, "<span class='warning'>Access denied.</span>")
+		user.visible_message("<span class='notice'>[user] swipes \the [I] against \the [src].</span>")
+	else
+		return ..()
+
+/obj/item/weapon/gun/energy/locked/emag_act(var/remaining_charges,var/mob/user)
+	..()
+	if(lockable)
+		locked = !locked
+		to_chat(user, "<span class='warning'>You [locked ? "enable" : "disable"] the safety lock on \the [src]!</span>")
+
+/obj/item/weapon/gun/energy/locked/special_check(mob/user)
+	if(locked)
+		var/turf/T = get_turf(src)
+		if(T.z in using_map.station_levels)
+			to_chat(user, "<span class='warning'>The safety device prevents the gun from firing this close to the facility.</span>")
+			return 0
+	return ..()
+
+////////////////Expedition Frontier Phaser////////////////
+
+/obj/item/weapon/gun/energy/locked/frontier
+	name = "frontier phaser"
+	desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
+	description_fluff = "The NT Brand Model E2 Secured Phaser System, a specialty phaser that has an intergrated chip that prevents the user from opperating the weapon within the vicinity of any NanoTrasen opperated outposts/stations/bases. However, this chip can be disabled so the weapon CAN BE used in the vicinity of any NanoTrasen opperated outposts/stations/bases. The weapon doesn't use traditional weapon power cells and instead works via a pump action that recharges the internal cells. It is a staple amongst exploration personell who usually don't have the license to opperate a lethal weapon through NT and provides them with a weapon that can be recharged away from civilization."
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "phaserkill"
+	item_state = "phaser"
+	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob_vr.dmi')
+	fire_sound = 'sound/weapons/laser2.ogg'
+	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_POWER = 4)
+	charge_cost = 300
+
+	battery_lock = 1
+	unacidable = TRUE
+
+	var/recharging = 0
+	var/phase_power = 75
+
+	projectile_type = /obj/item/projectile/beam/phaser
+	//CHOMP Edit: Changed beam type to new phaser beam type.
+	firemodes = list(
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, charge_cost = 300),
+		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, charge_cost = 80),
+	)
+	recoil_mode = 0 //CHOMP Addition: Removes recoil for micros.
+
+/obj/item/weapon/gun/energy/locked/frontier/unload_ammo(var/mob/user)
+	if(recharging)
+		return
+	recharging = 1
+	update_icon()
+	user.visible_message("<span class='notice'>[user] opens \the [src] and starts pumping the handle.</span>", \
+						"<span class='notice'>You open \the [src] and start pumping the handle.</span>")
+	while(recharging)
+		if(!do_after(user, 10, src))
+			break
+		playsound(src,'sound/items/change_drill.ogg',25,1)
+		user.hud_used.update_ammo_hud(user, src)
+		if(power_supply.give(phase_power/8) < phase_power/8) //CHOMP Edit: Nerfed charge time of all phasers by adding /8 in a couple spots to this line
+			break
+
+	recharging = 0
+	update_icon()
+	user.hud_used.update_ammo_hud(user, src) // Update one last time once we're finished!
+
+/obj/item/weapon/gun/energy/locked/frontier/update_icon()
+	if(recharging)
+		icon_state = "[initial(icon_state)]_pump"
+		update_held_icon()
+		return
+	..()
+
+/obj/item/weapon/gun/energy/locked/frontier/emp_act(severity)
+	return ..(severity+2)
+
+/obj/item/weapon/gun/energy/locked/frontier/ex_act() //|rugged|
+	return
+
+/obj/item/weapon/gun/energy/locked/frontier/unlocked
+	desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a built-in crank charger for recharging away from civilization."
+	req_access = newlist() //for toggling safety
+	locked = 0
+	lockable = 0
+
+////////////////Phaser Carbine////////////////
+
+/obj/item/weapon/gun/energy/locked/frontier/carbine
+	name = "frontier carbine"
+	desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
+	description_fluff = "The NT Brand Model AT2 Secured Phaser System, a specialty phaser that has an intergrated chip that prevents the user from opperating the weapon within the vicinity of any NanoTrasen opperated outposts/stations/bases. However, this chip can be disabled so the weapon CAN BE used in the vicinity of any NanoTrasen opperated outposts/stations/bases. The weapon doesn't use traditional weapon power cells and instead works via a pump action that recharges the internal cells. It is a staple amongst exploration personell who usually don't have the license to opperate a lethal weapon through NT and provides them with a weapon that can be recharged away from civilization."
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "carbinekill"
+	item_state = "energykill"
+	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
+	phase_power = 150
+
+	modifystate = "carbinekill"
+	//CHOMP Edit: Changed beam type to new phaser beam type.
+	firemodes = list(
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="carbinekill", charge_cost = 300),
+		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="carbinestun", charge_cost = 80),
+	)
+
+/obj/item/weapon/gun/energy/locked/frontier/carbine/update_icon()
+	if(recharging)
+		icon_state = "[modifystate]_pump"
+		update_held_icon()
+		return
+	..()
+
+/obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked
+	desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization."
+	req_access = newlist() //for toggling safety
+	locked = 0
+	lockable = 0
+
+////////////////Expeditionary Holdout Phaser Pistol////////////////
+
+/obj/item/weapon/gun/energy/locked/frontier/holdout
+	name = "holdout frontier phaser"
+	desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "holdoutkill"
+	item_state = null
+	phase_power = 100
+
+	w_class = ITEMSIZE_SMALL
+	charge_cost = 600
+	modifystate = "holdoutkill"
+	//CHOMP Edit: Changed beam type to new phaser beam type.
+	firemodes = list(
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="holdoutkill", charge_cost = 600),
+		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="holdoutstun", charge_cost = 120),
+		list(mode_name="stun", fire_delay=12, projectile_type=/obj/item/projectile/beam/stun/med, modifystate="holdoutshock", charge_cost = 300),
+	)
+
+/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked
+	desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for recharging away from civilization."
+	req_access = newlist() //for toggling safety
+	locked = 0
+	lockable = 0
+
+////////////////Phaser Rifle////////////////
+
+/obj/item/weapon/gun/energy/locked/frontier/rifle
+	name = "frontier marksman rifle"
+	desc = "A much larger, heavier weapon than the typical frontier-type weapons, this DMR can be fired both from the hip, and in scope. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "riflekill"
+	item_state = "sniper"
+	item_state_slots = list(slot_r_hand_str = "lsniper", slot_l_hand_str = "lsniper")
+	wielded_item_state = "lsniper-wielded"
+	action_button_name = "Use Scope"
+	w_class = ITEMSIZE_LARGE
+	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
+	accuracy = -15 //better than most snipers but still has penalty
+	scoped_accuracy = 40
+	one_handed_penalty = 50 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
+	phase_power = 150 //efficient crank charger
+	projectile_type = /obj/item/projectile/beam/phaser/heavy //CHOMPEdit
+	modifystate = "riflekill"
+	//CHOMP Edit: Changed beam type to new phaser beam type.
+	firemodes = list(
+		list(mode_name="sniper", fire_delay=35, projectile_type=/obj/item/projectile/beam/phaser/heavy, modifystate="riflekill", charge_cost = 600),
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="riflestun", charge_cost = 200),
+	)
+
+/obj/item/weapon/gun/energy/locked/frontier/rifle/ui_action_click()
+	scope()
+
+/obj/item/weapon/gun/energy/locked/frontier/rifle/verb/scope()
+	set category = "Object"
+	set name = "Use Scope"
+	set popup_menu = 1
+
+	toggle_scope(2.0)
+
+/obj/item/weapon/gun/energy/locked/frontier/rifle/update_icon()
+	if(recharging)
+		icon_state = "[modifystate]_pump"
+		update_held_icon()
+		return
+	..()
+
+/obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked
+	desc = "A much larger, heavier weapon than the typical frontier-type weapons, this DMR can be fired both from the hip, and in scope. Includes a built-in crank charger for recharging away from civilization."
+	req_access = newlist() //for toggling safety
+	locked = 0
+	lockable = 0
+
+///phaser bow///
+
+/obj/item/weapon/gun/energy/locked/frontier/handbow
+	name = "phaser handbow"
+	desc = "An minaturized weapon that fires a bolt of energy. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "handbowkill"
+	item_state = null
+	phase_power = 100
+
+	w_class = ITEMSIZE_SMALL
+	charge_cost = 600
+	modifystate = "handbowkill"
+	firemodes = list(
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/energy/phase/bolt/heavy, modifystate="handbowkill", charge_cost = 600), //CHOMP Edit
+		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/energy/phase/bolt, modifystate="handbowstun", charge_cost = 200), //CHOMP Edit
+	)
+
+/obj/item/weapon/gun/energy/locked/frontier/handbow/unlocked
+	desc = "An minaturized weapon that fires a bolt of engery. Includes a built-in crank charger for recharging away from civilization."
+	req_access = newlist() //for toggling safety
+	locked = 0
+	lockable = 0
+
+// ////////////////////////////////
+// /// End of old energy_vr.dm
+// ////////////////////////////////
 /obj/item/weapon/gun/energy/laser
 	icon = 'icons/obj/64x32guns_ch.dmi'
 	icon_state = "lcarbine"

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

@@ -165,4 +165,4 @@
 	firemodes = list(
 		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="nucgunstun", charge_cost = 240),
 		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="nucgunkill", charge_cost = 480),
-		)
+		)

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

@@ -82,4 +82,4 @@
 		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_delay=null, charge_cost = 240),
 		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, fire_delay=null, charge_cost = 240),
 		list(mode_name="DESTROY", projectile_type=/obj/item/projectile/beam/pulse, fire_delay=null, charge_cost = 480),
-		)
+		)

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

@@ -36,6 +36,7 @@
 	if(lockable)
 		locked = !locked
 		to_chat(user, "<span class='warning'>You [locked ? "enable" : "disable"] the safety lock on \the [src]!</span>")
+		return 1
 
 /obj/item/weapon/gun/energy/locked/special_check(mob/user)
 	if(locked)
@@ -158,32 +159,6 @@
 	locked = 0
 	lockable = 0
 
-////////////////Expeditionary Holdout Phaser Pistol////////////////
-
-/obj/item/weapon/gun/energy/locked/frontier/holdout
-	name = "holdout frontier phaser"
-	desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
-	icon = 'icons/obj/gun_vr.dmi'
-	icon_state = "holdoutkill"
-	item_state = null
-	phase_power = 100
-
-	w_class = ITEMSIZE_SMALL
-	charge_cost = 600
-	modifystate = "holdoutkill"
-	//CHOMP Edit: Changed beam type to new phaser beam type.
-	firemodes = list(
-		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="holdoutkill", charge_cost = 600),
-		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="holdoutstun", charge_cost = 120),
-		list(mode_name="stun", fire_delay=12, projectile_type=/obj/item/projectile/beam/stun/med, modifystate="holdoutshock", charge_cost = 300),
-	)
-
-/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked
-	desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for recharging away from civilization."
-	req_access = newlist() //for toggling safety
-	locked = 0
-	lockable = 0
-
 /*
  * Expedition Frontier Rifle
  */
@@ -289,7 +264,7 @@
 	)
 
 /obj/item/weapon/gun/energy/locked/frontier/handbow/unlocked
-	desc = "An minaturized weapon that fires a bolt of engery. Includes a built-in crank charger for recharging away from civilization."
+	desc = "An minaturized weapon that fires a bolt of energy. Includes a built-in crank charger for recharging away from civilization."
 	req_access = newlist() //for toggling safety
 	locked = 0
-	lockable = 0
+	lockable = 0

code/modules/projectiles/guns/projectile/automatic.dm

@@ -54,8 +54,8 @@
 	name = "submachine gun"
 	desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. It has 'Scarborough Arms - Per falcis, per pravitas', inscribed on the stock. Uses 10mm rounds."
 	description_fluff = "The C-20r is produced by Scarborough Arms, a specialist high-end weapons manufacturer based out of Titan, Sol. Scarborough has resisted numerous efforts by Trans-Stellars to acquire the brand since its founding in 2511, and has gained a dedicated following among a certain flavor of private operative."
-	icon = 'icons/obj/64x32guns_ch.dmi'
+	icon = 'icons/obj/64x32guns_ch.dmi' //Chomp Edit
-	icon_expected_width = 64
+	icon_expected_width = 64 //Chomp EDIT
 	icon_state = "c20r"
 	item_state = "c20r"
 	w_class = ITEMSIZE_NORMAL
@@ -159,8 +159,8 @@
 /obj/item/weapon/gun/projectile/automatic/wt550
 	name = "machine pistol"
 	desc = "The WT550 Saber is a cheap self-defense weapon mass-produced by Ward-Takahashi for paramilitary and private use. Uses 9mm rounds."
-	icon = 'icons/obj/64x32guns_ch.dmi'
+	icon = 'icons/obj/64x32guns_ch.dmi' //Chomp EDIT
-	icon_expected_width = 64
+	icon_expected_width = 64 //Chomp EDIT
 	icon_state = "wt550"
 	item_state = "wt550"
 	w_class = ITEMSIZE_NORMAL
@@ -192,8 +192,8 @@
 	description_fluff = "Zendai Foundries was a well-respected mid-sized arms company that operated until 2508, when it was acquired by Hephaestus Industries. \
 	Plans to integrate the brand into wider corporate operations were brought to an abrupt halt by the SolGov-Hegemony war, and the company was left by the wayside. \
 	Hephaestus still produces replacement parts for many of Zendai's most popular weapons, including the Z8 Bulldog, and a great detail remain in service."
-	icon = 'icons/obj/64x32guns_ch.dmi'
+	icon = 'icons/obj/64x32guns_ch.dmi' //Chomp EDIT
-	icon_expected_width = 64
+	icon_expected_width = 64 //Chomp EDIT
 	icon_state = "carbine" // This isn't a carbine. :T
 	item_state = "z8carbine"
 	wielded_item_state = "z8bulldog-wielded"
@@ -271,8 +271,8 @@
 	name = "light machine gun"
 	desc = "A rather sturdily made L6 SAW with a reassuringly ergonomic pistol grip. 'Hephaestus Industries' is engraved on the receiver. Uses 5.45mm rounds. It's also compatible with magazines from STS-35 assault rifles."
 	description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade equipment used by professional armed forces across human space."
-	icon = 'icons/obj/64x32guns_ch.dmi'
+	icon = 'icons/obj/64x32guns_ch.dmi' //Chomp EDIT
-	icon_expected_width = 64
+	icon_expected_width = 64 //Chomp EDIT
 	icon_state = "l6closed100"
 	item_state = "l6closed"
 	wielded_item_state = "genericLMG-wielded"
@@ -389,9 +389,9 @@
 	description_fluff = "Budget-grade weapons for the budget-grade consumer! Hephaestus’ low-end brand of cheaply made, low-maintenance personal defense weapons for those who just need a handgun with absolutely no frills. \
 	Early ProTek weapons were notoriously unsafe and unreliable, though more recent designs have improved somewhat - they still aren’t very good. \
 	Though sold for a pittance, the profit margin is too irresistible for Hephaestus to discontinue the brand."
-	icon = 'icons/obj/64x32guns_ch.dmi'
+	icon = 'icons/obj/64x32guns_ch.dmi' //Chomp EDIT
-	icon_expected_width = 64
+	icon_expected_width = 64 //Chomp EDIT
-	icon_state = "mini-uzi"
+	icon_state = "mini-uzi" //Chomp EDIT - uzi --> mini-uzi
 	w_class = ITEMSIZE_NORMAL
 	load_method = MAGAZINE
 	caliber = ".45"

code/modules/projectiles/guns/projectile/automatic_vr.dm

@@ -145,4 +145,4 @@
 
 /obj/item/ammo_magazine/m9mml/ap
 	name = "\improper SMG magazine (9mm armor-piercing)"
-	ammo_type = /obj/item/ammo_casing/a9mm/ap
+	ammo_type = /obj/item/ammo_casing/a9mm/ap