Skip to content

Commit

Permalink
various HP sprite improvments (#3500)
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

I shouldnt have to explain every god damn detail but here:
- Resprites the Candor
- Resprites the Ashhand
- Removes the Shadow skins nobody used
- Adds Shadow skins people will use
- Gives the Shadow and Ashand inhands
- Redoes the flaming arrow inhands
- Fixes the boomslang fitting on the belt

## Why It's Good For The Game

![image](https://github.com/user-attachments/assets/00ef5f85-501c-4395-86de-2911a9db4ebc)

## Changelog

:cl:
add: Various sprite improvemnts
fix: Boomslang no longer fits on the belt
/:cl:

---------

Co-authored-by: retlaw34 <[email protected]>
  • Loading branch information
rye-rice and rye-rice authored Oct 14, 2024
1 parent 14e809a commit 3e5fefe
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 6 deletions.
1 change: 1 addition & 0 deletions code/modules/projectiles/guns/ballistic/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
show_magazine_on_sprite = TRUE

EMPTY_GUN_HELPER(automatic/pistol/candor)

Expand Down
21 changes: 15 additions & 6 deletions code/modules/projectiles/guns/ballistic/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,10 @@ EMPTY_GUN_HELPER(revolver/detective)
mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'

icon_state = "ashhand"
item_state = "ashhand"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev4570
fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
rack_sound = 'sound/weapons/gun/revolver/viper_prime.ogg'
manufacturer = MANUFACTURER_HUNTERSPRIDE
gate_loaded = TRUE
fire_delay = 0.6 SECONDS
Expand Down Expand Up @@ -640,20 +642,22 @@ EMPTY_GUN_HELPER(revolver/detective)
righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
icon_state = "shadow"
item_state = "hp_generic"
item_state = "shadow"

mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
manufacturer = MANUFACTURER_HUNTERSPRIDE
obj_flags = UNIQUE_RENAME
gate_loaded = TRUE
unique_reskin = list("Shadow" = "shadow",
"Army" = "shadow_army",
unique_reskin = list(\
"Shadow" = "shadow",
"Cattleman" = "shadow_cattleman",
"General" = "shadow_general",
"Frontier Scout" = "shadow_frontier",
"Nanotrasen Special" = "shadow_nanotrasen",
"Sheriff" = "shadow_sheriff",
"Cobra" = "shadow_cobra",
"Hired Gun" = "shadow_hiredgun",
"Buntline" = "shadow_buntline",
"Cavalry Special" = "shadow_cavalry"
"Cavalry" = "shadow_cavalry",
"Lanchester Special" = "shadow_lanchester"
)

recoil = 0 //weaker than normal revolver, no recoil
Expand All @@ -665,3 +669,8 @@ EMPTY_GUN_HELPER(revolver/detective)

/obj/item/gun/ballistic/revolver/shadow/no_mag
spawnwithmagazine = FALSE

/obj/item/gun/ballistic/revolver/shadow/reskin_obj(mob/M)
. = ..()
if(current_skin)
item_state = unique_reskin[current_skin]
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,8 @@ EMPTY_GUN_HELPER(automatic/smg/sidewinder)

fire_delay = 1 SECONDS

slot_flags = ITEM_SLOT_BACK

show_magazine_on_sprite = TRUE
unique_mag_sprites_for_variants = TRUE
show_ammo_capacity_on_magazine_sprite = TRUE
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.

0 comments on commit 3e5fefe

Please sign in to comment.