Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bullet stacks #3456

Merged
merged 34 commits into from
Oct 12, 2024
Merged

Bullet stacks #3456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
cfa170b
Initial ammostack commit
thgvr Jul 30, 2024
b4aad1e
commit 2
thgvr Sep 29, 2024
cb094d6
stupid idiot commit
thgvr Sep 29, 2024
8644869
more stuff
thgvr Sep 29, 2024
eb1489c
a
thgvr Sep 29, 2024
98f0c9a
unused var, no sushi stacks
thgvr Oct 5, 2024
8922a42
Fully working + Updatepaths
thgvr Oct 5, 2024
3e1c2c0
Revert "Fully working + Updatepaths"
thgvr Oct 5, 2024
20ddf05
Merge branch 'master' into bullet-stax
thgvr Oct 5, 2024
f2d9803
Fixes
thgvr Oct 5, 2024
3abb8b3
UpdatePaths
thgvr Oct 5, 2024
7fc7c6e
Repathing
thgvr Oct 5, 2024
8d195bc
Merge branch 'master' into bullet-stax
thgvr Oct 5, 2024
3b3ae98
fixes
thgvr Oct 5, 2024
ea8c9ea
More fixes
thgvr Oct 5, 2024
4f81182
linter
thgvr Oct 5, 2024
52ed41f
linter?
thgvr Oct 6, 2024
865b20f
Update _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
thgvr Oct 6, 2024
1398389
Update _maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
thgvr Oct 6, 2024
37b60d8
Update _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
thgvr Oct 6, 2024
9685f94
ok
thgvr Oct 6, 2024
33b3ac6
fix CI hopefully
thgvr Oct 8, 2024
fac50f5
oops
thgvr Oct 8, 2024
467169f
How
thgvr Oct 8, 2024
51bdde8
Merge branch 'master' into bullet-stax
thgvr Oct 8, 2024
2add6f7
...?
thgvr Oct 8, 2024
d5d3b3d
more
thgvr Oct 8, 2024
263f43e
more changes
thgvr Oct 10, 2024
2c5eb5b
More
thgvr Oct 10, 2024
071f535
more
thgvr Oct 10, 2024
8ca3de4
fix hopefully
thgvr Oct 10, 2024
b033c75
lol
thgvr Oct 10, 2024
577410f
Forgot this
thgvr Oct 10, 2024
60efdf5
a
thgvr Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
},
/turf/open/water/beach/deep,
/area/overmap_encounter/planetoid/beachplanet/explored)
"eB" = (
/obj/item/storage/box/ammo/c38,
/obj/structure/closet/crate/wooden,
/turf/open/floor/wood,
/area/ruin/beach)
"eJ" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
Expand Down Expand Up @@ -200,12 +205,6 @@
/obj/structure/railing/corner,
/turf/open/water/beach/deep,
/area/overmap_encounter/planetoid/beachplanet/explored)
"kj" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/melee/knife/hunting,
/turf/open/floor/wood,
/area/ruin/beach)
"kr" = (
/obj/effect/turf_decal/weather/sand/corner{
dir = 1
Expand Down Expand Up @@ -280,11 +279,6 @@
},
/turf/open/floor/plating/asteroid/sand,
/area/overmap_encounter/planetoid/cave/explored)
"mq" = (
/obj/item/ammo_box/c38_box,
/obj/structure/closet/crate/wooden,
/turf/open/floor/wood,
/area/ruin/beach)
"my" = (
/obj/effect/turf_decal/weather/sand{
dir = 5
Expand Down Expand Up @@ -745,12 +739,27 @@
},
/turf/open/floor/wood/ebony,
/area/overmap_encounter/planetoid/beachplanet/explored)
"CJ" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/melee/knife/hunting,
/obj/machinery/light/small/directional/east{
light_color = "#d8b1b1"
},
/turf/open/floor/wood,
/area/ruin/beach)
"CV" = (
/obj/machinery/grill,
/obj/effect/turf_decal/corner/opaque/pink/diagonal,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plastic,
/area/ruin/beach)
"DG" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/melee/knife/hunting,
/turf/open/floor/wood,
/area/ruin/beach)
"DL" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
Expand Down Expand Up @@ -1047,15 +1056,6 @@
/obj/effect/turf_decal/siding/white/corner,
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"PB" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/melee/knife/hunting,
/obj/machinery/light/small/directional/east{
light_color = "#d8b1b1"
},
/turf/open/floor/wood,
/area/ruin/beach)
"PC" = (
/obj/effect/turf_decal/weather/sand{
dir = 10
Expand Down Expand Up @@ -2186,9 +2186,9 @@ sz
ut
Ty
oS
mq
kj
PB
eB
DG
CJ
ut
BW
BN
Expand Down
9 changes: 2 additions & 7 deletions _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,13 +666,8 @@
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
/obj/item/ammo_box/c38_box{
pixel_x = 10;
pixel_y = 8
},
/obj/item/ammo_box/c38_box{
pixel_x = 10
},
/obj/item/storage/box/ammo/c38,
/obj/item/storage/box/ammo/c38,
/obj/structure/sign/poster/contraband/energy_swords{
pixel_x = -32
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
"EF" = (
/obj/effect/decal/cleanable/blood/gibs/torso,
/obj/structure/safe,
/obj/item/ammo_box/a12g/slug,
/obj/item/storage/box/ammo/a12g_slug,
/obj/item/melee/knife/combat,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3050,7 +3050,7 @@
/obj/item/clothing/under/rank/security/officer/blueshirt,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/shoes/jackboots,
/obj/item/ammo_box/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/machinery/light/small/broken/directional/north,
/obj/effect/turf_decal/corner/transparent/bar/three_quarters{
dir = 4
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
name = "armory locker";
req_one_access_txt = "1"
},
/obj/item/ammo_box/a12g,
/obj/item/storage/box/ammo/a12g_buckshot,
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered/crashed_starwalker)
"bL" = (
Expand Down Expand Up @@ -942,7 +942,7 @@
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/closet/crate/secure/gear,
/obj/item/ammo_box/c10mm/surplus,
/obj/item/storage/box/ammo/c10mm_surplus,
/obj/item/weaponcrafting/stock,
/obj/item/weaponcrafting/stock{
pixel_x = -6
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3086,7 +3086,7 @@
pixel_x = -3
},
/obj/item/ammo_box/magazine/illestren_a850r,
/obj/item/ammo_box/c9mm/ap,
/obj/item/storage/box/ammo/c9mm/ap,
/obj/item/ammo_box/magazine/illestren_a850r,
/obj/item/ammo_box/magazine/co9mm{
start_empty = 1
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1862,10 +1862,7 @@
pixel_x = 5;
pixel_y = 7
},
/obj/item/ammo_box/foambox/riot{
pixel_x = -3;
pixel_y = -3
},
/obj/item/storage/box/ammo/foam_darts/riot,
/obj/structure/cable{
icon_state = "4-8"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,7 @@
"XP" = (
/obj/structure/table,
/obj/item/trash/can,
/obj/item/ammo_box/c45/surplus,
/obj/item/storage/box/ammo/c45_surplus,
/turf/open/floor/concrete,
/area/ruin)
"XS" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/power_puzzle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2694,8 +2694,8 @@
/obj/structure/closet/crate/secure/weapon{
name = "Ammo Crate"
},
/obj/item/ammo_box/c9mm/surplus,
/obj/item/ammo_box/c9mm/surplus,
/obj/item/storage/box/ammo/c9mm_surplus,
/obj/item/storage/box/ammo/c9mm_surplus,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/turf/open/floor/plasteel,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
/obj/item/toy/talking/AI{
pixel_x = 20
},
/obj/item/ammo_box/foambox/riot,
/obj/item/storage/box/ammo/foam_darts/riot,
/obj/item/gun/ballistic/shotgun/toy,
/turf/open/floor/light,
/area/ruin/space/has_grav/spacemall/shop2)
Expand Down Expand Up @@ -2434,7 +2434,7 @@
/area/ruin/space/has_grav/spacemall)
"jm" = (
/obj/structure/rack,
/obj/item/ammo_box/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/item/ammo_box/magazine/co9mm{
pixel_x = 5
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@
/area/ruin/powered)
"gw" = (
/obj/structure/table,
/obj/item/ammo_box/c45,
/obj/item/storage/box/ammo/c45,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/mono/white,
/area/ruin/powered)
"gx" = (
/obj/structure/table,
/obj/item/ammo_box/c9mm/rubbershot,
/obj/item/storage/box/ammo/c9mm_rubber,
/turf/open/floor/plasteel/mono/white,
/area/ruin/powered)
"gz" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/area/ruin/wasteplanet)
"bc" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/ammo_box/c9mm,
/obj/item/storage/box/ammo/c9mm,
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet)
"bd" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/independent/independent_dwayne.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/item/ammo_box/c38_box,
/obj/item/ammo_box/c38_box,
/obj/item/ammo_box/c38_box,
/obj/item/storage/box/ammo/c38,
/obj/item/storage/box/ammo/c38,
/obj/item/storage/box/ammo/c38,
/obj/structure/closet/crate/secure/plasma{
name = "ammo crate";
desc = "A secure ammo crate."
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/independent/independent_kilo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
/obj/item/ammo_box/a12g/rubbershot,
/obj/item/storage/box/ammo/a12g_rubbershot,
/obj/item/gun/ballistic/shotgun/doublebarrel/presawn{
spawnwithmagazine = 0
},
Expand Down Expand Up @@ -1875,7 +1875,7 @@
icon_state = "9-10"
},
/obj/effect/decal/cleanable/oil,
/obj/item/ammo_box/a12g,
/obj/item/storage/box/ammo/a12g_buckshot,
/obj/item/gun/ballistic/shotgun/doublebarrel/no_mag,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_rigger.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4132,7 +4132,7 @@
name = "ammunition locker";
req_access_txt = "1"
},
/obj/item/ammo_box/c38_box,
/obj/item/storage/box/ammo/c38,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_shetland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3475,7 +3475,7 @@
req_access_txt = "1";
req_ship_access = 1
},
/obj/item/ammo_box/c38_box,
/obj/item/storage/box/ammo/c38,
/obj/effect/turf_decal/box,
/obj/item/ammo_box/c38,
/obj/item/ammo_box/c38,
Expand Down
5 changes: 1 addition & 4 deletions _maps/shuttles/inteq/inteq_hound.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@
pixel_x = -11;
pixel_y = 5
},
/obj/item/ammo_box/a762_40/inteq{
pixel_x = 5;
pixel_y = 12
},
/obj/item/storage/box/ammo/a762_40/inteq,
/obj/item/reagent_containers/food/drinks/bottle/whiskey{
pixel_x = -7;
pixel_y = 6
Expand Down
10 changes: 2 additions & 8 deletions _maps/shuttles/inteq/inteq_valor.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5074,14 +5074,8 @@
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/structure/rack,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/item/ammo_box/c9mm/rubbershot{
pixel_x = 5;
pixel_y = 10
},
/obj/item/ammo_box/c9mm{
pixel_x = -2;
pixel_y = 2
},
/obj/item/storage/box/ammo/c9mm_rubber,
/obj/item/storage/box/ammo/c9mm,
/obj/machinery/light/small/directional/north,
/obj/structure/sign/poster/official/safety_report{
pixel_x = 32
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/nanotrasen/nanotrasen_harrier.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5189,9 +5189,9 @@
/obj/item/reagent_containers/spray/pepper,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm/rubbershot,
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm_rubber,
/obj/effect/turf_decal/trimline/opaque/vired/line,
/obj/item/storage/belt/security,
/obj/item/melee/knife/survival,
Expand Down
20 changes: 4 additions & 16 deletions _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13072,22 +13072,10 @@
pixel_x = 5;
pixel_y = 4
},
/obj/item/ammo_box/c9mm{
pixel_x = 4;
pixel_y = -6
},
/obj/item/ammo_box/c9mm{
pixel_x = 4;
pixel_y = 1
},
/obj/item/ammo_box/c9mm{
pixel_x = 4;
pixel_y = 9
},
/obj/item/ammo_box/c9mm/ap{
pixel_y = 17;
pixel_x = 4
},
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm/ap,
/obj/item/stock_parts/cell/gun{
pixel_x = -3;
pixel_y = -5
Expand Down
10 changes: 5 additions & 5 deletions _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1750,11 +1750,11 @@
/obj/structure/chair/handrail{
dir = 4
},
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm/rubbershot,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm_rubber,
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 10
},
Expand Down
7 changes: 2 additions & 5 deletions _maps/shuttles/pirate/pirate_tortuga.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,10 +667,7 @@
/area/ship/security/armory)
"hU" = (
/obj/structure/rack,
/obj/item/ammo_box/c45{
pixel_x = -9;
pixel_y = 8
},
/obj/item/storage/box/ammo/c45,
/obj/item/storage/toolbox/ammo/a762_40{
pixel_x = 5;
pixel_y = 6
Expand Down Expand Up @@ -3141,7 +3138,7 @@
/obj/item/clothing/shoes/jackboots{
pixel_y = -13
},
/obj/item/ammo_box/c38_box/surplus,
/obj/item/storage/box/ammo/c38_surplus,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/nanoweave,
/area/ship/crew/crewtwo)
Expand Down
Loading
Loading