shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up some turf decals, fixed beach away mission (#2152)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-27 00:56:55 -05:00
committed by kevinz000
parent 7c65bae7ba
commit 0f23a00e40
9 changed files with 97 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+17 -17
View File
@@ -37,7 +37,7 @@
/area/ruin/powered/beach)
"ak" = (
/obj/structure/toilet,
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating,
/area/ruin/powered/beach)
"al" = (
@@ -50,7 +50,7 @@
/obj/structure/urinal{
pixel_y = 32
},
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating,
/area/ruin/powered/beach)
"an" = (
@@ -65,7 +65,7 @@
dir = 4;
pixel_x = 11
},
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/obj/structure/mirror{
pixel_x = 28
},
@@ -90,7 +90,7 @@
/turf/open/floor/plating,
/area/ruin/powered/beach)
"au" = (
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating,
/area/ruin/powered/beach)
"av" = (
@@ -107,7 +107,7 @@
/area/ruin/powered/beach)
"ay" = (
/obj/machinery/door/airlock/hatch,
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating,
/area/ruin/powered/beach)
"az" = (
@@ -116,7 +116,7 @@
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"aA" = (
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"aB" = (
@@ -260,7 +260,7 @@
/area/ruin/powered/beach)
"bc" = (
/obj/machinery/door/airlock/sandstone,
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"bd" = (
@@ -366,7 +366,7 @@
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bL" = (
/obj/effect/decal/sandeffect{
/obj/effect/turf_decal/sand{
density = 1
},
/obj/effect/decal/fakelattice,
@@ -420,7 +420,7 @@
/turf/closed/wall/mineral/sandstone,
/area/ruin/powered/beach)
"ce" = (
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/obj/machinery/light{
dir = 1
},
@@ -459,7 +459,7 @@
/turf/open/floor/plating/beach/water,
/area/ruin/powered/beach)
"cz" = (
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/obj/effect/baseturf_helper,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
@@ -482,7 +482,7 @@
/turf/open/floor/pod/dark,
/area/ruin/powered/beach)
"jF" = (
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/pod/dark,
/area/ruin/powered/beach)
"lF" = (
@@ -514,7 +514,7 @@
/turf/open/floor/pod/dark,
/area/ruin/powered/beach)
"qa" = (
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/obj/machinery/light/small{
dir = 4
},
@@ -529,23 +529,23 @@
/area/ruin/powered/beach)
"zw" = (
/obj/structure/closet/athletic_mixed,
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/pod/dark,
/area/ruin/powered/beach)
"Ec" = (
/obj/machinery/door/airlock/sandstone,
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/pod/dark,
/area/ruin/powered/beach)
"Gc" = (
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/pod/light,
/area/ruin/powered/beach)
"HC" = (
/obj/structure/rack,
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/shoes/sandal,
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/pod/dark,
/area/ruin/powered/beach)
"TP" = (
@@ -560,7 +560,7 @@
/turf/open/floor/pod/dark,
/area/ruin/powered/beach)
"Xp" = (
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/obj/machinery/light/small{
brightness = 3;
dir = 8
_maps/RandomRuins/SpaceRuins/vaporwave.dmm
+6 -8
View File
@@ -116,7 +116,7 @@
/turf/open/floor/pod/dark,
/area/ruin/powered/aesthetic)
"A" = (
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/astplate{
initial_gas_mix = "TEMP=2.7"
},
@@ -163,10 +163,8 @@
/area/ruin/unpowered/no_grav)
"I" = (
/turf/open/space,
/obj/effect/decal/sandeffect,
/turf/open/floor/plasteel/airless/asteroid{
icon_state = "platingsandeffect"
},
/obj/effect/turf_decal/sand,
/turf/open/floor/plasteel/airless/asteroid,
/area/ruin/unpowered/no_grav)
"J" = (
/turf/open/floor/plasteel/airless/asteroid{
@@ -188,7 +186,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"N" = (
/obj/effect/decal/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plasteel/airless/asteroid,
/area/ruin/unpowered/no_grav)
"O" = (
@@ -422,7 +420,7 @@ O
n
k
w
Q
P
g
F
I
@@ -458,7 +456,7 @@ p
u
y
g
S
R
d
d
a
_maps/RandomZLevels/beach.dmm
+42 -45
View File
@@ -76,18 +76,18 @@
/turf/open/floor/plasteel/white,
/area/awaymission/beach)
"ap" = (
/turf/open/floor/plasteel/white,
/obj/structure/mirror{
pixel_x = 28
},
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plasteel/white,
/area/awaymission/beach)
"aq" = (
/turf/open/floor/plasteel/white,
/obj/structure/mirror{
pixel_x = -28
},
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plasteel/white,
/area/awaymission/beach)
"ar" = (
/obj/effect/decal/cleanable/dirt,
@@ -119,8 +119,8 @@
/turf/open/floor/plasteel/white,
/area/awaymission/beach)
"aw" = (
/obj/effect/turf_decal/sand,
/turf/open/floor/plasteel/white,
/turf/open/floor/plasteel/sandeffect,
/area/awaymission/beach)
"ax" = (
/obj/machinery/shower{
@@ -180,27 +180,27 @@
/turf/open/floor/wood,
/area/awaymission/beach)
"aF" = (
/turf/open/floor/plating/beach/sand,
/obj/structure/closet/crate/bin,
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aG" = (
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/turf/open/floor/plasteel/sandeffect,
/area/awaymission/beach)
"aH" = (
/turf/open/floor/plasteel/white,
/obj/machinery/door/airlock/sandstone,
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plasteel/white,
/area/awaymission/beach)
"aI" = (
/obj/structure/table,
/turf/open/floor/wood,
/area/awaymission/beach)
"aJ" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aK" = (
/obj/structure/table/wood,
@@ -211,33 +211,30 @@
/turf/open/floor/wood,
/area/awaymission/beach)
"aM" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/vending/cola,
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aN" = (
/turf/open/floor/plating/beach/sand,
/obj/structure/chair/stool,
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aO" = (
/obj/structure/closet/secure_closet/freezer/meat,
/turf/open/floor/wood,
/area/awaymission/beach)
"aP" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/vending/snack,
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aQ" = (
/obj/effect/overlay/palmtree_r,
/turf/open/floor/plating/beach/sand,
/area/space)
"aR" = (
/turf/open/floor/plating/beach/sand{
density = 1;
opacity = 1
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aS" = (
/obj/machinery/door/airlock/sandstone,
@@ -253,31 +250,31 @@
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aV" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/gateway{
dir = 9
},
/turf/open/floor/plasteel/sandeffect/warning{
/obj/effect/turf_decal/sand/warning{
dir = 9
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aW" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/gateway{
dir = 1
},
/turf/open/floor/plasteel/sandeffect/warning{
/obj/effect/turf_decal/sand/warning{
dir = 1
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aX" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/gateway{
dir = 5
},
/turf/open/floor/plasteel/sandeffect/warning{
/obj/effect/turf_decal/sand/warning{
dir = 5
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aY" = (
/obj/structure/sign/barsign,
@@ -288,66 +285,66 @@
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"ba" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/gateway{
dir = 8
},
/turf/open/floor/plasteel/sandeffect/warning{
/obj/effect/turf_decal/sand/warning{
dir = 8
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"bb" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/gateway/centeraway,
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"bc" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/gateway{
dir = 4
},
/turf/open/floor/plasteel/sandeffect/warning{
/obj/effect/turf_decal/sand/warning{
dir = 4
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"bd" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/gateway{
dir = 10
},
/turf/open/floor/plasteel/sandeffect/warning{
/obj/effect/turf_decal/sand/warning{
dir = 10
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"be" = (
/turf/open/floor/plating/beach/sand,
/turf/open/floor/plasteel/sandeffect/warning/corner{
/obj/effect/turf_decal/sand/warning/corner{
dir = 1
},
/obj/machinery/gateway,
/turf/open/floor/plasteel/sandeffect/warning/corner,
/obj/effect/turf_decal/sand/warning/corner,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"bf" = (
/turf/open/floor/plating/beach/sand,
/obj/machinery/gateway{
dir = 6
},
/turf/open/floor/plasteel/sandeffect/warning{
/obj/effect/turf_decal/sand/warning{
dir = 6
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"bg" = (
/turf/open/floor/plating/beach/sand,
/obj/structure/closet/athletic_mixed,
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"bh" = (
/turf/open/floor/plating/beach/sand,
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/shoes/sandal,
/obj/structure/closet/crate,
/turf/open/floor/plasteel/sandeffect,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"bi" = (
/obj/effect/overlay/palmtree_l,
_maps/RandomZLevels/beach2.dmm
+20 -10
View File
@@ -51,7 +51,8 @@
/area/awaymission/beach)
"ak" = (
/obj/machinery/gateway,
/turf/open/floor/plasteel/sandy,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"al" = (
/obj/machinery/gateway{
@@ -71,10 +72,12 @@
/area/awaymission/beach)
"ao" = (
/obj/machinery/telecomms/relay/preset/mining,
/turf/open/floor/plasteel/sandy,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"ap" = (
/turf/open/floor/plasteel/sandy,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aq" = (
/turf/closed/wall/mineral/sandstone,
@@ -109,7 +112,8 @@
/obj/structure/toilet{
pixel_y = 8
},
/turf/open/floor/plasteel/sandy,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aw" = (
/obj/structure/closet/secure_closet/personal/cabinet,
@@ -140,7 +144,8 @@
/obj/structure/mineral_door/wood{
name = "toilet"
},
/turf/open/floor/plasteel/sandy,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aA" = (
/obj/item/weapon/reagent_containers/food/drinks/bottle/wine,
@@ -215,18 +220,21 @@
/obj/structure/bedsheetbin{
pixel_y = -6
},
/turf/open/floor/plasteel/sandy,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aK" = (
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/shoes/sandal,
/obj/structure/closet/crate,
/turf/open/floor/plasteel/sandy,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aL" = (
/obj/structure/closet/athletic_mixed,
/turf/open/floor/plasteel/sandy,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aM" = (
/obj/structure/closet/gmcloset,
@@ -357,13 +365,15 @@
/area/awaymission/beach)
"bf" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel/sandy,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"bg" = (
/obj/structure/sign/barsign{
pixel_y = 32
},
/turf/open/floor/plasteel/sandy,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"bh" = (
/obj/structure/table,
code/game/objects/effects/decals/decal.dm
+12
View File
@@ -63,8 +63,20 @@
/obj/effect/turf_decal/sand
icon_state = "sandyfloor"
/obj/effect/turf_decal/sand/warning
icon_state = "sandy_warn"
/obj/effect/turf_decal/sand/warning/corner
icon_state = "sandy_warn_corner"
/obj/effect/turf_decal/sand/plating
icon_state = "sandyplating"
/obj/effect/turf_decal/sand/plating/warning
icon_state = "sandy_plating_warn"
/obj/effect/turf_decal/sand/plating/warning/corner
icon_state = "sandy_plating_warn_corner"
/obj/effect/turf_decal/plaque
icon_state = "plaque"
code/game/objects/effects/decals/misc.dm
-6
View File
@@ -20,12 +20,6 @@
pass_flags = PASSTABLE | PASSGRILLE
layer = FLY_LAYER
/obj/effect/decal/sandeffect
name = "sandy tile"
icon = 'icons/turf/floors.dmi'
icon_state = "sandeffect"
layer = ABOVE_OPEN_TURF_LAYER
/obj/effect/decal/fakelattice
name = "lattice"
desc = "A lightweight support lattice."
code/game/turfs/simulated/floor/plasteel_floor.dm
-18
View File
@@ -244,11 +244,6 @@
icon_state = "blueyellow"
/turf/open/floor/plasteel/warningline
icon_state = "warningline"
/turf/open/floor/plasteel/warningline/corner
icon_state = "warninglinecorners"
/turf/open/floor/plasteel/yellowsiding
icon_state = "yellowsiding"
/turf/open/floor/plasteel/yellowsiding/corner
@@ -399,16 +394,3 @@
/turf/open/floor/plasteel/sepia
icon_state = "sepia"
/turf/open/floor/plasteel/sandy
icon_state = "sandy"
baseturf = /turf/open/floor/plating/beach/sand
/turf/open/floor/plasteel/sandeffect
icon_state = "sandeffect"
/turf/open/floor/plasteel/sandeffect/warning
icon_state = "warningsandeffect"
/turf/open/floor/plasteel/sandeffect/warning/corner
icon_state = "warningsandeffectcorners"
icons/turf/decals.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 48 KiB

icons/turf/floors.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 431 KiB

After

Width:  |  Height:  |  Size: 439 KiB