From 399a65f93fb9998a6ff12b8351d781a82a80dcd2 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Tue, 19 Nov 2024 00:39:17 +0500 Subject: [PATCH 1/7] SG-85 Undo buff (nerf) --- .../projectiles/ammo_datums/bullet/machinegun.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm index c32d6fe7e68..ba4fdfd4fa4 100644 --- a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm +++ b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm @@ -108,6 +108,14 @@ hud_state_empty = "smartgun_empty" flags_ammo_behavior = AMMO_BALLISTIC accurate_range = 12 - damage = 25 - penetration = -15 + damage = 10 + penetration = 20 damage_falloff = 0.1 + var/shatter_duration = 3 SECONDS + +/datum/ammo/bullet/smart_minigun/on_hit_mob(mob/M, obj/projectile/proj) + if(!isliving(M)) + return + + var/mob/living/living_victim = M + living_victim.apply_status_effect(STATUS_EFFECT_SHATTER, shatter_duration) From a7c61880cb806c83dd500db33cf26e36caa93e58 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Tue, 19 Nov 2024 00:45:01 +0500 Subject: [PATCH 2/7] SG-85 Undo buff (nerf) --- code/modules/projectiles/ammo_datums/bullet/machinegun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm index ba4fdfd4fa4..22599fba955 100644 --- a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm +++ b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm @@ -109,7 +109,7 @@ flags_ammo_behavior = AMMO_BALLISTIC accurate_range = 12 damage = 10 - penetration = 20 + penetration = 25 damage_falloff = 0.1 var/shatter_duration = 3 SECONDS From f75e9a421d10ed91f9f529211f2c5425dcfb4027 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Tue, 19 Nov 2024 19:07:23 +0500 Subject: [PATCH 3/7] AP -> 20 --- code/modules/projectiles/ammo_datums/bullet/machinegun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm index 22599fba955..ba4fdfd4fa4 100644 --- a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm +++ b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm @@ -109,7 +109,7 @@ flags_ammo_behavior = AMMO_BALLISTIC accurate_range = 12 damage = 10 - penetration = 25 + penetration = 20 damage_falloff = 0.1 var/shatter_duration = 3 SECONDS From 632fb84f41c4a7afaf8da0946a2ed6a16ad49271 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Tue, 19 Nov 2024 21:36:32 +0500 Subject: [PATCH 4/7] AP 25 -> 15 --- code/modules/projectiles/ammo_datums/bullet/machinegun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm index ba4fdfd4fa4..96539fb6a73 100644 --- a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm +++ b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm @@ -109,7 +109,7 @@ flags_ammo_behavior = AMMO_BALLISTIC accurate_range = 12 damage = 10 - penetration = 20 + penetration = 15 damage_falloff = 0.1 var/shatter_duration = 3 SECONDS From 9009b2889afb59af240a2daba2accdc19dbcbb22 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Tue, 19 Nov 2024 21:43:27 +0500 Subject: [PATCH 5/7] Max ammo 2000 -> 1000 --- code/modules/projectiles/magazines/specialist.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/magazines/specialist.dm b/code/modules/projectiles/magazines/specialist.dm index 042f81290cf..4275e315b67 100644 --- a/code/modules/projectiles/magazines/specialist.dm +++ b/code/modules/projectiles/magazines/specialist.dm @@ -431,8 +431,8 @@ icon_state = "powerpacksg" flags_magazine = MAGAZINE_WORN|MAGAZINE_REFILLABLE default_ammo = /datum/ammo/bullet/smart_minigun - current_rounds = 2000 - max_rounds = 2000 + current_rounds = 1000 + max_rounds = 1000 caliber = CALIBER_10x26_CASELESS flags_item_map_variant = null From 31513d0b900e559c311479d4e959fd9e7db30894 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Wed, 20 Nov 2024 00:11:33 +0500 Subject: [PATCH 6/7] Zaebali AP 15 -> 20 --- code/modules/projectiles/ammo_datums/bullet/machinegun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm index 96539fb6a73..ba4fdfd4fa4 100644 --- a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm +++ b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm @@ -109,7 +109,7 @@ flags_ammo_behavior = AMMO_BALLISTIC accurate_range = 12 damage = 10 - penetration = 15 + penetration = 20 damage_falloff = 0.1 var/shatter_duration = 3 SECONDS From ba12d02719fbf1c2dca15515f1ff94f4bd521e72 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Fri, 22 Nov 2024 20:38:17 +0500 Subject: [PATCH 7/7] Liddl dmg buff --- code/modules/projectiles/ammo_datums/bullet/machinegun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm index ba4fdfd4fa4..1b725f19131 100644 --- a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm +++ b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm @@ -108,7 +108,7 @@ hud_state_empty = "smartgun_empty" flags_ammo_behavior = AMMO_BALLISTIC accurate_range = 12 - damage = 10 + damage = 12 penetration = 20 damage_falloff = 0.1 var/shatter_duration = 3 SECONDS