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.

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

Breaching nerfs #8082

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions code/datums/elements/bullet_trait/damage_boost.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ GLOBAL_LIST_INIT(damage_boost_turfs, typecacheof(/turf))

GLOBAL_LIST_INIT(damage_boost_turfs_xeno, typecacheof(/turf/closed/wall/resin))

GLOBAL_LIST_INIT(damage_boost_doors_xeno, typecacheof(/obj/structure/mineral_door/resin))

GLOBAL_LIST_INIT(damage_boost_breaching, typecacheof(list(
/obj/structure/machinery/door,
/obj/structure/mineral_door,
Expand All @@ -20,6 +22,8 @@ GLOBAL_LIST_INIT(damage_boost_pylons, typecacheof(list(

GLOBAL_LIST_INIT(damage_boost_vehicles, typecacheof(/obj/vehicle/multitile))

GLOBAL_LIST_INIT(daamge_boost_rwall, typecacheof(/turf/closed/wall/r_wall))

/datum/element/bullet_trait_damage_boost
element_flags = ELEMENT_DETACH|ELEMENT_BESPOKE
id_arg_index = 2
Expand Down
5 changes: 3 additions & 2 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3203,8 +3203,9 @@ Defined in conflicts.dm of the #defines folder.
/obj/item/attachable/attached_gun/shotgun/set_bullet_traits()
LAZYADD(traits_to_give_attached, list(
BULLET_TRAIT_ENTRY_ID("turfs", /datum/element/bullet_trait_damage_boost, 5, GLOB.damage_boost_turfs),
BULLET_TRAIT_ENTRY_ID("breaching", /datum/element/bullet_trait_damage_boost, 10.8, GLOB.damage_boost_breaching),
BULLET_TRAIT_ENTRY_ID("pylons", /datum/element/bullet_trait_damage_boost, 5, GLOB.damage_boost_pylons)
BULLET_TRAIT_ENTRY_ID("breaching", /datum/element/bullet_trait_damage_boost, 10.8, GLOB.damage_boost_breaching), // 1242 damage
BULLET_TRAIT_ENTRY_ID("pylons", /datum/element/bullet_trait_damage_boost, 5, GLOB.damage_boost_pylons),
BULLET_TRAIT_ENTRY_ID("xeno_door", /datum/element/bullet_trait_damage_boost, 0.4, GLOB.damage_boost_doors_xeno) // 496.8 two tap for normal three tap for thick
))

/obj/item/attachable/attached_gun/shotgun/reload_attachment(obj/item/ammo_magazine/handful/mag, mob/user)
Expand Down
4 changes: 3 additions & 1 deletion code/modules/projectiles/guns/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2060,9 +2060,11 @@

/obj/item/weapon/gun/rifle/xm51/set_bullet_traits()
LAZYADD(traits_to_give, list(
BULLET_TRAIT_ENTRY_ID("turfs", /datum/element/bullet_trait_damage_boost, 30, GLOB.damage_boost_turfs), //2550, 2 taps colony walls, 4 taps reinforced walls
BULLET_TRAIT_ENTRY_ID("turfs", /datum/element/bullet_trait_damage_boost, 30, GLOB.damage_boost_turfs), //2550, 2 taps colony walls
BULLET_TRAIT_ENTRY_ID("rwalls", /datum/element/bullet_trait_damage_boost, 0.44, GLOB.daamge_boost_rwall), // 1147, 7 taps for rwall
BULLET_TRAIT_ENTRY_ID("xeno turfs", /datum/element/bullet_trait_damage_boost, 0.23, GLOB.damage_boost_turfs_xeno), //2550*0.23 = 586, 2 taps resin walls, 3 taps thick resin
BULLET_TRAIT_ENTRY_ID("breaching", /datum/element/bullet_trait_damage_boost, 15, GLOB.damage_boost_breaching), //1275, enough to 1 tap airlocks
BULLET_TRAIT_ENTRY_ID("xeno_door", /datum/element/bullet_trait_damage_boost, 0.5, GLOB.damage_boost_doors_xeno), // 637.5 one tap normal resin door 2 tap thick resin door
BULLET_TRAIT_ENTRY_ID("pylons", /datum/element/bullet_trait_damage_boost, 6, GLOB.damage_boost_pylons) //510, 4 shots to take out a pylon
))

Expand Down
Loading