Skip to content

Commit

Permalink
it compiles..
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Oct 10, 2024
1 parent f416578 commit 34f44a4
Show file tree
Hide file tree
Showing 52 changed files with 2,485 additions and 1,749 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 @@ -1145,7 +1145,7 @@
/turf/open/floor/concrete/slab_1,
/area/ruin/beach/complex/wall)
"sa" = (
/obj/effect/spawner/random/garden/seaweed,
/obj/effect/spawner/random/food_or_drink/garden/seaweed,
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"so" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1433,9 +1433,9 @@
"QG" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate,
/obj/effect/spawner/random/random_machine_circuit_rare,
/obj/effect/spawner/random/circuit/machine/rare,
/obj/effect/spawner/random/maintenance/four,
/obj/effect/spawner/random/random_machine_circuit_common,
/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
24 changes: 12 additions & 12 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@
/area/ruin/lavaland/factory/manager_office)
"bE" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/effect/spawner/random/trash/decal,
/obj/item/storage/bag/trash,
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
Expand Down Expand Up @@ -216,7 +216,7 @@
"cm" = (
/obj/structure/table/wood,
/obj/machinery/light/directional/east,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/turf/open/floor/wood,
/area/ruin/lavaland/factory/adminstrative)
"co" = (
Expand Down Expand Up @@ -3148,12 +3148,12 @@
/obj/effect/turf_decal/corner/opaque/ntblue{
dir = 1
},
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/effect/spawner/random/trash/decal,
/obj/effect/spawner/random/trash/decal,
/obj/effect/spawner/random/trash/decal,
/obj/effect/spawner/random/trash/decal,
/obj/effect/spawner/random/trash/decal,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
Expand Down Expand Up @@ -4944,9 +4944,9 @@
/obj/effect/turf_decal/corner/opaque/bar,
/obj/structure/closet/crate/bin,
/obj/machinery/light/directional/west,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/effect/spawner/random/trash/decal,
/obj/effect/spawner/random/trash/decal,
/turf/open/floor/plasteel,
/area/ruin/lavaland/factory/dorms)
"Xn" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3034,8 +3034,8 @@
/obj/effect/turf_decal/industrial/outline/red,
/obj/effect/spawner/random/random_computer_circuit_common,
/obj/effect/spawner/random/maintenance/four,
/obj/effect/spawner/random/random_machine_circuit_common,
/obj/effect/spawner/random/random_machine_circuit_common,
/obj/effect/spawner/random/circuit/machine/common,
/obj/effect/spawner/random/circuit/machine/common,
/turf/open/floor/plasteel/patterned/brushed/rockplanet,
/area/ruin/rockplanet/distillery/crew)
"IA" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@
},
/area/overmap_encounter/planetoid/sand/explored)
"JE" = (
/obj/effect/spawner/random/tool_engie_sydnie,
/obj/effect/spawner/random/engineering/tool/sydnie,
/turf/open/floor/plating/asteroid/whitesands{
light_range = 2
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5866,7 +5866,7 @@
/area/ruin/space/has_grav/spacemall/shop2)
"vS" = (
/obj/structure/rack,
/obj/effect/spawner/random/beaker_loot_spawner,
/obj/effect/spawner/random/medical/beaker,
/obj/effect/turf_decal/corner/opaque/blue/diagonal,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/shop2)
Expand Down Expand Up @@ -11266,7 +11266,7 @@
/area/ruin/space/has_grav/spacemall)
"Qf" = (
/obj/structure/rack,
/obj/effect/spawner/random/tool_engie_common,
/obj/effect/spawner/random/engineering/tool/common,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
Expand Down Expand Up @@ -12655,8 +12655,8 @@
"VA" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner,
/obj/effect/spawner/random/beaker_loot_spawner,
/obj/effect/spawner/random/beaker_loot_spawner,
/obj/effect/spawner/random/medical/beaker,
/obj/effect/spawner/random/medical/beaker,
/obj/effect/turf_decal/corner/opaque/blue/diagonal,
/obj/item/clothing/neck/stethoscope,
/turf/open/floor/plasteel/white,
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_asteroid_40x20.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@
},
/area/hangar)
"vh" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating{
planetary_atmos = 1
Expand Down
42 changes: 21 additions & 21 deletions _maps/outpost/indie_space.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/port)
"bS" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/obj/effect/turf_decal/corner_techfloor_grid{
dir = 8
},
Expand Down Expand Up @@ -346,7 +346,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/central)
"ci" = (
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
Expand Down Expand Up @@ -481,7 +481,7 @@
/turf/open/floor/plasteel,
/area/outpost/vacant_rooms)
"dl" = (
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/effect/turf_decal/steeldecal/steel_decals7{
dir = 9
},
Expand Down Expand Up @@ -1001,7 +1001,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"gS" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"gT" = (
Expand Down Expand Up @@ -1269,7 +1269,7 @@
/turf/open/floor/wood,
/area/outpost/crew/library)
"iD" = (
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"iG" = (
Expand Down Expand Up @@ -2782,7 +2782,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
Expand Down Expand Up @@ -3791,7 +3791,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/port)
"xu" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
Expand Down Expand Up @@ -3884,7 +3884,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"xZ" = (
Expand Down Expand Up @@ -4155,7 +4155,7 @@
/turf/open/floor/plating/asteroid,
/area/outpost/external)
"zS" = (
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"zY" = (
Expand Down Expand Up @@ -4984,7 +4984,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"ER" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"EV" = (
Expand Down Expand Up @@ -5189,7 +5189,7 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/vacant_rooms/office)
"Gj" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
Expand Down Expand Up @@ -6213,8 +6213,8 @@
/turf/open/floor/wood,
/area/outpost/crew/library)
"LR" = (
/obj/effect/spawner/random/tool_engie_common,
/obj/effect/spawner/random/tool_engie_common,
/obj/effect/spawner/random/engineering/tool/common,
/obj/effect/spawner/random/engineering/tool/common,
/obj/structure/rack,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
Expand Down Expand Up @@ -7079,7 +7079,7 @@
/obj/structure/cable/yellow{
icon_state = "4-6"
},
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 10
},
Expand Down Expand Up @@ -7166,7 +7166,7 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"RJ" = (
Expand Down Expand Up @@ -7400,7 +7400,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"Ta" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/steeldecal/steel_decals9,
/turf/open/floor/plating,
Expand Down Expand Up @@ -7556,7 +7556,7 @@
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 9
},
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/maintenance/fore)
Expand Down Expand Up @@ -7618,7 +7618,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
Expand Down Expand Up @@ -7897,7 +7897,7 @@
/turf/open/floor/carpet/green,
/area/outpost/crew/bar)
"Wa" = (
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/mouse/brown,
/turf/open/floor/plating,
Expand Down Expand Up @@ -8332,7 +8332,7 @@
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo)
"YC" = (
/obj/effect/spawner/random/waste/trash,
/obj/effect/spawner/random/trash/decal,
/obj/structure/rack,
/obj/effect/turf_decal/steeldecal/steel_decals_central2{
dir = 4
Expand Down Expand Up @@ -8528,7 +8528,7 @@
/area/outpost/hallway/central)
"ZP" = (
/obj/structure/rack,
/obj/effect/spawner/random/tool_surgery_common,
/obj/effect/spawner/random/medical/surgery_tool/common,
/obj/effect/spawner/random/maintenance/four,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/vacant_rooms/office)
Expand Down
10 changes: 5 additions & 5 deletions _maps/outpost/nanotrasen_asteroid.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2337,7 +2337,7 @@
/area/outpost/vacant_rooms)
"iW" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/obj/structure/sign/poster/contraband/random{
pixel_x = 32;
pixel_y = -32
Expand Down Expand Up @@ -5481,7 +5481,7 @@
/turf/open/floor/plasteel/dark,
/area/outpost/operations)
"tD" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating{
icon_state = "panelscorched"
Expand Down Expand Up @@ -10560,7 +10560,7 @@
/area/outpost/hallway/starboard)
"KW" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/turf/open/floor/plating,
/area/outpost/maintenance/aft)
"KX" = (
Expand Down Expand Up @@ -11767,7 +11767,7 @@
"Pb" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/obj/item/stack/sheet/mineral/wood{
pixel_x = -6
},
Expand Down Expand Up @@ -14038,7 +14038,7 @@
/obj/structure/railing{
layer = 3.1
},
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/obj/item/trash/can{
pixel_x = -8;
pixel_y = -6
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_box.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1162,7 +1162,7 @@
/obj/structure/sign/poster/official/help_others{
pixel_x = -32
},
/obj/effect/spawner/random/tool_surgery_adv,
/obj/effect/spawner/random/medical/surgery_tool/adv,
/obj/item/megaphone/command,
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/independent/independent_junker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1610,7 +1610,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Df" = (
Expand Down Expand Up @@ -2730,7 +2730,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/spawner/random/trash/decal/grille_or_waste,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/ship/maintenance/port)
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/independent/independent_tranquility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6197,10 +6197,10 @@
"WS" = (
/obj/machinery/light/dim/directional/north,
/obj/structure/closet/crate/hydroponics,
/obj/effect/spawner/random/seeded,
/obj/effect/spawner/random/seeded,
/obj/effect/spawner/random/seeded,
/obj/effect/spawner/random/seeded,
/obj/effect/spawner/random/food_or_drink/seed,
/obj/effect/spawner/random/food_or_drink/seed,
/obj/effect/spawner/random/food_or_drink/seed,
/obj/effect/spawner/random/food_or_drink/seed,
/obj/item/seeds/random,
/turf/open/floor/grass,
/area/ship/crew/hydroponics)
Expand Down
Loading

0 comments on commit 34f44a4

Please sign in to comment.