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

Gang gun adjustments #18310

Merged
merged 4 commits into from Mar 28, 2024
Merged

Gang gun adjustments #18310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a285211
adjust hipoint, buff other pistols
TDHooligan Mar 25, 2024
a4a2f90
webley's somewhat AP now. thanks to black market weirdos
TDHooligan Mar 25, 2024
8b74845
adjust birdshot damage curve
TDHooligan Mar 25, 2024
98e3b05
reduce stun from revolver
TDHooligan Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions code/modules/projectiles/bullet.dm
View file
Open in desktop
Expand Up @@ -716,10 +716,11 @@ toxic - poisons
hit_ground_chance = 66
implanted = null
damage = 18
stun = 6
hit_type = DAMAGE_CUT //birdshot mutilates your skin more, but doesnt hurt organs like shotties
dissipation_rate = 2
dissipation_rate = 4 //spread handles most of this
shot_sound = 'sound/weapons/birdshot.ogg'
dissipation_delay = 3
dissipation_delay = 6
casing = /obj/item/casing/shotgun/red
on_launch(obj/projectile/O)
icon_state = "birdshot[rand(1,3)]"
Expand Down Expand Up @@ -1962,8 +1963,9 @@ datum/projectile/bullet/autocannon
/datum/projectile/bullet/webley
name = "bullet"
damage = 45
damage_type = D_KINETIC
hit_type = DAMAGE_CUT
stun = 7
damage_type = D_PIERCING
armor_ignored = 0.5 //just enough to get past gang vests in 3 shots
implanted = /obj/item/implant/projectile/bullet_455
impact_image_state = "bullethole-small"
casing = /obj/item/casing/medium
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/laser.dm
View file
Open in desktop
Expand Up @@ -729,7 +729,7 @@ toxic - poisons
shot_volume = 50
name = "single"
sname = "single"
damage = 11
damage = 14

/datum/projectile/laser/lasergat/burst
name = "burst laser"
Expand Down
6 changes: 3 additions & 3 deletions code/obj/item/gun/ammo.dm
View file
Open in desktop
Expand Up @@ -555,8 +555,8 @@

lopoint
name = "9mm Lo-Point magazine"
amount_left = 12
max_amount = 12
amount_left = 10
max_amount = 10

/obj/item/ammo/bullets/nine_mm_NATO
sname = "9mm frangible"
Expand Down Expand Up @@ -1353,7 +1353,7 @@ ABSTRACT_TYPE(/obj/item/ammo/bullets/pipeshot)
/obj/item/ammo/bullets/webley
sname = ".455 Webley"
name = ".455 Webley Bullets"
desc = "A small speedloader, full of ammunition for a Webley Revolver."
desc = "A small speedloader of reproduction .455 Webley ammunition, with a custom armor-penetrating core."
icon_state = "455-6"
amount_left = 6
max_amount = 6
Expand Down
8 changes: 4 additions & 4 deletions code/obj/item/gun/kinetic.dm
View file
Open in desktop
Expand Up @@ -898,9 +898,9 @@ ABSTRACT_TYPE(/obj/item/survival_rifle_barrel)

get_desc(dist, mob/user)
if (user.get_gang() != null)
. += "For when you need MOR' DAKKA. Uses 9mm NATO rounds."
. += "For when you need MOR' DAKKA. Uses 9mm Surplus rounds."
else
. += "Its firemodes are labelled 'DAKKA' and 'MOR'... Uses 9mm NATO rounds."
. += "Its firemodes are labelled 'DAKKA' and 'MOR'... Uses 9mm Surplus rounds."

New()
ammo = new default_magazine
Expand Down Expand Up @@ -1246,13 +1246,13 @@ ABSTRACT_TYPE(/obj/item/survival_rifle_barrel)
name = "Lo-Point"
icon_state = "hipoint"
item_state = "hipoint"
shoot_delay = 1
shoot_delay = 4
spread_angle = 3
throwforce = 14 // literally throw it away
w_class = W_CLASS_SMALL
force = MELEE_DMG_PISTOL
fire_animation = TRUE
max_ammo_capacity = 12
max_ammo_capacity = 10
auto_eject = TRUE
has_empty_state = TRUE
gildable = FALSE
Expand Down