mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2026-08-28 09:37:00 +01:00
AAAAAAAA EXPLORATION WORKS NOW
This commit is contained in:
Anthony Rodriguez
@@ -715,6 +715,15 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/ward)
|
||||
"cc" = (
|
||||
/obj/structure/sign/directions/cryo{
|
||||
pixel_y = -24
|
||||
},
|
||||
/obj/structure/sign/directions/cargo{
|
||||
pixel_y = -30
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/aft)
|
||||
"cd" = (
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
@@ -1192,18 +1201,16 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/research/testingrange)
|
||||
"dm" = (
|
||||
/obj/machinery/atmospherics/valve/digital{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = /obj/item/cell/super;
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
pixel_x = -30
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/substation/medical)
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/anomaly_lab)
|
||||
"do" = (
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
@@ -2019,6 +2026,22 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/test_area)
|
||||
"fu" = (
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = /obj/item/cell/super;
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
pixel_x = -30
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/substation/medical)
|
||||
"fv" = (
|
||||
/obj/structure/toilet{
|
||||
pixel_y = 10
|
||||
@@ -3063,6 +3086,16 @@
|
||||
/obj/machinery/atmospherics/valve/digital{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/anomaly_lab)
|
||||
"ih" = (
|
||||
@@ -5213,6 +5246,19 @@
|
||||
/obj/item/bodybag/cryobag,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/surgery_storage)
|
||||
"nV" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/substation/medical)
|
||||
"nW" = (
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
@@ -7218,6 +7264,11 @@
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/anomaly_lab)
|
||||
"th" = (
|
||||
@@ -8488,6 +8539,11 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/anomaly_lab)
|
||||
"wD" = (
|
||||
@@ -11824,12 +11880,7 @@
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/sign/directions/cryo{
|
||||
pixel_y = -24
|
||||
},
|
||||
/obj/structure/sign/directions/cargo{
|
||||
pixel_y = -30
|
||||
},
|
||||
/obj/structure/railing,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/triumph/station/stairs_three)
|
||||
"EJ" = (
|
||||
@@ -12926,7 +12977,8 @@
|
||||
/obj/structure/disposalpipe/trunk{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/bluegrid/airless,
|
||||
/obj/structure/plasticflaps,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/rnd/xenobiology)
|
||||
"HA" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
@@ -14840,6 +14892,7 @@
|
||||
name = "south bump";
|
||||
pixel_y = -28
|
||||
},
|
||||
/obj/structure/cable/green,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/anomaly_lab)
|
||||
"ML" = (
|
||||
@@ -15598,6 +15651,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/surgery_hallway)
|
||||
"OB" = (
|
||||
/obj/structure/railing,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/triumph/station/stairs_three)
|
||||
"OD" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10
|
||||
@@ -15655,6 +15712,11 @@
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/anomaly_lab)
|
||||
"OO" = (
|
||||
@@ -16071,6 +16133,11 @@
|
||||
"PU" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/anomaly_lab)
|
||||
"PV" = (
|
||||
@@ -17718,8 +17785,11 @@
|
||||
/turf/simulated/wall,
|
||||
/area/maintenance/medbay)
|
||||
"TX" = (
|
||||
/turf/simulated/wall,
|
||||
/area/rnd/research)
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/research_foyer_auxiliary)
|
||||
"TY" = (
|
||||
/obj/machinery/camera/network/research{
|
||||
dir = 4
|
||||
@@ -18865,6 +18935,11 @@
|
||||
"WX" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/anomaly_lab)
|
||||
"WY" = (
|
||||
@@ -26893,9 +26968,9 @@ vd
|
||||
tB
|
||||
Yv
|
||||
EI
|
||||
vd
|
||||
vd
|
||||
lB
|
||||
vd
|
||||
vd
|
||||
Pw
|
||||
iw
|
||||
Fe
|
||||
@@ -27034,10 +27109,10 @@ vd
|
||||
vd
|
||||
gl
|
||||
VU
|
||||
YY
|
||||
OB
|
||||
vd
|
||||
vd
|
||||
lB
|
||||
vd
|
||||
vd
|
||||
lB
|
||||
TW
|
||||
BO
|
||||
@@ -27176,11 +27251,11 @@ fn
|
||||
Vs
|
||||
cr
|
||||
VG
|
||||
cr
|
||||
cc
|
||||
mx
|
||||
mx
|
||||
mx
|
||||
hK
|
||||
fu
|
||||
KW
|
||||
BO
|
||||
Bw
|
||||
@@ -27321,8 +27396,8 @@ VG
|
||||
cr
|
||||
mx
|
||||
Qf
|
||||
dm
|
||||
zr
|
||||
nV
|
||||
QK
|
||||
BO
|
||||
lS
|
||||
@@ -29279,7 +29354,7 @@ DJ
|
||||
Yz
|
||||
YO
|
||||
uw
|
||||
Yz
|
||||
TX
|
||||
Yz
|
||||
Ly
|
||||
Yz
|
||||
@@ -30129,7 +30204,7 @@ TL
|
||||
Bu
|
||||
Lp
|
||||
WW
|
||||
ig
|
||||
dm
|
||||
RP
|
||||
DR
|
||||
ie
|
||||
@@ -32420,7 +32495,7 @@ GS
|
||||
GS
|
||||
GS
|
||||
GS
|
||||
GS
|
||||
qK
|
||||
lR
|
||||
Hl
|
||||
DX
|
||||
@@ -32562,7 +32637,7 @@ hC
|
||||
FE
|
||||
Ss
|
||||
pR
|
||||
GS
|
||||
qK
|
||||
wm
|
||||
Hl
|
||||
lR
|
||||
@@ -32704,7 +32779,7 @@ oW
|
||||
Pl
|
||||
Pl
|
||||
DU
|
||||
GS
|
||||
qK
|
||||
NY
|
||||
LV
|
||||
gy
|
||||
@@ -32846,7 +32921,7 @@ Kh
|
||||
mp
|
||||
mp
|
||||
pA
|
||||
GS
|
||||
qK
|
||||
lR
|
||||
Hl
|
||||
lR
|
||||
@@ -32988,7 +33063,7 @@ TF
|
||||
ur
|
||||
NH
|
||||
Bp
|
||||
GS
|
||||
qK
|
||||
lR
|
||||
Hl
|
||||
lR
|
||||
@@ -33130,7 +33205,7 @@ GS
|
||||
LJ
|
||||
GS
|
||||
yJ
|
||||
GS
|
||||
qK
|
||||
CD
|
||||
Hl
|
||||
lR
|
||||
@@ -33272,7 +33347,7 @@ Bg
|
||||
qI
|
||||
mg
|
||||
Ro
|
||||
TX
|
||||
tq
|
||||
lR
|
||||
Hl
|
||||
lR
|
||||
@@ -33414,7 +33489,7 @@ El
|
||||
ST
|
||||
Zi
|
||||
Nd
|
||||
TX
|
||||
tq
|
||||
lR
|
||||
Hl
|
||||
lR
|
||||
@@ -33556,7 +33631,7 @@ Ey
|
||||
OR
|
||||
Lt
|
||||
oO
|
||||
TX
|
||||
tq
|
||||
np
|
||||
Hl
|
||||
DX
|
||||
@@ -33698,7 +33773,7 @@ SL
|
||||
QV
|
||||
QQ
|
||||
AC
|
||||
TX
|
||||
tq
|
||||
lR
|
||||
Hl
|
||||
lR
|
||||
|
||||
+10
-49
@@ -1,17 +1,12 @@
|
||||
{
|
||||
"map_name":"Tether",
|
||||
"map_path":"map_files/tether",
|
||||
"map_name":"Triumph",
|
||||
"map_path":"map_files/nsv_triumph",
|
||||
"map_file":[
|
||||
"tether-01-surface1.dmm",
|
||||
"tether-02-surface2.dmm",
|
||||
"tether-03-surface3.dmm",
|
||||
"tether-04-transit.dmm",
|
||||
"tether-05-station1.dmm",
|
||||
"tether-06-station2.dmm",
|
||||
"tether-07-station3.dmm",
|
||||
"tether-08-mining.dmm",
|
||||
"tether-09-solars.dmm",
|
||||
"tether-10-colony.dmm"
|
||||
"triumph-01-deck1.dmm",
|
||||
"triumph-02-deck2.dmm",
|
||||
"triumph-03-deck3.dmm",
|
||||
"triumph-04-deck4.dmm",
|
||||
"triumph-05-flagship.dmm"
|
||||
],
|
||||
"traits":[
|
||||
{
|
||||
@@ -19,33 +14,11 @@
|
||||
"Station":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/simulated/floor/outdoors/grass/sif/virgo3b"
|
||||
"Baseturf":"/turf/space"
|
||||
},
|
||||
{
|
||||
"Up":1,
|
||||
"Down":-1,
|
||||
"Up":1,
|
||||
"Station":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/simulated/open/virgo3b"
|
||||
},
|
||||
{
|
||||
"Down":-1,
|
||||
"Station":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/simulated/open/virgo3b"
|
||||
},
|
||||
{
|
||||
"Down":-1,
|
||||
"Up":1,
|
||||
"Station":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/simulated/sky/virgo3b"
|
||||
},
|
||||
{
|
||||
"Up":1,
|
||||
"Station":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
@@ -66,23 +39,11 @@
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/space"
|
||||
},
|
||||
{
|
||||
"Mining":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/simulated/floor/outdoors/grass/sif/virgo3b"
|
||||
},
|
||||
{
|
||||
"Station":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/simulated/floor/outdoors/grass/sif/virgo3b"
|
||||
},
|
||||
{
|
||||
"Station":false,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/simulated/floor/outdoors/grass/sif/virgo3b"
|
||||
"Baseturf":"/turf/space"
|
||||
}
|
||||
],
|
||||
"minetype":"none"
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
{
|
||||
"map_name":"Triumph",
|
||||
"map_path":"map_files/triumph",
|
||||
"map_file":[
|
||||
"triumph-01-deck1.dmm",
|
||||
"triumph-02-deck2.dmm",
|
||||
"triumph-03-deck3.dmm",
|
||||
"triumph-04-deck4.dmm",
|
||||
"triumph-05-flagship.dmm",
|
||||
|
||||
],
|
||||
"traits":[
|
||||
{
|
||||
"Up":1,
|
||||
"Station":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/space"
|
||||
},
|
||||
{
|
||||
"Up":1,
|
||||
"Down":-1,
|
||||
"Station":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/space"
|
||||
},
|
||||
{
|
||||
"Up":1,
|
||||
"Down":-1,
|
||||
"Station":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/space"
|
||||
},
|
||||
{
|
||||
"Down":-1,
|
||||
"Station":true,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/space"
|
||||
},
|
||||
{
|
||||
"Station":false,
|
||||
"Linkage":null,
|
||||
"Gravity":true,
|
||||
"Baseturf":"/turf/space"
|
||||
}
|
||||
],
|
||||
"minetype":"none"
|
||||
}
|
||||
@@ -164,7 +164,7 @@
|
||||
var/use_loyalty_implants = 0
|
||||
|
||||
var/welder_vision = 1
|
||||
var/generate_map = 0
|
||||
var/generate_map = 1
|
||||
var/no_click_cooldown = 0
|
||||
|
||||
//Used for modifying movement speed for mobs.
|
||||
|
||||
@@ -33,32 +33,28 @@
|
||||
/// Away Missions
|
||||
#if AWAY_MISSION_TEST
|
||||
#include "space/debrisfield.dmm"
|
||||
//#include "beach/beach.dmm"
|
||||
//#include "beach/cave.dmm"
|
||||
//#include "alienship/alienship.dmm"
|
||||
//#include "aerostat/aerostat.dmm"
|
||||
//#include "aerostat/surface.dmm"
|
||||
#endif
|
||||
|
||||
#include "space/_debrisfield.dm"
|
||||
#include "space/pois/_templates.dm"
|
||||
#include "space/pois/debrisfield_things.dm"
|
||||
#include "space/_templates.dm"
|
||||
#include "space/debrisfield_things.dm"
|
||||
/datum/map_template/triumph_lateload/away_debrisfield
|
||||
name = "Debris Field - Z1 Space"
|
||||
desc = "A random debris field out in space."
|
||||
mappath = 'space/debrisfield.dmm'
|
||||
associated_map_datum = /datum/map_z_level/triumph_lateload/away_debrisfield
|
||||
|
||||
/datum/map_template/triumph_lateload/away_debrisfield/on_map_loaded(z)
|
||||
. = ..()
|
||||
//Commented out until we actually get POIs
|
||||
seed_submaps(list(Z_LEVEL_DEBRISFIELD), 200, /area/triumph_away/debrisfield/unexplored, /datum/map_template/debrisfield)
|
||||
ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = FALSE)
|
||||
|
||||
/datum/map_z_level/triumph_lateload/away_debrisfield
|
||||
name = "Away Mission - Debris Field"
|
||||
z = Z_LEVEL_DEBRISFIELD
|
||||
base_turf = /turf/space
|
||||
|
||||
|
||||
/datum/map_template/triumph_lateload/away_debrisfield/on_map_loaded(z)
|
||||
. = ..()
|
||||
seed_submaps(list(Z_LEVEL_DEBRISFIELD), 200, /area/triumph_away/debrisfield/unexplored, /datum/map_template/debrisfield/)
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////
|
||||
// Admin-use z-levels for loading whenever an admin feels like
|
||||
#if AWAY_MISSION_TEST
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
teleport_y = y
|
||||
teleport_z = z
|
||||
|
||||
//This does nothing right now, but is framework if we do POIs for this place
|
||||
//POI Init
|
||||
/obj/away_mission_init/debrisfield
|
||||
name = "away mission initializer - debrisfield"
|
||||
|
||||
|
||||
+7
-7
@@ -1,48 +1,53 @@
|
||||
/datum/map_template/debrisfield
|
||||
name = "Debris Field Content"
|
||||
desc = "For seeding submaps in debris field"
|
||||
allow_duplicates = TRUE
|
||||
|
||||
/datum/map_template/debrisfield/asteroids1
|
||||
name = "Asteroids 1"
|
||||
mappath = 'asteroids1.dmm'
|
||||
cost = 2
|
||||
allow_duplicates = TRUE
|
||||
|
||||
/datum/map_template/debrisfield/asteroids2
|
||||
name = "Asteroids 2"
|
||||
mappath = 'asteroids2.dmm'
|
||||
cost = 2
|
||||
allow_duplicates = TRUE
|
||||
|
||||
/datum/map_template/debrisfield/asteroids3
|
||||
name = "Asteroids 3"
|
||||
mappath = 'asteroids3.dmm'
|
||||
cost = 2
|
||||
allow_duplicates = TRUE
|
||||
|
||||
/datum/map_template/debrisfield/carp_asteroids1
|
||||
name = "Carp Asteroids 1"
|
||||
mappath = 'carp_asteroids1.dmm'
|
||||
cost = 5
|
||||
allow_duplicates = TRUE
|
||||
|
||||
/datum/map_template/debrisfield/carp_asteroids2
|
||||
name = "Carp Asteroids 2"
|
||||
mappath = 'carp_asteroids2.dmm'
|
||||
cost = 5
|
||||
allow_duplicates = TRUE
|
||||
|
||||
/datum/map_template/debrisfield/carp_asteroids3
|
||||
name = "Carp Asteroids 3"
|
||||
mappath = 'carp_asteroids3.dmm'
|
||||
cost = 5
|
||||
allow_duplicates = TRUE
|
||||
|
||||
/datum/map_template/debrisfield/carp_asteroids4
|
||||
name = "Carp Asteroids 4"
|
||||
mappath = 'carp_asteroids4.dmm'
|
||||
cost = 5
|
||||
allow_duplicates = TRUE
|
||||
|
||||
/datum/map_template/debrisfield/foodstand
|
||||
name = "Food Stand"
|
||||
mappath = 'foodstand.dmm'
|
||||
cost = 20
|
||||
allow_duplicates = FALSE
|
||||
|
||||
/datum/map_template/debrisfield/debris1
|
||||
name = "Debris 1"
|
||||
@@ -78,29 +83,24 @@
|
||||
name = "Exploded Cargo Ship"
|
||||
mappath = 'ship_sup_exploded.dmm'
|
||||
cost = 35
|
||||
allow_duplicates = FALSE
|
||||
|
||||
/datum/map_template/debrisfield/ship_med_crashed
|
||||
name = "Crashed Medical Ship"
|
||||
mappath = 'ship_med_crashed.dmm'
|
||||
cost = 35
|
||||
allow_duplicates = FALSE
|
||||
|
||||
/datum/map_template/debrisfield/ship_sci_overrun
|
||||
name = "Overrun Research Ship"
|
||||
mappath = 'ship_sci_overrun.dmm'
|
||||
cost = 35
|
||||
allow_duplicates = FALSE
|
||||
|
||||
/datum/map_template/debrisfield/oldshuttle
|
||||
name = "Old Expedition Shuttle"
|
||||
mappath = 'oldshuttle.dmm'
|
||||
cost = 30
|
||||
allow_duplicates = FALSE
|
||||
|
||||
/datum/map_template/debrisfield/alien_massive_derelict
|
||||
name = "Alien Derelict"
|
||||
mappath = 'derelict.dmm'
|
||||
cost = 35
|
||||
allow_duplicates = FALSE
|
||||
discard_prob = 50
|
||||
File diff suppressed because it is too large
Load Diff
@@ -94,14 +94,15 @@
|
||||
spawnpoint_left = /datum/spawnpoint/shuttle
|
||||
spawnpoint_stayed = /datum/spawnpoint/cryo
|
||||
|
||||
meteor_strike_areas = list(/area/triumph/surfacebase/outside/outside3)
|
||||
meteor_strike_areas = null
|
||||
|
||||
unit_test_exempt_areas = list(
|
||||
/area/vacant/vacant_site,
|
||||
/area/vacant/vacant_site/east)
|
||||
unit_test_exempt_from_atmos = list(
|
||||
/area/engineering/atmos/intake,
|
||||
/area/tcommsat/chamber)
|
||||
/area/tcommsat/chamber,
|
||||
/area/engineering/engineering_airlock)
|
||||
|
||||
lateload_z_levels = list(
|
||||
list("Triumph - Misc","Triumph - Ships",), //Stock Triumph lateload maps
|
||||
@@ -119,7 +120,7 @@
|
||||
lateload_single_pick = null //Nothing right now.
|
||||
|
||||
/datum/map/triumph/perform_map_generation()
|
||||
. = ..()
|
||||
return 1
|
||||
|
||||
|
||||
// Short range computers see only the main levels, others can see the surrounding surface levels.
|
||||
@@ -153,7 +154,7 @@
|
||||
z = Z_LEVEL_DECK_ONE
|
||||
name = "Deck 1"
|
||||
transit_chance = 33
|
||||
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT
|
||||
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT
|
||||
holomap_offset_x = TRIUMPH_HOLOMAP_MARGIN_X
|
||||
holomap_offset_y = TRIUMPH_HOLOMAP_MARGIN_Y + TRIUMPH_MAP_SIZE*1
|
||||
|
||||
@@ -161,7 +162,7 @@
|
||||
z = Z_LEVEL_DECK_TWO
|
||||
name = "Deck 2"
|
||||
transit_chance = 33
|
||||
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT
|
||||
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT
|
||||
holomap_offset_x = TRIUMPH_HOLOMAP_MARGIN_X
|
||||
holomap_offset_y = TRIUMPH_HOLOMAP_MARGIN_Y + TRIUMPH_MAP_SIZE*2
|
||||
|
||||
@@ -169,7 +170,7 @@
|
||||
z = Z_LEVEL_DECK_THREE
|
||||
name = "Deck 3"
|
||||
transit_chance = 33
|
||||
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT
|
||||
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT
|
||||
holomap_offset_x = HOLOMAP_ICON_SIZE - TRIUMPH_HOLOMAP_MARGIN_X - TRIUMPH_MAP_SIZE
|
||||
holomap_offset_y = TRIUMPH_HOLOMAP_MARGIN_Y + TRIUMPH_MAP_SIZE*1
|
||||
|
||||
@@ -177,7 +178,7 @@
|
||||
z = Z_LEVEL_DECK_FOUR
|
||||
name = "Deck 4"
|
||||
transit_chance = 33
|
||||
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT
|
||||
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT
|
||||
holomap_offset_x = HOLOMAP_ICON_SIZE - TRIUMPH_HOLOMAP_MARGIN_X - TRIUMPH_MAP_SIZE
|
||||
holomap_offset_y = TRIUMPH_HOLOMAP_MARGIN_Y + TRIUMPH_MAP_SIZE*2
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
move_time = SHUTTLE_TRANSIT_DURATION_RETURN
|
||||
|
||||
//////////////////////////////////////////////////////////////
|
||||
/*
|
||||
/datum/shuttle/ferry/escape_pod/large_escape_pod1
|
||||
name = "Large Escape Pod 1"
|
||||
location = 0
|
||||
@@ -24,7 +25,7 @@
|
||||
dock_target_station = "large_escape_pod_1_berth"
|
||||
dock_target_offsite = "large_escape_pod_1_recovery"
|
||||
move_time = SHUTTLE_TRANSIT_DURATION_RETURN
|
||||
|
||||
*/
|
||||
//////////////////////////////////////////////////////////////
|
||||
/* Removed for the time being
|
||||
/datum/shuttle/ferry/escape_pod/large_escape_pod2
|
||||
@@ -53,6 +54,7 @@
|
||||
|
||||
//////////////////////////////////////////////////////////////
|
||||
// Trade Ship
|
||||
/*
|
||||
/datum/shuttle/ferry/trade
|
||||
name = "Trade"
|
||||
location = 1
|
||||
@@ -62,7 +64,7 @@
|
||||
docking_controller_tag = "trade_shuttle"
|
||||
dock_target_station = "trade_shuttle_dock_airlock"
|
||||
dock_target_offsite = "trade_shuttle_bay"
|
||||
|
||||
*/
|
||||
//////////////////////////////////////////////////////////////
|
||||
// Away Mission Shuttle
|
||||
// TODO - Not implemented yet on new map
|
||||
@@ -113,6 +115,7 @@
|
||||
*/
|
||||
//////////////////////////////////////////////////////////////
|
||||
// Antag Space "Proto Shuttle" Shuttle
|
||||
/*
|
||||
/datum/shuttle/multi_shuttle/protoshuttle
|
||||
name = "Proto"
|
||||
warmup_time = 8
|
||||
@@ -186,7 +189,7 @@
|
||||
docking_controller_tag_offsite = "specops_shuttle_fore"
|
||||
dock_target_station = "specops_centcom_dock"
|
||||
dock_target_offsite = "specops_dock_airlock"
|
||||
|
||||
*/
|
||||
|
||||
//////////////////////////////////////////////////////////////
|
||||
// RogueMiner "Belter: Shuttle
|
||||
|
||||
@@ -29,86 +29,6 @@
|
||||
music = list('sound/music/elevator.ogg') // Woo elevator music!
|
||||
*/
|
||||
|
||||
/*
|
||||
/obj/machinery/atmospherics/unary/vent_pump/positive
|
||||
use_power = USE_POWER_IDLE
|
||||
icon_state = "map_vent_out"
|
||||
external_pressure_bound = ONE_ATMOSPHERE * 1.1
|
||||
|
||||
|
||||
/obj/effect/step_trigger/teleporter/to_mining/New()
|
||||
..()
|
||||
teleport_x = src.x
|
||||
teleport_y = 2
|
||||
teleport_z = Z_LEVEL_SURFACE_MINE
|
||||
|
||||
/obj/effect/step_trigger/teleporter/from_mining/New()
|
||||
..()
|
||||
teleport_x = src.x
|
||||
teleport_y = world.maxy - 1
|
||||
teleport_z = Z_LEVEL_SURFACE_LOW
|
||||
|
||||
/obj/effect/step_trigger/teleporter/to_solars/New()
|
||||
..()
|
||||
teleport_x = world.maxx - 1
|
||||
teleport_y = src.y
|
||||
teleport_z = Z_LEVEL_SOLARS
|
||||
|
||||
/obj/effect/step_trigger/teleporter/from_solars/New()
|
||||
..()
|
||||
teleport_x = 2
|
||||
teleport_y = src.y
|
||||
teleport_z = Z_LEVEL_SURFACE_LOW
|
||||
|
||||
/obj/effect/step_trigger/teleporter/wild/New()
|
||||
..()
|
||||
|
||||
//If starting on east/west edges.
|
||||
if (src.x == 1)
|
||||
teleport_x = world.maxx - 1
|
||||
else if (src.x == world.maxx)
|
||||
teleport_x = 2
|
||||
else
|
||||
teleport_x = src.x
|
||||
//If starting on north/south edges.
|
||||
if (src.y == 1)
|
||||
teleport_y = world.maxy - 1
|
||||
else if (src.y == world.maxy)
|
||||
teleport_y = 2
|
||||
else
|
||||
teleport_y = src.y
|
||||
|
||||
/obj/effect/step_trigger/teleporter/to_underdark
|
||||
icon = 'icons/obj/stairs.dmi'
|
||||
icon_state = "stairs"
|
||||
invisibility = 0
|
||||
/obj/effect/step_trigger/teleporter/to_underdark/Initialize()
|
||||
. = ..()
|
||||
teleport_x = x
|
||||
teleport_y = y
|
||||
for(var/z_num in GLOB.using_map.zlevels)
|
||||
var/datum/map_z_level/Z = GLOB.using_map.zlevels[z_num]
|
||||
if(Z.name == "Underdark")
|
||||
teleport_z = Z.z
|
||||
|
||||
/obj/effect/step_trigger/teleporter/from_underdark
|
||||
icon = 'icons/obj/stairs.dmi'
|
||||
icon_state = "stairs"
|
||||
invisibility = 0
|
||||
/obj/effect/step_trigger/teleporter/from_underdark/Initialize()
|
||||
. = ..()
|
||||
teleport_x = x
|
||||
teleport_y = y
|
||||
for(var/z_num in GLOB.using_map.zlevels)
|
||||
var/datum/map_z_level/Z = GLOB.using_map.zlevels[z_num]
|
||||
if(Z.name == "Mining Outpost")
|
||||
teleport_z = Z.z
|
||||
|
||||
/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/find_planet()
|
||||
planet = planet_virgo3b
|
||||
|
||||
*/
|
||||
|
||||
/obj/effect/step_trigger/lost_in_space
|
||||
var/deathmessage = "You drift off into space, floating alone in the void until your life support runs out."
|
||||
|
||||
@@ -132,7 +52,7 @@
|
||||
return ..()
|
||||
|
||||
/obj/effect/step_trigger/lost_in_space/shuttle
|
||||
deathmessage = "You fly down the tunnel of the shuttle at high speed for a few moments before impact kills you with sheer concussive force."
|
||||
deathmessage = "You fly out of the shuttle at high speed for a few moments before you see the last hopes of your survival fade away."
|
||||
|
||||
|
||||
// Invisible object that blocks z transfer to/from its turf and the turf above.
|
||||
@@ -151,39 +71,9 @@
|
||||
return TRUE
|
||||
|
||||
//
|
||||
// shuttle STATION
|
||||
// SHUTTLE STATION
|
||||
//
|
||||
|
||||
// The shuttle's electrified maglev tracks
|
||||
/turf/simulated/floor/maglev
|
||||
name = "maglev track"
|
||||
desc = "Magnetic levitation shuttle tracks. Caution! Electrified!"
|
||||
icon = 'icons/turf/flooring/maglevs.dmi'
|
||||
icon_state = "maglevup"
|
||||
|
||||
var/area/shock_area = /area/triumph/surfacebase/tram
|
||||
|
||||
/turf/simulated/floor/maglev/Initialize()
|
||||
. = ..()
|
||||
shock_area = locate(shock_area)
|
||||
|
||||
// Walking on maglev tracks will shock you! Horray!
|
||||
/turf/simulated/floor/maglev/Entered(var/atom/movable/AM, var/atom/old_loc)
|
||||
..()
|
||||
if(isliving(AM) && prob(50))
|
||||
track_zap(AM)
|
||||
|
||||
/turf/simulated/floor/maglev/attack_hand(var/mob/user)
|
||||
if(prob(75))
|
||||
track_zap(user)
|
||||
|
||||
/turf/simulated/floor/maglev/proc/track_zap(var/mob/living/user)
|
||||
if (!istype(user)) return
|
||||
if (electrocute_mob(user, shock_area, src))
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(5, 1, src)
|
||||
s.start()
|
||||
|
||||
// shuttle air scrubbers for keeping arrivals clean - they work even with no area power
|
||||
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/shuttle
|
||||
name = "\improper Shuttle Air Scrubber"
|
||||
@@ -229,7 +119,7 @@
|
||||
on_store_name = "Crew Shift Transfer Services"
|
||||
on_enter_occupant_message = "The shuttle arrives at the platform; you step inside and take a seat."
|
||||
on_store_visible_message_1 = "'s speakers chime, anouncing a shuttle has arrived to take"
|
||||
on_store_visible_message_2 = "to the commanding ship."
|
||||
on_store_visible_message_2 = "to the commanding ship"
|
||||
time_till_despawn = 10 SECONDS
|
||||
spawnpoint_type = /datum/spawnpoint/shuttle
|
||||
/obj/machinery/cryopod/robot/door/shuttle/process()
|
||||
@@ -256,6 +146,7 @@
|
||||
var/mob/observer/dead/newghost = user.ghostize()
|
||||
newghost.timeofdeath = world.time
|
||||
despawn_occupant(user)
|
||||
qdel(user)
|
||||
|
||||
// shuttle arrival point landmarks and datum
|
||||
var/global/list/latejoin_shuttle = list()
|
||||
|
||||
Reference in New Issue
Block a user