Merge branch 'master' into QM-as-Head

This commit is contained in:
Chayse Ramsay
2018-02-18 03:46:35 +00:00
committed by GitHub
355 changed files with 74624 additions and 281692 deletions
@@ -10,10 +10,10 @@
/area/lavaland/surface/outdoors)
"ad" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/virology{
frequency = 1449;
id_tag = "lavaland_syndie_virology_interior";
locked = 1;
name = "Virology Lab Interior Airlock";
req_access_txt = "150"
},
@@ -29,6 +29,9 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/syndicate_lava_base/virology)
"ae" = (
@@ -1586,6 +1589,9 @@
req_access_txt = "150"
},
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"gf" = (
@@ -1609,6 +1615,9 @@
/obj/machinery/door/airlock/external{
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"gj" = (
@@ -1801,6 +1810,9 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/main)
"gB" = (
@@ -2287,6 +2299,7 @@
req_access_txt = "150"
},
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/main)
"hx" = (
@@ -2516,6 +2529,9 @@
/obj/machinery/door/airlock/external{
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/main)
"hY" = (
@@ -2524,6 +2540,9 @@
req_access_txt = "150"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/main)
"hZ" = (
@@ -2857,9 +2876,9 @@
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/main)
"iI" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/vault{
id_tag = "syndie_lavaland_vault";
locked = 1;
req_access_txt = "150"
},
/turf/open/floor/plasteel/vault{
@@ -4563,6 +4582,7 @@
/obj/machinery/door/airlock/external{
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/arrivals)
"lU" = (
@@ -5007,6 +5027,9 @@
req_access_txt = "150"
},
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/arrivals)
"mT" = (
@@ -5422,15 +5445,16 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
id_tag = "syndie_lavaland_incinerator_interior";
locked = 1;
name = "Turbine Interior Airlock";
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"nE" = (
@@ -5900,15 +5924,18 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
id_tag = "syndie_lavaland_incinerator_exterior";
locked = 1;
name = "Turbine Exterior Airlock";
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"ou" = (
@@ -6033,6 +6060,24 @@
/obj/structure/sign/departments/chemistry,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"EZ" = (
/obj/machinery/door/airlock/external{
req_access_txt = "150"
},
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/arrivals)
"St" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/external{
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/arrivals)
(1,1,1) = {"
aa
@@ -6824,10 +6869,10 @@ mt
mU
np
nP
mS
EZ
oI
oD
lT
St
ab
ab
ab
+36 -3
View File
@@ -1096,6 +1096,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/gravity_generator)
"dD" = (
@@ -2983,6 +2986,9 @@
/obj/machinery/door/airlock/external{
name = "Arrivals Docking Bay 1"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/ruin/space/derelict/arrival)
"jV" = (
@@ -3590,6 +3596,7 @@
/obj/machinery/door/airlock/external{
name = "Escape Airlock"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/ruin/space/derelict/arrival)
"ma" = (
@@ -4478,6 +4485,15 @@
icon_state = "damaged3"
},
/area/space/nearstation)
"DE" = (
/obj/machinery/door/airlock/external{
name = "Escape Airlock"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/ruin/space/derelict/arrival)
"Ev" = (
/turf/open/floor/plasteel/airless{
icon_state = "damaged2"
@@ -4510,6 +4526,15 @@
},
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/hallway/primary/port)
"Le" = (
/obj/machinery/door/airlock/external{
name = "Arrivals Docking Bay 1"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/ruin/space/derelict/arrival)
"Lv" = (
/turf/closed/wall,
/area/space/nearstation)
@@ -4525,6 +4550,14 @@
icon_state = "damaged4"
},
/area/ruin/space/derelict/singularity_engine)
"RF" = (
/obj/machinery/door/airlock/engineering{
name = "Engineering Access";
req_access_txt = "10"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/ruin/space/derelict/gravity_generator)
"Sv" = (
/turf/closed/wall/r_wall,
/area/space/nearstation)
@@ -8650,7 +8683,7 @@ cw
cH
cO
cO
da
RF
dh
dt
dC
@@ -12988,7 +13021,7 @@ kM
hf
lZ
hP
lZ
DE
aa
aa
aa
@@ -13880,7 +13913,7 @@ aa
aa
aa
jK
jU
Le
jK
aa
aa
+66 -25
View File
@@ -47,10 +47,12 @@
/turf/template_noop,
/area/template_noop)
"aj" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 2
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/external{
cyclelinkeddir = 2;
id_tag = "caravanpirate_bolt_port";
locked = 1
id_tag = "caravanpirate_bolt_port"
},
/obj/docking_port/stationary{
dir = 2;
@@ -525,6 +527,9 @@
normalspeed = 0;
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/shuttle/caravan/syndicate3)
"bb" = (
@@ -689,10 +694,12 @@
},
/area/shuttle/caravan/pirate)
"dK" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/external{
cyclelinkeddir = 1;
id_tag = "caravanpirate_bolt_port";
locked = 1
id_tag = "caravanpirate_bolt_port"
},
/turf/open/floor/plating,
/area/shuttle/caravan/pirate)
@@ -1497,18 +1504,22 @@
/turf/open/floor/plating,
/area/shuttle/caravan/pirate)
"fD" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 2
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/external{
cyclelinkeddir = 2;
id_tag = "caravanpirate_bolt_starboard";
locked = 1
id_tag = "caravanpirate_bolt_starboard"
},
/turf/open/floor/plating,
/area/shuttle/caravan/pirate)
"fF" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/external{
cyclelinkeddir = 1;
id_tag = "caravanpirate_bolt_starboard";
locked = 1
id_tag = "caravanpirate_bolt_starboard"
},
/turf/open/floor/plating,
/area/shuttle/caravan/pirate)
@@ -1715,9 +1726,9 @@
/area/shuttle/caravan/freighter3)
"gc" = (
/obj/machinery/door/airlock/external{
cyclelinkeddir = 8;
req_access_txt = "13"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating/airless,
/area/shuttle/caravan/freighter3)
"gd" = (
@@ -1794,10 +1805,12 @@
/turf/open/floor/plasteel/vault/airless,
/area/shuttle/caravan/freighter1)
"gn" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/external{
cyclelinkeddir = 1;
id_tag = "caravantrade1_bolt";
locked = 1
id_tag = "caravantrade1_bolt"
},
/turf/open/floor/plating,
/area/shuttle/caravan/freighter1)
@@ -2155,9 +2168,9 @@
"hs" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/external{
cyclelinkeddir = 8;
req_access_txt = "13"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating/airless,
/area/shuttle/caravan/freighter2)
"ht" = (
@@ -3268,6 +3281,7 @@
timid = 0;
width = 15
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/shuttle/caravan/syndicate3)
"ks" = (
@@ -3407,9 +3421,9 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/caravan/syndicate2)
"kG" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/hatch{
id_tag = "caravansyndicate1_bolt";
locked = 1;
name = "External Airlock";
normalspeed = 0;
req_access_txt = "150"
@@ -3555,9 +3569,9 @@
},
/area/shuttle/caravan/syndicate3)
"kT" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/hatch{
id_tag = "caravansyndicate2_bolt";
locked = 1;
name = "External Airlock";
normalspeed = 0;
req_access_txt = "150"
@@ -3586,10 +3600,12 @@
/turf/open/floor/plating,
/area/shuttle/caravan/syndicate2)
"kU" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 2
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/external{
cyclelinkeddir = 2;
id_tag = "caravantrade1_bolt";
locked = 1
id_tag = "caravantrade1_bolt"
},
/obj/docking_port/stationary{
dir = 2;
@@ -3669,6 +3685,9 @@
name = "Ready Room";
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -3680,12 +3699,15 @@
},
/area/shuttle/caravan/syndicate3)
"ld" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/hatch{
id_tag = "caravansyndicate3_bolt_bridge";
locked = 1;
name = "Bridge";
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -3890,6 +3912,25 @@
},
/turf/closed/wall/mineral/plastitanium,
/area/ruin/unpowered)
"vE" = (
/obj/machinery/door/airlock/external{
req_access_txt = "13"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/caravan/freighter3)
"GL" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/external{
req_access_txt = "13"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/caravan/freighter2)
(1,1,1) = {"
aa
@@ -6523,7 +6564,7 @@ bg
jv
jN
kb
hs
GL
aa
aa
aa
@@ -8236,7 +8277,7 @@ aO
if
iF
je
gc
vE
aa
aa
aa
+6 -9
View File
@@ -65,9 +65,8 @@
/turf/closed/wall/mineral/titanium,
/area/awaymission/BMPship/Midship)
"ar" = (
/obj/machinery/door/airlock/silver{
locked = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/silver,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -1784,15 +1783,13 @@
},
/area/awaymission/BMPship/Midship)
"fY" = (
/obj/machinery/door/airlock/silver{
locked = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/silver,
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
"fZ" = (
/obj/machinery/door/airlock/silver{
locked = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/silver,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -104,8 +104,10 @@
},
/area/ruin/space/has_grav/listeningstation)
"an" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/airlock/external{
cyclelinkeddir = 4;
id_tag = "syndie_listeningpost_external";
req_access_txt = "150"
},
@@ -120,8 +122,10 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"ap" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/external{
cyclelinkeddir = 8;
id_tag = "syndie_listeningpost_external";
req_access_txt = "150"
},
+46 -17
View File
@@ -1929,6 +1929,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance_hatch,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/hydroponics)
"fJ" = (
@@ -2132,7 +2133,6 @@
/area/template_noop)
"gg" = (
/obj/machinery/door/airlock/external{
cyclelinkeddir = 2;
name = "Engineering External Access";
req_access = null;
req_access_txt = "200"
@@ -2144,6 +2144,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/engi)
"gh" = (
@@ -2620,6 +2623,9 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance_hatch,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/kitchen)
"ha" = (
@@ -4340,15 +4346,6 @@
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/ancientstation)
"ln" = (
/obj/machinery/door/airlock/external{
cyclelinkeddir = 2;
name = "Engineering External Access";
req_access = null;
req_access_txt = "10;13"
},
/turf/closed/mineral,
/area/ruin/unpowered)
"lo" = (
/turf/closed/mineral/silver,
/area/ruin/unpowered)
@@ -4429,6 +4426,31 @@
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/ancientstation/sec)
"nk" = (
/obj/machinery/door/airlock/highsecurity,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/hivebot)
"oM" = (
/obj/machinery/door/airlock/external{
name = "Engineering External Access";
req_access = null;
req_access_txt = "200"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/engi)
"Dj" = (
/obj/structure/transit_tube{
dir = 4
@@ -4439,6 +4461,13 @@
/obj/structure/transit_tube/crossing/horizontal,
/turf/template_noop,
/area/space/nearstation)
"MZ" = (
/obj/machinery/door/airlock/highsecurity,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/hivebot)
(1,1,1) = {"
aa
@@ -5297,7 +5326,7 @@ aa
aa
ac
ac
ln
ac
aa
aa
aa
@@ -5519,7 +5548,7 @@ dl
dl
fb
fD
gg
oM
gV
hk
dl
@@ -7519,8 +7548,8 @@ ad
ad
ad
ad
aN
aN
MZ
MZ
ad
ad
ad
@@ -7663,8 +7692,8 @@ ad
ad
ad
ad
aN
aN
nk
nk
ad
ad
ad
@@ -8279,4 +8308,4 @@ aa
aa
aa
aa
"}
"}
+34 -11
View File
@@ -233,15 +233,13 @@
/turf/open/space,
/area/space/nearstation)
"aQ" = (
/obj/machinery/door/airlock/gold{
locked = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/gold,
/turf/open/floor/carpet,
/area/awaymission/academy/headmaster)
"aR" = (
/obj/machinery/door/airlock/gold{
locked = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/gold,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -1252,10 +1250,16 @@
"eA" = (
/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/academy/classrooms)
"eB" = (
/obj/machinery/door/airlock/public/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/academy/classrooms)
"eC" = (
@@ -2021,9 +2025,8 @@
/turf/open/floor/carpet,
/area/awaymission/academy/academyaft)
"gT" = (
/obj/machinery/door/airlock/gold{
locked = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/gold,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -3958,6 +3961,26 @@
},
/turf/open/floor/carpet,
/area/awaymission/academy/headmaster)
"LW" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance_hatch,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/academy/academyaft)
"Tk" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance_hatch,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/academy/academyaft)
(1,1,1) = {"
aa
@@ -10924,7 +10947,7 @@ gq
hb
hc
hc
hD
LW
hc
hc
hc
@@ -11184,7 +11207,7 @@ bE
bE
hc
hc
hD
Tk
hc
hc
hc
+64 -16
View File
@@ -699,9 +699,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/highsecurity{
icon_state = "closed";
locked = 1;
name = "Gateway";
req_access_txt = "150"
},
@@ -1023,11 +1022,11 @@
},
/area/awaymission/moonoutpost19/syndicate)
"cr" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/public/glass{
density = 0;
set_obj_flags = "EMAGGED";
icon_state = "open";
locked = 1;
name = "Dormitories"
},
/obj/item/stack/rods,
@@ -1336,12 +1335,12 @@
},
/area/awaymission/moonoutpost19/syndicate)
"cT" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock{
density = 0;
set_obj_flags = "EMAGGED";
icon_state = "open";
id_tag = "awaydorm4";
locked = 1;
name = "Dorm 1";
opacity = 0
},
@@ -1650,14 +1649,15 @@
},
/area/awaymission/moonoutpost19/syndicate)
"du" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/external{
density = 0;
set_obj_flags = "EMAGGED";
icon_state = "open";
locked = 1;
opacity = 0;
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006
@@ -1810,14 +1810,17 @@
},
/area/awaymission/moonoutpost19/main)
"dI" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/external{
density = 0;
set_obj_flags = "EMAGGED";
icon_state = "open";
locked = 1;
opacity = 0;
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006;
@@ -2595,11 +2598,11 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/research{
density = 0;
set_obj_flags = "EMAGGED";
icon_state = "open";
locked = 1;
name = "Xenobiology Lab";
opacity = 0;
req_access_txt = "201"
@@ -3727,11 +3730,11 @@
/area/awaymission/moonoutpost19/research)
"hD" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/command{
density = 0;
set_obj_flags = "EMAGGED";
icon_state = "open";
locked = 1;
name = "Research Director's Office";
opacity = 0;
req_access_txt = "201";
@@ -4009,6 +4012,7 @@
req_access_txt = "201";
req_one_access_txt = "0"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel/white{
heat_capacity = 1e+006
},
@@ -6103,12 +6107,18 @@
"mL" = (
/obj/machinery/door/airlock/external,
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/arrivals)
"mM" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -6614,10 +6624,9 @@
},
/area/awaymission/moonoutpost19/arrivals)
"nO" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock{
icon_state = "closed";
id_tag = "awaydorm3";
locked = 1;
name = "Dorm 3"
},
/turf/open/floor/plasteel{
@@ -6811,6 +6820,45 @@
/obj/effect/mapping_helpers/planet_z,
/turf/open/space,
/area/space)
"vV" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/arrivals)
"zZ" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/arrivals)
"Mm" = (
/obj/machinery/door/airlock/medical{
id_tag = "";
name = "Research Division";
req_access_txt = "201";
req_one_access_txt = "0"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel/white{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/research)
"Wf" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/arrivals)
(1,1,1) = {"
aa
@@ -36266,10 +36314,10 @@ jG
lF
lF
no
mM
zZ
nA
nK
mM
Wf
dM
ba
ba
@@ -36510,7 +36558,7 @@ hN
ie
hj
hj
ie
Mm
jy
jU
jE
@@ -36523,10 +36571,10 @@ mN
mg
mg
mg
mM
zZ
lM
lN
mM
Wf
dM
ba
ba
@@ -41661,7 +41709,7 @@ hI
hJ
hI
hI
mM
vV
hI
hI
nJ
+241 -24
View File
@@ -739,6 +739,7 @@
name = "Engine Room";
req_access_txt = "10"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel/whiteyellow/side{
dir = 4
},
@@ -757,6 +758,7 @@
name = "Engine Room";
req_access_txt = "10"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel/whiteyellow/side{
dir = 8
},
@@ -1299,18 +1301,18 @@
/turf/open/floor/plasteel/red,
/area/awaymission/research/interior/security)
"dW" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/highsecurity{
aiDisabledIdScanner = 1;
locked = 1;
name = "Secure Storage C";
req_access_txt = "36"
},
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/secure)
"dX" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/highsecurity{
aiDisabledIdScanner = 1;
locked = 1;
name = "Secure Storage D";
req_access_txt = "36"
},
@@ -1433,6 +1435,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"eu" = (
@@ -1866,6 +1869,9 @@
name = "Cryogenetics Research";
req_access_txt = "9"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel/whitepurple/side,
/area/awaymission/research/interior)
"fN" = (
@@ -2024,6 +2030,9 @@
name = "Vault Storage";
req_access_txt = "36"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/secure)
"gm" = (
@@ -2041,6 +2050,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/research/interior/secure)
"go" = (
@@ -2067,6 +2079,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/research/interior)
"gr" = (
@@ -2092,6 +2107,9 @@
name = "Cryogenetics Research";
req_access_txt = "9"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel/whitepurple,
/area/awaymission/research/interior/cryo)
"gu" = (
@@ -2490,18 +2508,18 @@
},
/area/awaymission/research/interior/security)
"hI" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/highsecurity{
aiDisabledIdScanner = 1;
locked = 1;
name = "Secure Storage A";
req_access_txt = "36"
},
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/secure)
"hJ" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/highsecurity{
aiDisabledIdScanner = 1;
locked = 1;
name = "Secure Storage B";
req_access_txt = "36"
},
@@ -4035,6 +4053,9 @@
/obj/machinery/door/airlock/external{
name = "Escape Pod One"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/research/interior/escapepods)
"mv" = (
@@ -4161,6 +4182,9 @@
/obj/machinery/door/airlock/external{
name = "Escape Pod Two"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/research/interior/escapepods)
"mP" = (
@@ -4179,6 +4203,9 @@
name = "Escape Pod Three";
req_access_txt = "0"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/research/interior/escapepods)
"mT" = (
@@ -4226,6 +4253,7 @@
/obj/machinery/door/airlock/external{
name = "Escape Airlock"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/research/interior/escapepods)
"na" = (
@@ -4250,6 +4278,195 @@
"nf" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/awaymission/research/interior/engineering)
"pt" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Three";
req_access_txt = "0"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/research/interior/escapepods)
"su" = (
/obj/machinery/door/airlock/medical{
name = "Medical"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel/whiteblue/side,
/area/awaymission/research/interior)
"tE" = (
/obj/machinery/door/airlock/medical{
name = "Medical"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel/whiteblue/side{
dir = 1
},
/area/awaymission/research/interior)
"va" = (
/obj/machinery/door/airlock/research{
name = "Cryogenetics Research";
req_access_txt = "9"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel/whitepurple/side,
/area/awaymission/research/interior)
"wM" = (
/obj/machinery/door/airlock/medical{
name = "Medical"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel/whiteblue/side,
/area/awaymission/research/interior)
"xG" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Two"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/research/interior/escapepods)
"zn" = (
/obj/machinery/door/airlock/maintenance_hatch{
req_access_txt = "12"
},
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"Bx" = (
/obj/machinery/door/airlock/engineering{
name = "Engine Room";
req_access_txt = "10"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel/whiteyellow/side{
dir = 4
},
/area/awaymission/research/interior)
"Do" = (
/obj/machinery/door/airlock/maintenance_hatch{
req_access_txt = "12"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"Km" = (
/obj/machinery/door/airlock/security/glass{
id_tag = "outerbrig";
name = "Brig";
req_access_txt = "63"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel/whitered/side,
/area/awaymission/research/interior)
"Qd" = (
/obj/machinery/door/airlock/medical{
name = "Medical"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel/whiteblue/side{
dir = 1
},
/area/awaymission/research/interior)
"Qz" = (
/obj/machinery/door/airlock/security/glass{
id_tag = "outerbrig";
name = "Brig";
req_access_txt = "63"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel/whitered/side{
dir = 1
},
/area/awaymission/research/interior)
"TD" = (
/obj/machinery/door/airlock/engineering{
name = "Engine Room";
req_access_txt = "10"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel/whiteyellow/side{
dir = 8
},
/area/awaymission/research/interior)
"TE" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod One"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/research/interior/escapepods)
"Uu" = (
/obj/machinery/door/airlock/security/glass{
id_tag = "outerbrig";
name = "Brig";
req_access_txt = "63"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel/whitered/side,
/area/awaymission/research/interior)
"UA" = (
/obj/machinery/door/airlock/maintenance_hatch{
req_access_txt = "12"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"WR" = (
/obj/machinery/door/airlock/security/glass{
id_tag = "outerbrig";
name = "Brig";
req_access_txt = "63"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel/whitered/side{
dir = 1
},
/area/awaymission/research/interior)
"XE" = (
/obj/machinery/door/airlock/external{
name = "Escape Airlock"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/awaymission/research/interior/escapepods)
(1,1,1) = {"
aa
@@ -34959,7 +35176,7 @@ fC
gs
fC
fC
et
zn
dZ
cc
aH
@@ -38586,15 +38803,15 @@ iX
cd
ma
mb
mu
TE
mb
mb
mb
mO
xG
mb
mb
mb
mS
pt
mb
mb
ad
@@ -39626,7 +39843,7 @@ mE
mZ
mv
mv
mZ
XE
aa
aa
aa
@@ -40866,9 +41083,9 @@ cp
cp
eH
cp
fM
va
gB
fM
va
cp
eH
cp
@@ -41631,7 +41848,7 @@ cp
cp
cM
cp
aP
UA
cp
cp
ej
@@ -41887,7 +42104,7 @@ cf
cq
cA
cN
cZ
Bx
dl
dz
cZ
@@ -41939,7 +42156,7 @@ mE
mZ
mv
mv
mZ
XE
aa
aa
aa
@@ -42401,7 +42618,7 @@ bd
cs
cC
cP
da
TD
dn
dB
da
@@ -42659,7 +42876,7 @@ cp
cp
cp
cp
aP
Do
cp
cp
ei
@@ -42938,9 +43155,9 @@ bD
bD
cc
cp
jt
su
jK
kf
tE
cp
cd
dC
@@ -43436,9 +43653,9 @@ cp
cp
cp
cp
fS
Km
cp
hb
Qz
cp
cp
cp
@@ -43709,9 +43926,9 @@ ad
aH
cd
cp
jt
wM
cp
kf
Qd
cp
cd
aH
@@ -44207,9 +44424,9 @@ aH
aH
eP
cp
fS
Uu
cp
hb
WR
cp
hD
aH
+108 -17
View File
@@ -5003,10 +5003,12 @@
pixel_x = 5;
pixel_y = 5
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/garage)
"lN" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/garage)
"lO" = (
@@ -6816,6 +6818,7 @@
/obj/machinery/door/airlock/external/glass,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/barricade/wooden/crude,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"qs" = (
@@ -6826,6 +6829,7 @@
pixel_y = 5
},
/obj/structure/barricade/wooden/crude,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"qt" = (
@@ -7150,6 +7154,9 @@
"rc" = (
/obj/machinery/door/airlock/external/glass,
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/cavern2)
"rd" = (
@@ -7161,6 +7168,9 @@
/area/awaymission/snowdin/post/cavern2)
"re" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/cavern2)
"rf" = (
@@ -7234,15 +7244,16 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
id_tag = "snowdin_turbine_exterior";
locked = 1;
name = "Turbine Exterior Airlock";
req_access_txt = "32"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/engine,
/area/awaymission/snowdin/post/engineering)
"rr" = (
@@ -7358,6 +7369,9 @@
"rH" = (
/obj/machinery/door/airlock/external/glass,
/obj/structure/barricade/wooden/crude/snow,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"rI" = (
@@ -7553,15 +7567,18 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
id_tag = "snowdin_turbine_interior";
locked = 1;
name = "Turbine Interior Airlock";
req_access_txt = "32"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/engine,
/area/awaymission/snowdin/post/engineering)
"sh" = (
@@ -8466,6 +8483,9 @@
"uZ" = (
/obj/machinery/door/airlock/external/glass,
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/cavern1)
"va" = (
@@ -8476,6 +8496,9 @@
/area/awaymission/snowdin/post/cavern1)
"vb" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/cavern1)
"vc" = (
@@ -8909,7 +8932,7 @@
desc = "A turret built with substandard parts and run down further with age.";
icon_state = "syndie_off";
dir = 9;
faction = list("pirate")
faction = "pirate"
},
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/cave)
@@ -10014,6 +10037,7 @@
/area/awaymission/snowdin/post/mining_dock)
"zn" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"zo" = (
@@ -10235,6 +10259,9 @@
"zS" = (
/obj/machinery/door/airlock/external/glass,
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"zT" = (
@@ -10460,6 +10487,9 @@
/area/awaymission/snowdin/outside)
"AC" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/outside)
"AD" = (
@@ -12388,6 +12418,7 @@
/area/awaymission/snowdin/post/mining_main)
"Gb" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main)
"Gc" = (
@@ -13436,8 +13467,10 @@
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"Jl" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/mining/glass{
cyclelinkeddir = 8;
name = "Mining Dock";
req_access_txt = "48"
},
@@ -13479,8 +13512,10 @@
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"Jr" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/mining/glass{
cyclelinkeddir = 8;
name = "Mining Dock";
req_access_txt = "48"
},
@@ -14102,6 +14137,62 @@
/obj/effect/spawner/lootdrop/crate_spawner,
/turf/open/floor/plating/asteroid/snow/ice,
/area/awaymission/snowdin/cave/cavern)
"Lw" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/minipost)
"Lx" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"OF" = (
/obj/machinery/door/airlock/external{
name = "Ready Room";
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/awaymission/snowdin/cave)
"PR" = (
/obj/machinery/door/airlock/external{
name = "Ready Room";
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/awaymission/snowdin/cave)
"SX" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main)
"VW" = (
/obj/machinery/door/airlock/external/glass,
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"Yn" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/garage)
(1,1,1) = {"
aa
@@ -25559,7 +25650,7 @@ yW
yW
Ah
Av
Av
Lw
yX
AY
Be
@@ -25645,7 +25736,7 @@ dX
Gb
Gq
Gq
Gb
SX
GR
HW
Gq
@@ -25902,7 +25993,7 @@ dX
Gb
Gq
GR
Gb
SX
HG
HX
HX
@@ -31615,7 +31706,7 @@ kU
lM
mx
mS
lN
Yn
dX
dX
af
@@ -31872,7 +31963,7 @@ kV
lN
my
mT
lN
Yn
dX
dX
af
@@ -34856,11 +34947,11 @@ wS
an
an
Dy
DG
PR
CX
CX
CX
DG
OF
En
Es
Dp
@@ -60589,10 +60680,10 @@ oZ
Fk
oZ
oZ
zS
VW
FH
wL
zn
Lx
xy
Gj
xy
@@ -60846,10 +60937,10 @@ sY
oZ
oZ
oZ
zS
VW
wL
FK
zn
Lx
xy
xy
wL
@@ -79637,4 +79728,4 @@ ad
ad
ad
ad
"}
"}
+52 -12
View File
@@ -138,9 +138,8 @@
/turf/open/floor/carpet,
/area/awaymission/wildwest/vault)
"aF" = (
/obj/machinery/door/airlock/vault{
locked = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/vault,
/turf/open/floor/engine/cult,
/area/awaymission/wildwest/vaultdoors)
"aG" = (
@@ -153,9 +152,8 @@
/turf/closed/mineral/gold,
/area/awaymission/wildwest/mines)
"aJ" = (
/obj/machinery/door/airlock/vault{
locked = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/vault,
/turf/open/floor/engine/cult,
/area/awaymission/wildwest/vault)
"aK" = (
@@ -1142,6 +1140,7 @@
/area/awaymission/wildwest/gov)
"dU" = (
/obj/machinery/door/airlock/sandstone,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating/ironsand{
icon_state = "ironsand1"
},
@@ -1530,6 +1529,9 @@
/area/awaymission/wildwest/gov)
"fd" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/awaymission/wildwest/refine)
"fe" = (
@@ -1909,6 +1911,9 @@
/area/awaymission/wildwest/mines)
"gi" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/grass,
/area/awaymission/wildwest/gov)
"gj" = (
@@ -2126,6 +2131,41 @@
icon_state = "ironsand1"
},
/area/awaymission/wildwest/mines)
"pD" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/awaymission/wildwest/refine)
"Gh" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/grass,
/area/awaymission/wildwest/gov)
"Kh" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/awaymission/wildwest/refine)
"RN" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/awaymission/wildwest/refine)
"Ua" = (
/obj/machinery/door/airlock/sandstone,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating/ironsand{
icon_state = "ironsand1"
},
/area/awaymission/wildwest/gov)
(1,1,1) = {"
aa
@@ -21314,7 +21354,7 @@ eN
eg
ex
eg
dU
Ua
fL
fL
fL
@@ -21571,7 +21611,7 @@ eh
fc
eh
es
dU
Ua
fL
fL
fL
@@ -23374,7 +23414,7 @@ bv
fM
fW
gb
gi
Gh
go
fW
fW
@@ -27993,7 +28033,7 @@ et
et
eJ
eR
fd
RN
fj
fo
fA
@@ -29033,10 +29073,10 @@ eu
eu
eu
eu
fd
pD
eu
eu
fd
Kh
gL
gQ
gQ
+2 -7
View File
@@ -1,16 +1,11 @@
//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
#include "map_files\generic\CentCom.dmm"
#include "map_files\generic\SpaceStation.dmm"
#ifndef LOWMEMORYMODE
#include "map_files\generic\Space.dmm"
#include "map_files\generic\Space2.dmm"
#include "map_files\Mining\Lavaland.dmm"
#include "map_files\generic\City_of_Cogs.dmm"
#ifdef ALL_MAPS
#include "map_files\Mining\Lavaland.dmm"
#include "map_files\generic\City_of_Cogs.dmm"
#include "map_files\debug\runtimestation.dmm"
#include "map_files\Deltastation\DeltaStation2.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,168 @@
//custom access for some jobs. pasted together from ministation.
#define JOB_MODIFICATION_MAP_NAME "OmegaStation"
/datum/job/New()
..()
MAP_JOB_CHECK
supervisors = "the captain and the head of personnel"
/datum/outfit/job/New()
..()
MAP_JOB_CHECK
box = /obj/item/storage/box/survival/radio
/datum/job/assistant // Here so assistant appears on the top of the select job list.
//Command
/datum/job/captain/New()
..()
MAP_JOB_CHECK
supervisors = "Nanotrasen and Central Command"
/datum/job/hop/New()
..()
MAP_JOB_CHECK
supervisors = "the captain and Central Command"
/datum/job/hop/get_access()
MAP_JOB_CHECK_BASE
return get_all_accesses()
//Security
/datum/job/officer/New()
..()
MAP_JOB_CHECK
total_positions = 3
spawn_positions = 3
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS)
/datum/outfit/job/officer/New()
..()
MAP_JOB_CHECK
box = /obj/item/storage/box/security/radio
/datum/job/detective/New()
..()
MAP_JOB_CHECK
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS)
/datum/outfit/job/detective/New()
..()
MAP_JOB_CHECK
box = /obj/item/storage/box/security/radio
//Medbay
/datum/job/doctor/New()
..()
MAP_JOB_CHECK
selection_color = "#ffffff"
total_positions = 3
spawn_positions = 3
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS)
//Engineering
/datum/job/engineer/New()
..()
MAP_JOB_CHECK
total_positions = 2
spawn_positions = 2
access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT)
minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT)
/datum/outfit/job/engineer/New()
..()
MAP_JOB_CHECK
box = /obj/item/storage/box/engineer/radio
/datum/job/atmos/New()
..()
MAP_JOB_CHECK
total_positions = 2
spawn_positions = 2
//Science
/datum/job/scientist/New()
..()
MAP_JOB_CHECK
total_positions = 3
spawn_positions = 3
access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE)
minimal_access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE)
//Cargo
/datum/job/cargo_tech/New()
..()
MAP_JOB_CHECK
total_positions = 2
spawn_positions = 2
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
/datum/job/mining/New()
..()
MAP_JOB_CHECK
total_positions = 2
spawn_positions = 2
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
/datum/outfit/job/mining/New()
..()
box = /obj/item/storage/box/engineer/radio
//Service
/datum/job/bartender/New()
..()
MAP_JOB_CHECK
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS)
minimal_access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS)
/datum/job/cook/New()
..()
MAP_JOB_CHECK
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS)
minimal_access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS)
/datum/job/hydro/New()
..()
MAP_JOB_CHECK
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS)
// they get maint access because of all the hydro content in maint
/datum/job/janitor/New()
..()
MAP_JOB_CHECK
access = list(ACCESS_JANITOR, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_JANITOR, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS)
//Civilian
/datum/job/clown/New()
..()
MAP_JOB_CHECK
supervisors = "nobody but yourself" //Honk
MAP_REMOVE_JOB(hos)
MAP_REMOVE_JOB(chief_engineer)
MAP_REMOVE_JOB(qm)
MAP_REMOVE_JOB(cmo)
MAP_REMOVE_JOB(geneticist)
MAP_REMOVE_JOB(virologist)
MAP_REMOVE_JOB(rd)
MAP_REMOVE_JOB(warden)
MAP_REMOVE_JOB(lawyer)
MAP_REMOVE_JOB(chemist)
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,21 @@
#define JOB_MODIFICATION_MAP_NAME "PubbyStation"
/datum/job/hos/New()
..()
MAP_JOB_CHECK
access += ACCESS_CREMATORIUM
minimal_access += ACCESS_CREMATORIUM
/datum/job/warden/New()
..()
MAP_JOB_CHECK
access += ACCESS_CREMATORIUM
minimal_access += ACCESS_CREMATORIUM
/datum/job/officer/New()
..()
MAP_JOB_CHECK
access += ACCESS_CREMATORIUM
minimal_access += ACCESS_CREMATORIUM
MAP_REMOVE_JOB(lawyer)
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+30 -10
View File
@@ -194,8 +194,10 @@
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"aI" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/airlock{
cyclelinkeddir = 4;
name = "Labor Camp External Access"
},
/turf/open/floor/plasteel,
@@ -285,8 +287,10 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"aY" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/airlock/security/glass{
cyclelinkeddir = 4;
name = "Labor Camp Shuttle Security Airlock";
req_access_txt = "2"
},
@@ -449,8 +453,10 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/mine/eva)
"bx" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/airlock/security/glass{
cyclelinkeddir = 4;
name = "Labor Camp Shuttle Prisoner Airlock";
req_access_txt = "0"
},
@@ -657,8 +663,10 @@
},
/area/mine/eva)
"bX" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/airlock/external{
cyclelinkeddir = 4;
glass = 1;
name = "Mining External Airlock";
opacity = 0;
@@ -743,8 +751,10 @@
/turf/open/floor/plating,
/area/mine/laborcamp)
"cj" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/airlock/external{
cyclelinkeddir = 4;
glass = 1;
name = "Mining Shuttle Airlock";
opacity = 0;
@@ -3298,31 +3308,39 @@
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"WA" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock{
cyclelinkeddir = 8;
name = "Labor Camp External Access"
},
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"WB" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/security/glass{
cyclelinkeddir = 8;
name = "Labor Camp Shuttle Security Airlock";
req_access_txt = "2"
},
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"WC" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/security/glass{
cyclelinkeddir = 8;
name = "Labor Camp Shuttle Prisoner Airlock";
req_access_txt = "0"
},
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"WD" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/external{
cyclelinkeddir = 8;
glass = 1;
name = "Mining External Airlock";
opacity = 0;
@@ -3331,8 +3349,10 @@
/turf/open/floor/plasteel,
/area/mine/eva)
"WE" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/external{
cyclelinkeddir = 8;
glass = 1;
name = "Mining Shuttle Airlock";
opacity = 0;
+332 -48
View File
@@ -623,7 +623,6 @@
"abk" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
cyclelinkeddir = 0;
name = "Bridge Access";
req_access_txt = "19"
},
@@ -648,7 +647,6 @@
"abl" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
cyclelinkeddir = 0;
name = "Bridge Access";
req_access_txt = "19"
},
@@ -692,7 +690,6 @@
"abq" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
cyclelinkeddir = 0;
name = "Bridge Access";
req_access_txt = "19"
},
@@ -708,7 +705,6 @@
"abr" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
cyclelinkeddir = 0;
name = "Bridge Access";
req_access_txt = "19"
},
@@ -1272,6 +1268,9 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/maintenance/starboard)
"acD" = (
@@ -3201,6 +3200,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"agC" = (
@@ -4237,7 +4239,6 @@
"aiy" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
cyclelinkeddir = 0;
name = "Bridge Access";
req_access_txt = "19"
},
@@ -4259,8 +4260,8 @@
/area/ai_monitored/nuke_storage)
"aiA" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/highsecurity{
locked = 1;
name = "AI Vault Chamber";
req_access_txt = "16"
},
@@ -4293,7 +4294,6 @@
"aiC" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
cyclelinkeddir = 0;
name = "Bridge Access";
req_access_txt = "19"
},
@@ -5637,6 +5637,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/security/brig)
"akV" = (
@@ -7103,6 +7104,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"anS" = (
@@ -7116,6 +7118,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"anT" = (
@@ -7130,6 +7133,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"anU" = (
@@ -7422,6 +7426,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/security/brig)
"aoy" = (
@@ -7462,6 +7469,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/security/brig)
"aoB" = (
@@ -7898,6 +7908,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"apn" = (
@@ -7968,6 +7981,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/security/brig)
"apy" = (
@@ -8039,6 +8055,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/security/brig)
"apD" = (
@@ -8082,6 +8101,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/security/brig)
"apG" = (
@@ -8804,6 +8826,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/bar/atrium)
"ard" = (
@@ -8831,6 +8856,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/bar/atrium)
"arf" = (
@@ -13680,6 +13708,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"aBo" = (
@@ -14407,6 +14438,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/engine/atmos)
"aCJ" = (
@@ -14655,6 +14687,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"aDj" = (
@@ -14715,6 +14750,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/engine/atmos)
"aDu" = (
@@ -15274,11 +15310,13 @@
},
/area/crew_quarters/dorms)
"aEL" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21"
},
/obj/machinery/status_display{
pixel_y = -32
},
/obj/effect/turf_decal/bot,
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -16051,6 +16089,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aGo" = (
@@ -16662,6 +16703,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aHy" = (
@@ -17868,6 +17912,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/maintenance/port/central)
"aJN" = (
@@ -18100,6 +18145,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aKt" = (
@@ -18169,6 +18217,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aKy" = (
@@ -18758,6 +18809,7 @@
name = "Supermatter Chamber";
req_access_txt = "24"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/engine,
/area/engine/supermatter)
"aLS" = (
@@ -20990,8 +21042,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/command{
cyclelinkeddir = 2;
name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
@@ -21842,7 +21894,6 @@
/area/maintenance/starboard/aft)
"aSM" = (
/obj/machinery/door/airlock/command{
cyclelinkeddir = 2;
name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
@@ -21856,6 +21907,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel/vault/telecomms{
dir = 5
},
@@ -27613,6 +27667,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/science/research)
"beN" = (
@@ -27634,6 +27689,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/science/research)
"beO" = (
@@ -27949,6 +28005,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -28121,6 +28178,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bfR" = (
@@ -28146,6 +28206,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bfS" = (
@@ -28848,6 +28911,9 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -30212,6 +30278,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bkk" = (
@@ -31055,8 +31124,10 @@
/turf/open/space/basic,
/area/space)
"btk" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/airlock/external{
cyclelinkeddir = 4;
name = "External Docking Port"
},
/obj/effect/turf_decal/stripes/line{
@@ -31068,8 +31139,10 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"btl" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/external{
cyclelinkeddir = 8;
name = "External Docking Port"
},
/obj/effect/turf_decal/stripes/line{
@@ -31610,6 +31683,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"byk" = (
@@ -31632,6 +31708,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"bym" = (
@@ -31655,31 +31734,183 @@
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/security/checkpoint)
"hwc" = (
/turf/closed/wall,
"cmp" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"csX" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Maintenance Hatch";
req_access_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/maintenance/port/central)
"cRz" = (
/obj/machinery/button/door{
id = "supplybridge";
name = "Shuttle Bay Space Bridge Control";
pixel_y = 27;
req_access_txt = "0"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/airlock/maintenance_hatch{
name = "Bridge Hatch";
req_access_txt = "12"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/starboard)
"dfP" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Maintenance Hatch";
req_access_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"dqM" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/crew_quarters/cryopod)
"iCO" = (
/obj/machinery/cryopod,
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"puH" = (
"eJF" = (
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/medical/cryo";
dir = 1;
dir = 2;
name = "Cryogenics APC";
pixel_y = -24
},
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"rQZ" = (
"fWz" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port";
req_access_txt = "63"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"gHi" = (
/obj/machinery/computer/cryopod{
pixel_x = 25
},
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"icS" = (
/obj/machinery/cryopod,
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"kKd" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/external{
name = "Mining Dock Airlock";
req_access = null;
req_access_txt = "48"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"lCg" = (
/obj/machinery/door/airlock/external{
name = "Supply Dock Airlock";
req_access_txt = "31"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"nKi" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Maintenance Hatch";
req_access_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"sws" = (
/obj/docking_port/stationary{
dheight = 1;
@@ -31869,6 +32100,9 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/maintenance/starboard)
"sBW" = (
@@ -32516,6 +32750,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/maintenance/starboard)
"sJe" = (
@@ -32550,6 +32787,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/maintenance/starboard)
"sJk" = (
@@ -33281,8 +33521,8 @@
/area/ai_monitored/turret_protected/aisat_interior)
"sML" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/highsecurity{
locked = 1;
name = "MiniSat Chamber";
req_access_txt = "16"
},
@@ -33525,7 +33765,6 @@
/area/ai_monitored/turret_protected/aisat_interior)
"sNk" = (
/obj/machinery/door/airlock/external{
cyclelinkeddir = 1;
name = "MiniSat External Access";
req_access = null;
req_access_txt = "65"
@@ -33586,6 +33825,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel/vault,
/area/ai_monitored/turret_protected/aisat_interior)
"sNp" = (
@@ -33630,6 +33872,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel/vault,
/area/ai_monitored/turret_protected/aisat_interior)
"sNt" = (
@@ -33679,7 +33924,6 @@
/area/ai_monitored/turret_protected/aisat_interior)
"sNy" = (
/obj/machinery/door/airlock/external{
cyclelinkeddir = 1;
name = "MiniSat External Access";
req_access = null;
req_access_txt = "65"
@@ -34019,6 +34263,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/starboard)
"sOM" = (
@@ -34120,10 +34367,47 @@
"sPY" = (
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"sXe" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
"usJ" = (
/turf/closed/wall,
/area/crew_quarters/cryopod)
"uxJ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/bar/atrium)
"uxM" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"wUF" = (
/obj/machinery/door/airlock/atmos/glass{
name = "Supermatter Chamber";
req_access_txt = "24"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/engine,
/area/engine/supermatter)
(1,1,1) = {"
aaa
@@ -65597,7 +65881,7 @@ aHo
aIl
aLR
aMU
aLR
wUF
aMU
aOa
aMU
@@ -72024,7 +72308,7 @@ aJM
aKU
aMj
aNo
aJM
csX
aOY
aQf
abt
@@ -73342,14 +73626,14 @@ bgP
bgP
bjX
bgU
bkj
cmp
bgU
bkt
bky
bkB
bkE
bgU
bkj
cmp
bgU
bjY
sLm
@@ -75856,7 +76140,7 @@ anb
anS
aoP
apV
ard
uxJ
asg
asg
auc
@@ -76880,8 +77164,8 @@ ajx
akA
alt
amm
puH
hwc
eJF
usJ
aoT
apZ
ara
@@ -77138,7 +77422,7 @@ akB
alk
amm
amm
sXe
dqM
aoU
aqa
arg
@@ -77393,9 +77677,9 @@ aiC
ajz
akC
alk
iCO
rQZ
sXe
icS
gHi
dqM
aoV
aqb
arh
@@ -78469,7 +78753,7 @@ aZe
bdp
aZe
beL
aYu
nKi
bfP
bgp
bhb
@@ -79240,7 +79524,7 @@ baa
bds
baa
aZl
aYu
dfP
bfP
bgs
bhb
@@ -81787,7 +82071,7 @@ sIw
axW
aRz
sJN
sJd
cRz
abN
aaa
bte
@@ -82524,9 +82808,9 @@ aaa
aaa
ado
aeh
agB
lCg
ado
agB
lCg
ahq
ado
aaa
@@ -83821,7 +84105,7 @@ aaa
aaa
amD
amD
apm
kKd
amD
amD
aaa
@@ -85375,17 +85659,17 @@ aaa
aaa
aaa
azb
aBh
fWz
azb
aDi
uxM
azb
aaa
aaa
aaa
azb
aDi
uxM
azb
aDi
uxM
azb
aaa
aaa
File diff suppressed because it is too large Load Diff
+36 -3
View File
@@ -180,6 +180,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/engine/engineering)
"aD" = (
@@ -312,6 +315,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aV" = (
@@ -338,6 +344,9 @@
req_access_txt = "11";
req_one_access_txt = "0"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"aY" = (
@@ -1335,6 +1344,30 @@
},
/turf/open/floor/plasteel,
/area/storage/primary)
"pI" = (
/obj/machinery/door/airlock,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"Qt" = (
/obj/machinery/door/airlock,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"WT" = (
/obj/machinery/door/airlock,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/engine/engineering)
(1,1,1) = {"
aa
@@ -2755,7 +2788,7 @@ ad
ad
aj
aj
aC
WT
aj
aj
aj
@@ -3465,7 +3498,7 @@ by
by
cn
by
cn
Qt
by
cn
by
@@ -3573,7 +3606,7 @@ ad
ad
ad
by
cn
pI
by
ad
ad
+365 -130
View File
@@ -6045,6 +6045,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/centcom/supply)
"qT" = (
@@ -6056,6 +6057,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/centcom/control)
"qU" = (
@@ -6784,8 +6786,8 @@
},
/area/centcom/ferry)
"sH" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/vault{
locked = 1;
name = "Vault Door";
req_access_txt = "53"
},
@@ -8110,6 +8112,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/centcom/ferry)
"wv" = (
@@ -8228,6 +8233,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/centcom/evac)
"wK" = (
@@ -8334,6 +8342,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/centcom/ferry)
"xd" = (
@@ -8622,6 +8633,20 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
"yj" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/centcom/control)
"yk" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -8817,6 +8842,21 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/grass,
/area/wizard_station)
"yU" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "CentCom";
opacity = 1;
req_access_txt = "0"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/centcom/control)
"yX" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel/dark,
@@ -10656,6 +10696,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"EC" = (
@@ -12157,6 +12198,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/tdome/tdomeadmin)
"Iy" = (
@@ -13455,6 +13497,199 @@
},
/turf/open/floor/wood,
/area/wizard_station)
"Nk" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"NG" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/centcom/control)
"NU" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom";
opacity = 1;
req_access_txt = "0"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/centcom/control)
"Oj" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "CentCom";
opacity = 1;
req_access_txt = "0"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/centcom/control)
"Un" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"UO" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/centcom/control)
"Wc" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/centcom/evac)
"WJ" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome Administration";
opacity = 1;
req_access_txt = "102"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/tdome/tdomeadmin)
"WQ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/centcom/ferry)
"Xt" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/centcom/control)
"Xy" = (
/obj/machinery/door/airlock/external{
name = "Ferry Airlock";
req_access_txt = "0"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/centcom/ferry)
"Yt" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"ZJ" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/centcom/evac)
"ZX" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plasteel,
/area/centcom/supply)
(1,1,1) = {"
aa
@@ -15337,7 +15572,7 @@ fX
fX
fX
fX
fX
fY
fX
fX
fX
@@ -16108,7 +16343,7 @@ fX
fX
fX
fX
fY
fX
fX
fX
fX
@@ -17386,21 +17621,21 @@ aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -17643,21 +17878,21 @@ aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -17900,21 +18135,21 @@ aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18157,21 +18392,21 @@ aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18414,21 +18649,21 @@ aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18671,21 +18906,21 @@ aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -48582,7 +48817,7 @@ um
nT
vB
oe
xc
Xy
oe
vB
mD
@@ -50123,9 +50358,9 @@ pR
sw
uQ
mD
wu
WQ
xh
wu
WQ
mD
yZ
pg
@@ -52215,7 +52450,7 @@ IS
Je
Jo
IS
Ix
WJ
IS
JG
JG
@@ -52472,7 +52707,7 @@ IS
Jf
Jp
IS
Ix
WJ
IS
JG
JG
@@ -55006,9 +55241,9 @@ iu
iu
io
im
ja
Oj
mk
ja
Oj
im
io
iu
@@ -55515,7 +55750,7 @@ mg
qq
qS
rG
qS
ZX
tK
nq
mR
@@ -55527,9 +55762,9 @@ nq
mR
nq
zF
kZ
Xt
ut
kZ
NG
ly
jA
jA
@@ -56800,7 +57035,7 @@ nq
qt
qT
rI
qT
NU
tM
nq
iu
@@ -56814,7 +57049,7 @@ nq
nq
qT
BE
qT
NU
wH
nq
np
@@ -56826,11 +57061,11 @@ EO
Ft
EO
Gm
Gx
Un
GN
GN
GN
Gx
Nk
HL
HW
HN
@@ -57820,9 +58055,9 @@ il
iu
io
iu
ja
yU
mk
ja
yU
iu
io
iu
@@ -58097,9 +58332,9 @@ nq
mR
nq
zG
kZ
Xt
ut
kZ
NG
ly
jA
jA
@@ -58334,9 +58569,9 @@ il
in
im
iu
ja
Oj
mk
ja
Oj
iu
io
io
@@ -58601,12 +58836,12 @@ io
io
io
tP
lT
UO
io
im
ja
yU
mk
ja
yU
im
io
iu
@@ -59115,12 +59350,12 @@ io
io
iu
im
lT
yj
io
im
ja
Oj
mk
ja
Oj
im
io
iu
@@ -60164,7 +60399,7 @@ jA
jA
EB
EF
EB
Yt
FH
Gq
Gv
@@ -61169,24 +61404,24 @@ io
qx
qx
qx
sL
ZJ
tR
qx
io
im
ja
yU
mk
ja
yU
im
io
io
io
lT
UO
io
io
iu
io
lT
UO
io
aa
aa
@@ -61210,7 +61445,7 @@ IS
Je
Jo
IS
Ix
WJ
IS
JG
JG
@@ -61467,7 +61702,7 @@ IS
Jf
Jp
IS
Ix
WJ
IS
JG
JG
@@ -61683,7 +61918,7 @@ io
qx
qx
qx
sL
Wc
qx
qx
qx
@@ -61695,12 +61930,12 @@ rS
qx
qx
qx
sL
Wc
qx
qx
qx
qx
sL
Wc
qx
aa
aa
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+1
View File
@@ -17,6 +17,7 @@
dwidth = 4;
height = 17;
name = "delta arrivals shuttle";
timid = 1;
width = 9
},
/turf/closed/wall/mineral/plastitanium,
+2 -1
View File
@@ -112,7 +112,8 @@
},
/obj/docking_port/mobile/supply{
dwidth = 3;
width = 10
width = 10;
timid = 1
},
/turf/open/floor/plating,
/area/shuttle/supply)
+2 -1
View File
@@ -49,7 +49,8 @@
},
/obj/docking_port/mobile/supply{
dwidth = 5;
width = 12
width = 12;
timid = 1
},
/turf/open/floor/plating,
/area/shuttle/supply)
+1
View File
@@ -92,6 +92,7 @@
/obj/docking_port/mobile/supply{
dir = 4;
dwidth = 4;
timid = 1;
width = 12
},
/turf/open/floor/plating,
+1
View File
@@ -37,6 +37,7 @@
name = "Shuttle Under Construction";
port_direction = 4;
preferred_direction = 2;
timid = 1;
width = 30
},
/turf/open/floor/plating/airless,
+2 -1
View File
@@ -57,7 +57,8 @@
"o" = (
/obj/effect/forcefield/arena_shuttle_entrance,
/obj/docking_port/mobile/emergency{
name = "The Arena"
name = "The Arena";
timid = 1
},
/turf/open/indestructible/necropolis/air,
/area/shuttle/escape/arena)
+2 -1
View File
@@ -35,7 +35,8 @@
dwidth = 10;
height = 13;
name = "Asteroid emergency shuttle";
width = 28
width = 28;
timid = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
+2 -1
View File
@@ -242,7 +242,8 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
name = "The Emergency Escape Bar"
name = "The Emergency Escape Bar";
timid = 1
},
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
+1
View File
@@ -201,6 +201,7 @@
height = 18;
port_direction = 4;
width = 14;
timid = 1;
name = "Birdboat emergency escape shuttle"
},
/turf/open/floor/mineral/titanium,
+2 -1
View File
@@ -203,7 +203,8 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
name = "Box emergency shuttle"
name = "Box emergency shuttle";
timid = 1
},
/turf/open/floor/plating,
/area/shuttle/escape)
+1
View File
@@ -551,6 +551,7 @@
name = "Cere emergency shuttle";
port_direction = 4;
preferred_direction = 2;
timid = 1;
width = 42
},
/turf/open/floor/plating,
+2 -1
View File
@@ -191,7 +191,8 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
name = "Snappop(tm)!"
name = "Snappop(tm)!";
timid = 1
},
/turf/open/floor/plating,
/area/shuttle/escape)
+2 -1
View File
@@ -62,7 +62,8 @@
dwidth = 3;
height = 5;
name = "Secure Transport Vessel 5";
width = 14
width = 14;
timid = 1
},
/turf/open/floor/plating,
/area/shuttle/escape)
+2 -1
View File
@@ -443,7 +443,8 @@
name = "Delta emergency shuttle";
width = 30;
preferred_direction = 2;
port_direction = 4
port_direction = 4;
timid = 1
},
/turf/open/floor/plating,
/area/shuttle/escape)
+2 -1
View File
@@ -103,7 +103,8 @@
/area/shuttle/escape)
"u" = (
/obj/docking_port/mobile/emergency{
name = "Disco Inferno"
name = "Disco Inferno";
timid = 1
},
/obj/machinery/door/airlock/gold{
armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100);
+2 -1
View File
@@ -39,7 +39,8 @@
dir = 2;
dwidth = 9;
name = "NES Port";
width = 19
width = 19;
timid = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
@@ -13,7 +13,8 @@
dwidth = 1;
height = 10;
name = "Oh Hi Mark";
width = 12
width = 12;
timid = 1
},
/obj/machinery/door/airlock/wood,
/turf/open/floor/wood,
+1
View File
@@ -24,6 +24,7 @@
dwidth = 5;
height = 14;
name = "Luxury emergency shuttle";
timid = 1;
width = 25
},
/obj/machinery/door/airlock/gold,
+1
View File
@@ -28,6 +28,7 @@
dwidth = 5;
height = 14;
name = "Meta emergency shuttle";
timid = 1;
width = 25
},
/turf/open/floor/mineral/titanium/blue,
+1
View File
@@ -63,6 +63,7 @@
height = 40;
movement_force = list("KNOCKDOWN" = 3, "THROW" = 6);
name = "\proper a meteor with engines strapped to it";
timid = 1;
width = 40
},
/turf/open/floor/plating/asteroid,
+1
View File
@@ -170,6 +170,7 @@
dwidth = 8;
height = 9;
name = "Mini emergency shuttle";
timid = 1;
width = 21
},
/turf/open/floor/mineral/titanium/blue,
+2 -1
View File
@@ -159,7 +159,8 @@
"E" = (
/obj/machinery/door/airlock/cult/friendly,
/obj/docking_port/mobile/emergency{
name = "shuttle 667"
name = "shuttle 667";
timid = 1
},
/turf/open/floor/plating,
/area/shuttle/escape)
+1
View File
@@ -288,6 +288,7 @@
height = 15;
name = "Pubby emergency shuttle";
port_direction = 4;
timid = 1;
width = 18
},
/turf/open/floor/plating,
+1
View File
@@ -614,6 +614,7 @@
dwidth = 14;
height = 18;
name = "CentCom Raven Battlecruiser";
timid = 1;
width = 32
},
/obj/machinery/door/airlock/hatch,
+2 -1
View File
@@ -277,7 +277,8 @@
"aW" = (
/obj/docking_port/mobile/emergency{
height = 15;
name = "Box emergency shuttle"
name = "Box emergency shuttle";
timid = 1
},
/obj/machinery/door/airlock/security/glass{
name = "Emergency Shuttle Airlock"
+2 -1
View File
@@ -217,7 +217,8 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
name = "Scrapheap Challenge"
name = "Scrapheap Challenge";
timid = 1
},
/turf/open/floor/plating,
/area/shuttle/escape)
+2 -1
View File
@@ -141,7 +141,8 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
name = "Hyperfractal Gigashuttle"
name = "Hyperfractal Gigashuttle";
timid = 1
},
/turf/open/floor/plating,
/area/shuttle/escape)
+1
View File
@@ -154,6 +154,7 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
timid = 1;
name = "NT Lepton Violet"
},
/turf/open/floor/plating,
+2 -1
View File
@@ -55,7 +55,8 @@
id = "ferry";
name = "ferry shuttle";
port_direction = 2;
width = 5
width = 5;
timid = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
+1
View File
@@ -72,6 +72,7 @@
name = "ferry shuttle";
port_direction = 1;
preferred_direction = 4;
timid = 1;
width = 5
},
/turf/open/floor/pod/light,
+1
View File
@@ -165,6 +165,7 @@
height = 27;
id = "ferry";
name = "The Lighthouse";
timid = 1;
port_direction = 2;
width = 16
},
+2 -1
View File
@@ -111,7 +111,8 @@
id = "ferry";
name = "ferry shuttle";
port_direction = 2;
width = 5
width = 5;
timid = 1
},
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
+1
View File
@@ -111,6 +111,7 @@
id = "laborcamp";
name = "labor camp shuttle";
port_direction = 4;
timid = 1;
width = 9
},
/turf/open/floor/mineral/titanium/blue,
+1
View File
@@ -41,6 +41,7 @@
id = "mining";
name = "mining shuttle";
port_direction = 4;
timid = 1;
width = 7
},
/turf/open/floor/plating,
+1
View File
@@ -19,6 +19,7 @@
name = "NT Medical Ship";
port_direction = 8;
preferred_direction = 4;
timid = 1;
width = 35
},
/turf/open/floor/mineral/titanium,
+1
View File
@@ -23,6 +23,7 @@
name = "NT Recovery White-Ship";
port_direction = 8;
preferred_direction = 1;
timid = 1;
width = 16
},
/turf/open/floor/plating,
+14 -5
View File
@@ -12,8 +12,8 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned)
"ad" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/titanium{
cyclelinkeddir = 2;
name = "External Airlock"
},
/obj/effect/decal/cleanable/dirt{
@@ -102,8 +102,10 @@
},
/area/shuttle/abandoned)
"an" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/machinery/door/airlock/titanium{
cyclelinkeddir = 1;
glass = 1;
name = "Internal Airlock"
},
@@ -953,8 +955,10 @@
/turf/open/floor/plasteel,
/area/shuttle/abandoned)
"bP" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/airlock/titanium{
cyclelinkeddir = 4;
glass = 1;
name = "Internal Airlock"
},
@@ -967,8 +971,10 @@
},
/area/shuttle/abandoned)
"bQ" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/titanium{
cyclelinkeddir = 8;
name = "External Airlock"
},
/obj/effect/decal/cleanable/dirt{
@@ -1500,8 +1506,10 @@
/turf/open/floor/plating,
/area/shuttle/abandoned)
"cS" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/titanium{
cyclelinkeddir = 8;
name = "External Airlock"
},
/obj/effect/decal/cleanable/dirt{
@@ -1518,6 +1526,7 @@
name = "White-Ship";
port_direction = 8;
preferred_direction = 8;
timid = 0;
width = 32
},
/turf/open/floor/plasteel/neutral,
+1
View File
@@ -39,6 +39,7 @@
name = "NT Recovery White-Ship";
port_direction = 8;
preferred_direction = 4;
timid = 1;
width = 28
},
/turf/open/floor/mineral/titanium/blue,
+1
View File
@@ -94,6 +94,7 @@
name = "White Ship";
port_direction = 4;
preferred_direction = 1;
timid = 1;
width = 9
},
/turf/open/floor/plasteel/dark,
+18 -6
View File
@@ -448,9 +448,9 @@
/area/shuttle/pirate)
"bg" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/vault{
id_tag = "piratevault";
locked = 1;
name = "Vault"
},
/obj/effect/decal/cleanable/dirt,
@@ -648,9 +648,9 @@
/turf/open/floor/plating,
/area/shuttle/pirate)
"bF" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/external{
id_tag = "pirateportexternal";
locked = 1
id_tag = "pirateportexternal"
},
/obj/docking_port/mobile/pirate{
callTime = 100;
@@ -675,6 +675,9 @@
name = "Deep Space";
width = 23
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/pirate)
"bG" = (
@@ -683,6 +686,9 @@
"bH" = (
/obj/machinery/door/airlock/external,
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/shuttle/pirate)
"bI" = (
@@ -818,6 +824,9 @@
/area/shuttle/pirate)
"bU" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/pirate)
"bV" = (
@@ -825,11 +834,14 @@
/turf/open/floor/plating,
/area/shuttle/pirate)
"bW" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/external{
id_tag = "piratestarboardexternal";
locked = 1
id_tag = "piratestarboardexternal"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/shuttle/pirate)
"bX" = (
@@ -1700,10 +1712,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/public/glass{
heat_proof = 1;
id_tag = "pirateturbinebolt";
locked = 1;
name = "Turbine Access"
},
/turf/open/floor/engine,
+2 -1
View File
@@ -91,6 +91,7 @@
#define MAT_BANANIUM "$bananium"
#define MAT_TITANIUM "$titanium"
#define MAT_BIOMASS "$biomass"
#define MAT_PLASTIC "$plastic"
//The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
#define MINERAL_MATERIAL_AMOUNT 2000
//The maximum size of a stack object.
@@ -125,4 +126,4 @@
#define RCD_FLOORWALL 1
#define RCD_AIRLOCK 2
#define RCD_DECONSTRUCT 3
#define RCD_WINDOWGRILLE 4
#define RCD_WINDOWGRILLE 4
+1
View File
@@ -36,6 +36,7 @@
#define BELOW_OPEN_DOOR_LAYER 2.6
#define BLASTDOOR_LAYER 2.65
#define OPEN_DOOR_LAYER 2.7
#define DOOR_HELPER_LAYER 2.71 //keep this above OPEN_DOOR_LAYER
#define PROJECTILE_HIT_THRESHHOLD_LAYER 2.75 //projectiles won't hit objects at or below this layer if possible
#define TABLE_LAYER 2.8
#define BELOW_OBJ_LAYER 2.9
+2 -1
View File
@@ -29,6 +29,7 @@
#define BIOGENERATOR 32 //Uses biomass
#define LIMBGROWER 64 //Uses synthetic flesh
#define SMELTER 128 //uses various minerals
#define AUTOYLATHE 256 //Uses glass/metal/Plastic
//Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable.
//Modular computer/NTNet defines
@@ -86,4 +87,4 @@
#define SUPERMATTER_DELAMINATING 6 // Pretty obvious.
//R&D Snowflakes
#define RD_CONSOLE_LOCKED_SCREEN 0.2
#define RD_CONSOLE_LOCKED_SCREEN 0.2
+48 -48
View File
@@ -1,46 +1,32 @@
/*
The /tg/ codebase currently requires you to have 11 z-levels of the same size dimensions.
z-level order is important, the order you put them in inside the map config.dm will determine what z level number they are assigned ingame.
Names of z-level do not matter, but order does greatly, for instances such as checking alive status of revheads on z1
The /tg/ codebase allows mixing of hardcoded and dynamically-loaded z-levels.
Z-levels can be reordered as desired and their properties are set by "traits".
See map_config.dm for how a particular station's traits may be chosen.
The list DEFAULT_MAP_TRAITS at the bottom of this file should correspond to
the maps that are hardcoded, as set in _maps/_basemap.dm. SSmapping is
responsible for loading every non-hardcoded z-level.
current as of september 17, 2017
z1 = station
z2 = centcom
z5 = mining
z6 = city of cogs
Everything else = randomized space
Last space-z level = empty
As of 2018-02-04, the typical z-levels for a single-level station are:
1: CentCom
2: Station
3-4: Randomized space
5: Mining
6: City of Cogs
7-11: Randomized space
12: Empty space
13: Transit space
Multi-Z stations are supported and multi-Z mining and away missions would
require only minor tweaks.
*/
#define CROSSLINKED 2
#define SELFLOOPING 1
#define UNAFFECTED 0
#define MAIN_STATION "Main Station"
#define CENTCOM "CentCom"
#define CITY_OF_COGS "City of Cogs"
#define EMPTY_AREA_1 "Empty Area 1"
#define EMPTY_AREA_2 "Empty Area 2"
#define MINING_ASTEROID "Mining Asteroid"
#define EMPTY_AREA_3 "Empty Area 3"
#define EMPTY_AREA_4 "Empty Area 4"
#define EMPTY_AREA_5 "Empty Area 5"
#define EMPTY_AREA_6 "Empty Area 6"
#define EMPTY_AREA_7 "Empty Area 7"
#define EMPTY_AREA_8 "Empty Area 8"
#define AWAY_MISSION "Away Mission"
//for modifying jobs
// helpers for modifying jobs, used in various job_changes.dm files
#define MAP_JOB_CHECK if(SSmapping.config.map_name != JOB_MODIFICATION_MAP_NAME) { return; }
#define MAP_JOB_CHECK_BASE if(SSmapping.config.map_name != JOB_MODIFICATION_MAP_NAME) { return ..(); }
#define MAP_REMOVE_JOB(jobpath) /datum/job/##jobpath/map_check() { return (SSmapping.config.map_name != JOB_MODIFICATION_MAP_NAME) && ..() }
//zlevel defines, can be overridden for different maps in the appropriate _maps file.
#define ZLEVEL_STATION_PRIMARY 2
#define ZLEVEL_EMPTY_SPACE 12
#define SPACERUIN_MAP_EDGE_PAD 15
#define ZLEVEL_SPACE_RUIN_COUNT 5
#define ZLEVEL_SPACE_RUIN_COUNT 7
// traits
// boolean - marks a level as having that property if present
@@ -52,26 +38,40 @@ Last space-z level = empty
#define ZTRAIT_AWAY "Away Mission"
#define ZTRAIT_SPACE_RUINS "Space Ruins"
#define ZTRAIT_LAVA_RUINS "Lava Ruins"
// number - bombcap is multiplied by this before being applied to bombs
#define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier"
// trait definitions
#define DL_NAME "name"
#define DL_LINKAGE "linkage"
#define DL_TRAITS "traits"
// numeric offsets - e.g. {"Down": -1} means that chasms will fall to z - 1 rather than oblivion
#define ZTRAIT_UP "Up"
#define ZTRAIT_DOWN "Down"
#define DECLARE_LEVEL(NAME, LINKAGE, TRAITS) list(DL_NAME = NAME, DL_LINKAGE = LINKAGE, DL_TRAITS = TRAITS)
// corresponds to basemap.dm
// enum - how space transitions should affect this level
#define ZTRAIT_LINKAGE "Linkage"
// UNAFFECTED if absent - no space transitions
#define UNAFFECTED null
// SELFLOOPING - space transitions always self-loop
#define SELFLOOPING "Self"
// CROSSLINKED - mixed in with the cross-linked space pool
#define CROSSLINKED "Cross"
// default trait definitions, used by SSmapping
#define ZTRAITS_CENTCOM list(ZTRAIT_LINKAGE = SELFLOOPING, ZTRAIT_CENTCOM = TRUE)
#define ZTRAITS_STATION list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_STATION = TRUE)
#define ZTRAITS_SPACE list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_SPACE_RUINS = TRUE)
#define ZTRAITS_LAVALAND list(ZTRAIT_MINING = TRUE, ZTRAIT_LAVA_RUINS = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 2)
#define ZTRAITS_REEBE list(ZTRAIT_REEBE = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 0.5)
#define DL_NAME "name"
#define DL_TRAITS "traits"
#define DECLARE_LEVEL(NAME, TRAITS) list(DL_NAME = NAME, DL_TRAITS = TRAITS)
// must correspond to _basemap.dm for things to work correctly
#define DEFAULT_MAP_TRAITS list(\
DECLARE_LEVEL("CentCom", SELFLOOPING, list(ZTRAIT_CENTCOM = TRUE)),\
DECLARE_LEVEL("Main Station", CROSSLINKED, list(ZTRAIT_STATION = TRUE)),\
DECLARE_LEVEL("Empty Area 1", CROSSLINKED, list(ZTRAIT_SPACE_RUINS = TRUE)),\
DECLARE_LEVEL("Empty Area 2", CROSSLINKED, list(ZTRAIT_SPACE_RUINS = TRUE)),\
DECLARE_LEVEL("Lavaland", UNAFFECTED, list(ZTRAIT_MINING = TRUE, ZTRAIT_LAVA_RUINS = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 2)),\
DECLARE_LEVEL("Reebe", UNAFFECTED, list(ZTRAIT_REEBE = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 0.5)),\
DECLARE_LEVEL("CentCom", ZTRAITS_CENTCOM),\
)
//Camera lock flags
// Camera lock flags
#define CAMERA_LOCK_STATION 1
#define CAMERA_LOCK_MINING 2
#define CAMERA_LOCK_CENTCOM 4
@@ -85,4 +85,4 @@ Last space-z level = empty
#define PLACE_DEFAULT "random"
#define PLACE_SAME_Z "same"
#define PLACE_SPACE_RUIN "space"
#define PLACE_LAVA_RUIN "lavaland"
#define PLACE_LAVA_RUIN "lavaland"
+29
View File
@@ -0,0 +1,29 @@
// Medal names
#define BOSS_KILL_MEDAL "Killer"
#define ALL_KILL_MEDAL "Exterminator" //Killing all of x type
#define BOSS_KILL_MEDAL_CRUSHER "Crusher"
//Defines for boss medals
#define BOSS_MEDAL_MINER "Blood-drunk Miner"
#define BOSS_MEDAL_BUBBLEGUM "Bubblegum"
#define BOSS_MEDAL_COLOSSUS "Colossus"
#define BOSS_MEDAL_DRAKE "Drake"
#define BOSS_MEDAL_HIEROPHANT "Hierophant"
#define BOSS_MEDAL_LEGION "Legion"
#define BOSS_MEDAL_SWARMER "Swarmer Beacon"
#define BOSS_MEDAL_TENDRIL "Tendril"
// Score names
#define HIEROPHANT_SCORE "Hierophants Killed"
#define BOSS_SCORE "Bosses Killed"
#define BUBBLEGUM_SCORE "Bubblegum Killed"
#define COLOSSUS_SCORE "Colossus Killed"
#define DRAKE_SCORE "Drakes Killed"
#define LEGION_SCORE "Legion Killed"
#define SWARMER_BEACON_SCORE "Swarmer Beacons Killed"
#define TENDRIL_CLEAR_SCORE "Tendrils Killed"
//Misc medals
#define MEDAL_METEOR "Your Life Before Your Eyes"
#define MEDAL_PULSE "Jackpot"
#define MEDAL_TIMEWASTE "Overextended The Joke"
-14
View File
@@ -378,20 +378,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
#define INCREMENT_TALLY(L, stat) if(L[stat]){L[stat]++}else{L[stat] = 1}
// Medal names
#define BOSS_KILL_MEDAL "Killer"
#define ALL_KILL_MEDAL "Exterminator" //Killing all of x type
// Score names
#define LEGION_SCORE "Legion Killed"
#define COLOSSUS_SCORE "Colossus Killed"
#define BUBBLEGUM_SCORE "Bubblegum Killed"
#define DRAKE_SCORE "Drakes Killed"
#define BIRD_SCORE "Hierophants Killed"
#define SWARMER_BEACON_SCORE "Swarmer Beacons Killed"
#define BOSS_SCORE "Bosses Killed"
#define TENDRIL_CLEAR_SCORE "Tendrils Killed"
//TODO Move to a pref
#define STATION_GOAL_BUDGET 1
+3 -3
View File
@@ -9,13 +9,13 @@ GLOBAL_LIST_EMPTY(stealthminID) //reference list with IDs that store ckeys,
//Since it didn't really belong in any other category, I'm putting this here
//This is for procs to replace all the goddamn 'in world's that are chilling around the code
GLOBAL_LIST_EMPTY(player_list) //all mobs **with clients attached**. Excludes /mob/dead/new_player
GLOBAL_LIST_EMPTY(player_list) //all mobs **with clients attached**.
GLOBAL_LIST_EMPTY(mob_list) //all mobs, including clientless
GLOBAL_LIST_EMPTY(mob_directory) //mob_id -> mob
GLOBAL_LIST_EMPTY(mob_directory) //mob_id -> mob
GLOBAL_LIST_EMPTY(alive_mob_list) //all alive mobs, including clientless. Excludes /mob/dead/new_player
GLOBAL_LIST_EMPTY(drones_list)
GLOBAL_LIST_EMPTY(dead_mob_list) //all dead mobs, including clientless. Excludes /mob/dead/new_player
GLOBAL_LIST_EMPTY(joined_player_list) //all clients that have joined the game at round-start or as a latejoin.
GLOBAL_LIST_EMPTY(joined_player_list) //all clients that have joined the game at round-start or as a latejoin.
GLOBAL_LIST_EMPTY(silicon_mobs) //all silicon mobs
GLOBAL_LIST_EMPTY(mob_living_list) //all instances of /mob/living and subtypes
GLOBAL_LIST_EMPTY(carbon_list) //all instances of /mob/living/carbon and subtypes, notably does not contain brains or simple animals
-75
View File
@@ -189,15 +189,6 @@
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
/datum/design/foam_x9
name = "Foam Force X9 Rifle"
id = "foam_x9"
build_type = AUTOLATHE
materials = list(MAT_METAL = 24000, MAT_GLASS = 14000)
build_path = /obj/item/gun/ballistic/automatic/x9/toy
category = list("hacked", "Misc")
////////XCOM2 Magpistol/////////
//////projectiles//////
@@ -352,22 +343,6 @@
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag
max_ammo = 42
/datum/design/magfoam_dart
name = "Box of MagFoam Darts"
id = "magfoam_dart"
build_type = AUTOLATHE
materials = list(MAT_METAL = 300, MAT_GLASS = 200)
build_path = /obj/item/ammo_box/foambox/mag
category = list("initial", "Misc")
/datum/design/foam_magpistol
name = "Foam Force Magpistol"
id = "magfoam_launcher"
build_type = AUTOLATHE
materials = list(MAT_METAL = 7500, MAT_GLASS = 1000)
build_path = /obj/item/gun/ballistic/shotgun/toy/mag
category = list("hacked", "Misc")
//////Magrifle//////
///projectiles///
@@ -502,14 +477,6 @@
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
/datum/design/foam_magrifle
name = "Foam Force MagRifle"
id = "foam_magrifle"
build_type = AUTOLATHE
materials = list(MAT_METAL = 15000, MAT_GLASS = 7500)
build_path = /obj/item/gun/ballistic/automatic/magrifle/toy
category = list("hacked", "Misc")
/*
// TECHWEBS IMPLEMENTATION
*/
@@ -648,14 +615,6 @@
name = "toy mag burst rifle power supply"
maxcharge = 4000
/datum/design/foam_hyperburst
name = "MagTag Hyper Rifle"
id = "foam_hyperburst"
build_type = AUTOLATHE
materials = list(MAT_METAL = 35000, MAT_GLASS = 25000)
build_path = /obj/item/gun/energy/laser/practice/hyperburst
category = list("hacked", "Misc")
/* made redundant by reskinnable stetchkins
//////Stealth Pistol//////
@@ -708,15 +667,6 @@
cut_overlays()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
/datum/design/foam_sp
name = "Foam Force Stealth Pistol"
id = "foam_sp"
build_type = AUTOLATHE
materials = list(MAT_METAL = 30000, MAT_GLASS = 15000)
build_path = /obj/item/gun/ballistic/automatic/toy/pistol/stealth
category = list("hacked", "Misc")
//////10mm soporific bullets//////
obj/item/projectile/bullet/c10mm/soporific
@@ -923,14 +873,6 @@ obj/item/projectile/bullet/c10mm/soporific
ammo_type = list(/obj/item/ammo_casing/energy/laser/raytag)
selfcharge = TRUE
/datum/design/toyray
name = "RayTag Gun"
id = "toyray"
build_type = AUTOLATHE
materials = list(MAT_METAL = 7500, MAT_GLASS = 1000)
build_path = /obj/item/gun/energy/laser/practice/raygun
category = list("hacked", "Misc")
/*/////////////////////////////////////////////////////////////////////////////////////////////
The Recolourable Gun
*//////////////////////////////////////////////////////////////////////////////////////////////
@@ -1179,15 +1121,6 @@ obj/item/projectile/bullet/c10mm/soporific
can_suppress = FALSE
actions_types = list(/datum/action/item_action/pick_color)
/datum/design/foam_p37
name = "Foam Force Mk.37F"
id = "foam_p37"
build_type = AUTOLATHE
materials = list(MAT_METAL = 15000, MAT_GLASS = 10000)
build_path = /obj/item/gun/ballistic/automatic/pistol/p37/foam
category = list("hacked", "Misc")
/*/////////////////////////////////////////////////////////////////////////////////////////////
The Recolourable Energy Gun
*//////////////////////////////////////////////////////////////////////////////////////////////
@@ -1311,11 +1244,3 @@ obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file)
w_class = WEIGHT_CLASS_NORMAL
burst_size = 4 //Shh.
fire_delay = 1
/datum/design/am4c
name = "Foam Force AM4-C Rifle"
id = "foam_am4c"
build_type = AUTOLATHE
materials = list(MAT_METAL = 24000, MAT_GLASS = 14000)
build_path = /obj/item/gun/ballistic/automatic/AM4C
category = list("hacked", "Misc")
@@ -17,11 +17,11 @@
var/petcount = target_amount
for(var/mob/living/simple_animal/pet/P in GLOB.mob_list)
if(!(P.stat == DEAD))
if(P.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(P)])
if(P.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(P)])
petcount--
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(!(H.stat == DEAD))
if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
petcount--
if(petcount <= 0)
@@ -65,7 +65,7 @@
/datum/objective/crew/responsibility/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(H.stat == DEAD && H.drunkenness >= 80)
if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)])
return FALSE
return TRUE
@@ -6,7 +6,7 @@
/datum/objective/crew/morgue/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(H.stat == DEAD && H.z == ZLEVEL_STATION_PRIMARY)
if(H.stat == DEAD && H.z == SSmapping.station_start)
if(get_area(H) != /area/medical/morgue)
return FALSE
return TRUE
@@ -80,7 +80,7 @@
/datum/objective/crew/noinfections/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(!H.stat == DEAD)
if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(H.check_virus() == 2)
return FALSE
return TRUE
@@ -263,3 +263,37 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
/*TechnicalMagi*/
/obj/item/clothing/under/bb_sweater/black/naomi
name = "worn black sweater"
desc = "A well-loved sweater, showing signs of several cleanings and re-stitchings. And a few stains. Is that cat fur?"
/obj/item/clothing/neck/petcollar/naomi
name = "worn pet collar"
desc = "a pet collar that looks well used."
/obj/item/clothing/neck/petcollar/naomi/examine(mob/user)
. = ..()
if(usr.ckey != "technicalmagi")
to_chat(user, "There's something odd about the it. You probably shouldn't wear it...")//warn people not to wear it if they're not Naomi, lest they become as crazy as she is
/obj/item/clothing/neck/petcollar/naomi/equipped()
. = ..()
START_PROCESSING(SSobj, src)
/obj/item/clothing/neck/petcollar/naomi/dropped()
. = ..()
STOP_PROCESSING(SSobj, src)
/obj/item/clothing/neck/petcollar/naomi/process()
var/mob/living/carbon/human/H
if(ishuman(loc))
H = loc
if(!H)
return
else if(H.get_item_by_slot(slot_neck) == src)
if(H.arousalloss < H.max_arousal / 3)
H.arousalloss = H.max_arousal / 3
if(prob(5) && H.hallucination < 15)
H.hallucination += 10
@@ -236,7 +236,7 @@
switch (command)
if ("map")
currentmap = new ("_maps/[data].json")
currentmap = load_map_config("_maps/[data].json")
if(currentmap.defaulted)
log_config("Failed to load map config for [data]!")
currentmap = null
@@ -20,8 +20,6 @@
/datum/config_entry/string/cross_comms_name
GLOBAL_VAR_INIT(medals_enabled, TRUE) //will be auto set to false if the game fails contacting the medal hub to prevent unneeded calls.
/datum/config_entry/string/medal_hub_address
/datum/config_entry/string/medal_hub_password
+78 -24
View File
@@ -23,15 +23,19 @@ SUBSYSTEM_DEF(mapping)
var/loading_ruins = FALSE
// Z-manager stuff
var/station_start // should only be used for maploading-related tasks
var/space_levels_so_far = 0
var/list/z_list
var/datum/space_level/transit
var/datum/space_level/empty_space
var/dmm_suite/loader
/datum/controller/subsystem/mapping/PreInit()
if(!config)
#ifdef FORCE_MAP
config = new(FORCE_MAP)
config = load_map_config(FORCE_MAP)
#else
config = new(error_if_missing = FALSE)
config = load_map_config(error_if_missing = FALSE)
#endif
return ..()
@@ -39,16 +43,20 @@ SUBSYSTEM_DEF(mapping)
/datum/controller/subsystem/mapping/Initialize(timeofday)
if(config.defaulted)
to_chat(world, "<span class='boldannounce'>Unable to load next map config, defaulting to Box Station</span>")
loader = new
loadWorld()
repopulate_sorted_areas()
process_teleport_locs() //Sets up the wizard teleport locations
preloadTemplates()
#ifndef LOWMEMORYMODE
// Create space levels
for(var/I in 1 to ZLEVEL_SPACE_RUIN_COUNT)
add_new_zlevel("Empty Area [2 + I]", CROSSLINKED, list(ZTRAIT_SPACE_RUINS = TRUE))
add_new_zlevel("Empty Area [3 + ZLEVEL_SPACE_RUIN_COUNT]", CROSSLINKED, list()) // no ruins
transit = add_new_zlevel("Transit", UNAFFECTED, list(ZTRAIT_TRANSIT = TRUE))
// Create space ruin levels
while (space_levels_so_far < ZLEVEL_SPACE_RUIN_COUNT)
++space_levels_so_far
add_new_zlevel("Empty Area [space_levels_so_far]", ZTRAITS_SPACE)
// and one level with no ruins
empty_space = add_new_zlevel("Empty Area [1 + space_levels_so_far]", list(ZTRAIT_LINKAGE = CROSSLINKED))
// and the transit level
transit = add_new_zlevel("Transit", list(ZTRAIT_TRANSIT = TRUE))
// Pick a random away mission.
createRandomZlevel()
@@ -71,6 +79,7 @@ SUBSYSTEM_DEF(mapping)
// Set up Z-level transitions.
setup_map_transitions()
generate_station_area_list()
QDEL_NULL(loader)
..()
/* Nuke threats, for making the blue tiles on the station go RED
@@ -108,32 +117,77 @@ SUBSYSTEM_DEF(mapping)
z_list = SSmapping.z_list
/datum/controller/subsystem/mapping/proc/TryLoadZ(filename, errorList, forceLevel, last)
var/static/dmm_suite/loader
if(!loader)
loader = new
if(!loader.load_map(file(filename), 0, 0, forceLevel, no_changeturf = TRUE))
errorList |= filename
if(last)
QDEL_NULL(loader)
#define INIT_ANNOUNCE(X) to_chat(world, "<span class='boldannounce'>[X]</span>"); log_world(X)
/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits)
var/start_time = REALTIMEOFDAY
if (!islist(files)) // handle single-level maps
files = list(files)
// check that the total z count of all maps matches the list of traits
var/total_z = 0
for (var/file in files)
var/full_path = "_maps/[path]/[file]"
var/bounds = loader.load_map(file(full_path), 1, 1, 1, cropMap=FALSE, measureOnly=TRUE)
files[file] = total_z // save the start Z of this file
total_z += bounds[MAP_MAXZ] - bounds[MAP_MINZ] + 1
if (!length(traits)) // null or empty - default
for (var/i in 1 to total_z)
traits += list(default_traits)
else if (total_z != traits.len) // mismatch
INIT_ANNOUNCE("WARNING: [traits.len] trait sets specified for [total_z] z-levels in [path]!")
if (total_z < traits.len) // ignore extra traits
traits.Cut(total_z + 1)
while (total_z > traits.len) // fall back to defaults on extra levels
traits += list(default_traits)
// preload the relevant space_level datums
var/start_z = world.maxz + 1
var/i = 0
for (var/level in traits)
add_new_zlevel("[name][i ? " [i + 1]" : ""]", level)
++i
// load the maps
for (var/file in files)
var/full_path = "_maps/[path]/[file]"
if(!loader.load_map(file(full_path), 0, 0, start_z + files[file], no_changeturf = TRUE))
errorList |= full_path
INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
/datum/controller/subsystem/mapping/proc/loadWorld()
//if any of these fail, something has gone horribly, HORRIBLY, wrong
var/list/FailedZs = list()
var/start_time = REALTIMEOFDAY
INIT_ANNOUNCE("Loading [config.map_name]...")
TryLoadZ(config.GetFullMapPath(), FailedZs, ZLEVEL_STATION_PRIMARY)
// ensure we have space_level datums for compiled-in maps
InitializeDefaultZLevels()
INIT_ANNOUNCE("Loaded station in [(REALTIMEOFDAY - start_time)/10]s!")
// load the station
station_start = world.maxz + 1
INIT_ANNOUNCE("Loading [config.map_name]...")
LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION)
if(SSdbcore.Connect())
var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]")
query_round_map_name.Execute()
if(config.minetype != "lavaland")
INIT_ANNOUNCE("WARNING: A map without lavaland set as its minetype was loaded! This is being ignored! Update the maploader code!")
#ifndef LOWMEMORYMODE
// TODO: remove this when the DB is prepared for the z-levels getting reordered
while (world.maxz < (5 - 1) && space_levels_so_far < ZLEVEL_SPACE_RUIN_COUNT)
++space_levels_so_far
add_new_zlevel("Empty Area [space_levels_so_far]", ZTRAITS_SPACE)
// load mining
if(config.minetype == "lavaland")
LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
else if (!isnull(config.minetype))
INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!")
// load Reebe
LoadGroup(FailedZs, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE)
#endif
if(LAZYLEN(FailedZs)) //but seriously, unless the server's filesystem is messed up this will never happen
var/msg = "RED ALERT! The following map files failed to load: [FailedZs[1]]"
@@ -209,7 +263,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
/datum/controller/subsystem/mapping/proc/changemap(var/datum/map_config/VM)
if(!VM.MakeNextMap())
next_map_config = new(default_to_box = TRUE)
next_map_config = load_map_config(default_to_box = TRUE)
message_admins("Failed to set new map with next_map.json for [VM.map_name]! Using default as backup!")
return
+87
View File
@@ -0,0 +1,87 @@
SUBSYSTEM_DEF(medals)
name = "Medals"
flags = SS_NO_FIRE
var/hub_enabled = FALSE
/datum/controller/subsystem/medals/Initialize(timeofday)
if(CONFIG_GET(string/medal_hub_address) && CONFIG_GET(string/medal_hub_password))
hub_enabled = TRUE
..()
/datum/controller/subsystem/medals/proc/UnlockMedal(medal, client/player)
set waitfor = FALSE
if(!medal || !hub_enabled)
return
if(isnull(world.SetMedal(medal, player, CONFIG_GET(string/medal_hub_address), CONFIG_GET(string/medal_hub_password))))
hub_enabled = FALSE
log_game("MEDAL ERROR: Could not contact hub to award medal:[medal] player:[player.ckey]")
message_admins("Error! Failed to contact hub to award [medal] medal to [player.ckey]!")
return
to_chat(player, "<span class='greenannounce'><B>Achievement unlocked: [medal]!</B></span>")
/datum/controller/subsystem/medals/proc/SetScore(score, client/player, increment, force)
set waitfor = FALSE
if(!score || !hub_enabled)
return
var/list/oldscore = GetScore(score, player, TRUE)
if(increment)
if(!oldscore[score])
oldscore[score] = 1
else
oldscore[score] = (text2num(oldscore[score]) + 1)
else
oldscore[score] = force
var/newscoreparam = list2params(oldscore)
if(isnull(world.SetScores(player.ckey, newscoreparam, CONFIG_GET(string/medal_hub_address), CONFIG_GET(string/medal_hub_password))))
hub_enabled = FALSE
log_game("SCORE ERROR: Could not contact hub to set score. Score:[score] player:[player.ckey]")
message_admins("Error! Failed to contact hub to set [score] score for [player.ckey]!")
/datum/controller/subsystem/medals/proc/GetScore(score, client/player, returnlist)
if(!score || !hub_enabled)
return
var/scoreget = world.GetScores(player.ckey, score, CONFIG_GET(string/medal_hub_address), CONFIG_GET(string/medal_hub_password))
if(isnull(scoreget))
hub_enabled = FALSE
log_game("SCORE ERROR: Could not contact hub to get score. Score:[score] player:[player.ckey]")
message_admins("Error! Failed to contact hub to get score: [score] for [player.ckey]!")
return
. = params2list(scoreget)
if(!returnlist)
return .[score]
/datum/controller/subsystem/medals/proc/CheckMedal(medal, client/player)
if(!medal || !hub_enabled)
return
if(isnull(world.GetMedal(medal, player, CONFIG_GET(string/medal_hub_address), CONFIG_GET(string/medal_hub_password))))
hub_enabled = FALSE
log_game("MEDAL ERROR: Could not contact hub to get medal:[medal] player: [player.ckey]")
message_admins("Error! Failed to contact hub to get [medal] medal for [player.ckey]!")
return
to_chat(player, "[medal] is unlocked")
/datum/controller/subsystem/medals/proc/LockMedal(medal, client/player)
if(!player || !medal || !hub_enabled)
return
var/result = world.ClearMedal(medal, player, CONFIG_GET(string/medal_hub_address), CONFIG_GET(string/medal_hub_password))
switch(result)
if(null)
hub_enabled = FALSE
log_game("MEDAL ERROR: Could not contact hub to clear medal:[medal] player:[player.ckey]")
message_admins("Error! Failed to contact hub to clear [medal] medal for [player.ckey]!")
if(TRUE)
message_admins("Medal: [medal] removed for [player.ckey]")
if(FALSE)
message_admins("Medal: [medal] was not found for [player.ckey]. Unable to clear.")
/datum/controller/subsystem/medals/proc/ClearScore(client/player)
if(isnull(world.SetScores(player.ckey, "", CONFIG_GET(string/medal_hub_address), CONFIG_GET(string/medal_hub_password))))
log_game("MEDAL ERROR: Could not contact hub to clear scores for [player.ckey]!")
message_admins("Error! Failed to contact hub to clear scores for [player.ckey]!")
+4 -1
View File
@@ -9,7 +9,10 @@ SUBSYSTEM_DEF(minimap)
/datum/controller/subsystem/minimap/Initialize(timeofday)
z_levels = SSmapping.levels_by_trait(ZTRAIT_STATION)
var/hash = md5(SSmapping.config.GetFullMapPath())
var/list/hashlist = list()
for (var/file in SSmapping.config.GetFullMapPaths())
hashlist += md5(file2text(file))
var/hash = hashlist.Join("\n")
if(CONFIG_GET(flag/generate_minimaps))
if(hash == trim(file2text(hash_path())))
for(var/z in z_levels) //We have these files cached, let's register them
+3 -3
View File
@@ -56,7 +56,7 @@ SUBSYSTEM_DEF(persistence)
old_secret_satchels.Cut(pos, pos+1 % old_secret_satchels.len)
F.x = old_secret_satchels[pos]["x"]
F.y = old_secret_satchels[pos]["y"]
F.z = ZLEVEL_STATION_PRIMARY
F.z = SSmapping.station_start
path = text2path(old_secret_satchels[pos]["saved_obj"])
if(F)
@@ -67,7 +67,7 @@ SUBSYSTEM_DEF(persistence)
spawned_objects[spawned_item] = TRUE
placed_satchel++
var/free_satchels = 0
for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,ZLEVEL_STATION_PRIMARY), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,ZLEVEL_STATION_PRIMARY)))) //Nontrivially expensive but it's roundstart only
for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,SSmapping.station_start), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,SSmapping.station_start)))) //Nontrivially expensive but it's roundstart only
if(isfloorturf(T) && !isplatingturf(T))
new /obj/item/storage/backpack/satchel/flat/secret(T)
free_satchels++
@@ -189,7 +189,7 @@ SUBSYSTEM_DEF(persistence)
var/list/satchels_to_add = list()
for(var/A in new_secret_satchels)
var/obj/item/storage/backpack/satchel/flat/F = A
if(QDELETED(F) || F.z != ZLEVEL_STATION_PRIMARY || F.invisibility != INVISIBILITY_MAXIMUM)
if(QDELETED(F) || F.z != SSmapping.station_start || F.invisibility != INVISIBILITY_MAXIMUM)
continue
var/list/savable_obj = list()
for(var/obj/O in F)
+1 -1
View File
@@ -41,7 +41,7 @@
set waitfor = FALSE
var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [owner]'s imaginary friend?", ROLE_PAI, null, null, 75, friend)
if(LAZYLEN(candidates))
var/client/C = pick(candidates)
var/mob/dead/observer/C = pick(candidates)
friend.key = C.key
friend_initialized = TRUE
else
@@ -25,7 +25,7 @@
set waitfor = FALSE
var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [owner]'s split personality?", ROLE_PAI, null, null, 75, stranger_backseat)
if(LAZYLEN(candidates))
var/client/C = pick(candidates)
var/mob/dead/observer/C = pick(candidates)
stranger_backseat.key = C.key
log_game("[key_name(stranger_backseat)] became [key_name(owner)]'s split personality.")
message_admins("[key_name_admin(stranger_backseat)] became [key_name_admin(owner)]'s split personality.")
@@ -183,7 +183,7 @@
set waitfor = FALSE
var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [owner]'s brainwashed mind?", null, null, null, 75, stranger_backseat)
if(LAZYLEN(candidates))
var/client/C = pick(candidates)
var/mob/dead/observer/C = pick(candidates)
stranger_backseat.key = C.key
else
qdel(src)
@@ -350,3 +350,8 @@
/datum/material/biomass
name = "Biomass"
id = MAT_BIOMASS
/datum/material/plastic
name = "Plastic"
id = MAT_PLASTIC
sheet_type = /obj/item/stack/sheet/plastic
+58 -82
View File
@@ -1,44 +1,50 @@
#define FORWARD -1
#define BACKWARD 1
#define FORWARD 1
#define BACKWARD -1
#define ITEM_DELETE "delete"
#define ITEM_MOVE_INSIDE "move_inside"
/datum/construction
var/list/steps
var/atom/holder
var/result
var/list/steps_desc
var/index = 1
/datum/construction/New(atom)
..()
holder = atom
if(!holder) //don't want this without a holder
qdel(src)
set_desc(steps.len)
return
update_holder(index)
/datum/construction/proc/next_step()
steps.len--
if(!steps.len)
/datum/construction/proc/on_step()
if(index > steps.len)
spawn_result()
else
set_desc(steps.len)
return
update_holder(index)
/datum/construction/proc/action(obj/item/I, mob/user)
return
/datum/construction/proc/action(obj/item/I, mob/living/user)
return check_step(I, user)
/datum/construction/proc/check_step(obj/item/I, mob/user) //check last step only
var/valid_step = is_right_key(I)
if(valid_step)
if(custom_action(valid_step, I, user))
next_step()
return 1
return 0
/datum/construction/proc/update_index(diff)
index += diff
on_step()
/datum/construction/proc/is_right_key(obj/item/I) // returns current step num if I is of the right type.
var/list/L = steps[steps.len]
/datum/construction/proc/check_step(obj/item/I, mob/living/user)
var/diff = is_right_key(I)
if(diff && custom_action(I, user, diff))
update_index(diff)
return TRUE
return FALSE
/datum/construction/proc/is_right_key(obj/item/I) // returns index step
var/list/L = steps[index]
if(check_used_item(I, L["key"]))
return steps.len
return 0
return FORWARD //to the first step -> forward
else if(check_used_item(I, L["back_key"]))
return BACKWARD //to the last step -> backwards
return FALSE
/datum/construction/proc/check_used_item(obj/item/I, key)
if(!key)
@@ -52,77 +58,47 @@
return FALSE
/datum/construction/proc/custom_action(step, obj/item/I, user)
return 1
/datum/construction/proc/check_all_steps(obj/item/I, mob/user) //check all steps, remove matching one.
for(var/i=1;i<=steps.len;i++)
var/list/L = steps[i]
if(check_used_item(I, L["key"]))
if(custom_action(i, I, user))
steps[i] = null//stupid byond list from list removal...
listclearnulls(steps)
if(!steps.len)
spawn_result()
return 1
return 0
/datum/construction/proc/custom_action(obj/item/I, mob/living/user, diff)
return TRUE
/datum/construction/proc/spawn_result()
if(result)
new result(get_turf(holder))
new result(drop_location())
qdel(holder)
return
/datum/construction/proc/spawn_mecha_result()
if(result)
var/obj/mecha/m = new result(get_turf(holder))
var/obj/item/oldcell = locate (/obj/item/stock_parts/cell) in m
QDEL_NULL(oldcell)
m.CheckParts(holder.contents)
SSblackbox.record_feedback("tally", "mechas_created", 1, m.name)
QDEL_NULL(holder)
/datum/construction/proc/update_holder(step_index)
var/list/step = steps[step_index]
/datum/construction/proc/set_desc(index as num)
var/list/step = steps[index]
holder.desc = step["desc"]
return
if(step["desc"])
holder.desc = step["desc"]
if(step["icon_state"])
holder.icon_state = step["icon_state"]
/datum/construction/proc/drop_location()
return holder.drop_location()
/datum/construction/reversible
var/index
/datum/construction/reversible/New(atom)
..()
index = steps.len
return
/datum/construction/reversible/proc/update_index(diff as num)
index+=diff
if(index==0)
spawn_result()
else
set_desc(index)
return
/datum/construction/reversible/is_right_key(obj/item/I) // returns index step
var/list/L = steps[index]
if(check_used_item(I, L["key"]))
return FORWARD //to the first step -> forward
else if(check_used_item(I, L["backkey"]))
return BACKWARD //to the last step -> backwards
// Unordered construction.
// Takes a list of part types, to be added in any order, as steps.
// Calls spawn_result() when every type has been added.
/datum/construction/unordered/check_step(obj/item/I, mob/living/user)
for(var/typepath in steps)
if(istype(I, typepath) && custom_action(I, user, typepath))
steps -= typepath
on_step()
return TRUE
return FALSE
/datum/construction/reversible/check_step(obj/item/I, mob/user)
var/diff = is_right_key(I)
if(diff)
if(custom_action(index, diff, I, user))
update_index(diff)
return 1
return 0
/datum/construction/unordered/on_step()
if(!steps.len)
spawn_result()
else
update_holder(steps.len)
/datum/construction/reversible/custom_action(index, diff, obj/item/I, user)
return 1
/datum/construction/unordered/update_holder(steps_left)
return
/datum/construction/unordered/custom_action(obj/item/I, mob/living/user, typepath)
return TRUE
+65 -102
View File
@@ -4,46 +4,42 @@
// -Cyberboss
/datum/map_config
// Metadata
var/config_filename = "_maps/boxstation.json"
var/defaulted = TRUE // set to FALSE by LoadConfig() succeeding
// Config from maps.txt
var/config_max_users = 0
var/config_min_users = 0
var/voteweight = 1
// Config actually from the JSON - should default to Box
var/map_name = "Box Station"
var/map_path = "map_files/BoxStation"
var/map_file = "BoxStation.dmm"
var/traits = null
var/minetype = "lavaland"
var/allow_custom_shuttles = TRUE
var/shuttles = list(
"cargo" = "cargo_box",
"ferry" = "ferry_fancy",
"whiteship" = "whiteship_box",
"emergency" = "emergency_box")
//Order matters here.
var/list/transition_config = list(CENTCOM = SELFLOOPING,
MAIN_STATION = CROSSLINKED,
EMPTY_AREA_1 = CROSSLINKED,
EMPTY_AREA_2 = CROSSLINKED,
MINING = SELFLOOPING,
CITY_OF_COGS = SELFLOOPING,
EMPTY_AREA_3 = CROSSLINKED,
EMPTY_AREA_4 = CROSSLINKED,
EMPTY_AREA_5 = CROSSLINKED,
EMPTY_AREA_6 = CROSSLINKED,
EMPTY_AREA_7 = CROSSLINKED,
EMPTY_AREA_8 = CROSSLINKED)
var/defaulted = TRUE //if New failed
var/config_max_users = 0
var/config_min_users = 0
var/voteweight = 1
var/allow_custom_shuttles = TRUE
/datum/map_config/New(filename = "data/next_map.json", default_to_box, delete_after, error_if_missing = TRUE)
if(default_to_box)
return
LoadConfig(filename, error_if_missing)
if(delete_after)
/proc/load_map_config(filename = "data/next_map.json", default_to_box, delete_after, error_if_missing = TRUE)
var/datum/map_config/config = new
if (default_to_box)
return config
if (!config.LoadConfig(filename, error_if_missing))
qdel(config)
config = new /datum/map_config // Fall back to Box
if (delete_after)
fdel(filename)
return config
#define CHECK_EXISTS(X) if(!istext(json[X])) { log_world("[##X] missing from json!"); return; }
/datum/map_config/proc/LoadConfig(filename, error_if_missing)
if(!fexists(filename))
if(error_if_missing)
@@ -65,99 +61,66 @@
log_world("map_config is not json: [filename]")
return
if(!ValidateJSON(json))
log_world("map_config failed to validate for above reason: [filename]")
return
config_filename = filename
CHECK_EXISTS("map_name")
map_name = json["map_name"]
CHECK_EXISTS("map_path")
map_path = json["map_path"]
map_file = json["map_file"]
if(islist(json["shuttles"]))
map_file = json["map_file"]
// "map_file": "BoxStation.dmm"
if (istext(map_file))
if (!fexists("_maps/[map_path]/[map_file]"))
log_world("Map file ([map_path]/[map_file]) does not exist!")
return
// "map_file": ["Lower.dmm", "Upper.dmm"]
else if (islist(map_file))
for (var/file in map_file)
if (!fexists("_maps/[map_path]/[file]"))
log_world("Map file ([map_path]/[file]) does not exist!")
return
else
log_world("map_file missing from json!")
return
if (islist(json["shuttles"]))
var/list/L = json["shuttles"]
for(var/key in L)
var/value = L[key]
shuttles[key] = value
minetype = json["minetype"] || minetype
allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE
var/jtcl = json["transition_config"]
if(jtcl && jtcl != "default")
transition_config.Cut()
for(var/I in jtcl)
transition_config[TransitionStringToEnum(I)] = TransitionStringToEnum(jtcl[I])
defaulted = FALSE
#define CHECK_EXISTS(X) if(!istext(json[X])) { log_world("[##X] missing from json!"); return; }
/datum/map_config/proc/ValidateJSON(list/json)
CHECK_EXISTS("map_name")
CHECK_EXISTS("map_path")
CHECK_EXISTS("map_file")
var/shuttles = json["shuttles"]
if(shuttles && !islist(shuttles))
log_world("json\[shuttles\] is not a list!")
var/path = GetFullMapPath(json["map_path"], json["map_file"])
if(!fexists(path))
log_world("Map file ([path]) does not exist!")
else if ("shuttles" in json)
log_world("map_config shuttles is not a list!")
return
var/tc = json["transition_config"]
if(tc != null && tc != "default")
if(!islist(tc))
log_world("transition_config is not a list!")
return
traits = json["traits"]
// "traits": [{"Linkage": "Cross"}, {"Space Ruins": true}]
if (islist(traits))
// "Station" is set by default, but it's assumed if you're setting
// traits you want to customize which level is cross-linked
for (var/level in traits)
if (!(ZTRAIT_STATION in level))
level[ZTRAIT_STATION] = TRUE
// "traits": null or absent -> default
else if (!isnull(traits))
log_world("map_config traits is not a list!")
return
for(var/I in tc)
if(isnull(TransitionStringToEnum(I)))
log_world("Invalid transition_config option: [I]!")
if(isnull(TransitionStringToEnum(tc[I])))
log_world("Invalid transition_config option: [I]!")
if ("minetype" in json)
minetype = json["minetype"]
allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE
defaulted = FALSE
return TRUE
#undef CHECK_EXISTS
/datum/map_config/proc/TransitionStringToEnum(string)
switch(string)
if("CROSSLINKED")
return CROSSLINKED
if("SELFLOOPING")
return SELFLOOPING
if("UNAFFECTED")
return UNAFFECTED
if("MAIN_STATION")
return MAIN_STATION
if("CENTCOM")
return CENTCOM
if("CITY_OF_COGS")
return CITY_OF_COGS
if("MINING")
return MINING
if("EMPTY_AREA_1")
return EMPTY_AREA_1
if("EMPTY_AREA_2")
return EMPTY_AREA_2
if("EMPTY_AREA_3")
return EMPTY_AREA_3
if("EMPTY_AREA_4")
return EMPTY_AREA_4
if("EMPTY_AREA_5")
return EMPTY_AREA_5
if("EMPTY_AREA_6")
return EMPTY_AREA_6
if("EMPTY_AREA_7")
return EMPTY_AREA_7
if("EMPTY_AREA_8")
return EMPTY_AREA_8
/datum/map_config/proc/GetFullMapPath(mp = map_path, mf = map_file)
return "_maps/[mp]/[mf]"
/datum/map_config/proc/GetFullMapPaths()
if (istext(map_file))
return list("_maps/[map_path]/[map_file]")
. = list()
for (var/file in map_file)
. += "_maps/[map_path]/[file]"
/datum/map_config/proc/MakeNextMap()
return config_filename == "data/next_map.json" || fcopy(config_filename, "data/next_map.json")
-186
View File
@@ -95,16 +95,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
. = ..()
set_dynamic_lighting()
/area/planet/clown
name = "Clown Planet"
icon_state = "honk"
requires_power = FALSE
/area/telesciareas
name = "Cosmic Anomaly"
icon_state = "telesci"
requires_power = FALSE
//STATION13
@@ -258,105 +248,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "disposal"
/area/maintenance/disposal/incinerator
// /area/maintenance/incinerator
name = "Incinerator"
icon_state = "disposal"
//Cere / Asteroid Specific
/area/maintenance/asteroid/aft/science
name = "Aft Maintenance"
icon_state = "amaint"
/area/maintenance/asteroid/aft/arrivals
name = "Aft Maintenance"
icon_state = "amaint"
/area/maintenance/asteroid/central
name = "Central Asteroid Maintenance"
icon_state = "maintcentral"
/area/maintenance/asteroid/disposal
icon_state = "disposal"
/area/maintenance/asteroid/disposal/north
name = "Northern Disposal"
/area/maintenance/asteroid/disposal/north/east
name = "North-Eastern Disposal"
/area/maintenance/asteroid/disposal/north/west
name = "North-Western Disposal"
/area/maintenance/asteroid/disposal/east
name = "Eastern Disposal"
/area/maintenance/asteroid/disposal/west
name = "Western Disposal"
/area/maintenance/asteroid/disposal/west/secondary
name = "Secondary Western Disposal"
/area/maintenance/asteroid/disposal/south
name = "Southern Disposal"
/area/maintenance/asteroid/disposal/south/west
name = "South-Western Disposal"
/area/maintenance/asteroid/disposal/external/east
name = "Eastern External Waste Belt"
/area/maintenance/asteroid/disposal/external/north
name = "Northern External Waste Belt"
/area/maintenance/asteroid/disposal/external/southeast
name = "South-Eastern External Waste Belt"
/area/maintenance/asteroid/disposal/external/southwest
name = "South-Western External Waste Belt"
/area/maintenance/asteroid/fore/cargo_west
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/fore/cargo_south
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/fore/com_west
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/fore/com_north
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/fore/com_east
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/fore/com_south
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/port/neast
name = "Port Asteroid Maintenance"
icon_state = "pmaint"
/area/maintenance/asteroid/port/east
name = "Port Asteroid Maintenance"
icon_state = "pmaint"
/area/maintenance/asteroid/port/west
name = "Port Asteroid Maintenance"
icon_state = "pmaint"
/area/maintenance/asteroid/starboard
name = "Starboard Asteroid Maintenance"
icon_state = "smaint"
//Hallway
/area/hallway/primary/aft
@@ -419,42 +314,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Service Hallway"
icon_state = "hall_service"
/area/hallway/secondary/bridges/cargo_ai
name = "Cargo-AI-Command Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/com_engi
name = "Command-Engineering Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/com_serv
name = "Command-Service Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/dock_med
name = "Docking-Medical Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/engi_med
name = "Engineering-Medical Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/med_cargo
name = "Medical-Cargo Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/sci_dock
name = "Science-Docking Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/serv_engi
name = "Service-Engineering Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/serv_sci
name = "Service-Science Bridge"
icon_state = "yellow"
//Command
/area/bridge
@@ -745,18 +604,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
flags_1 = NONE
ambientsounds = ENGINEERING
/area/solar/asteroid/aft
name = "Aft Asteroid Solar"
icon_state = "panelsA"
/area/solar/asteroid/command
name = "Command Asteroid Solar"
icon_state = "panelsA"
/area/solar/asteroid/fore
name = "Fore Asteroid Solar"
icon_state = "panelsA"
/area/solar/fore
name = "Fore Solar Array"
icon_state = "yellow"
@@ -804,18 +651,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Solar Maintenance"
icon_state = "yellow"
/area/maintenance/solars/asteroid/aft
name = "Aft Asteroid Solar Maintenance"
icon_state = "SolarcontrolA"
/area/maintenance/solars/asteroid/command
name = "Command Asteroid Solar Maintenance"
icon_state = "SolarcontrolP"
/area/maintenance/solars/asteroid/fore
name = "Fore Asteroid Solar Maintenance"
icon_state = "SolarcontrolP"
/area/maintenance/solars/port
name = "Port Solar Maintenance"
icon_state = "SolarcontrolP"
@@ -872,22 +707,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
music = "signal"
ambientsounds = ENGINEERING
/area/teleporter/quantum/cargo
name = "Cargo Quantum Pad"
icon_state = "teleporter"
/area/teleporter/quantum/docking
name = "Docking Quantum Pad"
icon_state = "teleporter"
/area/teleporter/quantum/research
name = "Research Quantum Pad"
icon_state = "teleporter"
/area/teleporter/quantum/security
name = "Security Quantum Pad"
icon_state = "teleporter"
/area/gateway
name = "Gateway"
icon_state = "gateway"
@@ -1458,11 +1277,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "AI Sat Ext"
icon_state = "storage"
/area/ai_monitored/turret_protected/NewAIMain
name = "AI Main New"
icon_state = "storage"
// Telecommunications Satellite
-6
View File
@@ -65,12 +65,6 @@
/area/mine/sleeper
name = "Mining Station Emergency Sleeper"
/area/mine/north_outpost
name = "North Mining Outpost"
/area/mine/west_outpost
name = "West Mining Outpost"
/area/mine/laborcamp
name = "Labor Camp"
-122
View File
@@ -1,122 +0,0 @@
// Hell
/area/hell
name = "Hell Lobby"
//icon = "ICON FILENAME"
//icon_state = "NAME OF ICON"
requires_power = FALSE
ambientsounds = SPOOKY
/area/hell/trial1
name = "Hell Trial1"
//icon_state = "NAME OF ICON" (defaults to "unknown" (blank))
/area/hell/trial1
name = "Hell Trial2"
//icon_state = "NAME OF ICON" (defaults to "unknown" (blank))
/area/hell/trial1
name = "Hell Trial3"
//icon_state = "NAME OF ICON" (defaults to "unknown" (blank))
//Misc
/area/generic
name = "Unknown"
icon_state = "storage"
//PRISON
/area/prison
name = "Prison Station"
icon_state = "brig"
ambientsounds = HIGHSEC
/area/prison/arrival_airlock
name = "Prison Station Airlock"
icon_state = "green"
requires_power = FALSE
/area/prison/control
name = "Prison Security Checkpoint"
icon_state = "security"
/area/prison/crew_quarters
name = "Prison Security Quarters"
icon_state = "security"
/area/prison/rec_room
name = "Prison Rec Room"
icon_state = "green"
/area/prison/closet
name = "Prison Supply Closet"
icon_state = "dk_yellow"
/area/prison/hallway/fore
name = "Prison Fore Hallway"
icon_state = "yellow"
/area/prison/hallway/aft
name = "Prison Aft Hallway"
icon_state = "yellow"
/area/prison/hallway/port
name = "Prison Port Hallway"
icon_state = "yellow"
/area/prison/hallway/starboard
name = "Prison Starboard Hallway"
icon_state = "yellow"
/area/prison/morgue
name = "Prison Morgue"
icon_state = "morgue"
ambientsounds = SPOOKY
/area/prison/medical_research
name = "Prison Genetic Research"
icon_state = "medresearch"
/area/prison/medical
name = "Prison Medbay"
icon_state = "medbay"
/area/prison/solar
name = "Prison Solar Array"
icon_state = "storage"
requires_power = FALSE
/area/prison/podbay
name = "Prison Podbay"
icon_state = "dk_yellow"
/area/prison/solar_control
name = "Prison Solar Array Control"
icon_state = "dk_yellow"
/area/prison/solitary
name = "Solitary Confinement"
icon_state = "brig"
/area/prison/execution_room
name = "Prisoner Education Chamber"
icon_state = "execution_room"
/area/prison/cell_block/a
// /area/prison/cell_block/A
name = "Prison Cell Block A"
icon_state = "brig"
/area/prison/cell_block/b
// /area/prison/cell_block/B
name = "Prison Cell Block B"
icon_state = "brig"
/area/prison/cell_block/c
// /area/prison/cell_block/C
name = "Prison Cell Block C"
icon_state = "brig"
-98
View File
@@ -1,98 +0,0 @@
/area/spacecontent
name = "space"
ambientsounds = AWAY_MISSION
/area/spacecontent/a1
icon_state = "spacecontent1"
/area/spacecontent/a2
icon_state = "spacecontent2"
/area/spacecontent/a3
icon_state = "spacecontent3"
/area/spacecontent/a4
icon_state = "spacecontent4"
/area/spacecontent/a5
icon_state = "spacecontent5"
/area/spacecontent/a6
icon_state = "spacecontent6"
/area/spacecontent/a7
icon_state = "spacecontent7"
/area/spacecontent/a8
icon_state = "spacecontent8"
/area/spacecontent/a9
icon_state = "spacecontent9"
/area/spacecontent/a10
icon_state = "spacecontent10"
/area/spacecontent/a11
icon_state = "spacecontent11"
/area/spacecontent/a11
icon_state = "spacecontent12"
/area/spacecontent/a12
icon_state = "spacecontent13"
/area/spacecontent/a13
icon_state = "spacecontent14"
/area/spacecontent/a14
icon_state = "spacecontent14"
/area/spacecontent/a15
icon_state = "spacecontent15"
/area/spacecontent/a16
icon_state = "spacecontent16"
/area/spacecontent/a17
icon_state = "spacecontent17"
/area/spacecontent/a18
icon_state = "spacecontent18"
/area/spacecontent/a19
icon_state = "spacecontent19"
/area/spacecontent/a20
icon_state = "spacecontent20"
/area/spacecontent/a21
icon_state = "spacecontent21"
/area/spacecontent/a22
icon_state = "spacecontent22"
/area/spacecontent/a23
icon_state = "spacecontent23"
/area/spacecontent/a24
icon_state = "spacecontent24"
/area/spacecontent/a25
icon_state = "spacecontent25"
/area/spacecontent/a26
icon_state = "spacecontent26"
/area/spacecontent/a27
icon_state = "spacecontent27"
/area/spacecontent/a28
icon_state = "spacecontent28"
/area/spacecontent/a29
icon_state = "spacecontent29"
/area/spacecontent/a30
icon_state = "spacecontent30"
+1 -5
View File
@@ -164,15 +164,11 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
/obj/effect/meteor/ex_act()
return
#define METEOR_MEDAL "Your Life Before Your Eyes"
/obj/effect/meteor/examine(mob/user)
if(!admin_spawned && isliving(user))
UnlockMedal(METEOR_MEDAL,user.client)
SSmedals.UnlockMedal(MEDAL_METEOR, user.client)
..()
#undef METEOR_MEDAL
/obj/effect/meteor/attackby(obj/item/I, mob/user, params)
if(I.tool_behaviour == TOOL_MINING)
make_debris()
+6 -2
View File
@@ -221,8 +221,9 @@ GLOBAL_LIST_EMPTY(objectives)
explanation_text = "Free Objective"
/datum/objective/protect//The opposite of killing a dude.
var/target_role_type=0
martyr_compatible = 1
var/target_role_type = 0
var/human_check = TRUE
/datum/objective/protect/find_target_by_role(role, role_type=0, invert=0)
if(!invert)
@@ -231,7 +232,7 @@ GLOBAL_LIST_EMPTY(objectives)
return target
/datum/objective/protect/check_completion()
return !target || considered_alive(target)
return !target || considered_alive(target, enforce_human = human_check)
/datum/objective/protect/update_explanation_text()
..()
@@ -240,6 +241,9 @@ GLOBAL_LIST_EMPTY(objectives)
else
explanation_text = "Free Objective"
/datum/objective/protect/nonhuman
human_check = FALSE
/datum/objective/hijack
explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody."
team_explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody. Leave no team member behind."
+3 -3
View File
@@ -114,7 +114,7 @@ Class Procs:
/obj/machinery/Initialize()
if(!armor)
armor = list(melee = 25, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70)
armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
. = ..()
GLOB.machines += src
@@ -391,9 +391,9 @@ Class Procs:
/obj/machinery/proc/exchange_parts(mob/user, obj/item/storage/part_replacer/W)
if(!istype(W))
return
return FALSE
if((flags_1 & NODECONSTRUCT_1) && !W.works_from_distance)
return
return FALSE
var/shouldplaysound = 0
if(component_parts)
if(panel_open || W.works_from_distance)

Some files were not shown because too many files have changed in this diff Show More