Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest
Browse files Browse the repository at this point in the history
  • Loading branch information
@MemeSnorfer
MemeSnorfer committed Oct 31, 2024
2 parents 20e63c4 + 0e36495 commit 271fbd8
Show file tree
Hide file tree
Showing 193 changed files with 14,378 additions and 4,186 deletions.
227 changes: 73 additions & 154 deletions _maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
View file

Large diffs are not rendered by default.

204 changes: 102 additions & 102 deletions _maps/RandomRuins/BeachRuins/beach_float_resort.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,6 @@
/obj/structure/destructible/tribal_torch/lit,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"bO" = (
/obj/effect/turf_decal/weather/sand{
dir = 5
},
/obj/effect/turf_decal/weather/sand,
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/beach/sand
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"ca" = (
/obj/structure/chair/plastic{
dir = 1
Expand Down Expand Up @@ -332,20 +320,6 @@
light_range = 2
},
/area/ruin/beach/float_resort)
"jh" = (
/obj/effect/turf_decal/weather/sand{
dir = 6
},
/obj/effect/turf_decal/weather/sand{
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/turf/open/floor/carpet/orange{
baseturfs = /turf/open/floor/plating/beach/sand
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"jQ" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
Expand Down Expand Up @@ -476,6 +450,17 @@
},
/turf/open/floor/plating,
/area/overmap_encounter/planetoid/beachplanet/explored)
"ni" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/weather/sand{
dir = 1
},
/obj/item/candle,
/obj/effect/spawner/random/food_or_drink/donut,
/turf/open/floor/wood{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"nw" = (
/obj/structure/railing/wood{
dir = 4
Expand Down Expand Up @@ -508,6 +493,18 @@
/obj/structure/flora/junglebush/large,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"oB" = (
/obj/effect/turf_decal/weather/sand{
dir = 5
},
/obj/effect/turf_decal/weather/sand,
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"oJ" = (
/obj/effect/turf_decal/industrial/stand_clear{
dir = 1
Expand All @@ -533,24 +530,6 @@
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"pq" = (
/obj/effect/turf_decal/weather/sand{
dir = 6
},
/obj/effect/turf_decal/weather/sand{
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/obj/structure/fluff/beach_umbrella{
pixel_x = -18;
pixel_y = 13
},
/turf/open/floor/carpet/blue{
baseturfs = /turf/open/floor/plating/beach/sand
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"pr" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
Expand Down Expand Up @@ -727,6 +706,18 @@
light_range = 2
},
/area/ruin/beach/float_resort)
"tl" = (
/obj/effect/turf_decal/weather/sand{
dir = 9
},
/obj/effect/turf_decal/weather/sand,
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/turf/open/floor/carpet/orange{
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"tA" = (
/obj/structure/railing/corner/wood{
dir = 8
Expand All @@ -750,6 +741,20 @@
light_range = 2
},
/area/ruin/beach/float_resort/villa)
"ug" = (
/obj/effect/turf_decal/weather/sand{
dir = 9
},
/obj/effect/turf_decal/weather/sand{
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/turf/open/floor/carpet/blue{
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"uk" = (
/obj/effect/turf_decal/weather/sand{
dir = 6
Expand All @@ -758,6 +763,20 @@
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"uJ" = (
/obj/effect/turf_decal/weather/sand{
dir = 6
},
/obj/effect/turf_decal/weather/sand{
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/turf/open/floor/carpet/orange{
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"uV" = (
/obj/structure/chair/plastic,
/turf/open/floor/wood{
Expand Down Expand Up @@ -819,17 +838,6 @@
light_range = 2
},
/area/ruin/beach/float_resort/villa)
"wp" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/weather/sand{
dir = 1
},
/obj/item/candle,
/obj/effect/spawner/random/food_or_drink/donut,
/turf/open/floor/wood{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"wx" = (
/obj/structure/flora/ausbushes/grassybush,
/turf/open/floor/plating/grass/beach/lit,
Expand Down Expand Up @@ -989,6 +997,20 @@
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Bu" = (
/obj/effect/turf_decal/weather/sand{
dir = 10
},
/obj/effect/turf_decal/weather/sand{
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Bw" = (
/obj/structure/table/wood,
/obj/structure/curtain/cloth,
Expand Down Expand Up @@ -1385,20 +1407,6 @@
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Ka" = (
/obj/effect/turf_decal/weather/sand{
dir = 9
},
/obj/effect/turf_decal/weather/sand{
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/turf/open/floor/carpet/blue{
baseturfs = /turf/open/floor/plating/beach/sand
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Kv" = (
/obj/effect/turf_decal/weather/sand{
dir = 9
Expand Down Expand Up @@ -1537,32 +1545,6 @@
/obj/structure/flora/ausbushes/grassybush,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"NS" = (
/obj/effect/turf_decal/weather/sand{
dir = 10
},
/obj/effect/turf_decal/weather/sand{
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/turf/open/floor/carpet/cyan{
baseturfs = /turf/open/floor/plating/beach/sand
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"NU" = (
/obj/effect/turf_decal/weather/sand{
dir = 9
},
/obj/effect/turf_decal/weather/sand,
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/turf/open/floor/carpet/orange{
baseturfs = /turf/open/floor/plating/beach/sand
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"NV" = (
/turf/closed/wall/mineral/wood/nonmetal,
/area/ruin/beach/float_resort/villa)
Expand Down Expand Up @@ -1594,6 +1576,24 @@
/obj/structure/flora/ausbushes/ywflowers,
/turf/open/floor/plating/grass/beach/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"OU" = (
/obj/effect/turf_decal/weather/sand{
dir = 6
},
/obj/effect/turf_decal/weather/sand{
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust{
layer = 2.01
},
/obj/structure/fluff/beach_umbrella{
pixel_x = -18;
pixel_y = 13
},
/turf/open/floor/carpet/blue{
baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Pc" = (
/obj/effect/turf_decal/weather/sand{
dir = 9
Expand Down Expand Up @@ -2585,7 +2585,7 @@ Rt
Rt
Rt
Rt
NS
Bu
Rt
YP
YP
Expand Down Expand Up @@ -2639,7 +2639,7 @@ Cn
Rt
Cn
am
bO
oB
Rt
YP
YP
Expand Down Expand Up @@ -2740,7 +2740,7 @@ Rt
Rt
Rt
Zp
NU
tl
JQ
FB
UA
Expand Down Expand Up @@ -2794,7 +2794,7 @@ Rt
Zp
VY
QS
jh
uJ
Rt
qi
Gv
Expand Down Expand Up @@ -2954,7 +2954,7 @@ qS
Fs
QV
Rt
wp
ni
NC
Tc
Rt
Expand Down Expand Up @@ -3380,8 +3380,8 @@ kp
kp
Dr
Rt
Ka
pq
ug
OU
Rt
Rt
Rt
Expand Down
Loading

0 comments on commit 271fbd8

Please sign in to comment.