From 3b44024e886a47a0eba2fc4a95be12f1a5ea160d Mon Sep 17 00:00:00 2001 From: Spades Date: Sun, 5 Jun 2016 17:55:39 -0400 Subject: [PATCH] Reverts ammo change, fixes P90 --- code/modules/projectiles/guns/projectile/automatic.dm | 2 +- code/modules/projectiles/projectile/bullets.dm | 8 ++++---- html/changelogs/JerTheAce_GunsGunsGuns.yml | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 390e8cf33e..bfd1038bfa 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -305,7 +305,7 @@ icon_state = "p90smg" item_state = "p90" w_class = 3 - caliber = "5mm" + caliber = "9mm" origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2) slot_flags = SLOT_BELT // ToDo: Belt sprite. fire_sound = 'sound/weapons/Gunshot_light.ogg' diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 568da5fde8..fef93692ec 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -177,17 +177,17 @@ penetrating = 1 /obj/item/projectile/bullet/rifle/a762 - damage = 35 + damage = 25 /obj/item/projectile/bullet/rifle/a762/ap - damage = 30 + damage = 20 armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds. /obj/item/projectile/bullet/rifle/a556 - damage = 25 + damage = 35 /obj/item/projectile/bullet/rifle/a556/ap - damage = 20 + damage = 30 armor_penetration = 50 // At 30 or more armor, this will do more damage than standard rounds. /obj/item/projectile/bullet/rifle/a145 diff --git a/html/changelogs/JerTheAce_GunsGunsGuns.yml b/html/changelogs/JerTheAce_GunsGunsGuns.yml index 9e020384e6..005fd728f1 100644 --- a/html/changelogs/JerTheAce_GunsGunsGuns.yml +++ b/html/changelogs/JerTheAce_GunsGunsGuns.yml @@ -38,7 +38,6 @@ changes: - rscadd: "All magazines and ammunitions can now be produced with the autolathe." - maptweak: "New bullpup SMG is available in armory area on CentCom level." - tweak: "Revolvers now use 6 shots. Finally." - - tweak: "5.56 now does less damage, 7.62 does more, because previously it was backwards which made no sense." - tweak: "Most guns that didn't use magazines before for some reason (such as the Uzi) now use magazines." - tweak: "All casings now update icons if they have been spent." - tweak: "Corrects Pulse Rifle charge cost consistency."