From 068976c9714c04a168f8987bf4df7fe3bc28662f Mon Sep 17 00:00:00 2001 From: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com> Date: Tue, 31 Oct 2017 16:37:09 +0800 Subject: [PATCH 1/2] Rebalances citprojectiles somewhat Magjectiles have had their speed and range nerfed by about 50%, non lethal 9mms have lower speed and drastically lower range. --- code/citadel/cit_guns.dm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm index 8a90e75a6b..0d88ab6407 100644 --- a/code/citadel/cit_guns.dm +++ b/code/citadel/cit_guns.dm @@ -213,6 +213,8 @@ damage = 15 armour_penetration = 10 light_range = 2 + speed = 1.2 + range = 25 light_color = LIGHT_COLOR_RED /obj/item/projectile/bullet/nlmags //non-lethal boolets @@ -220,9 +222,11 @@ icon_state = "magjectile-nl" damage = 1 knockdown = 0 - stamina = 25 + stamina = 30 armour_penetration = -10 light_range = 2 + speed = 1.2 + range = 25 light_color = LIGHT_COLOR_BLUE @@ -378,19 +382,23 @@ /obj/item/projectile/bullet/magrifle icon = 'icons/obj/guns/cit_guns.dmi' icon_state = "magjectile-large" - damage = 25 + damage = 20 armour_penetration = 25 light_range = 3 + speed = 1.2 + range = 35 light_color = LIGHT_COLOR_RED /obj/item/projectile/bullet/nlmagrifle //non-lethal boolets icon = 'icons/obj/guns/cit_guns.dmi' icon_state = "magjectile-large-nl" - damage = 2 + damage = 1 knockdown = 0 - stamina = 30 + stamina = 35 armour_penetration = -10 light_range = 3 + speed = 1.0 + range = 35 light_color = LIGHT_COLOR_BLUE ///ammo casings/// @@ -1070,12 +1078,16 @@ obj/item/projectile/bullet/c10mm/soporific name = "9mm frangible bullet" damage = 15 stamina = 0 + speed = 1.0 + range = 20 armour_penetration = -25 /obj/item/projectile/bullet/c9mm/rubber name = "9mm rubber bullet" - damage = 2 - stamina = 25 + damage = 5 + stamina = 30 + speed = 1.2 + range = 14 knockdown = 0 /obj/item/ammo_casing/c9mm/frangible From e0a153c4c710820ac0e271ce549f61cda3cf9d79 Mon Sep 17 00:00:00 2001 From: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com> Date: Tue, 31 Oct 2017 19:47:20 +0800 Subject: [PATCH 2/2] 9mm frangibles now requires hacked lathes, costs slightly less They are by all means, lethal, even if they absolutely pale in comparison to regular bullets. They'll cost ever so slightly less materials to build. --- code/citadel/cit_guns.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm index 0d88ab6407..bceeb820e2 100644 --- a/code/citadel/cit_guns.dm +++ b/code/citadel/cit_guns.dm @@ -1132,9 +1132,9 @@ obj/item/projectile/bullet/c10mm/soporific name = "Box of 9mm Frangible Bullets" id = "9mm_frag" build_type = AUTOLATHE - materials = list(MAT_METAL = 30000) + materials = list(MAT_METAL = 25000) build_path = /obj/item/ammo_box/c9mm/frangible - category = list("initial", "Security") + category = list("hacked", "Security") /datum/design/c9mmrubber name = "Box of 9mm Rubber Bullets"