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

Special Buck Icon #324

Merged
merged 4 commits into from
Jul 18, 2024
Merged

Special Buck Icon #324

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
09c8206
special buck icon
Meatstuff882 Jul 5, 2024
165bdf5
removes useless variable
Meatstuff882 Jul 5, 2024
e168b21
special buck icon
Meatstuff882 Jul 17, 2024
a6f0b56
Merge branch 'master' into specialbuck
Meatstuff882 Jul 17, 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
1 change: 1 addition & 0 deletions code/datums/ammo/bullet/shotgun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@

/datum/ammo/bullet/shotgun/buckshot/special
name = "buckshot shell, USCM special type"
handful_state = "special_buck"
bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread/special

accurate_range = 8
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/magazines/shotguns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ var/list/shotgun_boxes_12g = list(
/obj/item/ammo_magazine/shotgun/buckshot/special
name = "box of buckshot shells, USCM special type"
desc = "A box filled with buckshot spread shotgun shells, USCM special type. 12 Gauge."
icon_state = "special"
default_ammo = /datum/ammo/bullet/shotgun/buckshot/special
//-------------------------------------------------------

Expand Down Expand Up @@ -172,6 +173,7 @@ var/list/shotgun_handfuls_8g = list(
var/list/shotgun_handfuls_12g = list(
/obj/item/ammo_magazine/handful/shotgun/slug,
/obj/item/ammo_magazine/handful/shotgun/buckshot,
/obj/item/ammo_magazine/handful/shotgun/buckshot/special,
/obj/item/ammo_magazine/handful/shotgun/flechette,
/obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary,
Expand Down Expand Up @@ -205,6 +207,7 @@ var/list/shotgun_handfuls_12g = list(

/obj/item/ammo_magazine/handful/shotgun/buckshot/special
name = "handful of shotgun buckshot shells, USCM special type (12g)"
icon_state = "special_buck_5"
default_ammo = /datum/ammo/bullet/shotgun/buckshot/special

/obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary
Expand Down
Binary file modified icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/handful.dmi
View file
Open in desktop
Binary file not shown.
Loading