Skip to content

Commit

Permalink
yeah
Browse files Browse the repository at this point in the history
  • Loading branch information
rye-rice committed Feb 24, 2024
1 parent f224996 commit 8f7e6f8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

/datum/supply_pack/ammo/m45_speedloader
name = ".45 ACP Speedloader Crate"
desc = "Contains four .45 ACP speedloaders for revolvers, each containing six rounds."
desc = "Contains four .45 ACP speedloaders for the HP Montagne, each containing six rounds."
contains = list(/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45_speedloader,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
/datum/supply_pack/gun/shadowrevolver
name = "Shadow Revolver crate"
desc = "Contains two concealable Shadow revolvers, chambered in .45 ACP."
cost = 2500
cost = 1800
contains = list(/obj/item/gun/ballistic/revolver/shadow,
/obj/item/gun/ballistic/revolver/shadow)

Expand Down
9 changes: 2 additions & 7 deletions code/modules/projectiles/guns/ballistic/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,8 @@
REVOLVER_AUTO_ROTATE_RIGHT_LOADING = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_revolver_auto_right"),
)

var/image/editing_image
if(gate_load_direction == REVOLVER_AUTO_ROTATE_RIGHT_LOADING)
editing_image = chamber_options[REVOLVER_AUTO_ROTATE_RIGHT_LOADING]
editing_image.icon_state = "radial_revolver_auto_right_on"
else
editing_image = chamber_options[REVOLVER_AUTO_ROTATE_LEFT_LOADING]
editing_image.icon_state = "radial_revolver_auto_left_on"
var/image/editing_image = chamber_options[gate_load_direction]
editing_image.icon_state = "radial_revolver_auto_[gate_load_direction == REVOLVER_AUTO_ROTATE_RIGHT_LOADING ? "right":"left"]_on"

if(!gate_loaded) //these are completely redundant if you can reload everything with a speedloader
chamber_options -= REVOLVER_AUTO_ROTATE_LEFT_LOADING
Expand Down
2 changes: 0 additions & 2 deletions code/modules/projectiles/guns/gunhud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,6 @@
var/obj/item/gun/ballistic/revolver/the_revolver = the_gun
if(the_revolver.magazine)
return the_revolver.magazine.ammo_list()
else
return FALSE

/* //for counter-clockwise, kept here for reference
var/list/round_positions = list(
Expand Down

0 comments on commit 8f7e6f8

Please sign in to comment.