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

Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths (#410)

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-15 15:01:54 -04:00
committed by TalkingCactus
parent 74244a3d32
commit c38fa1eaa3
44 changed files with 5022 additions and 1252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+3 -3
View File
@@ -218,7 +218,7 @@
},
/area/ruin/powered)
"aE" = (
/turf/closed/wall/shuttle/smooth/nodiagonal{
/turf/closed/wall/mineral/titanium/nodiagonal{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
@@ -238,12 +238,12 @@
/area/ruin/powered)
"aH" = (
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/shuttle/smooth/nodiagonal{
/turf/closed/wall/mineral/titanium/nodiagonal{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
"aI" = (
/turf/closed/wall/shuttle/smooth,
/turf/closed/wall/mineral/titanium,
/area/ruin/powered)
"aJ" = (
/turf/open/floor/plasteel/grimy{
_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+1 -1
View File
@@ -104,7 +104,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"t" = (
/turf/closed/wall/shuttle/survival/pod{
/turf/closed/wall/mineral/titanium/survival/pod{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
+1 -1
View File
@@ -12,7 +12,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"d" = (
/turf/closed/wall/shuttle/survival/pod{
/turf/closed/wall/mineral/titanium/survival/pod{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm
+4 -6
View File
@@ -11,9 +11,8 @@
},
/area/ruin/unpowered)
"d" = (
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
/turf/open/floor/mineral/plastitanium{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
"e" = (
@@ -25,9 +24,8 @@
/area/ruin/unpowered)
"f" = (
/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon,
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
/turf/open/floor/mineral/plastitanium{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+4038 -286
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+8 -8
View File
@@ -237,16 +237,16 @@
/obj/structure/chair,
/obj/item/weapon/shard,
/obj/item/stack/sheet/metal,
/turf/open/floor/plasteel/airless/shuttle/red,
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/unpowered/no_grav)
"aQ" = (
/obj/structure/chair,
/obj/effect/decal/cleanable/shreds,
/turf/open/floor/plasteel/airless/shuttle/red,
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/unpowered/no_grav)
"aR" = (
/obj/item/weapon/shard,
/turf/open/floor/plasteel/airless/shuttle/red,
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/unpowered/no_grav)
"aS" = (
/turf/open/floor/plating/airless{
@@ -274,11 +274,11 @@
icon_state = "singular"
},
/obj/effect/decal/cleanable/shreds,
/turf/open/floor/plasteel/airless/shuttle/red,
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/unpowered/no_grav)
"aW" = (
/obj/effect/gibspawner/human,
/turf/open/floor/plasteel/airless/shuttle/red,
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/unpowered/no_grav)
"aX" = (
/turf/open/space,
@@ -319,7 +319,7 @@
},
/obj/item/stack/rods,
/obj/effect/gibspawner/human,
/turf/open/floor/plasteel/airless/shuttle/red,
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/unpowered/no_grav)
"bd" = (
/obj/structure/chair{
@@ -328,10 +328,10 @@
/obj/item/weapon/shard,
/obj/item/stack/sheet/metal,
/obj/effect/decal/cleanable/shreds,
/turf/open/floor/plasteel/airless/shuttle/red,
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/unpowered/no_grav)
"be" = (
/turf/open/floor/plasteel/airless/shuttle/red,
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/unpowered/no_grav)
"bf" = (
/obj/item/stack/sheet/metal,
_maps/RandomRuins/SpaceRuins/derelict4.dmm
+7 -7
View File
@@ -22,7 +22,7 @@
/turf/open/floor/plating/airless,
/area/ruin/unpowered)
"h" = (
/turf/open/floor/plasteel/airless/shuttle,
/turf/open/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"i" = (
/obj/structure/chair,
@@ -31,15 +31,15 @@
icon_state = "rwindow";
dir = 8
},
/turf/open/floor/plasteel/airless/shuttle,
/turf/open/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"j" = (
/obj/structure/chair,
/turf/open/floor/plasteel/airless/shuttle,
/turf/open/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"k" = (
/obj/effect/spawner/lootdrop/crate_spawner,
/turf/open/floor/plasteel/airless/shuttle,
/turf/open/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"l" = (
/obj/structure/shuttle/engine/propulsion{
@@ -67,7 +67,7 @@
/area/ruin/unpowered)
"p" = (
/obj/structure/table,
/turf/open/floor/plasteel/airless/shuttle,
/turf/open/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"q" = (
/obj/item/weapon/shard,
@@ -76,7 +76,7 @@
icon_state = "chair";
dir = 8
},
/turf/open/floor/plasteel/airless/shuttle,
/turf/open/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"r" = (
/obj/structure/chair{
@@ -87,7 +87,7 @@
icon_state = "rwindow";
dir = 8
},
/turf/open/floor/plasteel/airless/shuttle,
/turf/open/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"s" = (
/obj/structure/chair{
_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
+20 -22
View File
@@ -10,9 +10,7 @@
},
/area/ruin/powered/authorship)
"c" = (
/turf/closed/wall/shuttle{
icon_state = "wall3"
},
/turf/closed/wall/mineral/plastitanium,
/area/ruin/powered/authorship)
"d" = (
/turf/open/space,
@@ -43,10 +41,10 @@
"g" = (
/obj/structure/table/wood,
/obj/item/clothing/under/shorts/black,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"h" = (
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"i" = (
/obj/structure/table,
@@ -54,35 +52,35 @@
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"j" = (
/obj/structure/closet,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"k" = (
/obj/machinery/vending/assist,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"l" = (
/obj/structure/table/wood,
/obj/item/clothing/shoes/sandal,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"m" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"n" = (
/obj/structure/table/wood,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"o" = (
/obj/structure/table/wood,
/obj/machinery/computer/libraryconsole/bookmanagement,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"p" = (
/obj/structure/window/reinforced/fulltile,
@@ -98,7 +96,7 @@
/obj/structure/table/wood,
/obj/item/weapon/paper_bin,
/obj/item/weapon/pen,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"s" = (
/obj/machinery/door/poddoor{
@@ -109,35 +107,35 @@
name = "Strange Ship Door Button";
pixel_y = 32
},
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"t" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"u" = (
/obj/machinery/door/airlock/glass,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"v" = (
/obj/structure/chair{
dir = 4
},
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"w" = (
/obj/structure/table/wood,
/obj/item/weapon/paper,
/obj/item/weapon/pen,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"x" = (
/obj/machinery/light,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"y" = (
/mob/living/simple_animal/bot/medbot,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"z" = (
/turf/open/space,
@@ -147,7 +145,7 @@
/area/ruin/powered/authorship)
"A" = (
/obj/structure/chair,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
"B" = (
/turf/open/space,
@@ -159,7 +157,7 @@
"C" = (
/obj/machinery/light,
/obj/structure/bed,
/turf/open/floor/plasteel/shuttle/purple,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/authorship)
(1,1,1) = {"
_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+1 -3
View File
@@ -245,9 +245,7 @@
/turf/closed/mineral/clown,
/area/ruin/unpowered/no_grav)
"L" = (
/turf/closed/wall/shuttle{
icon_state = "wall3"
},
/turf/closed/wall/mineral/plastitanium,
/area/ruin/unpowered/no_grav)
"M" = (
/turf/open/floor/plating/airless,