Adds basic muskets

_maps/map_files/domotan/old_doma.dmm

@@ -2171,14 +2171,18 @@
 /area/rogue/outdoors/beach)
 "cxZ" = (
 /obj/structure/closet/crate/roguecloset,
-/obj/item/quiver/arrows,
-/obj/item/quiver/arrows,
-/obj/item/quiver/arrows,
-/obj/item/quiver/arrows,
-/obj/item/quiver/arrows,
 /obj/effect/decal/cobbleedge{
 	icon_state = "cobbleedge-sread"
 	},
+/obj/item/quiver/shotpouch/ironshots,
+/obj/item/quiver/shotpouch/ironshots,
+/obj/item/quiver/shotpouch/ironshots,
+/obj/item/gunpowderhorn,
+/obj/item/gunpowderhorn,
+/obj/item/gunpowderhorn,
+/obj/item/gun/ballistic/revolver/grenadelauncher/powdergun/advanced,
+/obj/item/gun/ballistic/revolver/grenadelauncher/powdergun/advanced,
+/obj/item/gun/ballistic/revolver/grenadelauncher/powdergun/advanced,
 /turf/open/floor/rogue/blocks,
 /area/rogue/indoors/town/garrison)
 "czX" = (

code/__DEFINES/font_changers.dm

@@ -9,7 +9,7 @@
 #define FONT_LARGE(str) ("<font size='6'>[str]</font>")
 
 //colour changes
-#define FONT_BRIGHTRED(str) ("<font color='#DD0000'>[str]</font>")
+#define FONT_BRIGHTRED(str) ("<font color='#CC3730'>[str]</font>")
 #define FONT_YELLOW(str) ("<font color='#F1D669'>[str]</font>")
 #define FONT_PURPLE(str) ("<font color='#800080'>[str]</font>")
 #define FONT_GREEN(str) ("<font color='#80B077'>[str]</font>")

code/datums/skills/combat.dm

@@ -105,6 +105,13 @@
 	"...the crossbow is a deadly marvel of engineering, waiting for your guidance. You steady your breath, finger poised on the trigger. The world narrows as you take aim, the perfect shot soon to come..."
 	)
 
+/datum/skill/combat/firearms
+	name = "Firearms"
+	dreams = list(
+	"...'HOLD!' your commander yells, you're just able to maintain your balance and your cannon's aim trained on the behemoth of an airborne demon just off the airship's port-side. 'FIRE!' your cannon looses its payload, the demon is hit in the eye - blinded, it begins to fall out of the air...",
+	"...an instructor drills the same mantra over and over into you and your comrades: 'fill the flash pan with the powder, put your ball in, pack it into the powder with your ramrod, close the flash pan. Fail any of these steps and you may as well be blowing air at your enemy'..."
+	)
+
 /datum/skill/combat/wrestling
 	name = "Wrestling"
 	dreams = list(

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -230,6 +230,9 @@
 	icon_state = "smoke"
 	duration = 50
 
+/obj/effect/temp_visual/small_smoke/gunpowdersmoke
+	duration = 15
+
 /obj/effect/temp_visual/small_smoke/halfsecond
 	duration = 5
 

code/game/objects/items/rogueweapons/ranged/ammo.dm

@@ -212,7 +212,7 @@
 	poisonfeel = "burning" //Ditto
 	poisonamount = 5 //Support and balance for bodkins, which will hold less poison due to how
 
-//pyro bolts - stonekeep port 
+//pyro bolts - stonekeep port
 
 /obj/item/ammo_casing/caseless/rogue/bolt/pyro
 	name = "pyroclastic bolt"
@@ -327,28 +327,26 @@
 		addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living, adjustToxLoss), 100), 10 SECONDS)
 		addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, visible_message), span_danger("[M] appears greatly weakened by the poison!")), 10 SECONDS)
 
-/obj/projectile/bullet/reusable/bullet
-	name = "lead ball"
-	damage = 50
+/obj/item/ammo_casing/caseless/rogue/bullet/ironshot
+	name = "iron ball"
+	desc = "A small iron ball, often seen being propelled with great force from various firearms."
+	projectile_type = /obj/projectile/bullet/ironshot
+	caliber = "musketball"
+	icon = 'icons/roguetown/weapons/ammo.dmi'
+	icon_state = "musketball"
+	dropshrink = 0.5
+
+/obj/projectile/bullet/ironshot
+	name = "iron ball"
+	damage = 80
 	damage_type = BRUTE
+	armor_penetration = 40 // this bullet does more damage than a bolt, so less armour-pen is a fair trade-off
 	icon = 'icons/roguetown/weapons/ammo.dmi'
 	icon_state = "musketball_proj"
-	ammo_type = /obj/item/ammo_casing/caseless/rogue/bullet
+	ammo_type = /obj/item/ammo_casing/caseless/rogue/bullet/ironshot
 	range = 30
-	hitsound = 'sound/combat/hits/hi_arrow2.ogg'
+	hitsound = 'sound/combat/hits/hi_bolt (3).ogg'
 	embedchance = 100
-	woundclass = BCLASS_STAB
+	woundclass = BCLASS_SMASH // doesn't really cause severed arteries, but feels like it dislocates and fractures bones a lot more
 	flag = "bullet"
-	armor_penetration = 200
 	speed = 0.1
-
-/obj/item/ammo_casing/caseless/rogue/bullet
-	name = "lead sphere"
-	desc = "A small lead sphere. This should go well with gunpowder."
-	projectile_type = /obj/projectile/bullet/reusable/bullet
-	caliber = "musketball"
-	icon = 'icons/roguetown/weapons/ammo.dmi'
-	icon_state = "musketball"
-	dropshrink = 0.5
-	possible_item_intents = list(/datum/intent/use)
-	max_integrity = 0.1