Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds a new ammo type, 44 Roumain, used by the Montagne and Shadow revolvers. #3110

Merged
merged 8 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
/area/ruin/powered)
"fq" = (
/obj/structure/table,
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/a44roum_speedloader,
/turf/open/floor/plasteel/mono/white,
/area/ruin/powered)
"fJ" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/roumain/srm_elder.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2026,9 +2026,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,
/obj/item/ammo_box/a44roum,
/obj/item/clothing/accessory/waistcoat/roumain,
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
Expand Down
26 changes: 22 additions & 4 deletions code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
21 changes: 21 additions & 0 deletions code/modules/projectiles/ammunition/ballistic/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,24 @@
desc = "A .38 iceblox bullet casing."
bullet_skin = "surplus"
projectile_type = /obj/projectile/bullet/c38/iceblox

//44 Roumain (Montagne & Shadow)

/obj/item/ammo_casing/a44roum
name = ".44 roumain bullet casing"
desc = "A .44 roumain bullet casing."
caliber = ".44 Roumain"
icon_state = "pistol-steel"
projectile_type = /obj/projectile/bullet/a44roum

/obj/item/ammo_casing/a44roum/rubber
name = ".44 roumain rubber bullet casing"
desc = "A .44 roumain rubber bullet casing."
bullet_skin = "rubber"
projectile_type = /obj/projectile/bullet/a44roum/rubber

/obj/item/ammo_casing/a44roum/hp
name = ".44 roumain hollow point bullet casing"
desc = "A .44 roumain holow point bullet casing."
bullet_skin = "hollow"
projectile_type = /obj/projectile/bullet/a44roum/hp
29 changes: 25 additions & 4 deletions code/modules/projectiles/boxes_magazines/ammo_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
caliber = ".45"
ammo_type = /obj/item/ammo_casing/a44roum
caliber = ".44 Roumain"
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
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/ballistic/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
. = ..()
Expand Down Expand Up @@ -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
Expand Down
17 changes: 17 additions & 0 deletions code/modules/projectiles/projectile/bullets/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,20 @@
armour_penetration = -45
ricochet_incidence_leeway = 20
ricochet_chance = 65

// 44 Short (Roumain & Shadow)

/obj/projectile/bullet/a44roum
name = ".44 roumain bullet"
damage = 25

/obj/projectile/bullet/a44roum/rubber
name = ".44 roumain bullet"
damage = 7
stamina = 38
armour_penetration = -20

/obj/projectile/bullet/a44roum/hp
name = ".44 roumain bullet"
damage = 45
armour_penetration = -20
Binary file modified icons/obj/ammo.dmi
Binary file not shown.
Loading