Fixeki 2

code/datums/jobs/job/shipside.dm

@@ -89,8 +89,8 @@ Godspeed, captain! And remember, you are not above the law."})
 	glasses = /obj/item/clothing/glasses/sunglasses/aviator/yellow
 	head = null
 	back = FALSE
-	l_hand = /obj/item/weapon/gun/shotgun/double/musket
-	r_hand = /obj/item/ammo_magazine/rifle/musket
+	r_hand = /obj/item/weapon/gun/shotgun/double/musket
+	l_hand = /obj/item/ammo_magazine/packet/musket
 
 //Field Commander
 /datum/job/terragov/command/fieldcommander
@@ -236,8 +236,8 @@ You are in charge of logistics and the overwatch system. You are also in line to
 	head = null
 	w_uniform = /obj/item/clothing/under/marine/whites/blacks
 	shoes = /obj/item/clothing/shoes/laceup
-	l_hand = /obj/item/weapon/gun/shotgun/double/musketoon
-	r_hand = /obj/item/ammo_magazine/rifle/musket/small
+	r_hand = /obj/item/weapon/gun/shotgun/double/musketoon
+	l_hand = /obj/item/ammo_magazine/packet/musket/small
 
 //Transport Officer
 /datum/job/terragov/command/transportofficer

code/modules/projectiles/ammo_datums/bullet/sniper.dm

@@ -141,8 +141,8 @@
 	name = "musket lead bullet"
 	icon_state = "musket"
 	handful_icon_state = "musket"
-	hud_state = "pepperball"
-	hud_state_empty = "pepperball_empty"
+	hud_state = "musket_ball"
+	hud_state_empty = "musket_ball_empty"
 	handful_amount = 3
 	flags_ammo_behavior = AMMO_BALLISTIC
 	damage = 220

code/modules/projectiles/gun_system.dm

@@ -464,7 +464,7 @@
 		COMSIG_HUMAN_MARKSMAN_AURA_CHANGED))
 		gun_user.client?.mouse_pointer_icon = initial(gun_user.client.mouse_pointer_icon)
 		SEND_SIGNAL(gun_user, COMSIG_GUN_USER_UNSET)
-		gun_user.hud_used.remove_ammo_hud(src)
+		gun_user.hud_used?.remove_ammo_hud(src)
 		gun_user = null
 
 	if(!user)
@@ -475,7 +475,7 @@
 	gun_user = user
 	SEND_SIGNAL(gun_user, COMSIG_GUN_USER_SET, src)
 	if(flags_gun_features & GUN_AMMO_COUNTER)
-		gun_user.hud_used.add_ammo_hud(src, get_ammo_list(), get_display_ammo_count())
+		gun_user.hud_used?.add_ammo_hud(src, get_ammo_list(), get_display_ammo_count())
 	if(master_gun)
 		return
 	setup_bullet_accuracy()

code/modules/projectiles/guns/shotguns.dm

@@ -507,13 +507,11 @@
 	name = "\improper Croweson musket"
 	desc = "A breech-loading rifle with room for a single round of 19mm ball."
 	icon = 'icons/Marine/gun64.dmi'
-	//flags_equip_slot = ITEM_SLOT_BACK
 	icon_state = "musket"
 	item_state = "musket"
 	inhand_x_dimension = 64
 	inhand_y_dimension = 32
 	item_icons = list(
-		slot_back_str = 'icons/mob/clothing/back.dmi',
 		slot_l_hand_str = 'icons/mob/items_lefthand_64.dmi',
 		slot_r_hand_str = 'icons/mob/items_righthand_64.dmi',
 	)

code/modules/projectiles/magazines/misc.dm

@@ -400,3 +400,23 @@
 	caliber = CALIBER_10X27_CASELESS
 	current_rounds = 200
 	max_rounds = 200
+
+/obj/item/ammo_magazine/packet/musket
+	name = "sack of musket lead rounds"
+	desc = "A sack filled with lead bullets."
+	icon_state = "musket_sack_m"
+	default_ammo = /datum/ammo/bullet/sniper/musket
+	max_rounds = 54
+	caliber = CALIBER_19MM
+	w_class = WEIGHT_CLASS_SMALL
+	icon_state_mini = "musket_sack_m"
+
+/obj/item/ammo_magazine/packet/musket/small
+	name = "sack of musket lead rounds"
+	desc = "A sack filled with lead bullets."
+	icon_state = "musket_sack_s"
+	default_ammo = /datum/ammo/bullet/sniper/musket
+	max_rounds = 27
+	caliber = CALIBER_19MM
+	w_class = WEIGHT_CLASS_TINY
+	icon_state_mini = "musket_sack_s"

code/modules/projectiles/magazines/specialist.dm

@@ -451,23 +451,3 @@
 	max_rounds = 5
 	reload_delay = 10
 	icon_state_mini = "mag_dmr"
-
-/obj/item/ammo_magazine/rifle/musket
-	name = "sack of musket lead rounds"
-	desc = "A sack filled with lead bullets."
-	icon_state = "musket_sack_m"
-	default_ammo = /datum/ammo/bullet/sniper/musket
-	max_rounds = 54
-	caliber = CALIBER_19MM
-	w_class = WEIGHT_CLASS_SMALL
-	icon_state_mini = "musket_sack_m"
-
-/obj/item/ammo_magazine/rifle/musket/small
-	name = "sack of musket lead rounds"
-	desc = "A sack filled with lead bullets."
-	icon_state = "musket_sack_s"
-	default_ammo = /datum/ammo/bullet/sniper/musket
-	max_rounds = 27
-	caliber = CALIBER_19MM
-	w_class = WEIGHT_CLASS_TINY
-	icon_state_mini = "musket_sack_s"