Cleans up bullets to use subtypes for ammo variations (#57846)

We have a bunch of bullets across the code that are pewpewmm_ap and powpowmm/ap
This switches it to the latter for consistency.
This commit is contained in:
KathrinBailey
2021-04-12 16:51:13 +01:00
committed by GitHub
parent 92b32c3f00
commit 9deb7102c7
8 changed files with 23 additions and 27 deletions
@@ -10,12 +10,12 @@
/obj/item/ammo_casing/mm712x82/ap
name = "7.12x82mm armor-piercing bullet casing"
desc = "A 7.12x82mm bullet casing designed with a hardened-tipped core to help penetrate armored targets."
projectile_type = /obj/projectile/bullet/mm712x82_ap
projectile_type = /obj/projectile/bullet/mm712x82/ap
/obj/item/ammo_casing/mm712x82/hollow
name = "7.12x82mm hollow-point bullet casing"
desc = "A 7.12x82mm bullet casing designed to cause more damage to unarmored targets."
projectile_type = /obj/projectile/bullet/mm712x82_hp
projectile_type = /obj/projectile/bullet/mm712x82/hp
/obj/item/ammo_casing/mm712x82/incen
name = "7.12x82mm incendiary bullet casing"
@@ -25,9 +25,9 @@
/obj/item/ammo_casing/mm712x82/match
name = "7.12x82mm match bullet casing"
desc = "A 7.12x82mm bullet casing manufactured to unfailingly high standards, you could pull off some cool trickshots with this."
projectile_type = /obj/projectile/bullet/mm712x82_match
projectile_type = /obj/projectile/bullet/mm712x82/match
/obj/item/ammo_casing/mm712x82/bouncy
name = "7.12x82mm rubber bullet casing"
desc = "A 7.12x82mm rubber bullet casing manufactured to unfailingly disastrous standards, you could piss off a lot of people spraying this down a hallway."
projectile_type = /obj/projectile/bullet/mm712x82_bouncy
projectile_type = /obj/projectile/bullet/mm712x82/bouncy
@@ -9,12 +9,12 @@
/obj/item/ammo_casing/c10mm/ap
name = "10mm armor-piercing bullet casing"
desc = "A 10mm armor-piercing bullet casing."
projectile_type = /obj/projectile/bullet/c10mm_ap
projectile_type = /obj/projectile/bullet/c10mm/ap
/obj/item/ammo_casing/c10mm/hp
name = "10mm hollow-point bullet casing"
desc = "A 10mm hollow-point bullet casing."
projectile_type = /obj/projectile/bullet/c10mm_hp
projectile_type = /obj/projectile/bullet/c10mm/hp
/obj/item/ammo_casing/c10mm/fire
name = "10mm incendiary bullet casing"
@@ -32,12 +32,12 @@
/obj/item/ammo_casing/c9mm/ap
name = "9mm armor-piercing bullet casing"
desc = "A 9mm armor-piercing bullet casing."
projectile_type =/obj/projectile/bullet/c9mm_ap
projectile_type =/obj/projectile/bullet/c9mm/ap
/obj/item/ammo_casing/c9mm/hp
name = "9mm hollow-point bullet casing"
desc = "A 10mm hollow-point bullet casing."
projectile_type = /obj/projectile/bullet/c9mm_hp
desc = "A 9mm hollow-point bullet casing."
projectile_type = /obj/projectile/bullet/c9mm/hp
/obj/item/ammo_casing/c9mm/fire
name = "9mm incendiary bullet casing"
@@ -8,7 +8,7 @@
projectile_type = /obj/projectile/bullet/a762
/obj/item/ammo_casing/a762/enchanted
projectile_type = /obj/projectile/bullet/a762_enchanted
projectile_type = /obj/projectile/bullet/a762/enchanted
// 5.56mm (M-90gl Carbine)
@@ -9,7 +9,7 @@
/obj/item/ammo_casing/c46x30mm/ap
name = "4.6x30mm armor-piercing bullet casing"
desc = "A 4.6x30mm armor-piercing bullet casing."
projectile_type = /obj/projectile/bullet/c46x30mm_ap
projectile_type = /obj/projectile/bullet/c46x30mm/ap
/obj/item/ammo_casing/c46x30mm/inc
name = "4.6x30mm incendiary bullet casing"
@@ -27,7 +27,7 @@
/obj/item/ammo_casing/c45/ap
name = ".45 armor-piercing bullet casing"
desc = "A .45 bullet casing."
projectile_type = /obj/projectile/bullet/c45_ap
projectile_type = /obj/projectile/bullet/c45/ap
/obj/item/ammo_casing/c45/inc
name = ".45 incendiary bullet casing"
@@ -30,12 +30,11 @@
wound_bonus = -50
wound_falloff_tile = 0
/obj/projectile/bullet/mm712x82_ap
/obj/projectile/bullet/mm712x82/ap
name = "7.12x82mm armor-piercing bullet"
damage = 40
armour_penetration = 75
/obj/projectile/bullet/mm712x82_hp
/obj/projectile/bullet/mm712x82/hp
name = "7.12x82mm hollow-point bullet"
damage = 50
armour_penetration = -60
@@ -49,16 +48,14 @@
damage = 20
fire_stacks = 3
/obj/projectile/bullet/mm712x82_match
/obj/projectile/bullet/mm712x82/match
name = "7.12x82mm match bullet"
damage = 40
ricochets_max = 2
ricochet_chance = 60
ricochet_auto_aim_range = 4
ricochet_incidence_leeway = 55
wound_bonus = -50
/obj/projectile/bullet/mm712x82_bouncy
/obj/projectile/bullet/mm712x82/bouncy
name = "7.12x82mm rubber bullet"
damage = 25
ricochets_max = 40
@@ -5,14 +5,14 @@
damage = 30
embedding = list(embed_chance=15, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
/obj/projectile/bullet/c9mm_ap
/obj/projectile/bullet/c9mm/ap
name = "9mm armor-piercing bullet"
damage = 27
armour_penetration = 40
embedding = null
shrapnel_type = null
/obj/projectile/bullet/c9mm_hp
/obj/projectile/bullet/c9mm/hp
name = "9mm hollow-point bullet"
damage = 40
armour_penetration = -50
@@ -28,12 +28,12 @@
name = "10mm bullet"
damage = 40
/obj/projectile/bullet/c10mm_ap
/obj/projectile/bullet/c10mm/ap
name = "10mm armor-piercing bullet"
damage = 37
armour_penetration = 40
/obj/projectile/bullet/c10mm_hp
/obj/projectile/bullet/c10mm/hp
name = "10mm hollow-point bullet"
damage = 60
armour_penetration = -50
@@ -22,7 +22,7 @@
wound_bonus = -45
wound_falloff_tile = 0
/obj/projectile/bullet/a762_enchanted
/obj/projectile/bullet/a762/enchanted
name = "enchanted 7.62 bullet"
damage = 20
stamina = 80
@@ -6,9 +6,8 @@
wound_bonus = -10
wound_falloff_tile = -10
/obj/projectile/bullet/c45_ap
/obj/projectile/bullet/c45/ap
name = ".45 armor-piercing bullet"
damage = 30
armour_penetration = 50
/obj/projectile/bullet/incendiary/c45
@@ -25,7 +24,7 @@
bare_wound_bonus = 5
embed_falloff_tile = -4
/obj/projectile/bullet/c46x30mm_ap
/obj/projectile/bullet/c46x30mm/ap
name = "4.6x30mm armor-piercing bullet"
damage = 15
armour_penetration = 40