Skip to content

Commit

Permalink
name + ammo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Martinpachu committed Jul 31, 2024
1 parent 135416d commit 8380482
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions code/modules/projectiles/boxes_magazines/internal/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@
caliber = ".38"
max_ammo = 12

/obj/item/ammo_box/magazine/internal/shot/winchester/a357
name = "357 lever internal magazine"
/obj/item/ammo_box/magazine/internal/shot/winchester/absolution
name = "absolution internal magazine"
ammo_type = /obj/item/ammo_casing/a357
caliber = ".357"
max_ammo = 8

/obj/item/ammo_box/magazine/internal/shot/winchester/shotgun
name = "shotgun lever internal magazine"
/obj/item/ammo_box/magazine/internal/shot/winchester/conflagration
name = "conflagration internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
caliber = "12ga"
max_ammo = 4
Expand Down
20 changes: 10 additions & 10 deletions code/modules/projectiles/guns/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -717,10 +717,10 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
item_state = "flamingbolt_sawn"
mob_overlay_state = item_state

/obj/item/gun/ballistic/shotgun/flamingarrow/a357
name = "357 lever"
desc = "A sturdy and lightweight lever-action rifle with hand-stamped Hunter's Pride marks on the receiver. A popular choice among Frontier homesteaders for hunting small game and rudimentary self-defense. Chambered in .38."
sawn_desc = "A lever-action rifle that has been sawed down and modified for extra portability. While surprisingly effective as a sidearm, the more important benefit is how much cooler it looks."
/obj/item/gun/ballistic/shotgun/flamingarrow/absolution
name = "HP Absolution"
desc = "WIP."
sawn_desc = "WIP SAWED OFF."
mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester/a357

/obj/item/gun/ballistic/shotgun/flamingarrow/a357/sawoff(mob/user)
Expand All @@ -745,17 +745,17 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
/obj/item/gun/ballistic/shotgun/flamingarrow/a357/no_mag
spawnwithmagazine = FALSE

/obj/item/gun/ballistic/shotgun/flamingarrow/shotgun
name = "shotgun lever"
desc = "A sturdy and lightweight lever-action rifle with hand-stamped Hunter's Pride marks on the receiver. A popular choice among Frontier homesteaders for hunting small game and rudimentary self-defense. Chambered in .38."
sawn_desc = "A lever-action rifle that has been sawed down and modified for extra portability. While surprisingly effective as a sidearm, the more important benefit is how much cooler it looks."
mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester/shotgun
/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration
name = "HP Conflagration"
desc = "WIP."
sawn_desc = "WIP SAWED OFF."
mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester/conflagration

/obj/item/gun/ballistic/shotgun/flamingarrow/shotgun/sawoff(mob/user)
. = ..()
if(.)
var/obj/item/ammo_box/magazine/internal/tube = magazine
tube.max_ammo = 3
tube.max_ammo = 4

item_state = "flamingarrow_sawn"
mob_overlay_state = item_state
Expand Down

0 comments on commit 8380482

Please sign in to comment.