Small gun changes

_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm

@@ -797,7 +797,7 @@
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
 "Fn" = (
-/obj/item/gun/ballistic/automatic/smg/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
 	pixel_y = -18
 	},
 /obj/item/ammo_casing/spent{

_maps/shuttles/nanotrasen/nanotrasen_heron.dmm

@@ -3374,13 +3374,13 @@
 "mt" = (
 /obj/structure/window/reinforced/spawner,
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/smg/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
 	pixel_y = 3
 	},
-/obj/item/gun/ballistic/automatic/smg/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
 	pixel_y = -2
 	},
-/obj/item/gun/ballistic/automatic/smg/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
 	pixel_y = -7
 	},
 /turf/open/floor/plasteel/tech,

code/game/objects/structures/salvaging.dm

@@ -578,7 +578,7 @@
 /obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop
 	loot = list(
 			/obj/item/gun/energy/lasercannon = 1,
-			/obj/item/gun/ballistic/automatic/smg/proto = 1,
+			/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 1,
 			/obj/item/gun/energy/temperature/security = 1,
 		)
 /obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop

code/modules/cargo/blackmarket/blackmarket_items/weapons.dm

@@ -150,7 +150,7 @@
 /datum/blackmarket_item/weapon/saber_smg
 	name = "Saber 9mm SMG"
 	desc = "A prototype 9mm submachine gun. Most of these never got past the RND phase and into distribution. But we happen know a guy."
-	item = /obj/item/gun/ballistic/automatic/smg/proto
+	item = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto
 	pair_item = /datum/blackmarket_item/weapon/saber_mag
 
 	price_min = 2500

code/modules/projectiles/guns/ballistic/pistol.dm

@@ -234,15 +234,19 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
 	name = "\improper TEC-9 machine pistol"
 	desc = "A crude machine pistol designed to vomit 9mm ammunition at a truly eye-watering rate of fire."
 	icon_state = "tec9"
+	fire_delay = 0.15 SECONDS
 	weapon_weight = WEAPON_LIGHT
-	w_class = WEIGHT_CLASS_SMALL
+	w_class = WEIGHT_CLASS_NORMAL
 	mag_type = /obj/item/ammo_box/magazine/tec9
 	show_magazine_on_sprite = TRUE
 	load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
 	load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
 	eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
 	eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
 
+	gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
+	default_firemode = FIREMODE_SEMIAUTO
+
 /obj/item/gun/ballistic/automatic/pistol/disposable
 	name = "disposable gun"
 	desc = "An exceedingly flimsy plastic gun that is extremely cheap to produce. You get what you pay for."

code/modules/projectiles/guns/ballistic/shotgun.dm

@@ -146,14 +146,14 @@
 	item_state = "shotgun_combat"
 	fire_delay = 0.5 SECONDS
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/com
-	w_class = WEIGHT_CLASS_HUGE
+	w_class = WEIGHT_CLASS_BULKY
 
 /obj/item/gun/ballistic/shotgun/automatic/combat/compact
 	name = "compact combat shotgun"
 	desc = "A compact version of the semi-automatic combat shotgun. For close encounters."
 	icon_state = "cshotgunc"
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = WEIGHT_CLASS_NORMAL
 	weapon_weight = WEAPON_MEDIUM
 
 //Dual Feed Shotgun

code/modules/projectiles/guns/ballistic/smg.dm

@@ -39,17 +39,6 @@
 	. = total_spread
 	return ..()
 
-/obj/item/gun/ballistic/automatic/smg/proto
-	name = "\improper Nanotrasen Saber SMG"
-	desc = "A prototype full-auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock."
-	icon_state = "saber"
-	actions_types = list()
-	mag_type = /obj/item/ammo_box/magazine/smgm9mm
-
-	bolt_type = BOLT_TYPE_LOCKING
-	show_magazine_on_sprite = TRUE
-	manufacturer = MANUFACTURER_NANOTRASEN_OLD
-
 /obj/item/gun/ballistic/automatic/smg/c20r
 	name = "\improper C-20r SMG"
 	desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.'"
@@ -403,3 +392,20 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
 
 	unfolded_slowdown = 0.35
 	unfolded_wield_delay = 0.4 SECONDS
+
+
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/automatic_fire, 0.13 SECONDS)
+
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto
+	name = "\improper Nanotrasen Saber SMG"
+	desc = "A prototype full-auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock."
+	icon = 'icons/obj/guns/projectile.dmi'
+	icon_state = "saber"
+	item_state = "gun"
+	mag_type = /obj/item/ammo_box/magazine/smgm9mm
+	bolt_type = BOLT_TYPE_LOCKING
+	show_magazine_on_sprite = TRUE
+	manufacturer = MANUFACTURER_NANOTRASEN_OLD
+

code/modules/spells/spell_types/rightandwrong.dm

@@ -26,7 +26,7 @@ GLOBAL_LIST_INIT(summoned_guns, list(
 	/obj/item/gun/energy/lasercannon,
 	/obj/item/gun/energy/kinetic_accelerator/crossbow/large,
 	/obj/item/gun/energy/e_gun/nuclear,
-	/obj/item/gun/ballistic/automatic/smg/proto,
+	/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
 	/obj/item/gun/ballistic/automatic/smg/c20r,
 	/obj/item/gun/ballistic/automatic/hmg/l6_saw,
 	/obj/item/gun/ballistic/automatic/smg/m90,

code/modules/vending/liberation.dm

@@ -13,7 +13,7 @@
 		/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
 		/obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2,
 		/obj/item/gun/ballistic/automatic/pistol/candor = 2,
-		/obj/item/gun/ballistic/automatic/smg/proto = 2,
+		/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 2,
 		/obj/item/gun/ballistic/shotgun/automatic/combat = 2,
 		/obj/item/gun/ballistic/automatic/gyropistol = 1,
 		/obj/item/gun/ballistic/shotgun = 2)