From 3b44024e886a47a0eba2fc4a95be12f1a5ea160d Mon Sep 17 00:00:00 2001 From: Spades Date: Sun, 5 Jun 2016 17:55:39 -0400 Subject: [PATCH 1/3] 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 390e8cf33e3..bfd1038bfa0 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 568da5fde8f..fef93692ec1 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 9e020384e6d..005fd728f1a 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." From baf8ca5dccb7733dc4ad7551648f091e11c40e6b Mon Sep 17 00:00:00 2001 From: Spades Date: Sun, 5 Jun 2016 22:24:35 -0400 Subject: [PATCH 2/3] These were supposed to be removed. We scrapped this change. --- code/game/machinery/autolathe_datums.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm index eda9262351f..da175c936c7 100644 --- a/code/game/machinery/autolathe_datums.dm +++ b/code/game/machinery/autolathe_datums.dm @@ -491,7 +491,7 @@ /////// 5.56mm /datum/autolathe/recipe/rifle_556 name = "10rnd rifle magazine (5.56mm)" - path = /obj/item/ammo_magazine/a556/empty + path = /obj/item/ammo_magazine/a556 category = "Arms and Ammunition" hidden = 1 From e51da6c35bc7bfbb4f15a798570a28abceb1b8ab Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 6 Jun 2016 22:03:03 -0400 Subject: [PATCH 3/3] Renamed SVD mag to be consistent per request. It's just a 10 round 762 magazine. It's compatible with the STS. --- code/datums/uplink/ammunition.dm | 8 ++++---- code/game/machinery/autolathe_datums.dm | 4 ++-- code/modules/projectiles/ammunition/boxes.dm | 10 +++++----- code/modules/projectiles/guns/projectile/automatic.dm | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index a9aa5017889..8308cfc319e 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -60,14 +60,14 @@ name = "20rnd Rifle Magazine (7.62mm AP)" path = /obj/item/ammo_magazine/c762/ap -/datum/uplink_item/item/ammo/SVD +/datum/uplink_item/item/ammo/s762 name = "10rnd Rifle Magazine (7.62mm)" - path = /obj/item/ammo_magazine/SVD + path = /obj/item/ammo_magazine/s762 item_cost = 1 // Half the capacity. -/datum/uplink_item/item/ammo/SVD/ap +/datum/uplink_item/item/ammo/s762/ap name = "10rnd Rifle Magazine (7.62mm AP)" - path = /obj/item/ammo_magazine/SVD/ap + path = /obj/item/ammo_magazine/s762/ap /datum/uplink_item/item/ammo/a10mm name = "SMG Magazine (10mm)" diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm index da175c936c7..e88af6b5211 100644 --- a/code/game/machinery/autolathe_datums.dm +++ b/code/game/machinery/autolathe_datums.dm @@ -513,9 +513,9 @@ hidden = 1 /////// 7.62 -/datum/autolathe/recipe/rifle_SVD +/datum/autolathe/recipe/rifle_small_762 name = "10rnd rifle magazine (7.62mm)" - path = /obj/item/ammo_magazine/SVD + path = /obj/item/ammo_magazine/s762 category = "Arms and Ammunition" hidden = 1 diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 0a148e2ca29..001753e81a8 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -387,8 +387,8 @@ /obj/item/ammo_magazine/c762/empty initial_ammo = 0 -/obj/item/ammo_magazine/SVD - name = "\improper SVD magazine (7.62mm)" +/obj/item/ammo_magazine/s762 // 's' for small! + name = "magazine (7.62mm)" icon_state = "SVD" mag_type = MAGAZINE caliber = "a762" @@ -397,11 +397,11 @@ max_ammo = 10 multiple_sprites = 1 -/obj/item/ammo_magazine/SVD/empty +/obj/item/ammo_magazine/s762/empty initial_ammo = 0 -/obj/item/ammo_magazine/SVD/ap - name = "\improper SVD magazine (7.62mm armor-piercing)" +/obj/item/ammo_magazine/s762/ap + name = "magazine (7.62mm armor-piercing)" ammo_type = /obj/item/ammo_casing/a762/ap /obj/item/ammo_magazine/clip/a762 diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index bfd1038bfa0..2ed89336a9a 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -61,7 +61,7 @@ slot_flags = SLOT_BACK load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/c762 - allowed_magazines = list(/obj/item/ammo_magazine/c762, /obj/item/ammo_magazine/SVD) + allowed_magazines = list(/obj/item/ammo_magazine/c762, /obj/item/ammo_magazine/s762) one_handed_penalty = 4 @@ -73,7 +73,7 @@ /obj/item/weapon/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands) ..() - if(istype(ammo_magazine,/obj/item/ammo_magazine/SVD)) + if(istype(ammo_magazine,/obj/item/ammo_magazine/s762)) icon_state = "arifle-small" else icon_state = (ammo_magazine)? "arifle" : "arifle-empty"