Skip to content

Commit

Permalink
Updates shotgun ammo boxes in ships to the new version. (#2676)
Browse files Browse the repository at this point in the history
## About The Pull Request
Updates shotgun ammo boxes in ships to the new version. Hyena,
Halftrack, Cepheus and Twinkleshine.

## Why It's Good For The Game
The new version is a lot better to use and this probably overdue.
## Changelog

:cl:
fix: updated ship shotgun ammo boxes
/:cl:
  • Loading branch information
Martinpachu authored Feb 1, 2024
1 parent a8c38df commit 0ab62db
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 22 deletions.
20 changes: 10 additions & 10 deletions _maps/shuttles/independent/independent_halftrack.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -200,16 +200,16 @@
/obj/machinery/airalarm/directional/south,
/obj/machinery/firealarm/directional/west,
/obj/structure/closet/crate/secure/weapon,
/obj/item/storage/box/lethalshot,
/obj/item/storage/box/lethalshot,
/obj/item/storage/box/lethalshot,
/obj/item/storage/box/lethalshot,
/obj/item/storage/box/lethalshot,
/obj/item/storage/box/beanbag,
/obj/item/storage/box/beanbag,
/obj/item/storage/box/beanbag,
/obj/item/storage/box/beanbag,
/obj/item/storage/box/beanbag,
/obj/item/ammo_box/a12g,
/obj/item/ammo_box/a12g,
/obj/item/ammo_box/a12g,
/obj/item/ammo_box/a12g,
/obj/item/ammo_box/a12g,
/obj/item/ammo_box/a12g/beanbag,
/obj/item/ammo_box/a12g/beanbag,
/obj/item/ammo_box/a12g/beanbag,
/obj/item/ammo_box/a12g/beanbag,
/obj/item/ammo_box/a12g/beanbag,
/obj/effect/turf_decal/box/red,
/turf/open/floor/plasteel/dark,
/area/ship/security)
Expand Down
10 changes: 2 additions & 8 deletions _maps/shuttles/minutemen/minutemen_cepheus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4108,15 +4108,9 @@
/obj/item/ammo_box/magazine/m45{
pixel_x = 6
},
/obj/item/storage/box/rubbershot{
pixel_x = 3;
pixel_y = -3
},
/obj/item/ammo_box/a12g/rubbershot,
/obj/item/ammo_box/magazine/cm15_mag,
/obj/item/storage/box/rubbershot{
pixel_x = 3;
pixel_y = -3
},
/obj/item/ammo_box/a12g/rubbershot,
/turf/open/floor/plasteel/tech/grid,
/area/ship/security)
"RN" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/industrial/outline,
/obj/item/storage/box/lethalshot,
/obj/item/ammo_box/a12g,
/obj/item/ammo_box/c10mm,
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/syndicate/syndicate_twinkleshine.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3719,9 +3719,9 @@
/obj/item/ammo_casing/caseless/rocket,
/obj/item/ammo_casing/caseless/rocket/hedp,
/obj/item/ammo_casing/caseless/rocket/hedp,
/obj/item/storage/box/lethalshot,
/obj/item/storage/box/lethalshot,
/obj/item/storage/box/lethalshot,
/obj/item/ammo_box/a12g,
/obj/item/ammo_box/a12g,
/obj/item/ammo_box/a12g,
/obj/item/gun/ballistic/rocketlauncher,
/obj/item/gun/ballistic/automatic/ebr,
/obj/item/gun/ballistic/automatic/ebr{
Expand Down

0 comments on commit 0ab62db

Please sign in to comment.