Skip to content

Commit

Permalink
Lethal shotgun ammo rebalance 2 (#10095)
Browse files Browse the repository at this point in the history
* Shotgun rebalance

* Update shotgun.dm

* Update shotgun.dm
  • Loading branch information
PowerfulBacon authored Dec 1, 2023
1 parent 8ca70f9 commit fdfa68f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions code/modules/projectiles/ammunition/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@

/obj/item/ammo_casing/shotgun/improvised
name = "improvised shell"
desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
desc = "A shotgun shell improvised from small metal shards. It won't travel as far as a regular shotgun shell, but it will still pack a punch against unarmoured opponents at close ranges."
icon_state = "improvshell"
projectile_type = /obj/projectile/bullet/pellet/shotgun_improvised
materials = list(/datum/material/iron=250)
pellets = 10
variance = 25
pellets = 9
variance = 15

/obj/item/ammo_casing/shotgun/ion
name = "ion shell"
Expand Down
11 changes: 6 additions & 5 deletions code/modules/projectiles/projectile/bullets/shotgun.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/projectile/bullet/shotgun_slug
name = "12g shotgun slug"
damage = 60
armour_penetration = -20
damage = 41
armour_penetration = 0

/obj/projectile/bullet/shotgun_beanbag
name = "beanbag slug"
Expand Down Expand Up @@ -64,8 +64,9 @@

/obj/projectile/bullet/pellet/shotgun_buckshot
name = "buckshot pellet"
damage = 9
damage = 8
tile_dropoff = 0.5
armour_penetration = 20

/obj/projectile/bullet/pellet/shotgun_rubbershot
name = "rubbershot pellet"
Expand All @@ -87,8 +88,8 @@
qdel(src)

/obj/projectile/bullet/pellet/shotgun_improvised
tile_dropoff = 0.55 //Come on it does 6 damage don't be like that.
damage = 6
tile_dropoff = 0.3 //Come on it does 6 damage don't be like that.
damage = 5

/obj/projectile/bullet/pellet/shotgun_improvised/Initialize(mapload)
. = ..()
Expand Down

0 comments on commit fdfa68f

Please sign in to comment.