Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into landmines
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sun-Soaked
Sun-Soaked committed Feb 28, 2024
2 parents 40ecae0 + ada6e39 commit 4be7fb9
Show file tree
Hide file tree
Showing 21 changed files with 1,334 additions and 1,303 deletions.
588 changes: 294 additions & 294 deletions _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
View file

Large diffs are not rendered by default.

118 changes: 60 additions & 58 deletions _maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
dir = 4
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"bs" = (
/obj/structure/barricade/sandbags,
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"bB" = (
/obj/structure/sign/poster/contraband/steppyflag,
/turf/closed/wall/r_wall/rust,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"dk" = (
/obj/structure/ore_box,
/turf/open/floor/plating/asteroid/rockplanet/lit,
Expand All @@ -40,41 +40,43 @@
"gN" = (
/obj/structure/sign/poster/contraband/tools,
/turf/closed/wall/r_wall/rust,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"js" = (
/obj/item/chair,
/obj/effect/decal/cleanable/blood,
/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_y = 1
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"lg" = (
/obj/structure/table,
/obj/machinery/microwave,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"ll" = (
/turf/open/floor/plating/rust,
/area/overmap_encounter/planetoid/rockplanet/explored)
"mf" = (
/obj/structure/bed,
/obj/machinery/light/broken/directional/west,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"mk" = (
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"nn" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/mining,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"ov" = (
/obj/structure/sign/warning/gasmask,
/turf/closed/wall/r_wall/rust,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"pl" = (
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"qj" = (
/mob/living/simple_animal/hostile/netherworld/blankbody{
desc = "What seems to be the remnants of what was once a human.";
Expand All @@ -85,28 +87,28 @@
"ro" = (
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"rr" = (
/obj/structure/sign/warning/xeno_mining,
/turf/closed/wall/r_wall/rust,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"rY" = (
/mob/living/simple_animal/hostile/netherworld/blankbody{
desc = "What seems to be the remnants of what was once a human.";
name = "Turned"
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"sj" = (
/obj/machinery/computer/mech_bay_power_console{
dir = 8
},
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"sJ" = (
/obj/effect/gibspawner/human,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"sM" = (
/obj/structure/flora/rock/pile,
/turf/open/floor/plating/asteroid/rockplanet/lit,
Expand All @@ -123,15 +125,15 @@
dir = 8
},
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"ug" = (
/obj/machinery/suit_storage_unit/mining,
/turf/open/floor/plasteel/mono,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"uq" = (
/obj/machinery/suit_storage_unit/open,
/turf/open/floor/plasteel/mono,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"ur" = (
/obj/structure/flora/rock,
/turf/open/floor/plating/asteroid/rockplanet/lit,
Expand All @@ -140,70 +142,64 @@
/obj/machinery/door/airlock/mining,
/obj/structure/fans/tiny,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"wY" = (
/obj/structure/table,
/obj/item/stack/sheet/cardboard,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"yv" = (
/turf/open/floor/plasteel/mono/dark,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"yz" = (
/obj/structure/sign/poster/official/no_erp,
/turf/closed/wall/r_wall/rust,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"yT" = (
/obj/machinery/mineral/ore_redemption,
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"yZ" = (
/turf/closed/mineral/random/rockplanet,
/area/overmap_encounter/planetoid/rockplanet/explored)
"BR" = (
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Ch" = (
/obj/machinery/vending/mining_equipment,
/turf/open/floor/plasteel/mono,
/area/ruin/unpowered)
"Cy" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/mob_spawn/human/miner,
/obj/item/pickaxe,
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
/area/ruin/rockplanet/syndicate)
"CL" = (
/obj/structure/sign/poster/random,
/turf/closed/wall/r_wall/rust,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"CX" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/light/broken/directional/east,
/turf/open/floor/plasteel/mono,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Du" = (
/obj/structure/sign/poster/contraband/space_up,
/turf/closed/wall/r_wall/rust,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Fl" = (
/obj/structure/bed,
/obj/effect/gibspawner/human/bodypartless,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Gc" = (
/mob/living/simple_animal/hostile/asteroid/goliath,
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"Gh" = (
/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/plasteel/mono,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"HW" = (
/obj/machinery/light/broken/directional/east,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Jz" = (
/obj/effect/decal/cleanable/blood,
/mob/living/simple_animal/hostile/netherworld/blankbody{
Expand All @@ -216,31 +212,31 @@
/obj/item/weldingtool,
/obj/effect/decal/cleanable/blood/gibs/up,
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"LZ" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Mh" = (
/obj/structure/bed,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"NV" = (
/obj/machinery/light/broken/directional/south,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"OB" = (
/obj/structure/chair{
dir = 8
},
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"OQ" = (
/obj/effect/turf_decal/dept/mining,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Pk" = (
/obj/item/reagent_containers/food/drinks/beer/light,
/obj/item/cigbutt{
Expand All @@ -254,31 +250,37 @@
/obj/effect/decal/cleanable/blood/gibs/core,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Pz" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"PJ" = (
/obj/structure/table/wood,
/obj/item/toy/cards/deck{
pixel_x = 3;
pixel_y = 6
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"PK" = (
/obj/effect/decal/cleanable/blood,
/obj/item/stack/ore/plasma{
amount = 8
},
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Qo" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/mob_spawn/human/miner,
/obj/item/pickaxe,
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"Qr" = (
/obj/effect/turf_decal/rechargefloor,
/obj/structure/mecha_wreckage/ripley,
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"QR" = (
/mob/living/simple_animal/bot/mulebot,
/turf/open/floor/plating/asteroid/rockplanet/lit,
Expand All @@ -298,27 +300,27 @@
},
/obj/machinery/light/broken/directional/east,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Uu" = (
/obj/machinery/light/broken/directional/north,
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Vw" = (
/turf/closed/wall/r_wall/rust,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"VL" = (
/obj/machinery/mech_bay_recharge_port{
dir = 2
},
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"VM" = (
/obj/item/chair{
dir = 8
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"Wf" = (
/obj/effect/decal/cleanable/blood,
/obj/item/clothing/glasses/material/mining/gar,
Expand All @@ -332,18 +334,18 @@
/obj/item/broken_bottle,
/obj/effect/decal/cleanable/blood/gibs/body,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"YN" = (
/obj/effect/decal/cleanable/blood,
/obj/structure/bed,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"YS" = (
/obj/machinery/door/airlock/mining{
dir = 8
},
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
/area/ruin/rockplanet/syndicate)
"YW" = (
/obj/structure/barricade/wooden,
/turf/open/floor/plating/asteroid/rockplanet/lit,
Expand Down Expand Up @@ -448,7 +450,7 @@ tN
(5,1,1) = {"
yZ
yZ
Cy
Qo
yZ
Vw
YN
Expand Down
Loading

0 comments on commit 4be7fb9

Please sign in to comment.