wawa

shiptest-ss13 · Jun 15, 2024 · a728bab · a728bab
1 parent f855059
commit a728bab
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm
@@ -98,3 +98,23 @@
 	desc = "A .38 iceblox bullet casing."
 	bullet_skin = "surplus"
 	projectile_type = /obj/projectile/bullet/c38/iceblox
+
+//44 Roumain (Montagne & Shadow)
+
+/obj/item/ammo_casing/44roum
+	name = ".44 roumain bullet casing"
+	desc = "A 44 roumain bullet casing."
+	bullet_skin = "pistol-steel"
+	projectile_type = /obj/projectile/bullet/44roum
+
+/obj/item/ammo_casing/44roum/rubber
+	name = ".44 roumain rubber bullet casing"
+	desc = "A 44 roumain rubber bullet casing."
+	bullet_skin = "rubber"
+	projectile_type = /obj/projectile/bullet/44roum/rubber
+
+/obj/item/ammo_casing/44roum/hp
+	name = ".44 roumain hollow point bullet casing"
+	desc = "A 44 roumain holow point bullet casing."
+	bullet_skin = "hollow"
+	projectile_type = /obj/projectile/bullet/44roum/hp
diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
@@ -33,13 +33,13 @@
 	max_ammo = 5
 	instant_load = FALSE
 
-/obj/item/ammo_box/magazine/internal/cylinder/rev45
+/obj/item/ammo_box/magazine/internal/cylinder/rev44
 	name = "cattleman revolver cylinder"
-	ammo_type = /obj/item/ammo_casing/c45
+	ammo_type = /obj/item/ammo_casing/44roum
 	caliber = ".45"
 	max_ammo = 6
 	instant_load = FALSE
 
-/obj/item/ammo_box/magazine/internal/cylinder/rev45/montagne
+/obj/item/ammo_box/magazine/internal/cylinder/rev44/montagne
 	name = "montagne revolver cylinder"
 	instant_load = TRUE
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -570,7 +570,7 @@ EMPTY_GUN_HELPER(revolver/detective)
 	spread_unwielded = 15
 	recoil = 0
 
-	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45/montagne
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44/montagne
 
 /obj/item/gun/ballistic/revolver/montagne/ComponentInitialize()
 	. = ..()
@@ -698,7 +698,7 @@ EMPTY_GUN_HELPER(revolver/detective)
 	fire_sound = 'sound/weapons/gun/revolver/cattleman.ogg'
 	icon = 'icons/obj/guns/48x32guns.dmi'
 	icon_state = "shadow"
-	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
 	manufacturer = MANUFACTURER_HUNTERSPRIDE
 	obj_flags = UNIQUE_RENAME
 	gate_loaded = TRUE

diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -152,3 +152,20 @@
 	armour_penetration = -45
 	ricochet_incidence_leeway = 20
 	ricochet_chance = 65
+
+// 44 Short (Roumain & Shadow)
+
+/obj/projectile/bullet/44roum
+	name = ".44 roumain bullet"
+	damage =  25
+
+/obj/projectile/bullet/44roum/rubber
+	name = ".44 roumain bullet"
+	damage =  7
+	stamina = 38
+	armour_penetration = -20
+
+/obj/projectile/bullet/44roum/hp
+	name = ".44 roumain bullet"
+	damage =  45
+	armour_penetration = -20