From 002f14a6eb5fefdf9b20bdd7a16d1ef195b30687 Mon Sep 17 00:00:00 2001 From: Spades Date: Fri, 9 Nov 2018 19:37:15 -0500 Subject: [PATCH] Fixes missing hollow point ammo for 9mm 9mm didn't have HP ammo for some reason, which is dumb, considering HP ammo makes 9mm not useless while not being overpowered as hell. All I did was add in the missing projectiles and relevant casings. How they get implimented if at all is up to another PR. Also made some notes for later because apparently Polaris is in a feature freeze so I am not pushing new features, just fixing a missing one, but I need to remind myself to do this later or remind somebody else if I forget. --- code/modules/projectiles/ammunition/rounds.dm | 10 ++++--- .../modules/projectiles/projectile/bullets.dm | 27 +++++++++++-------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index 406dbcae88..dbe6aa55ec 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -149,7 +149,11 @@ /obj/item/ammo_casing/a45/hp desc = "A .45 hollow-point bullet casing." - projectile_type = /obj/item/projectile/bullet/pistol/medium/hollow + projectile_type = /obj/item/projectile/bullet/pistol/medium/hp + +/obj/item/ammo_casing/a9mm/hp + desc = "A 9mm hollow-point bullet casing." + projectile_type = /obj/item/projectile/bullet/pistol/hp /* * 10mm @@ -265,7 +269,7 @@ /obj/item/ammo_casing/a762/hp desc = "A 7.62mm hollow-point bullet casing." - projectile_type = /obj/item/projectile/bullet/rifle/a762/hollow + projectile_type = /obj/item/projectile/bullet/rifle/a762/hp /obj/item/ammo_casing/a762/hunter desc = "A 7.62mm hunting bullet casing." @@ -311,7 +315,7 @@ /obj/item/ammo_casing/a545/hp desc = "A 5.45mm hollow-point bullet casing." - projectile_type = /obj/item/projectile/bullet/rifle/a545/hollow + projectile_type = /obj/item/projectile/bullet/rifle/a545/hp /obj/item/ammo_casing/a545/hunter desc = "A 5.45mm hunting bullet casing." diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index e4b7241bb0..ed16105939 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -64,38 +64,43 @@ /* short-casing projectiles, like the kind used in pistols or SMGs */ -/obj/item/projectile/bullet/pistol - fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg' +/obj/item/projectile/bullet/pistol // 9mm pistols and most SMGs. Sacrifice power for capacity. + fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg' // ToDo: Different shot sounds for different strength pistols. -Ace damage = 20 /obj/item/projectile/bullet/pistol/ap damage = 15 armor_penetration = 30 -/obj/item/projectile/bullet/pistol/medium +/obj/item/projectile/bullet/pistol/hp + damage = 25 + armor_penetration = -50 + +/obj/item/projectile/bullet/pistol/medium // .45 (and maybe .40 if it ever gets added) caliber security pistols. Balance between capacity and power. + // fire_sound = 'sound/weapons/gunshot3.ogg' // ToDo: Different shot sounds for different strength pistols. damage = 25 /obj/item/projectile/bullet/pistol/medium/ap damage = 20 armor_penetration = 15 -/obj/item/projectile/bullet/pistol/medium/hollow +/obj/item/projectile/bullet/pistol/medium/hp damage = 30 armor_penetration = -50 -/obj/item/projectile/bullet/pistol/strong //revolvers and matebas - fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg' +/obj/item/projectile/bullet/pistol/strong // .357 and .44 caliber stuff. High power pistols like the Mateba or Desert Eagle. Sacrifice capacity for power. + fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg' // ToDo: Replace with something less ugly. I recommend weapons/gunshot3.ogg damage = 60 -/obj/item/projectile/bullet/pistol/rubber/strong //"rubber" bullets for revolvers and matebas - fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg' +/obj/item/projectile/bullet/pistol/rubber/strong // "Rubber" bullets for high power pistols. + fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg' // ToDo: Same as above. damage = 10 agony = 60 embed_chance = 0 sharp = 0 check_armour = "melee" -/obj/item/projectile/bullet/pistol/rubber //"rubber" bullets +/obj/item/projectile/bullet/pistol/rubber // "Rubber" bullets for all other pistols. name = "rubber bullet" damage = 5 agony = 40 @@ -167,7 +172,7 @@ damage = 30 armor_penetration = 50 // At 30 or more armor, this will do more damage than standard rounds. -/obj/item/projectile/bullet/rifle/a762/hollow +/obj/item/projectile/bullet/rifle/a762/hp damage = 40 armor_penetration = -50 penetrating = 0 @@ -184,7 +189,7 @@ damage = 20 armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds. -/obj/item/projectile/bullet/rifle/a545/hollow +/obj/item/projectile/bullet/rifle/a545/hp damage = 35 armor_penetration = -50 penetrating = 0