Merge pull request #12175 from Detective-Google/snaxi2

Adds a New map, Snow Taxi (A vgstation13 map port)
This commit is contained in:
Ghom
2020-06-02 23:48:50 +02:00
committed by GitHub
20 changed files with 244395 additions and 15 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

110234
_maps/map_files/Snaxi/Snaxi.dmm Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,224 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"b" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/arrival)
"c" = (
/obj/machinery/door/airlock/titanium{
name = "Arrivals Shuttle Airlock"
},
/obj/structure/fans/tiny,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"d" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"e" = (
/obj/structure/closet/wardrobe/black,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"f" = (
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"g" = (
/obj/machinery/computer/arcade,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"h" = (
/obj/structure/closet/wardrobe/grey,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"i" = (
/obj/structure/closet/wardrobe/green,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"j" = (
/obj/machinery/requests_console{
department = "Arrival shuttle";
name = "Arrivals Shuttle console";
pixel_y = 30
},
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"k" = (
/obj/structure/shuttle/engine/heater{
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
},
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
"m" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/closet/wardrobe/mixed,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"n" = (
/obj/docking_port/mobile/arrivals{
name = "Snaxi Arrivals Shuttle"
},
/obj/structure/shuttle/engine/propulsion/burst/right{
dir = 4
},
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
"o" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
/obj/machinery/light/small,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"p" = (
/obj/structure/table,
/obj/item/storage/toolbox/emergency,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"q" = (
/obj/machinery/light,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"r" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"s" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
/obj/machinery/light,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"x" = (
/obj/structure/closet/emcloset,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"z" = (
/obj/structure/shuttle/engine/propulsion/burst/right{
dir = 4
},
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
(1,1,1) = {"
a
b
d
d
d
b
a
"}
(2,1,1) = {"
b
b
r
r
r
b
b
"}
(3,1,1) = {"
b
h
f
f
f
o
b
"}
(4,1,1) = {"
b
i
r
r
r
p
b
"}
(5,1,1) = {"
b
e
f
f
f
x
b
"}
(6,1,1) = {"
b
m
r
r
r
q
b
"}
(7,1,1) = {"
d
g
f
f
f
f
d
"}
(8,1,1) = {"
c
f
r
r
r
f
c
"}
(9,1,1) = {"
c
f
f
f
f
f
c
"}
(10,1,1) = {"
b
j
r
r
r
s
b
"}
(11,1,1) = {"
b
k
k
k
k
k
b
"}
(12,1,1) = {"
b
z
z
n
z
z
b
"}

View File

@@ -342,11 +342,6 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"aN" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"aO" = (
/obj/structure/chair/comfy/shuttle{
dir = 4;
@@ -385,8 +380,9 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate/eva)
"aS" = (
/obj/structure/tank_dispenser/oxygen,
/obj/effect/turf_decal/bot_white,
/obj/vehicle/ridden/atv/snowmobile,
/obj/item/key,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"aT" = (
@@ -1172,15 +1168,37 @@
},
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/syndicate/armory)
"gZ" = (
/obj/effect/turf_decal/bot_white,
/obj/vehicle/ridden/atv/snowmobile,
/obj/item/key,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/airlock)
"pd" = (
/obj/machinery/porta_turret/syndicate/shuttle{
dir = 5
},
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/syndicate/bridge)
"vv" = (
/obj/structure/reagent_dispensers/fueltank,
"qk" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/turf_decal/bot_white,
/obj/vehicle/ridden/atv/snowmobile,
/obj/item/key,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/airlock)
"vv" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"In" = (
@@ -1195,6 +1213,14 @@
},
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/syndicate/medical)
"Sz" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/armory)
(1,1,1) = {"
aa
@@ -1330,7 +1356,7 @@ ac
ad
aa
ax
aN
aS
aS
aU
aZ
@@ -1480,7 +1506,7 @@ ac
In
aa
aB
aO
gZ
aO
aX
bc
@@ -1505,7 +1531,7 @@ ac
aa
aa
aB
aP
qk
aP
aP
aP
@@ -1530,7 +1556,7 @@ aa
aa
aa
aB
aP
qk
aP
aP
aP
@@ -1587,7 +1613,7 @@ bd
aB
bm
bB
bG
Sz
bQ
bX
ci

View File

@@ -0,0 +1,116 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/snowtaxi)
"b" = (
/obj/structure/shuttle/engine/propulsion/burst{
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"c" = (
/obj/machinery/door/airlock/titanium{
name = "Mining Shuttle Airlock"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"e" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"f" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/snowtaxi)
"g" = (
/obj/machinery/door/airlock/titanium{
name = "Mining Shuttle Airlock"
},
/obj/docking_port/mobile{
dwidth = 3;
height = 4;
id = "snow_taxi";
name = "snow taxi";
port_direction = 8;
width = 6
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"i" = (
/obj/machinery/light,
/obj/machinery/computer/shuttle/snow_taxi{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/snowtaxi)
"j" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/snowtaxi)
"k" = (
/turf/open/floor/mineral/titanium,
/area/shuttle/snowtaxi)
"l" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating/airless,
/area/shuttle/snowtaxi)
"u" = (
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/snowtaxi)
(1,1,1) = {"
a
e
e
a
"}
(2,1,1) = {"
a
f
i
a
"}
(3,1,1) = {"
e
u
j
l
"}
(4,1,1) = {"
c
k
k
g
"}
(5,1,1) = {"
a
u
j
a
"}
(6,1,1) = {"
a
b
b
a
"}

1
_maps/snaxi.dm Normal file
View File

@@ -0,0 +1 @@
#define FORCE_MAP "_maps/snaxi.json"

49
_maps/snaxi.json Normal file
View File

@@ -0,0 +1,49 @@
{
"map_name":"Snow Taxi",
"map_path":"map_files/Snaxi",
"map_file":[
"IcemoonUnderground_Below.dmm",
"IcemoonUnderground_Above.dmm",
"Snaxi.dmm"
],
"station_ruin_budget":0,
"space_ruin_levels":0,
"space_empty_levels":0,
"shuttles":{
"cargo":"cargo_box",
"ferry":"ferry_fancy",
"whiteship":"whiteship_box",
"emergency":"emergency_box"
},
"traits":[
{
"Up":1,
"Station":0,
"Mining":true,
"Linkage":null,
"Gravity":true,
"Ice Ruins Underground":true,
"Baseturf":"/turf/open/lava/plasma/ice_moon"
},
{
"Down":-1,
"Up":1,
"Station":0,
"Mining":true,
"Linkage":null,
"Gravity":true,
"Ice Ruins Underground":true,
"Baseturf":"/turf/open/openspace/icemoon"
},
{
"Down":-1,
"Mining":true,
"Linkage":null,
"Gravity":true,
"Ice Ruins":true,
"Weather_Snowstorm":true,
"Baseturf":"/turf/open/floor/plating/asteroid/snow/icemoon"
}
],
"minetype":"none"
}

View File

@@ -170,6 +170,11 @@
port_id = "snowdin"
can_be_bought = FALSE
/datum/map_template/shuttle/snow_taxi
port_id = "snow"
can_be_bought = FALSE
suffix = "taxi"
// Shuttles start here:
/datum/map_template/shuttle/emergency/backup
@@ -557,6 +562,10 @@
suffix = "cog"
name = "arrival shuttle (Cog)"
/datum/map_template/shuttle/arrival/snaxi
suffix = "snaxi"
name = "arrival shuttle (Snaxi)"
/datum/map_template/shuttle/aux_base/default
suffix = "default"
name = "auxilliary base (Default)"

View File

@@ -18,7 +18,7 @@
area_type = /area
protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison, /area/ruin, /area/space/nearstation)
/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison, /area/ruin, /area/space/nearstation, /area/icemoon)
target_trait = ZTRAIT_STATION
immunity_type = "rad"

View File

@@ -200,4 +200,7 @@
name = "Tiny Freighter"
/area/shuttle/caravan/freighter3
name = "Tiny Freighter"
name = "Tiny Freighter"
/area/shuttle/snowtaxi
name = "Snow Taxi"

View File

@@ -293,6 +293,10 @@
name = "Mining Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/mining
/obj/item/circuitboard/computer/snow_taxi
name = "Snow Taxi (Computer Board)"
build_path = /obj/machinery/computer/shuttle/snow_taxi
/obj/item/circuitboard/computer/white_ship
name = "White Ship (Computer Board)"
build_path = /obj/machinery/computer/shuttle/white_ship

View File

@@ -185,3 +185,16 @@
desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
icon = 'icons/turf/walls/hierophant_wall.dmi'
icon_state = "wall"
/turf/closed/indestructible/rock/glacierrock
name = "unaturally hard ice wall"
desc = "Ice, hardened over thousands of years, you're not breaking through this."
icon = 'icons/turf/walls.dmi'
icon_state = "snow_rock"
/turf/closed/indestructible/rock/glacierrock/blue
name = "blue ice wall"
desc = "The incredible compressive forces that formed this sturdy ice wall gave it a blue color."
icon = 'icons/turf/walls.dmi'
icon_state = "ice"
canSmoothWith = list(/turf/closed/indestructible/rock/glacierrock/blue)

View File

@@ -66,6 +66,16 @@
crate_name = "shaft miner starter kit"
crate_type = /obj/structure/closet/crate/secure
/datum/supply_pack/service/snowmobile
name = "Snowmobile kit"
desc = "trapped on a frigid wasteland? need to get around fast? purchase a refurbished snowmobile, with a FREE 10 microsecond warranty!"
cost = 1500 // 1000 points cheaper than ATV
contains = list(/obj/vehicle/ridden/atv/snowmobile = 1,
/obj/item/key = 1,
/obj/item/clothing/mask/gas/explorer = 1)
crate_name = "Snowmobile kit"
crate_type = /obj/structure/closet/crate/large
//////////////////////////////////////////////////////////////////////////////
/////////////////////// Chef, Botanist, Bartender ////////////////////////////
//////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,7 @@
/obj/machinery/computer/shuttle/snow_taxi
name = "snow taxi console"
desc = "Used to direct the snow taxi."
circuit = /obj/item/circuitboard/computer/snow_taxi
shuttleId = "snow_taxi"
possible_destinations = "snaxi_nw;snaxi_ne;snaxi_s"
no_destination_swap = TRUE

View File

@@ -60,3 +60,23 @@
turret.pixel_x = 12
turret.pixel_y = 4
turret.layer = OBJ_LAYER
/obj/vehicle/ridden/atv/snowmobile
name = "snowmobile"
desc = "a tracked vehicle designed for use in the snow, it looks like it would have difficulty moving elsewhere, however."
icon_state = "snowmobile"
/obj/vehicle/ridden/atv/snowmobile/Moved()
. = ..()
var/static/list/snow_typecache = typecacheof(list(/turf/open/floor/plating/asteroid/snow/icemoon, /turf/open/floor/plating/snowed/smoothed/icemoon))
var/datum/component/riding/E = LoadComponent(/datum/component/riding)
if(snow_typecache[loc.type])
E.vehicle_move_delay = 1
else
E.vehicle_move_delay = 2
/obj/vehicle/ridden/atv/snowmobile/snowcurity
name = "security snowmobile"
desc = "for when you want to look like even more of a tool than riding a secway."
icon_state = "snowcurity"
key_type = /obj/item/key/security

View File

@@ -40,6 +40,10 @@ map icebox
minplayers 25
endmap
map snaxi
minplayers 25
endmap
map runtimestation
endmap

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 70 KiB

1
tgstation.dme Executable file → Normal file
View File

@@ -3138,6 +3138,7 @@
#include "code\modules\shuttle\ripple.dm"
#include "code\modules\shuttle\shuttle.dm"
#include "code\modules\shuttle\shuttle_rotate.dm"
#include "code\modules\shuttle\snaxi.dm"
#include "code\modules\shuttle\special.dm"
#include "code\modules\shuttle\supply.dm"
#include "code\modules\shuttle\syndicate.dm"