Skip to content

Commit

Permalink
fixes 8x50 boxes and also adds them and some other ammo to the elder (#…
Browse files Browse the repository at this point in the history
…2818)

<!-- 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
sorry for not atomizing more i have a really bad tummyache today
## Why It's Good For The Game
boxes being invisible and having 50 rounds is bad and also its good to
like have ammo in the hunting. ship

## Changelog

:cl:
add: More and appropriate ammo to the Elder-class.
fix: Fixed a few oversights with 8x50 ammo boxes.

/: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. -->
  • Loading branch information
Martinpachu authored Mar 9, 2024
1 parent 17d99a5 commit 8cab622
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 13 deletions.
25 changes: 18 additions & 7 deletions _maps/shuttles/roumain/srm_elder.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -345,17 +345,27 @@
pixel_x = 8;
pixel_y = 6
},
/obj/item/ammo_box/magazine/illestren_a850r{
pixel_x = 8;
pixel_y = 2
},
/obj/item/ammo_box/c38_box{
pixel_x = -6;
pixel_y = 1
},
/obj/item/ammo_box/magazine/illestren_a850r{
pixel_x = 8
},
/obj/item/ammo_box/magazine/illestren_a850r{
pixel_x = 8;
pixel_y = -2
pixel_y = -4
},
/obj/item/ammo_box/magazine/illestren_a850r{
pixel_x = 8
},
/obj/item/ammo_box/magazine/illestren_a850r{
pixel_x = 8;
pixel_y = 6
},
/obj/item/ammo_box/magazine/illestren_a850r{
pixel_x = 8;
pixel_y = -6
},
/turf/open/floor/wood/ebony,
/area/ship/storage)
Expand Down Expand Up @@ -2016,9 +2026,10 @@
pixel_x = -7
},
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/ammo_box/c38/match,
/obj/item/ammo_box/c38/match,
/obj/item/storage/backpack/satchel/leather,
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45,
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
"zH" = (
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/toolbox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@
/obj/item/storage/toolbox/ammo/a850r/PopulateContents()
name = "ammo can (8x50mmR)"
icon_state = "ammobox_850"
for(var/i in 1 to 7)
new /obj/item/ammo_box/magazine/illestren_a850r(src)
for(var/i in 1 to 4)
new /obj/item/ammo_box/c8x50mm_box(src)

/obj/item/storage/toolbox/ammo/a762_40/PopulateContents()
name = "ammo can (7.62x40mm CLIP)"
Expand Down
8 changes: 4 additions & 4 deletions code/modules/projectiles/boxes_magazines/ammo_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,9 @@
/obj/item/ammo_box/c8x50mm_box
name = "ammo box (8x50mm)"
desc = "A box of standard 8x50mm ammo."
icon_state = "8x50mm"
icon_state = "8x50mmbox"
ammo_type = /obj/item/ammo_casing/a8_50r
max_ammo = 50
max_ammo = 20

/obj/item/ammo_box/ferropelletbox
name = "ammo box (ferromagnetic pellets)"
Expand All @@ -429,7 +429,7 @@

/obj/item/ammo_box/c8x50mmhp_box
name = "ammo box (8x50mm)"
desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of ."
icon_state = "8x50mm-hp"
desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of armor penetration.."
icon_state = "8x50mmbox-hp"
ammo_type = /obj/item/ammo_casing/a8_50rhp
max_ammo = 20
Binary file modified icons/obj/ammo.dmi
Binary file not shown.

0 comments on commit 8cab622

Please sign in to comment.