wawa

_maps/shuttles/roumain/srm_elder.dmm

@@ -2007,9 +2007,9 @@
 	},
 /obj/item/gun/ballistic/revolver/montagne,
 /obj/item/storage/backpack/satchel/leather,
-/obj/item/ammo_box/c45_speedloader,
-/obj/item/ammo_box/c45_speedloader,
 /obj/item/ammo_box/c45,
+/obj/item/ammo_box/a44roum_speedloader,
+/obj/item/ammo_box/a44roum_speedloader,
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "zH" = (

code/modules/cargo/packs/ammo.dm

@@ -18,10 +18,10 @@
 	contains = list(/obj/item/ammo_box/magazine/m45)
 	cost = 500
 
-/datum/supply_pack/ammo/m45_speedloader
-	name = ".45 ACP Speedloader Crate"
-	desc = "Contains a .45 ACP speedloader for the HP Montagne, containing six rounds."
-	contains = list(/obj/item/ammo_box/c45_speedloader)
+/datum/supply_pack/ammo/a44roum_speedloader
+	name = ".44 Roumain Speedloader Crate"
+	desc = "Contains a .44 Roumain speedloader for the HP Montagne, containing six rounds."
+	contains = list(/obj/item/ammo_box/a44roum_speedloader)
 	cost = 400
 
 /datum/supply_pack/ammo/c38_mag
@@ -370,3 +370,21 @@
 	desc = "Contains a fifty-round box for high-powered gauss guns such as the GAR assault rifle."
 	contains = list(/obj/item/ammo_box/ferrolancebox)
 	cost = 250
+
+/datum/supply_pack/ammo/a44roum
+	name = ".44 Roumain Ammo Box Crate"
+	desc = "Contains a fifty-round box of .44 roumain ammo for revolvers such as the Shadow and Montagne."
+	contains = list(/obj/item/ammo_box/a44roum)
+	cost = 250
+
+/datum/supply_pack/ammo/a44roum_rubber
+	name = ".44 Roumain Rubber Ammo Box Crate"
+	desc = "Contains a fifty-round box of .44 roumain ammo loaded with less-than-lethal rubber rounds."
+	contains = list(/obj/item/ammo_box/a44roum/rubber)
+	cost = 250
+
+/datum/supply_pack/ammo/a44roum_hp
+	name = ".44 Roumain Hollow Point Ammo Box Crate"
+	desc = "Contains a fifty-round box of .44 roumain hollow point ammo, great against unarmored targets."
+	contains = list(/obj/item/ammo_box/a44roum/hp)
+	cost = 500

code/modules/cargo/packs/gun.dm

@@ -52,7 +52,7 @@
 
 /datum/supply_pack/gun/shadowrevolver
 	name = "Shadow Revolver Crate"
-	desc = "Contains a concealable Shadow revolver, chambered in .45 ACP."
+	desc = "Contains a concealable Shadow revolver, chambered in .44 Roumain."
 	cost = 1000
 	contains = list(/obj/item/gun/ballistic/revolver/shadow)
 

code/modules/projectiles/ammunition/ballistic/revolver.dm

@@ -101,20 +101,21 @@
 
 //44 Roumain (Montagne & Shadow)
 
-/obj/item/ammo_casing/44roum
+/obj/item/ammo_casing/a44roum
 	name = ".44 roumain bullet casing"
-	desc = "A 44 roumain bullet casing."
-	bullet_skin = "pistol-steel"
-	projectile_type = /obj/projectile/bullet/44roum
+	desc = "A .44 roumain bullet casing."
+	caliber = ".44 Roumain"
+	icon_state = "pistol-steel"
+	projectile_type = /obj/projectile/bullet/a44roum
 
-/obj/item/ammo_casing/44roum/rubber
+/obj/item/ammo_casing/a44roum/rubber
 	name = ".44 roumain rubber bullet casing"
-	desc = "A 44 roumain rubber bullet casing."
+	desc = "A .44 roumain rubber bullet casing."
 	bullet_skin = "rubber"
-	projectile_type = /obj/projectile/bullet/44roum/rubber
+	projectile_type = /obj/projectile/bullet/a44roum/rubber
 
-/obj/item/ammo_casing/44roum/hp
+/obj/item/ammo_casing/a44roum/hp
 	name = ".44 roumain hollow point bullet casing"
-	desc = "A 44 roumain holow point bullet casing."
+	desc = "A .44 roumain holow point bullet casing."
 	bullet_skin = "hollow"
-	projectile_type = /obj/projectile/bullet/44roum/hp
+	projectile_type = /obj/projectile/bullet/a44roum/hp

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -411,13 +411,13 @@
 	ammo_type = /obj/item/ammo_casing/c22lr
 	max_ammo = 75
 
-/obj/item/ammo_box/c45_speedloader
-	name = "speed loader (.45)"
+/obj/item/ammo_box/a44roum_speedloader
+	name = "speed loader (.44)"
 	desc = "Designed to quickly reload revolvers."
 	icon_state = "speedloader_38-6"
 	base_icon_state = "speedloader_38"
-	ammo_type = /obj/item/ammo_casing/c45
-	caliber = ".45"
+	ammo_type = /obj/item/ammo_casing/a44roum
+	caliber = ".44 Roumain"
 	max_ammo = 6
 	multiple_sprites = AMMO_BOX_PER_BULLET
 	custom_materials = list(/datum/material/iron = 15000)
@@ -472,3 +472,24 @@
 	icon_state = "300box"
 	ammo_type = /obj/item/ammo_casing/a300
 	max_ammo = 20
+
+/obj/item/ammo_box/a44roum
+	name = "ammo box (.44 roumain)"
+	desc = "A box of standard .44 roumain ammo."
+	icon_state = "a44roum"
+	ammo_type = /obj/item/ammo_casing/a44roum
+	max_ammo = 50
+
+/obj/item/ammo_box/a44roum/rubber
+	name = "ammo box (.44 roumain rubber)"
+	desc = "A box of .44 roumain rubbershot ammo, designed to disable targets without causing serious damage."
+	icon_state = "a44roum-rubber"
+	ammo_type = /obj/item/ammo_casing/a44roum/rubber
+	max_ammo = 50
+
+/obj/item/ammo_box/a44roum/hp
+	name = "ammo box (.44 roumain hollow point)"
+	desc = "A box of .44 roumain hollow point ammo, designed to cause massive damage at the cost of armor penetration."
+	icon_state = "a44roum-hp"
+	ammo_type = /obj/item/ammo_casing/a44roum/hp
+	max_ammo = 50

code/modules/projectiles/boxes_magazines/internal/revolver.dm

@@ -35,8 +35,8 @@
 
 /obj/item/ammo_box/magazine/internal/cylinder/rev44
 	name = "cattleman revolver cylinder"
-	ammo_type = /obj/item/ammo_casing/44roum
-	caliber = ".45"
+	ammo_type = /obj/item/ammo_casing/a44roum
+	caliber = ".44 Roumain"
 	max_ammo = 6
 	instant_load = FALSE
 

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

@@ -155,17 +155,17 @@
 
 // 44 Short (Roumain & Shadow)
 
-/obj/projectile/bullet/44roum
+/obj/projectile/bullet/a44roum
 	name = ".44 roumain bullet"
 	damage =  25
 
-/obj/projectile/bullet/44roum/rubber
+/obj/projectile/bullet/a44roum/rubber
 	name = ".44 roumain bullet"
 	damage =  7
 	stamina = 38
 	armour_penetration = -20
 
-/obj/projectile/bullet/44roum/hp
+/obj/projectile/bullet/a44roum/hp
 	name = ".44 roumain bullet"
 	damage =  45
 	armour_penetration = -20