Merge pull request #11449 from VOREStation/upstream-merge-8182

[MIRROR] New Shotguns/Rifles

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

@@ -1,7 +1,8 @@
 // For all intents and purposes, these work exactly the same as pump shotguns. It's unnecessary to make their own procs for them.
 
+////////Base Rifle////////
 /obj/item/weapon/gun/projectile/shotgun/pump/rifle
-	name = "bolt action rifle"
+	name = "bolt-action rifle"
 	desc = "The Hedberg-Hammarstrom Volsung is a modern interpretation of an almost ancient weapon design. The model is popular among hunters and collectors due to its reliability. Uses 7.62mm rounds."
 	description_fluff = "Sif’s largest home-grown firearms manufacturer, the Hedberg-Hammarstrom company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the Sivian wilderness - and its wildlife - in mind. \
 	The company operates just one production plant in Kalmar, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, precision, and stopping power."
@@ -14,20 +15,25 @@
 	ammo_type = /obj/item/ammo_casing/a762
 	load_method = SINGLE_CASING|SPEEDLOADER
 	action_sound = 'sound/weapons/riflebolt.ogg'
-	pump_animation = null
+	pump_animation = "boltaction-cycling"
 
-/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice //For target practice
+////////Practice Rifle////////
+/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice // For target practice
+	name = "practice bolt-action rifle"
+	icon_state = "boltaction_practice"
 	desc = "A bolt-action rifle with a lightweight synthetic wood stock, designed for competitive shooting. Comes shipped with practice rounds pre-loaded into the gun. Popular among professional marksmen. Uses 7.62mm rounds."
 	ammo_type = /obj/item/ammo_casing/a762/practice
+	pump_animation = "boltaction_practice-cycling"
 
+////////Ceremonial Rifle////////
 /obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial
 	name = "ceremonial bolt-action rifle"
 	desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. Clearly not intended to be used in combat. Uses 7.62mm rounds."
-	icon_state = "boltaction_c"
 	item_state = "boltaction_c"
+	icon_state = "ceremonial_rifle"
 	ammo_type = /obj/item/ammo_casing/a762/blank
+	pump_animation = "ceremonial_rifle-cycling"
 
-// Stole hacky terrible code from doublebarrel shotgun. -Spades
 /obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial/attackby(var/obj/item/A as obj, mob/user as mob)
 	if(istype(A, /obj/item/weapon/surgical/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter) && w_class != ITEMSIZE_NORMAL)
 		to_chat(user, "<span class='notice'>You begin to shorten the barrel and stock of \the [src].</span>")
@@ -37,7 +43,7 @@
 			user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>The rifle goes off in your face!</span>")
 			return
 		if(do_after(user, 30))
-			icon_state = "sawnrifle"
+			icon_state = "sawn_rifle"
 			w_class = ITEMSIZE_NORMAL
 			recoil = 2 // Owch
 			accuracy = -15 // You know damn well why.
@@ -46,11 +52,14 @@
 			slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
 			name = "sawn-off rifle"
 			desc = "The firepower of a rifle, now the size of a pistol, with an effective combat range of about three feet. Uses 7.62mm rounds."
+			pump_animation = "sawn_rifle-cycling"
 			to_chat(user, "<span class='warning'>You shorten the barrel and stock of \the [src]!</span>")
 	else
 		..()
 
 //Lever actions are the same thing, but bigger.
+
+////////Standard Lever Action Rifle////////
 /obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever
 	name = "lever-action rifle"
 	desc = "The Hedberg-Hammarstrom Edda is the latest version of an almost ancient weapon design from the 19th century, popular with some due to its simplistic design. This one uses a lever-action to move new rounds into the chamber. Uses 7.62mm rounds."
@@ -61,10 +70,12 @@
 	max_shells = 5
 	caliber = "7.62mm"
 	load_method = SINGLE_CASING
+	pump_animation = "leveraction-cycling"
 
+////////Vintage Lever Action Rifle////////
 /obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/vintage
 	name = "vintage repeater"
 	desc = "An iconic manually operated lever action rifle, offering adequate stopping power due to it's still powerful cartridge while at the same time having a rather respectable firing rate due to it's mechanism. It is very probable this is a replica instead of a museum piece, but rifles of this pattern still see usage as colonist guns in some far off regions. Uses 7.62mm rounds."
-	item_state = "levercarabine" // That isn't how carbine is spelled ya knob! :U
-	icon_state = "levercarabine"
-	pump_animation = "levercarabine-cycling"
+	item_state = "levercarbine"
+	icon_state = "levercarbine"
+	pump_animation = "levercarbine-cycling"

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

@@ -24,6 +24,8 @@
 		icon_state = "[initial(icon_state)]-e"
 
 //Bastard child of a revolver and a semi-auto rifle.
+
+//Standard Revolving Rifle
 /obj/item/weapon/gun/projectile/revolvingrifle
 	name = "revolving rifle"
 	desc = "The Gungnir is a novel, antique idea brought into the modern era by Hedberg-Hammarstrom. The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. Uses .44 magnum revolver rounds."
@@ -31,7 +33,7 @@
 	The company operates just one production plant in Kalmar, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, \
 	precision, and stopping power."
 	icon_state = "revolvingrifle"
-	item_state = "boltaction"
+	item_state = "rifle"
 	w_class = ITEMSIZE_LARGE
 	caliber = ".44"
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
@@ -41,8 +43,9 @@
 	max_shells = 6
 	ammo_type = /obj/item/ammo_casing/a44/rifle
 
-/obj/item/weapon/gun/projectile/revolvingrifle/update_icon()
-	if(ammo_magazine)
-		icon_state = initial(icon_state)
-	else
-		icon_state = "[initial(icon_state)]-e"
+//Vintage Revolving Rifle
+/obj/item/weapon/gun/projectile/revolvingrifle/vintage
+	name = "vintage revolving rifle"
+	desc = "The Willhem is the Gungir's older cousin by Hedberg-Hammarstrom, the perfect collector piece. The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. Uses .44 magnum revolver rounds."
+	icon_state = "vintagerevolvingrifle"
+