Skip to content

Commit

Permalink
Various Hunter's pride sprite improvments (#3943)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Various minor hunter's pride improvements.

Gives derringer it's own new sprite

## Why It's Good For The Game

Sprites


![image](https://github.com/user-attachments/assets/a68dfe7a-4959-4e04-a7c4-5676348cfa60)


## Changelog

:cl:
add: Touches up the sprites of various hunter's pride thingys, notably
the hellfire and brimstone
add: Derringers have a new sprite
del: Double barreled shotgun reskins
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: retlaw34 <[email protected]>
  • Loading branch information
rye-rice and rye-rice authored Jan 6, 2025
1 parent 4685b73 commit ee913a9
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 4 deletions.
2 changes: 2 additions & 0 deletions code/modules/projectiles/guns/ballistic/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
name = ".38 Derringer"
desc = "An easily concealable derringer. Uses .38 special ammo."
icon_state = "derringer"
item_state = "hp_generic"

icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
Expand Down Expand Up @@ -201,6 +202,7 @@
mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'

icon_state = "derringer_syndie"
item_state = "sa_generic"
default_ammo_type = /obj/item/ammo_box/magazine/internal/derr357
allowed_ammo_types = list(
/obj/item/ammo_box/magazine/internal/derr357,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,6 @@ NO_MAG_GUN_HELPER(automatic/pistol/candor/factory)
)

obj_flags = UNIQUE_RENAME
unique_reskin = list("Default" = "dshotgun",
"Stainless Steel" = "dshotgun_white",
"Stained Green" = "dshotgun_green"
)
semi_auto = TRUE
can_be_sawn_off = TRUE
bolt_type = BOLT_TYPE_NO_BOLT
Expand Down
Binary file modified icons/obj/guns/manufacturer/hunterspride/48x32.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/hunterspride/lefthand.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/hunterspride/onmob.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/hunterspride/righthand.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/scarborough/48x32.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi
Binary file not shown.

0 comments on commit ee913a9

Please sign in to comment.