-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'nova/master' into upsterrrrrrrrreem,
- Loading branch information
Showing
1,267 changed files
with
20,272 additions
and
12,124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 61 additions & 41 deletions
102
_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,99 +1,119 @@ | ||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE | ||
"a" = ( | ||
/obj/machinery/holopad, | ||
/turf/open/floor/iron/dark/smooth_edge{ | ||
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ | ||
dir = 4 | ||
}, | ||
/turf/open/floor/iron/dark/smooth_large, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"c" = ( | ||
/obj/machinery/door/window/left/directional/north, | ||
/obj/machinery/door/window/left/directional/south, | ||
/turf/open/floor/iron/dark/smooth_edge{ | ||
dir = 4 | ||
}, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
/turf/open/floor/plating/snowed/smoothed/icemoon, | ||
/area/icemoon/underground/explored) | ||
"e" = ( | ||
/obj/structure/lattice, | ||
/turf/open/misc/asteroid/snow/icemoon, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
/area/icemoon/underground/explored) | ||
"k" = ( | ||
/obj/machinery/vending/coffee, | ||
/obj/machinery/vending/cigarette{ | ||
all_products_free = 0 | ||
}, | ||
/obj/structure/window/reinforced/spawner/directional/east, | ||
/turf/open/floor/plating/icemoon, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"q" = ( | ||
/obj/machinery/airalarm/directional/south, | ||
/obj/effect/turf_decal/tile/yellow/half/contrasted{ | ||
dir = 4 | ||
dir = 8 | ||
}, | ||
/obj/machinery/atmospherics/components/tank/air/layer4{ | ||
/obj/effect/turf_decal/weather/snow/corner{ | ||
dir = 8 | ||
}, | ||
/obj/structure/window/reinforced/spawner/directional/west, | ||
/obj/effect/turf_decal/weather/snow, | ||
/turf/open/floor/plating/icemoon, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"v" = ( | ||
"q" = ( | ||
/obj/structure/lattice, | ||
/obj/structure/billboard/Phone_booth, | ||
/turf/open/misc/asteroid/snow/icemoon, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"z" = ( | ||
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ | ||
/area/icemoon/underground/explored) | ||
"v" = ( | ||
/obj/structure/window/reinforced/spawner/directional/west, | ||
/obj/machinery/light/small/directional/north, | ||
/obj/effect/turf_decal/tile/yellow/half/contrasted{ | ||
dir = 4 | ||
}, | ||
/obj/item/gps/spaceruin{ | ||
gpstag = "Public Holophone" | ||
}, | ||
/obj/effect/turf_decal/weather/snow/corner{ | ||
dir = 5 | ||
}, | ||
/obj/effect/turf_decal/weather/snow, | ||
/turf/open/floor/plating/icemoon, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"z" = ( | ||
/obj/machinery/door/window/left/directional/north, | ||
/obj/machinery/door/window/left/directional/south, | ||
/obj/effect/turf_decal/weather/snow/corner, | ||
/turf/open/floor/iron/dark/smooth_edge{ | ||
dir = 4 | ||
dir = 1 | ||
}, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"J" = ( | ||
/obj/effect/turf_decal/tile/yellow/half/contrasted{ | ||
dir = 4 | ||
}, | ||
/obj/item/gps/spaceruin{ | ||
gpstag = "Public Holophone" | ||
}, | ||
/obj/machinery/light/small{ | ||
dir = 1 | ||
/obj/machinery/atmospherics/components/tank/air/layer4{ | ||
dir = 8 | ||
}, | ||
/obj/structure/window/reinforced/spawner/directional/west, | ||
/obj/effect/turf_decal/weather/snow/corner{ | ||
dir = 4 | ||
}, | ||
/obj/effect/turf_decal/weather/snow, | ||
/turf/open/floor/plating/icemoon, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"M" = ( | ||
/turf/closed/wall/ice, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"R" = ( | ||
/obj/effect/spawner/structure/window/hollow/reinforced, | ||
/turf/open/floor/plating/icemoon, | ||
/obj/machinery/holopad, | ||
/obj/machinery/airalarm/directional/north, | ||
/obj/effect/mapping_helpers/airalarm/all_access, | ||
/turf/open/floor/iron/dark/smooth_large, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"V" = ( | ||
/obj/structure/lattice, | ||
/turf/open/misc/asteroid/snow/icemoon, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"W" = ( | ||
/obj/machinery/vending/cigarette{ | ||
all_products_free = 0 | ||
}, | ||
/obj/machinery/vending/coffee, | ||
/obj/structure/window/reinforced/spawner/directional/east, | ||
/obj/effect/turf_decal/tile/yellow/half/contrasted{ | ||
dir = 8 | ||
}, | ||
/obj/effect/turf_decal/weather/snow/corner{ | ||
dir = 8 | ||
}, | ||
/obj/effect/turf_decal/weather/snow, | ||
/turf/open/floor/plating/icemoon, | ||
/area/ruin/powered/icemoon_phone_booth) | ||
"W" = ( | ||
/turf/open/misc/asteroid/snow/icemoon, | ||
/area/icemoon/underground/explored) | ||
|
||
(1,1,1) = {" | ||
v | ||
q | ||
M | ||
V | ||
k | ||
W | ||
M | ||
c | ||
"} | ||
(2,1,1) = {" | ||
e | ||
W | ||
M | ||
R | ||
a | ||
z | ||
c | ||
"} | ||
(3,1,1) = {" | ||
V | ||
e | ||
M | ||
v | ||
J | ||
q | ||
M | ||
c | ||
"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.