Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SG falloff rebalance and far sight removal #7065

Merged
merged 3 commits into from
Sep 12, 2024
Merged

SG falloff rebalance and far sight removal #7065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a00fd6e
a
Git-Nivrak Aug 30, 2024
17a2bc0
a
Git-Nivrak Sep 8, 2024
537653c
e
Git-Nivrak Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/datums/ammo/bullet/special_ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
icon_state = "redbullet"
flags_ammo_behavior = AMMO_BALLISTIC

damage_falloff = DAMAGE_FALLOFF_TIER_7
max_range = 12
accuracy = HIT_ACCURACY_TIER_4
damage = 30
penetration = 0
effective_range_max = 7

/datum/ammo/bullet/smartgun/armor_piercing
name = "armor-piercing smartgun bullet"
Expand All @@ -31,6 +33,7 @@
shrapnel_chance = SHRAPNEL_CHANCE_TIER_7
accurate_range = 32
accuracy = HIT_ACCURACY_TIER_3
damage_falloff = DAMAGE_FALLOFF_TIER_10
damage = 40
penetration = 0

Expand Down
3 changes: 2 additions & 1 deletion code/modules/clothing/glasses/night.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
Loading