From a00fd6e2787cd6b48c3f7682f9ec6e6fb962cb41 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Fri, 30 Aug 2024 19:52:28 +0300 Subject: [PATCH 1/3] a --- code/datums/ammo/bullet/special_ammo.dm | 2 ++ code/modules/clothing/glasses/night.dm | 2 +- code/modules/projectiles/guns/smartgun.dm | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index cd30f8db1a78..71b9849f9eed 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -9,6 +9,7 @@ icon_state = "redbullet" flags_ammo_behavior = AMMO_BALLISTIC + damage_falloff = DAMAGE_FALLOFF_TIER_7 max_range = 12 accuracy = HIT_ACCURACY_TIER_4 damage = 30 @@ -31,6 +32,7 @@ shrapnel_chance = SHRAPNEL_CHANCE_TIER_7 accurate_range = 32 accuracy = HIT_ACCURACY_TIER_3 + damage_falloff = 0 damage = 40 penetration = 0 diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm index 984a906eabed..2013798953af 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -94,7 +94,7 @@ icon_state = "m56_goggles" deactive_state = "m56_goggles_0" toggleable = TRUE - actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/m56_goggles/far_sight) + actions_types = list(/datum/action/item_action/toggle) vision_flags = SEE_TURFS fullscreen_vision = null req_skill = SKILL_SPEC_WEAPONS diff --git a/code/modules/projectiles/guns/smartgun.dm b/code/modules/projectiles/guns/smartgun.dm index b2d228e27a26..6d3e45e338a0 100644 --- a/code/modules/projectiles/guns/smartgun.dm +++ b/code/modules/projectiles/guns/smartgun.dm @@ -18,6 +18,7 @@ force = 20 wield_delay = WIELD_DELAY_FAST aim_slowdown = SLOWDOWN_ADS_SPECIALIST + effective_range_max = 7 var/obj/item/smartgun_battery/battery = null /// Whether the smartgun drains the battery (Ignored if requires_battery is false) var/requires_power = TRUE From 17a2bc090ec64a9685df7c36c20ba931f33ed696 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sun, 8 Sep 2024 14:20:52 +0300 Subject: [PATCH 2/3] a --- code/datums/ammo/bullet/special_ammo.dm | 2 +- code/modules/clothing/glasses/night.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index 71b9849f9eed..ed010af94b3d 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -32,7 +32,7 @@ shrapnel_chance = SHRAPNEL_CHANCE_TIER_7 accurate_range = 32 accuracy = HIT_ACCURACY_TIER_3 - damage_falloff = 0 + damage_falloff = DAMAGE_FALLOFF_TIER_10 damage = 40 penetration = 0 diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm index 2013798953af..d822a1598320 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -203,6 +203,7 @@ name = "\improper M56T head mounted sight" desc = "A headset and goggles system for the M56T 'Terminator' Smartgun. Has a low-light vision processor as well as a system allowing detection of thermal signatures though solid surfaces." vision_flags = SEE_TURFS|SEE_MOBS + actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/m56_goggles/far_sight) /obj/item/clothing/glasses/night/yautja name = "bio-mask nightvision" From 537653c2902b3b6c1b232f45fec607736edfbe7d Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:32:53 +0300 Subject: [PATCH 3/3] e --- code/datums/ammo/bullet/special_ammo.dm | 1 + code/modules/projectiles/guns/smartgun.dm | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index ed010af94b3d..b6d1ad4c93c3 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -14,6 +14,7 @@ accuracy = HIT_ACCURACY_TIER_4 damage = 30 penetration = 0 + effective_range_max = 7 /datum/ammo/bullet/smartgun/armor_piercing name = "armor-piercing smartgun bullet" diff --git a/code/modules/projectiles/guns/smartgun.dm b/code/modules/projectiles/guns/smartgun.dm index 6d3e45e338a0..b2d228e27a26 100644 --- a/code/modules/projectiles/guns/smartgun.dm +++ b/code/modules/projectiles/guns/smartgun.dm @@ -18,7 +18,6 @@ force = 20 wield_delay = WIELD_DELAY_FAST aim_slowdown = SLOWDOWN_ADS_SPECIALIST - effective_range_max = 7 var/obj/item/smartgun_battery/battery = null /// Whether the smartgun drains the battery (Ignored if requires_battery is false) var/requires_power = TRUE