Skip to content

Commit

Permalink
Refactors lootdroppers (#3526)
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
Refactors lootdroppers, giving them a fresh coat of paint from
tgstation/tgstation#60522
Ports docking port sprites from
tgstation/tgstation#82729
I also tweaked some of the mapping helper's icons.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
refactor: refactored some mapping stuff including random spawners!
/: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
FalloutFalcon authored Oct 24, 2024
1 parent 4d7cdcd commit 94cb62b
Show file tree
Hide file tree
Showing 224 changed files with 4,584 additions and 5,518 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@
/turf/open/floor/concrete/slab_1,
/area/ruin/beach/complex/wall)
"sa" = (
/obj/effect/spawner/lootdrop/garden/seaweed,
/obj/effect/spawner/random/food_or_drink/garden/seaweed,
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"so" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_float_resort.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@
dir = 1
},
/obj/item/candle,
/obj/effect/spawner/lootdrop/donut,
/obj/effect/spawner/random/food_or_drink/donut,
/turf/open/floor/wood{
light_range = 2
},
Expand Down
56 changes: 28 additions & 28 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"bs" = (
/obj/machinery/vending/cola/random,
/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"bu" = (
Expand Down Expand Up @@ -412,9 +412,9 @@
/area/ruin/beach/oceantown)
"fn" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/donut/slimejelly,
/obj/effect/spawner/lootdrop/donut,
/obj/effect/spawner/lootdrop/donut,
/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/obj/effect/spawner/random/food_or_drink/donut,
/obj/effect/spawner/random/food_or_drink/donut,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"fp" = (
Expand Down Expand Up @@ -711,8 +711,8 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"ix" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/donut/slimejelly,
/obj/effect/spawner/lootdrop/donut,
/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/obj/effect/spawner/random/food_or_drink/donut,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"iz" = (
Expand Down Expand Up @@ -1560,11 +1560,11 @@
/area/ruin/beach/oceantown/bar)
"un" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/donut,
/obj/effect/spawner/lootdrop/donut,
/obj/effect/spawner/lootdrop/donut,
/obj/effect/spawner/lootdrop/donut,
/obj/effect/spawner/lootdrop/donut/slimejelly,
/obj/effect/spawner/random/food_or_drink/donut,
/obj/effect/spawner/random/food_or_drink/donut,
/obj/effect/spawner/random/food_or_drink/donut,
/obj/effect/spawner/random/food_or_drink/donut,
/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"ur" = (
Expand Down Expand Up @@ -3367,8 +3367,8 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"NX" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/spawner/random/food_or_drink/donut/jelly,
/obj/effect/spawner/random/food_or_drink/donut/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"Oe" = (
Expand Down Expand Up @@ -3541,7 +3541,7 @@
/area/ruin/beach/oceantown)
"PF" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/donut/slimejelly,
/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"PH" = (
Expand Down Expand Up @@ -3569,7 +3569,7 @@
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Qf" = (
/obj/machinery/vending/snack/random,
/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"Qm" = (
Expand Down Expand Up @@ -3733,10 +3733,10 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"SS" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/donut,
/obj/effect/spawner/lootdrop/donut,
/obj/effect/spawner/lootdrop/donut/slimejelly,
/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/spawner/random/food_or_drink/donut,
/obj/effect/spawner/random/food_or_drink/donut,
/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/obj/effect/spawner/random/food_or_drink/donut/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"SY" = (
Expand Down Expand Up @@ -3906,7 +3906,7 @@
/area/ruin/beach/oceantown/bar)
"Vr" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/turf/open/floor/carpet,
/area/ruin/beach/oceantown)
"VI" = (
Expand Down Expand Up @@ -3945,9 +3945,9 @@
/area/ruin/beach/oceantown/shop)
"VQ" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/spawner/random/food_or_drink/donut/jelly,
/obj/effect/spawner/random/food_or_drink/donut/jelly,
/obj/effect/spawner/random/food_or_drink/donut/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"VS" = (
Expand Down Expand Up @@ -4112,11 +4112,11 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"XQ" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/spawner/lootdrop/donut/slimejelly,
/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/spawner/random/food_or_drink/donut/jelly,
/obj/effect/spawner/random/food_or_drink/donut/jelly,
/obj/effect/spawner/random/food_or_drink/donut/jelly,
/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/obj/effect/spawner/random/food_or_drink/donut/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"XS" = (
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@
/obj/structure/closet/crate,
/obj/effect/turf_decal/box,
/obj/item/stack/cable_coil/red,
/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ruin/beach/piratecrash/shuttle)
Expand Down Expand Up @@ -1350,7 +1350,7 @@
"Pf" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/spawner/random/maintenance/two,
/obj/item/stack/sheet/mineral/gold/five,
/obj/item/stack/sheet/mineral/silver/five,
/obj/item/stack/sheet/mineral/silver/five,
Expand Down Expand Up @@ -1433,9 +1433,9 @@
"QG" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/random_machine_circuit_rare,
/obj/effect/spawner/lootdrop/maintenance/four,
/obj/effect/spawner/lootdrop/random_machine_circuit_common,
/obj/effect/spawner/random/circuit/machine/rare,
/obj/effect/spawner/random/maintenance/four,
/obj/effect/spawner/random/circuit/machine/common,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/rust,
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"bI" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/light/small/directional/north,
/obj/effect/spawner/lootdrop/glowstick,
/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/concrete/slab_1,
/area/ruin/beach/treasure_cove)
"bN" = (
Expand All @@ -53,7 +53,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/spawner/lootdrop/glowstick,
/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/plating/dirt/jungle,
/area/ruin/unpowered)
"cJ" = (
Expand Down Expand Up @@ -543,7 +543,7 @@
pixel_x = -10;
pixel_y = 4
},
/obj/effect/spawner/lootdrop/glowstick,
/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/wood,
/area/ruin/beach/treasure_cove)
"rA" = (
Expand Down
12 changes: 5 additions & 7 deletions _maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,7 @@
/obj/structure/bed/double{
dir = 1
},
/obj/item/bedsheet/dorms/double{
dir = 1
},
/obj/effect/spawner/random/bedsheet/double,
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_holemaker)
"iN" = (
Expand Down Expand Up @@ -674,7 +672,7 @@
/area/ruin/unpowered/crashed_holemaker)
"lt" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/spawner/lootdrop/crate_spawner,
/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
/area/ruin/unpowered/crashed_holemaker)
"lu" = (
Expand Down Expand Up @@ -743,7 +741,7 @@
},
/obj/item/radio/intercom/directional/north,
/obj/structure/closet/cabinet,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_holemaker)
Expand Down Expand Up @@ -1441,7 +1439,7 @@
/turf/open/floor/carpet,
/area/ruin/unpowered/crashed_holemaker)
"ze" = (
/obj/effect/spawner/lootdrop/crate_spawner,
/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
/area/ruin/unpowered/crashed_holemaker)
"zh" = (
Expand Down Expand Up @@ -2389,7 +2387,7 @@
/turf/open/floor/plasteel/icemoon,
/area/ruin/unpowered/crashed_holemaker)
"RL" = (
/obj/machinery/vending/snack/random,
/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/spline/fancy/transparent/neutral/corner{
dir = 4
},
Expand Down
22 changes: 11 additions & 11 deletions _maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
/turf/open/floor/concrete/slab_3/icemoon,
/area/overmap_encounter/planetoid/cave/explored)
"fe" = (
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet,
/obj/effect/turf_decal/siding/wood,
/obj/structure/bed{
icon_state = "dirty_mattress"
Expand Down Expand Up @@ -1256,10 +1256,10 @@
/obj/item/clothing/head/frontier,
/obj/item/clothing/gloves/color/latex,
/obj/item/clothing/mask/surgical,
/obj/effect/spawner/lootdrop/chem_jug,
/obj/effect/spawner/lootdrop/chem_jug,
/obj/effect/spawner/lootdrop/chem_jug,
/obj/effect/spawner/lootdrop/chem_jug,
/obj/effect/spawner/random/medical/chem_jug,
/obj/effect/spawner/random/medical/chem_jug,
/obj/effect/spawner/random/medical/chem_jug,
/obj/effect/spawner/random/medical/chem_jug,
/obj/effect/turf_decal/corner/opaque/blue,
/obj/effect/turf_decal/corner/opaque/neutral{
dir = 4
Expand Down Expand Up @@ -1659,7 +1659,7 @@
/area/ruin/powered/icemoon/lodge/mainhall)
"wD" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet,
/obj/effect/turf_decal/siding/wood{
dir = 10
},
Expand Down Expand Up @@ -1771,7 +1771,7 @@
/turf/open/floor/wood/maple,
/area/ruin/powered/icemoon/lodge/mainhall)
"yi" = (
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
Expand Down Expand Up @@ -1968,9 +1968,9 @@
/obj/effect/turf_decal/spline/fancy/wood{
dir = 8
},
/obj/effect/spawner/lootdrop/ration,
/obj/effect/spawner/lootdrop/ration,
/obj/effect/spawner/lootdrop/ration,
/obj/effect/spawner/random/food_or_drink/ration,
/obj/effect/spawner/random/food_or_drink/ration,
/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/wood/mahogany{
icon_state = "wood-broken6"
},
Expand Down Expand Up @@ -2677,7 +2677,7 @@
/turf/closed/wall/mineral/wood,
/area/ruin/powered/icemoon/lodge/residential)
"Nq" = (
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet,
/obj/effect/turf_decal/siding/wood,
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"fD" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/blood/bubblegum,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/turf/open/floor/wood,
/area/ruin/powered)
"fQ" = (
Expand Down Expand Up @@ -459,7 +459,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"LZ" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/turf/open/floor/wood,
/area/ruin/powered)
"Nq" = (
Expand All @@ -477,7 +477,7 @@
/turf/open/floor/carpet,
/area/ruin/powered)
"Pp" = (
/obj/machinery/vending/snack/random,
/obj/effect/spawner/random/vending/snack,
/turf/open/floor/holofloor/wood,
/area/ruin/powered)
"PQ" = (
Expand Down Expand Up @@ -554,7 +554,7 @@
"WH" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/turf/open/floor/wood,
/area/ruin/powered)
"Ze" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"xN" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance/three,
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/unpowered)
"xQ" = (
Expand Down Expand Up @@ -1028,7 +1028,7 @@
/obj/structure/rack,
/obj/item/hatchet,
/obj/item/hatchet,
/obj/effect/spawner/lootdrop/maintenance/three,
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/unpowered)
"Ul" = (
Expand Down Expand Up @@ -1086,7 +1086,7 @@
/obj/item/ammo_casing/shotgun/improvised,
/obj/item/ammo_casing/shotgun/improvised,
/obj/item/ammo_casing/shotgun/improvised,
/obj/effect/spawner/lootdrop/maintenance/three,
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/unpowered)
"WH" = (
Expand Down Expand Up @@ -1181,7 +1181,7 @@
"Yx" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/rack_parts,
/obj/effect/spawner/lootdrop/maintenance/three,
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/wood{
icon_state = "wood-broken3";
initial_gas_mix = "ICEMOON_ATMOS"
Expand Down
Loading

0 comments on commit 94cb62b

Please sign in to comment.