Bad Moon on the Rise: A Farewell to Arms edition (#9715)

code/modules/projectiles/ammunition/bullets.dm

@@ -337,3 +337,10 @@
 	desc = "A miniaturized version of a nuclear bomb."
 	projectile_type = /obj/item/projectile/bullet/nuke
 	max_stack = 2
+
+/obj/item/ammo_casing/musket
+	name = "musket ball"
+	desc = "A solid ball made of lead."
+	icon_state = "musketball"
+	caliber = "musket"
+	projectile_type = /obj/item/projectile/bullet/pistol/strong

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

@@ -327,6 +327,42 @@
 		return
 	..()
 
+/obj/item/gun/projectile/automatic/rifle/adhomian
+	name = "adhomian automatic rifle"
+	desc = "The Tsarrayut'yan rifle is a select-fire, crew-served automatic rifle producted by the People's Republic of Adhomai."
+	icon = 'icons/obj/guns/tsarrayut.dmi'
+	icon_state = "tsarrayut"
+	item_state = "tsarrayut"
+	contained_sprite = TRUE
+
+	desc_fluff = "People's Republic military hardware is the most advanced among the Tajaran nations. Laser weapons, alongside simple ballistic guns, are used by high ranking soldiers or \
+	special operatives. The majority of military is still equipped with simple bolt action rifles, that are being slowly replaced by the Tsarrayut'yan rifle; a select-fire, crew-served \
+	automatic rifle. Regardless of advances in the small arms field, artillery is the Republican army's main weapon and pride."
+
+	load_method = SINGLE_CASING|SPEEDLOADER
+
+	ammo_type = /obj/item/ammo_casing/a762
+	allowed_magazines = null
+	magazine_type = null
+	max_shells = 25
+
+	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
+	fire_sound = 'sound/weapons/gunshot/gunshot_rifle.ogg'
+
+	is_wieldable = TRUE
+
+	can_bayonet = TRUE
+	knife_x_offset = 23
+	knife_y_offset = 14
+
+/obj/item/gun/projectile/automatic/rifle/adhomian/update_icon()
+	..()
+	if(wielded)
+		item_state = "tsarrayut-wielded"
+	else
+		item_state = "tsarrayut"
+	update_held_icon()
+
 /obj/item/gun/projectile/automatic/tommygun
 	name = "vintage submachine gun"
 	desc = "A classic submachine gun. Uses .45 rounds."

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

@@ -0,0 +1,85 @@
+/obj/item/gun/projectile/musket
+	name = "adhomian musket"
+	desc = "A rustic firearm, used by Tajaran soldiers during the adhomian gunpowder age"
+
+	desc_fluff = "The Gunpowder Age was marked by the slow replacement of traditional Adhomian battle tactics and weapons, that included melee weapons and crossbows, in favor of \
+	cannons and primitive firing lines. The Kingdoms of Amohda, Nal'tor and Das'nrra were the first countries to make use of this new technology."
+
+	icon = 'icons/obj/guns/musket.dmi'
+	icon_state = "musket"
+	item_state = "musket"
+	contained_sprite = TRUE
+
+	load_method = SINGLE_CASING
+	handle_casings = DELETE_CASINGS
+
+	max_shells = 1
+
+	caliber = "musket"
+
+	slot_flags = SLOT_BACK
+
+	is_wieldable = TRUE
+
+	needspin = FALSE
+
+	w_class = ITEMSIZE_LARGE
+
+	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
+
+	fire_delay = 35
+	fire_sound = 'sound/weapons/gunshot/musket.ogg'
+	recoil = 4
+
+	ammo_type = /obj/item/ammo_casing/musket
+
+	var/has_powder = FALSE
+
+/obj/item/gun/projectile/musket/update_icon()
+	if(wielded)
+		item_state = "musket-wielded"
+	else
+		item_state = "musket"
+	update_held_icon()
+
+/obj/item/gun/projectile/musket/special_check(mob/user)
+	if(!has_powder)
+		to_chat(user, SPAN_WARNING("\The [src] is not loaded with gunpowder!"))
+		return FALSE
+
+	if(!wielded)
+		to_chat(user, SPAN_WARNING("You can't fire without stabilizing \the [src]!"))
+		return FALSE
+
+	var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
+	smoke.set_up(3, 0, user.loc)
+	smoke.start()
+	has_powder = FALSE
+	return ..()
+
+/obj/item/gun/projectile/musket/attackby(obj/item/W, mob/user)
+	..()
+	if (istype(W, /obj/item/reagent_containers))
+		if(has_powder)
+			to_chat(user, SPAN_WARNING("\The [src] is already full of gunpowder."))
+			return
+		var/obj/item/reagent_containers/C = W
+		if(C.reagents.has_reagent(/datum/reagent/gunpowder, 5))
+			if(do_after(user, 15))
+				if(has_powder)
+					return
+				C.reagents.remove_reagent(/datum/reagent/gunpowder, 5)
+				has_powder = TRUE
+				to_chat(user, SPAN_NOTICE("You fill \the [src] with gunpowder."))
+
+/obj/item/reagent_containers/powder_horn
+	name = "powder horn"
+	desc = "An ivory container for gunpowder."
+	icon = 'icons/obj/guns/musket.dmi'
+	icon_state = "powderhorn"
+	w_class = ITEMSIZE_NORMAL
+	slot_flags = SLOT_BELT
+	amount_per_transfer_from_this = 5
+	possible_transfer_amounts = list(5)
+	volume = 30
+	reagents_to_add = list(/datum/reagent/gunpowder = 30)

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

@@ -260,3 +260,26 @@
 	desc_fluff = "A simple and reliable double action revolver, favored by the nobility, officers and law enforcement. The design is known for having an outdated reloading \
 	mechanism, with the need to manually eject each of the used cartridges, and reload one cartridge at a time through a loading gate. However, their cheap manufacturing cost has \
 	allowed countless copies to flood the Kingdom's markets."
+
+/obj/item/gun/projectile/revolver/knife
+	name = "knife-revolver"
+	desc = "An adhomian revolver with a blade attached to its barrel."
+	icon = 'icons/obj/guns/knifegun.dmi'
+	icon_state = "knifegun"
+	item_state = "knifegun"
+	max_shells = 6
+	caliber = "38"
+	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
+	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
+	ammo_type = /obj/item/ammo_casing/c38
+	magazine_type = /obj/item/ammo_magazine/c38
+	force = 15
+	sharp = TRUE
+	edge = TRUE
+
+/obj/item/gun/projectile/revolver/knife/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+	if(default_parry_check(user, attacker, damage_source) && prob(20))
+		user.visible_message(SPAN_DANGER("\The [user] parries [attack_text] with \the [src]!"))
+		playsound(user.loc, "punchmiss", 50, 1)
+		return TRUE
+	return FALSE