Skip to content

Commit

Permalink
bugfix: Lavaland ruins baseturf bugfix (#4870)
Browse files Browse the repository at this point in the history
nemnogo failov
  • Loading branch information
aeternaclose authored Apr 15, 2024
1 parent 5011387 commit bc4bc1b
Show file tree
Hide file tree
Showing 15 changed files with 150 additions and 158 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1107,11 +1107,6 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/powered/clownplanet)
"sF" = (
/obj/effect/mapping_helpers/no_lava,
/obj/effect/baseturf_helper/lava_land/surface,
/turf/simulated/floor/noslip/lavaland,
/area/lavaland/surface/outdoors/explored)
"ye" = (
/turf/simulated/floor/plating/lava/smooth,
/area/ruin/powered/clownplanet)
Expand Down Expand Up @@ -1699,7 +1694,7 @@ ye
cc
"}
(16,1,1) = {"
sF
eX
CB
YI
cc
Expand Down
18 changes: 7 additions & 11 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_green.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,7 @@
/turf/simulated/floor/pod,
/area/ruin/powered/green_bio)
"nK" = (
/obj/structure/closet{
icon_closed = "cabinet_closed";
icon_opened = "cabinet_open";
icon_state = "cabinet_closed"
},
/obj/structure/closet,
/turf/simulated/floor/wood,
/area/ruin/powered/green_bio)
"og" = (
Expand Down Expand Up @@ -419,6 +415,10 @@
tag = "icon-redfull (NORTHWEST)"
},
/area/ruin/powered/green_bio)
"Du" = (
/obj/effect/baseturf_helper/lava_land/surface,
/turf/simulated/floor/indestructible/grass,
/area/ruin/powered/green_bio)
"DN" = (
/obj/structure/dresser,
/obj/machinery/light/small{
Expand Down Expand Up @@ -707,15 +707,11 @@
/turf/simulated/floor/carpet,
/area/ruin/powered/green_bio)
"YL" = (
/obj/structure/closet{
icon_closed = "cabinet_closed";
icon_opened = "cabinet_open";
icon_state = "cabinet_closed"
},
/obj/machinery/light/small{
dir = 8;
light_power = 3
},
/obj/structure/closet,
/turf/simulated/floor/carpet,
/area/ruin/powered/green_bio)
"YQ" = (
Expand Down Expand Up @@ -1398,7 +1394,7 @@ gm
Oy
PE
ol
ol
Du
ol
ol
ol
Expand Down
53 changes: 20 additions & 33 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@
/turf/simulated/floor/carpet,
/area/ruin/powered/snow_cabin)
"aM" = (
/turf/simulated/floor/carpet,
/obj/effect/baseturf_helper/lava_land/surface,
/turf/simulated/floor/wood/cold,
/area/ruin/powered/snow_cabin)
"aN" = (
/obj/structure/bed/dogbed,
Expand Down Expand Up @@ -286,9 +287,6 @@
/obj/machinery/vending/coffee,
/turf/simulated/floor/pod/dark,
/area/ruin/powered/snow_biodome)
"fx" = (
/turf/simulated/floor/carpet,
/area/ruin/powered/snow_cabin)
"gh" = (
/obj/machinery/light/small{
dir = 8
Expand Down Expand Up @@ -342,9 +340,6 @@
/obj/structure/table,
/turf/simulated/floor/plating,
/area/ruin/powered/snow_biodome)
"sf" = (
/turf/simulated/floor/carpet,
/area/ruin/powered/snow_cabin)
"sE" = (
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/carpet,
Expand Down Expand Up @@ -373,11 +368,6 @@
},
/turf/simulated/floor/carpet,
/area/ruin/powered/snow_cabin)
"vf" = (
/obj/structure/bed,
/obj/item/bedsheet/blue,
/turf/simulated/floor/carpet,
/area/ruin/powered/snow_cabin)
"xU" = (
/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/pod/dark,
Expand Down Expand Up @@ -578,9 +568,6 @@
},
/turf/simulated/floor/carpet,
/area/ruin/powered/snow_cabin)
"QI" = (
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"QJ" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/beans,
Expand Down Expand Up @@ -825,8 +812,8 @@ UW
Wg
Wg
Wg
QI
QI
tb
tb
aa
aa
aa
Expand Down Expand Up @@ -859,8 +846,8 @@ Wg
aK
Wg
Wg
QI
QI
tb
tb
aa
aa
aa
Expand Down Expand Up @@ -893,7 +880,7 @@ aQ
ak
Wg
Wg
QI
tb
tb
aa
aa
Expand Down Expand Up @@ -926,7 +913,7 @@ ak
ak
ak
Wg
QI
tb
tb
aa
aa
Expand Down Expand Up @@ -1141,8 +1128,8 @@ hk
at
Gf
aD
aM
aM
Bz
Bz
bD
ak
ak
Expand Down Expand Up @@ -1171,7 +1158,7 @@ aq
aq
aq
Li
fx
Bz
qI
aq
Zo
Expand Down Expand Up @@ -1205,7 +1192,7 @@ um
Lf
aq
Cz
vf
Cz
aq
aq
aD
Expand Down Expand Up @@ -1302,12 +1289,12 @@ tg
as
at
aG
aG
aM
Jl
aG
Ir
at
sf
Bz
bi
ak
ab
Expand Down Expand Up @@ -1553,7 +1540,7 @@ ak
aC
ak
Wg
QI
tb
tb
aa
aa
Expand Down Expand Up @@ -1586,7 +1573,7 @@ ak
ak
Wg
Wg
QI
tb
aa
aa
aa
Expand Down Expand Up @@ -1618,8 +1605,8 @@ ak
ak
Wg
Wg
QI
QI
tb
tb
aa
aa
aa
Expand Down Expand Up @@ -1650,8 +1637,8 @@ ak
Wg
Wg
Wg
QI
QI
tb
tb
aa
aa
aa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
/area/ruin/unpowered)
"aD" = (
/obj/machinery/computer{
name = "Broken Computer";
desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."
desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
name = "Broken Computer"
},
/turf/simulated/floor{
nitrogen = 23;
Expand Down Expand Up @@ -377,8 +377,8 @@
dir = 1
},
/obj/structure/sign/atmosplaque{
name = "\improper Althland facility plaque";
desc = "A ruined and partially melted plaque bears words that are now faded and rusted, with some letters missing entirely. It reads: Est...ished by the Althland Mining...ration. In recog...on of the brave...who dared...harness...fiery heart...this world. May the...of our labor...shine as brightly...as the molten rivers...beneath our feet. The date of the facility's establishment at the bottom is obliterated, and the signatures of any founding miners are completely lost to time.";
name = "\improper Althland facility plaque";
pixel_y = 29
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -607,8 +607,8 @@
id = "mining_internal"
},
/obj/item/stack/ore/bluespace_crystal{
pixel_y = 4;
pixel_x = 4
pixel_x = 4;
pixel_y = 4
},
/turf/simulated/floor{
nitrogen = 23;
Expand Down Expand Up @@ -783,6 +783,7 @@
/area/ruin/unpowered)
"vz" = (
/obj/effect/landmark/tiles/damageturf,
/obj/effect/baseturf_helper/lava_land/surface,
/turf/simulated/floor/plasteel{
nitrogen = 23;
oxygen = 14;
Expand Down Expand Up @@ -1715,8 +1716,8 @@
/area/ruin/unpowered)
"Xd" = (
/obj/machinery/computer{
name = "Broken Computer";
desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."
desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
name = "Broken Computer"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor{
Expand Down Expand Up @@ -1747,8 +1748,8 @@
/area/lavaland/surface/outdoors)
"ZF" = (
/obj/item/stack/sheet/mineral/gold{
pixel_y = -8;
pixel_x = -7
pixel_x = -7;
pixel_y = -8
},
/obj/effect/landmark/tiles/damageturf,
/obj/effect/decal/cleanable/dirt,
Expand Down
Loading

0 comments on commit bc4bc1b

Please sign in to comment.