New sand and water sprites (ported from Bay) (#75254)

## About The Pull Request
Ports over new water sprites originally made by Flashkirby in
https://github.com/Baystation12/Baystation12/pull/3724

Also made some code adjustments because they don't have that weird
in-between sprite that the old water had.

## Why It's Good For The Game

![image](https://user-images.githubusercontent.com/66640614/236734326-fd492313-270e-4ba5-ae68-3e5adf8d3c89.png)
This could be us but you're still using those jank-ass old water sprites
:\

## Changelog
🆑 Tattle, Flashkirby
sound: increased the volume of the water step noises
image: ported over bay's water sprites
/🆑

---------

Co-authored-by: tattle <article.disaster@gmail.com>
This commit is contained in:
tattle
2023-05-09 19:51:16 +01:00
committed by GitHub
co-authored by tattle
parent c340223b4d
commit eaf962dbf9
19 changed files with 2116 additions and 2165 deletions
@@ -162,7 +162,7 @@
/area/ruin/powered/beach)
"cP" = (
/obj/structure/flora/bush/stalky/style_random,
/turf/open/water/beach/biodome,
/turf/open/water/beach,
/area/ruin/powered/beach)
"cV" = (
/obj/structure/closet/secure_closet/freezer/meat{
@@ -335,7 +335,7 @@
"iH" = (
/obj/structure/flora/bush/stalky/style_random,
/obj/structure/flora/bush/sparsegrass/style_random,
/turf/open/water/beach/biodome,
/turf/open/water/beach,
/area/ruin/powered/beach)
"jc" = (
/obj/structure/table/wood,
@@ -457,7 +457,7 @@
/turf/open/floor/pod/light,
/area/ruin/powered/beach)
"pz" = (
/turf/open/water/beach/biodome,
/turf/open/water/beach,
/area/ruin/powered/beach)
"pE" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -614,12 +614,6 @@
},
/turf/open/floor/wood,
/area/ruin/powered/beach)
"tG" = (
/turf/open/misc/beach/coastline_t/sandwater_inner,
/area/ruin/powered/beach)
"tO" = (
/turf/open/misc/beach/coastline_t,
/area/ruin/powered/beach)
"tQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 4
@@ -680,9 +674,7 @@
/obj/structure/railing{
dir = 8
},
/turf/open/misc/beach/coastline_b{
dir = 9
},
/turf/open/misc/beach/coast/corner,
/area/ruin/powered/beach)
"xA" = (
/obj/machinery/light/directional/east,
@@ -713,11 +705,11 @@
/turf/open/misc/beach/sand,
/area/ruin/powered/beach)
"yT" = (
/turf/open/misc/beach/coastline_b,
/turf/open/misc/beach/coast,
/area/ruin/powered/beach)
"yY" = (
/obj/machinery/light/directional/east,
/turf/open/misc/beach/coastline_b{
/turf/open/misc/beach/coast{
dir = 8
},
/area/ruin/powered/beach)
@@ -878,7 +870,7 @@
/area/ruin/powered/beach)
"Eu" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/turf/open/water/beach/biodome,
/turf/open/water/beach,
/area/ruin/powered/beach)
"EE" = (
/obj/structure/dresser,
@@ -886,7 +878,7 @@
/area/ruin/powered/beach)
"EL" = (
/obj/machinery/light/directional/south,
/turf/open/misc/beach/coastline_b{
/turf/open/misc/beach/coast{
dir = 1
},
/area/ruin/powered/beach)
@@ -1053,8 +1045,8 @@
dir = 1
},
/obj/machinery/light/directional/south,
/turf/open/misc/beach/coastline_b{
dir = 10
/turf/open/misc/beach/coast/corner{
dir = 8
},
/area/ruin/powered/beach)
"Jr" = (
@@ -1071,7 +1063,7 @@
/obj/structure/railing{
dir = 8
},
/turf/open/misc/beach/coastline_b{
/turf/open/misc/beach/coast{
dir = 4
},
/area/ruin/powered/beach)
@@ -1096,8 +1088,8 @@
/turf/closed/wall/mineral/sandstone,
/area/ruin/powered/beach)
"Ld" = (
/turf/open/misc/beach/coastline_b{
dir = 5
/turf/open/misc/beach/coast/corner{
dir = 1
},
/area/ruin/powered/beach)
"Lm" = (
@@ -1235,12 +1227,12 @@
/turf/open/floor/wood,
/area/ruin/powered/beach)
"Ro" = (
/turf/open/misc/beach/coastline_b{
/turf/open/misc/beach/coast{
dir = 1
},
/area/ruin/powered/beach)
"Rx" = (
/turf/open/misc/beach/coastline_b{
/turf/open/misc/beach/coast{
dir = 8
},
/area/ruin/powered/beach)
@@ -1428,8 +1420,8 @@
/turf/open/floor/wood,
/area/ruin/powered/beach)
"WV" = (
/turf/open/misc/beach/coastline_b{
dir = 6
/turf/open/misc/beach/coast/corner{
dir = 4
},
/area/ruin/powered/beach)
"Xa" = (
@@ -1437,7 +1429,7 @@
/mob/living/simple_animal/chicken{
name = "Chicken Joe"
},
/turf/open/misc/beach/coastline_t,
/turf/open/misc/beach/sand,
/area/ruin/powered/beach)
"Xt" = (
/obj/machinery/door/airlock/sandstone{
@@ -1805,7 +1797,7 @@ VI
VI
VI
VI
tG
VI
Iv
lq
lq
@@ -1837,7 +1829,7 @@ VI
hN
SH
VI
tO
VI
xn
JA
JA
@@ -1869,7 +1861,7 @@ VI
bC
Ti
VI
tO
VI
yT
cP
pz
@@ -1901,7 +1893,7 @@ VI
XM
VI
rz
tO
VI
yT
pz
pz
@@ -1933,7 +1925,7 @@ VI
Jr
Jr
VI
tO
VI
yT
pz
pz
@@ -1965,7 +1957,7 @@ VI
FO
VI
VI
tO
VI
yT
pz
pz
@@ -1997,7 +1989,7 @@ VI
Bn
Zj
VI
tO
VI
yT
cP
pz
@@ -2029,7 +2021,7 @@ ks
xA
VI
VI
tO
VI
yT
pz
pz
@@ -2061,7 +2053,7 @@ Ao
bG
bL
VI
tO
VI
yT
pz
Eu
@@ -2125,7 +2117,7 @@ VI
VI
VI
wc
tO
VI
Ld
yY
Rx
+23 -28
View File
@@ -309,11 +309,6 @@
dir = 1
},
/area/ruin/space/has_grav/hotel/dock)
"db" = (
/turf/open/misc/beach/coastline_b{
dir = 8
},
/area/ruin/space/has_grav/hotel/pool)
"dd" = (
/obj/structure/sink/directional/west,
/turf/open/floor/iron/showroomfloor,
@@ -2715,7 +2710,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel)
"CG" = (
/turf/open/misc/beach/coastline_t{
/turf/open/misc/beach/coast{
dir = 8
},
/area/ruin/space/has_grav/hotel/pool)
@@ -2805,7 +2800,7 @@
/turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/bar)
"DK" = (
/turf/open/misc/beach/coastline_t,
/turf/open/water/beach,
/area/ruin/space/has_grav/hotel/pool)
"DO" = (
/obj/effect/turf_decal/loading_area,
@@ -3153,7 +3148,7 @@
/area/ruin/space/has_grav/hotel/bar)
"HI" = (
/obj/machinery/light/directional/west,
/turf/open/misc/beach/coastline_t,
/turf/open/water/beach,
/area/ruin/space/has_grav/hotel/pool)
"HP" = (
/obj/structure/table/wood/fancy/red,
@@ -6646,11 +6641,11 @@ MQ
JY
ma
JC
db
db
db
db
db
DK
DK
DK
DK
DK
xP
ma
JY
@@ -6719,11 +6714,11 @@ Iw
Vq
Si
QP
db
db
db
db
db
DK
DK
DK
DK
DK
nJ
mL
JY
@@ -6792,11 +6787,11 @@ JY
JY
Fi
QP
db
db
db
db
db
DK
DK
DK
DK
DK
nJ
qg
JY
@@ -6865,11 +6860,11 @@ yV
JY
wW
Cu
db
db
db
db
db
DK
DK
DK
DK
DK
Qc
dN
JY
+2 -2
View File
@@ -84,7 +84,7 @@
/turf/open/floor/holofloor/beach,
/area/ruin/space/has_grav/powered/aesthetic)
"u" = (
/turf/open/floor/holofloor/beach/coast_t,
/turf/open/floor/holofloor/beach/coast,
/area/ruin/space/has_grav/powered/aesthetic)
"v" = (
/obj/item/statuebust,
@@ -101,7 +101,7 @@
/turf/open/misc/asteroid/airless,
/area/ruin/space)
"y" = (
/turf/open/floor/holofloor/beach/coast_b,
/turf/open/floor/holofloor/beach/water,
/area/ruin/space/has_grav/powered/aesthetic)
"z" = (
/obj/structure/fans/tiny,
File diff suppressed because it is too large Load Diff
+129 -129
View File
@@ -2757,6 +2757,13 @@
},
/turf/open/floor/iron,
/area/station/science/auxlab)
"aHX" = (
/obj/machinery/light/red/dim/directional/north,
/turf/open/water/beach{
desc = "Refreshing!";
name = "treated water"
},
/area/station/maintenance/floor1/port/aft)
"aId" = (
/obj/effect/turf_decal/trimline/blue/line{
dir = 4
@@ -5035,6 +5042,18 @@
/obj/structure/window/spawner/directional/west,
/turf/open/floor/grass,
/area/station/hallway/secondary/exit/departure_lounge)
"bkG" = (
/obj/structure/railing{
dir = 6
},
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 6
},
/turf/open/water/beach{
desc = "Refreshing!";
name = "treated water"
},
/area/station/maintenance/floor1/port/aft)
"bkM" = (
/obj/effect/landmark/start/ai/secondary,
/obj/item/radio/intercom/directional/north{
@@ -6669,14 +6688,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
"bCM" = (
/obj/structure/railing,
/obj/effect/turf_decal/siding/thinplating_new/dark,
/turf/open/misc/beach/coastline_b{
desc = "refreshing!";
name = "treated water"
},
/area/station/maintenance/floor1/port/aft)
"bCW" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/spawner/random/engineering/material,
@@ -6861,6 +6872,12 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/pod/light,
/area/station/maintenance/floor3/port)
"bGf" = (
/turf/open/water/beach{
desc = "Refreshing!";
name = "treated water"
},
/area/station/maintenance/floor1/port/aft)
"bGh" = (
/obj/effect/spawner/random/engineering/atmospherics_portable,
/obj/effect/decal/cleanable/dirt/dust,
@@ -9179,6 +9196,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
"ckP" = (
/obj/machinery/smartfridge/extract/preloaded,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"ckQ" = (
/obj/item/kirbyplants/random,
/turf/open/floor/wood/parquet,
@@ -10827,18 +10848,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
"cIW" = (
/obj/structure/railing{
dir = 4
},
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 4
},
/turf/open/misc/beach/coastline_b{
desc = "refreshing!";
name = "treated water"
},
/area/station/maintenance/floor1/port/aft)
"cJf" = (
/obj/effect/turf_decal/bot,
/obj/structure/rack,
@@ -11465,6 +11474,20 @@
},
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
"cSb" = (
/obj/structure/table,
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/servo{
pixel_x = 15;
pixel_y = 4
},
/obj/item/reagent_containers/dropper{
pixel_x = -2;
pixel_y = 9
},
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/lab)
"cSc" = (
/obj/item/food/cornchips/green{
pixel_x = -8;
@@ -28471,20 +28494,6 @@
/obj/machinery/light/small/red/directional/east,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor3/port/aft)
"hBs" = (
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/airlock/medical{
name = "Medical Storage"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/duct,
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"hBw" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/textured_large,
@@ -29071,6 +29080,11 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/plating,
/area/station/maintenance/floor4/starboard/aft)
"hKI" = (
/obj/machinery/smartfridge/organ,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/station/science/cytology)
"hKK" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/structure/cable,
@@ -32734,12 +32748,6 @@
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
"iNe" = (
/turf/open/misc/beach/coastline_b{
desc = "refreshing!";
name = "treated water"
},
/area/station/maintenance/floor1/port/aft)
"iNs" = (
/obj/structure/table/reinforced/rglass,
/obj/item/flashlight/lamp{
@@ -35840,17 +35848,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/service/kitchen/diner)
"jDl" = (
/obj/structure/rack,
/obj/item/circuitboard/machine/biogenerator{
pixel_y = 6
},
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/servo,
/obj/item/stack/cable_coil,
/obj/item/stack/sheet/glass/fifty,
/turf/open/floor/iron,
/area/station/science/research/abandoned)
"jDq" = (
/obj/machinery/light/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41044,6 +41041,18 @@
/obj/structure/table/reinforced/rglass,
/turf/open/floor/iron/dark,
/area/station/commons/dorms/room3)
"kUk" = (
/obj/structure/table,
/obj/item/stock_parts/servo{
pixel_x = 2;
pixel_y = -4
},
/obj/item/disk/tech_disk{
pixel_y = 8
},
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/lab)
"kUo" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/iron/dark,
@@ -47253,6 +47262,11 @@
"myz" = (
/turf/open/openspace,
/area/station/maintenance/department/medical)
"myF" = (
/obj/machinery/smartfridge/chemistry/preloaded,
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"myO" = (
/turf/closed/wall,
/area/station/hallway/secondary/exit/escape_pod)
@@ -48184,10 +48198,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
/area/station/service/bar/atrium)
"mKI" = (
/obj/machinery/smartfridge/extract/preloaded,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"mKO" = (
/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
name = "Burn Chamber Interior Airlock"
@@ -51524,6 +51534,11 @@
},
/turf/open/floor/pod/light,
/area/station/maintenance/floor3/starboard/aft)
"nyx" = (
/obj/machinery/smartfridge/organ,
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"nyE" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai_upload_foyer)
@@ -54175,6 +54190,20 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/lobby)
"ohF" = (
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/airlock/medical{
name = "Medical Storage"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/duct,
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"ohL" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/structure/cable,
@@ -56376,6 +56405,17 @@
dir = 8
},
/area/station/hallway/secondary/exit/departure_lounge)
"oMU" = (
/obj/structure/rack,
/obj/item/circuitboard/machine/biogenerator{
pixel_y = 6
},
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/servo,
/obj/item/stack/cable_coil,
/obj/item/stack/sheet/glass/fifty,
/turf/open/floor/iron,
/area/station/science/research/abandoned)
"oMV" = (
/obj/structure/cable,
/obj/machinery/light/red/dim/directional/east,
@@ -57937,18 +57977,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/kitchen/abandoned)
"pkI" = (
/obj/structure/railing{
dir = 6
},
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 6
},
/turf/open/misc/beach/coastline_b{
desc = "refreshing!";
name = "treated water"
},
/area/station/maintenance/floor1/port/aft)
"pkR" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59538,20 +59566,6 @@
/obj/effect/turf_decal/tile/green/opposingcorners,
/turf/open/floor/iron/white,
/area/station/medical/virology)
"pHB" = (
/obj/structure/table,
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/servo{
pixel_x = 15;
pixel_y = 4
},
/obj/item/reagent_containers/dropper{
pixel_x = -2;
pixel_y = 9
},
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/lab)
"pHI" = (
/obj/effect/landmark/blobstart,
/obj/structure/railing,
@@ -65943,6 +65957,14 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
"rpF" = (
/obj/structure/railing,
/obj/effect/turf_decal/siding/thinplating_new/dark,
/turf/open/water/beach{
desc = "Refreshing!";
name = "treated water"
},
/area/station/maintenance/floor1/port/aft)
"rpR" = (
/turf/open/floor/iron/dark/textured_edge,
/area/station/maintenance/floor1/starboard/aft)
@@ -69265,11 +69287,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/dark/side,
/area/station/security/brig)
"soU" = (
/obj/machinery/smartfridge/chemistry/preloaded,
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"soZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -70248,11 +70265,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/dark/textured,
/area/station/commons/fitness)
"sBZ" = (
/obj/machinery/smartfridge/organ,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/station/science/cytology)
"sCe" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/table/wood,
@@ -82783,6 +82795,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor1/port/fore)
"vZn" = (
/obj/structure/railing{
dir = 4
},
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 4
},
/turf/open/water/beach{
desc = "Refreshing!";
name = "treated water"
},
/area/station/maintenance/floor1/port/aft)
"vZq" = (
/obj/structure/railing/corner{
dir = 8
@@ -86051,11 +86075,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/cargo/storage)
"wOk" = (
/obj/machinery/smartfridge/organ,
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"wOm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/turf/open/floor/engine,
@@ -86920,18 +86939,6 @@
/obj/structure/closet/emcloset,
/turf/open/floor/iron,
/area/station/hallway/floor3/fore)
"wZY" = (
/obj/structure/table,
/obj/item/stock_parts/servo{
pixel_x = 2;
pixel_y = -4
},
/obj/item/disk/tech_disk{
pixel_y = 8
},
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/lab)
"xad" = (
/obj/machinery/door/airlock/research{
name = "Research Director's Office"
@@ -87041,13 +87048,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor4/starboard)
"xbz" = (
/obj/machinery/light/red/dim/directional/north,
/turf/open/misc/beach/coastline_b{
desc = "refreshing!";
name = "treated water"
},
/area/station/maintenance/floor1/port/aft)
"xbA" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 4
@@ -137349,8 +137349,8 @@ vFE
khQ
wss
vcr
iNe
bCM
bGf
rpF
cgx
aSj
nhU
@@ -137606,8 +137606,8 @@ xWv
khQ
qwj
vcr
xbz
bCM
aHX
rpF
grD
aSj
wor
@@ -137863,8 +137863,8 @@ bwL
xzr
wzB
vcr
cIW
pkI
vZn
bkG
kzn
cPQ
lnX
@@ -182300,7 +182300,7 @@ mhT
jFr
sif
lvS
pHB
cSb
mUJ
jnV
sif
@@ -182557,7 +182557,7 @@ jFJ
fJo
sif
lvS
wZY
kUk
aRK
jnV
sif
@@ -188205,7 +188205,7 @@ dTG
xcZ
sRY
tZR
jDl
oMU
nqo
tbp
tEN
@@ -191051,7 +191051,7 @@ ilg
gmj
unV
fTN
soU
myF
wPX
neu
dCp
@@ -193374,7 +193374,7 @@ svm
xLp
nBt
jQj
wOk
nyx
jVs
bPo
noN
@@ -193631,7 +193631,7 @@ fJU
vrA
rja
sHX
hBs
ohF
jVQ
kmT
kyq
@@ -250645,7 +250645,7 @@ uhr
abx
vuH
qvb
sBZ
hKI
elp
qel
gvW
@@ -252444,7 +252444,7 @@ nAj
nAj
rpY
nPH
mKI
ckP
nyc
aXr
nBg
+14 -14
View File
@@ -38,7 +38,7 @@
dir = 8
},
/obj/machinery/light/directional/south,
/turf/open/misc/beach/coastline_t{
/turf/open/misc/beach/coast{
dir = 4
},
/area/shuttle/escape)
@@ -79,7 +79,7 @@
desc = "An adorable stuffed toy that resembles a very determined seafaring lizardperson. To ten thousand leagues and below, little guy.";
name = "Drinks-The-Salt"
},
/turf/open/water/beach/biodome,
/turf/open/water/beach,
/area/shuttle/escape)
"eQ" = (
/obj/structure/moisture_trap{
@@ -136,7 +136,7 @@
dir = 8
},
/obj/item/fishing_rod,
/turf/open/misc/beach/coastline_t{
/turf/open/misc/beach/coast{
dir = 4
},
/area/shuttle/escape)
@@ -226,14 +226,14 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"kX" = (
/turf/open/water/beach/biodome,
/turf/open/water/beach,
/area/shuttle/escape)
"lW" = (
/turf/open/chasm,
/area/shuttle/escape)
"mD" = (
/obj/item/toy/beach_ball/branded,
/turf/open/water/beach/biodome,
/turf/open/water/beach,
/area/shuttle/escape)
"nz" = (
/obj/machinery/door/airlock/medical/glass,
@@ -335,8 +335,8 @@
pixel_y = 3
},
/obj/item/fishing_hook{
pixel_y = 3;
layer = 5
layer = 5;
pixel_y = 3
},
/obj/item/bait_can/worm{
pixel_x = -5;
@@ -397,7 +397,7 @@
/area/shuttle/escape)
"ut" = (
/obj/machinery/light/directional/south,
/turf/open/water/beach/biodome,
/turf/open/water/beach,
/area/shuttle/escape)
"vH" = (
/obj/structure/table/wood,
@@ -406,7 +406,7 @@
"vV" = (
/obj/machinery/light/directional/north,
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/water/beach/biodome,
/turf/open/water/beach,
/area/shuttle/escape)
"wq" = (
/obj/machinery/light/directional/east,
@@ -618,8 +618,8 @@
"IM" = (
/obj/structure/table/wood,
/obj/item/fishing_hook{
pixel_y = 3;
layer = 5
layer = 5;
pixel_y = 3
},
/obj/item/fishing_line{
layer = 4;
@@ -646,8 +646,8 @@
"Ju" = (
/obj/structure/table/reinforced,
/obj/item/storage/fancy/donut_box{
pixel_y = 3;
pixel_x = -1
pixel_x = -1;
pixel_y = 3
},
/obj/effect/turf_decal/tile/dark/opposingcorners,
/turf/open/floor/mineral/plastitanium/red,
@@ -860,7 +860,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/turf/open/misc/beach/coastline_t{
/turf/open/misc/beach/coast{
dir = 4
},
/area/shuttle/escape)
+20 -11
View File
@@ -9,7 +9,7 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"bJ" = (
/turf/open/floor/holofloor/beach/coast_t{
/turf/open/floor/holofloor/beach{
dir = 4
},
/area/shuttle/escape/luxury)
@@ -104,8 +104,8 @@
/area/shuttle/escape)
"gG" = (
/obj/machinery/door/poddoor/shutters/indestructible/preopen{
id = "gimmemoney";
dir = 4
dir = 4;
id = "gimmemoney"
},
/turf/closed/indestructible/opsglass{
desc = "A durable looking window made of an alloy of of plasma and titanium.";
@@ -569,9 +569,9 @@
/area/shuttle/escape)
"yB" = (
/obj/structure/chair/stool/bar{
name = "buckleable bar stool";
can_buckle = 1;
dir = 1
dir = 1;
name = "buckleable bar stool"
},
/turf/open/floor/carpet/blue,
/area/shuttle/escape/luxury)
@@ -608,9 +608,9 @@
/area/shuttle/escape/luxury)
"zM" = (
/obj/structure/chair/stool/bar{
name = "buckleable bar stool";
can_buckle = 1;
dir = 8
dir = 8;
name = "buckleable bar stool"
},
/turf/open/floor/carpet/blue,
/area/shuttle/escape/luxury)
@@ -768,7 +768,9 @@
/area/shuttle/escape/luxury)
"FC" = (
/obj/machinery/light/directional/north,
/turf/open/floor/holofloor/beach/water,
/turf/open/floor/holofloor/beach/coast{
dir = 4
},
/area/shuttle/escape/luxury)
"FD" = (
/obj/item/food/cherrycupcake{
@@ -897,7 +899,9 @@
/area/shuttle/escape/luxury)
"Lc" = (
/obj/machinery/light/directional/south,
/turf/open/floor/holofloor/beach/water,
/turf/open/floor/holofloor/beach/coast{
dir = 4
},
/area/shuttle/escape/luxury)
"Li" = (
/obj/structure/window/spawner/directional/north,
@@ -963,6 +967,11 @@
/obj/structure/table/wood/fancy/black,
/turf/open/floor/carpet/red,
/area/shuttle/escape/luxury)
"Om" = (
/turf/open/floor/holofloor/beach/coast{
dir = 4
},
/area/shuttle/escape/luxury)
"Ow" = (
/obj/effect/decal/cleanable/oil/slippery,
/obj/structure/door_assembly,
@@ -1789,8 +1798,8 @@ WF
vL
Ex
FC
YV
YV
Om
Om
Lc
Ex
Ex
+19 -25
View File
@@ -1,10 +1,10 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/open/floor/holofloor/beach/water,
/turf/open/floor/holofloor/beach/coast,
/area/template_noop)
"f" = (
/obj/item/shovel/spade,
/turf/open/floor/holofloor/beach/coast_t,
/turf/open/floor/holofloor/beach,
/area/template_noop)
"g" = (
/obj/item/toy/beach_ball,
@@ -15,12 +15,9 @@
/obj/item/clothing/glasses/sunglasses,
/turf/open/floor/holofloor/beach,
/area/template_noop)
"k" = (
/turf/open/floor/holofloor/beach/coast_b,
/area/template_noop)
"q" = (
/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/holofloor/beach/coast_t,
/turf/open/floor/holofloor/beach,
/area/template_noop)
"t" = (
/turf/open/floor/holofloor/carpet,
@@ -29,16 +26,13 @@
/obj/effect/holodeck_effect/mobspawner/monkey,
/turf/open/floor/holofloor/beach,
/area/template_noop)
"J" = (
/turf/open/floor/holofloor/beach/coast_t,
/area/template_noop)
"M" = (
/obj/item/toy/seashell,
/turf/open/floor/holofloor/beach,
/area/template_noop)
"Q" = (
/obj/effect/holodeck_effect/mobspawner/crab/jon,
/turf/open/floor/holofloor/beach/coast_t,
/turf/open/floor/holofloor/beach,
/area/template_noop)
"R" = (
/turf/open/floor/holofloor/beach,
@@ -69,8 +63,8 @@ R
R
R
R
J
k
R
R
a
"}
(2,1,1) = {"
@@ -82,7 +76,7 @@ R
S
R
Q
k
R
a
"}
(3,1,1) = {"
@@ -93,8 +87,8 @@ R
R
t
t
J
k
R
R
a
"}
(4,1,1) = {"
@@ -105,8 +99,8 @@ R
h
R
R
J
k
R
R
a
"}
(5,1,1) = {"
@@ -117,8 +111,8 @@ R
R
t
t
J
k
R
R
a
"}
(6,1,1) = {"
@@ -130,7 +124,7 @@ X
g
R
q
k
R
a
"}
(7,1,1) = {"
@@ -142,7 +136,7 @@ R
R
R
f
k
R
a
"}
(8,1,1) = {"
@@ -153,8 +147,8 @@ R
H
R
M
J
k
R
R
a
"}
(9,1,1) = {"
@@ -165,7 +159,7 @@ R
R
R
R
J
k
R
R
a
"}
+21 -21
View File
@@ -1,7 +1,7 @@
/turf/open/misc/beach
name = "beach"
desc = "Sandy."
icon = 'icons/misc/beach.dmi'
icon = 'icons/turf/sand.dmi'
flags_1 = NONE
bullet_bounce_sound = null
footstep = FOOTSTEP_SAND
@@ -20,33 +20,33 @@
base_icon_state = "sand"
baseturfs = /turf/open/misc/beach/sand
/turf/open/misc/beach/coastline_t
/turf/open/misc/beach/sand/Initialize(mapload)
. = ..()
if(prob(15))
icon_state = "sand[rand(1,4)]"
/turf/open/misc/beach/coast
name = "coastline"
desc = "Tide's high tonight. Charge your batons."
icon_state = "sandwater_t"
base_icon_state = "sandwater_t"
baseturfs = /turf/open/misc/beach/coastline_t
icon = 'icons/turf/beach.dmi'
icon_state = "beach"
base_icon_state = "beach"
footstep = FOOTSTEP_WATER
barefootstep = FOOTSTEP_WATER
clawfootstep = FOOTSTEP_WATER
heavyfootstep = FOOTSTEP_WATER
/turf/open/misc/beach/sand/coastline_t/break_tile()
/turf/open/misc/beach/coast/break_tile()
. = ..()
icon_state = "sandwater_t"
icon_state = "beach"
/turf/open/misc/beach/coastline_t/sandwater_inner
icon_state = "sandwater_inner"
/turf/open/misc/beach/coast/corner
icon_state = "beach-corner"
base_icon_state = "beach-corner"
/turf/open/misc/beach/coastline_b //need to make this water subtype.
name = "coastline"
icon_state = "sandwater_b"
base_icon_state = "sandwater_b"
baseturfs = /turf/open/misc/beach/coastline_b
footstep = FOOTSTEP_LAVA
barefootstep = FOOTSTEP_LAVA
clawfootstep = FOOTSTEP_LAVA
heavyfootstep = FOOTSTEP_LAVA
/turf/open/misc/beach/sand/coastline_b/break_tile()
/turf/open/misc/beach/coast/corner/break_tile()
. = ..()
icon_state = "sandwater_b"
icon_state = "beach-corner"
/turf/open/misc/sandy_dirt
gender = PLURAL
+1 -9
View File
@@ -4,27 +4,23 @@
icon = 'icons/turf/floors.dmi'
icon_state = "riverwater_motion"
baseturfs = /turf/open/chasm/lavaland
initial_gas_mix = OPENTURF_LOW_PRESSURE
planetary_atmos = TRUE
slowdown = 1
bullet_sizzle = TRUE
bullet_bounce_sound = null //needs a splashing sound one day.
turf_flags = NO_RUST
footstep = FOOTSTEP_WATER
barefootstep = FOOTSTEP_WATER
clawfootstep = FOOTSTEP_WATER
heavyfootstep = FOOTSTEP_WATER
/turf/open/water/jungle
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
//This version of the beach turf uses low pressure, inherieted from above
/turf/open/water/beach
planetary_atmos = FALSE
gender = PLURAL
desc = "You get the feeling that nobody's bothered to actually make this water functional..."
icon = 'icons/misc/beach.dmi'
icon = 'icons/turf/beach.dmi'
icon_state = "water"
base_icon_state = "water"
baseturfs = /turf/open/water/beach
@@ -32,7 +28,3 @@
/turf/open/water/beach/Initialize(mapload)
. = ..()
AddElement(/datum/element/lazy_fishing_spot, FISHING_SPOT_PRESET_BEACH)
//Same turf, but instead used in the Beach Biodome
/turf/open/water/beach/biodome
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+7 -7
View File
@@ -70,24 +70,24 @@
gender = PLURAL
name = "sand"
desc = "This is better than a vacation, since you're still getting paid."
icon = 'icons/misc/beach.dmi'
icon = 'icons/turf/sand.dmi'
icon_state = "sand"
bullet_bounce_sound = null
tiled_dirt = FALSE
/turf/open/floor/holofloor/beach/coast_t
/turf/open/floor/holofloor/beach/coast
gender = NEUTER
name = "coastline"
icon_state = "sandwater_t"
icon = 'icons/turf/beach.dmi'
icon_state = "beach"
/turf/open/floor/holofloor/beach/coast_b
gender = NEUTER
name = "coastline"
icon_state = "sandwater_b"
/turf/open/floor/holofloor/beach/coast/corner
icon_state = "beach-corner"
/turf/open/floor/holofloor/beach/water
name = "water"
desc = "Gives the impression you can walk on water. Chaplains love it."
icon = 'icons/turf/beach.dmi'
icon_state = "water"
bullet_sizzle = TRUE
Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 159 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,11 @@
# These aren't going to be a perfect 1:1, adjust your maps accordingly
/turf/open/water/beach/biodome : /turf/open/water/beach{@OLD}
/turf/open/misc/beach/coastline_b : /turf/open/misc/beach/coast{@OLD}
/turf/open/misc/beach/coastline_t : /turf/open/misc/beach/sand{@OLD}
/turf/open/misc/beach/coastline_t/sandwater_inner : /turf/open/misc/beach/coast/corner{@OLD}
/turf/open/floor/holofloor/beach/coast_t : /turf/open/floor/holofloor/beach/coast{@OLD}
/turf/open/floor/holofloor/beach/coast_b : /turf/open/floor/holofloor/beach/water{@OLD}