April sync (#360)
* Maps and things no code/icons * helpers defines globalvars * Onclick world.dm orphaned_procs * subsystems Round vote and shuttle autocall done here too * datums * Game folder * Admin - chatter modules * clothing - mining * modular computers - zambies * client * mob level 1 * mob stage 2 + simple_animal * silicons n brains * mob stage 3 + Alien/Monkey * human mobs * icons updated * some sounds * emitter y u no commit * update tgstation.dme * compile fixes * travis fixes Also removes Fast digest mode, because reasons. * tweaks for travis Mentors are broke again Also fixes Sizeray guns * oxygen loss fix for vore code. * removes unused code * some code updates * bulk fixes * further fixes * outside things * whoops. * Maint bar ported * GLOBs.
This commit is contained in:
Poojawa
@@ -1,6 +1,6 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"aa" = (
|
||||
/turf/open/space,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"ab" = (
|
||||
/turf/closed/indestructible/riveted,
|
||||
@@ -2297,7 +2297,7 @@
|
||||
/turf/closed/indestructible/riveted,
|
||||
/area/start)
|
||||
"gd" = (
|
||||
/obj/effect/landmark/start,
|
||||
/obj/effect/landmark/start/new_player,
|
||||
/turf/open/floor/plating,
|
||||
/area/start)
|
||||
"ge" = (
|
||||
@@ -2992,9 +2992,7 @@
|
||||
/turf/closed/indestructible/riveted,
|
||||
/area/centcom/control)
|
||||
"iv" = (
|
||||
/obj/effect/landmark{
|
||||
name = "prisonwarp"
|
||||
},
|
||||
/obj/effect/landmark/prisonwarp,
|
||||
/turf/open/floor/plasteel/vault{
|
||||
dir = 8
|
||||
},
|
||||
@@ -6494,9 +6492,7 @@
|
||||
/area/syndicate_mothership/control)
|
||||
"qp" = (
|
||||
/obj/structure/chair/stool,
|
||||
/obj/effect/landmark{
|
||||
name = "Syndicate-Spawn"
|
||||
},
|
||||
/obj/effect/landmark/syndicate_spawn,
|
||||
/turf/open/floor/plasteel/bar{
|
||||
dir = 2
|
||||
},
|
||||
@@ -8111,9 +8107,7 @@
|
||||
/turf/open/floor/wood,
|
||||
/area/syndicate_mothership/control)
|
||||
"tT" = (
|
||||
/obj/effect/landmark{
|
||||
name = "Syndicate-Spawn"
|
||||
},
|
||||
/obj/effect/landmark/syndicate_spawn,
|
||||
/turf/open/floor/wood,
|
||||
/area/syndicate_mothership/control)
|
||||
"tU" = (
|
||||
@@ -9049,16 +9043,12 @@
|
||||
/area/centcom/ferry)
|
||||
"wo" = (
|
||||
/obj/structure/chair/office/dark,
|
||||
/obj/effect/landmark{
|
||||
name = "Emergencyresponseteam"
|
||||
},
|
||||
/obj/effect/landmark/ert_spawn,
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/centcom/ferry)
|
||||
"wp" = (
|
||||
/obj/structure/chair/office/dark,
|
||||
/obj/effect/landmark{
|
||||
name = "Emergencyresponseteam"
|
||||
},
|
||||
/obj/effect/landmark/ert_spawn,
|
||||
/turf/open/floor/plasteel/vault{
|
||||
dir = 5
|
||||
},
|
||||
@@ -9204,9 +9194,7 @@
|
||||
/obj/structure/chair/office/dark{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/landmark{
|
||||
name = "Emergencyresponseteam"
|
||||
},
|
||||
/obj/effect/landmark/ert_spawn,
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/centcom/ferry)
|
||||
"wK" = (
|
||||
@@ -9294,9 +9282,7 @@
|
||||
},
|
||||
/area/wizard_station)
|
||||
"wY" = (
|
||||
/obj/effect/landmark/start{
|
||||
name = "wizard"
|
||||
},
|
||||
/obj/effect/landmark/start/wizard,
|
||||
/turf/open/floor/engine/cult,
|
||||
/area/wizard_station)
|
||||
"wZ" = (
|
||||
@@ -9357,9 +9343,7 @@
|
||||
/obj/structure/chair/office/dark{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/landmark{
|
||||
name = "Emergencyresponseteam"
|
||||
},
|
||||
/obj/effect/landmark/ert_spawn,
|
||||
/turf/open/floor/plasteel/vault{
|
||||
dir = 5
|
||||
},
|
||||
@@ -9697,18 +9681,14 @@
|
||||
/obj/structure/chair/office/dark{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/landmark{
|
||||
name = "Emergencyresponseteam"
|
||||
},
|
||||
/obj/effect/landmark/ert_spawn,
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/centcom/ferry)
|
||||
"xV" = (
|
||||
/obj/structure/chair/office/dark{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/landmark{
|
||||
name = "Emergencyresponseteam"
|
||||
},
|
||||
/obj/effect/landmark/ert_spawn,
|
||||
/turf/open/floor/plasteel/vault{
|
||||
dir = 5
|
||||
},
|
||||
@@ -10328,9 +10308,7 @@
|
||||
/area/wizard_station)
|
||||
"zj" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/effect/landmark{
|
||||
name = "Teleport-Scroll"
|
||||
},
|
||||
/obj/effect/landmark/teleport_scroll,
|
||||
/obj/item/weapon/dice/d20,
|
||||
/obj/item/weapon/dice,
|
||||
/turf/open/floor/carpet,
|
||||
@@ -11791,9 +11769,7 @@
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"CV" = (
|
||||
/obj/effect/landmark{
|
||||
name = "Holding Facility"
|
||||
},
|
||||
/obj/effect/landmark/holding_facility,
|
||||
/turf/open/floor/engine,
|
||||
/area/centcom/holding)
|
||||
"CW" = (
|
||||
@@ -11837,9 +11813,7 @@
|
||||
/area/tdome/tdomeobserve)
|
||||
"Da" = (
|
||||
/obj/structure/chair,
|
||||
/obj/effect/landmark{
|
||||
name = "tdomeobserve"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/observe,
|
||||
/obj/structure/sign/barsign{
|
||||
pixel_y = 32
|
||||
},
|
||||
@@ -11849,9 +11823,7 @@
|
||||
/area/tdome/tdomeobserve)
|
||||
"Db" = (
|
||||
/obj/structure/chair,
|
||||
/obj/effect/landmark{
|
||||
name = "tdomeobserve"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/observe,
|
||||
/turf/open/floor/plasteel/vault{
|
||||
dir = 8
|
||||
},
|
||||
@@ -12189,27 +12161,21 @@
|
||||
},
|
||||
/area/tdome/arena)
|
||||
"DO" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 9
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"DP" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"DQ" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 5
|
||||
},
|
||||
@@ -12262,27 +12228,21 @@
|
||||
},
|
||||
/area/tdome/arena)
|
||||
"DZ" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 9
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"Ea" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"Eb" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 5
|
||||
},
|
||||
@@ -12336,9 +12296,7 @@
|
||||
},
|
||||
/area/tdome/tdomeadmin)
|
||||
"Eh" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
},
|
||||
@@ -12348,22 +12306,16 @@
|
||||
/obj/machinery/recharger{
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"Ej" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/turf/open/floor/plasteel/neutral,
|
||||
/area/tdome/arena)
|
||||
"Ek" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
},
|
||||
@@ -12380,9 +12332,7 @@
|
||||
},
|
||||
/area/tdome/arena)
|
||||
"En" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
},
|
||||
@@ -12392,22 +12342,16 @@
|
||||
/obj/machinery/recharger{
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"Ep" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/turf/open/floor/plasteel/neutral,
|
||||
/area/tdome/arena)
|
||||
"Eq" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
},
|
||||
@@ -12441,9 +12385,7 @@
|
||||
network = list("thunder");
|
||||
c_tag = "Red Team"
|
||||
},
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/turf/open/floor/plasteel/neutral,
|
||||
/area/tdome/arena)
|
||||
"Ev" = (
|
||||
@@ -12474,9 +12416,7 @@
|
||||
network = list("thunder");
|
||||
c_tag = "Green Team"
|
||||
},
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/turf/open/floor/plasteel/neutral,
|
||||
/area/tdome/arena)
|
||||
"EA" = (
|
||||
@@ -12516,50 +12456,38 @@
|
||||
/turf/open/floor/plasteel/green/corner,
|
||||
/area/tdome/arena)
|
||||
"EG" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"EH" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"EI" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome2"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/two,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"EJ" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"EK" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena)
|
||||
"EL" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdome1"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/one,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 6
|
||||
},
|
||||
@@ -12644,9 +12572,7 @@
|
||||
},
|
||||
/area/tdome/tdomeadmin)
|
||||
"EV" = (
|
||||
/obj/effect/landmark{
|
||||
name = "tdomeadmin"
|
||||
},
|
||||
/obj/effect/landmark/thunderdome/admin,
|
||||
/obj/structure/chair/comfy/black{
|
||||
dir = 1
|
||||
},
|
||||
@@ -14446,7 +14372,7 @@
|
||||
/area/wizard_station)
|
||||
"KN" = (
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/engine/cult,
|
||||
/area/wizard_station)
|
||||
@@ -14964,6 +14890,10 @@
|
||||
name = "Centcom"
|
||||
},
|
||||
/area/centcom/evac)
|
||||
"Md" = (
|
||||
/obj/machinery/computer/emergency_shuttle,
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/escape)
|
||||
|
||||
(1,1,1) = {"
|
||||
aa
|
||||
@@ -62947,7 +62877,7 @@ tH
|
||||
qk
|
||||
Ks
|
||||
ql
|
||||
Ma
|
||||
LY
|
||||
Mb
|
||||
yS
|
||||
Lc
|
||||
@@ -65807,7 +65737,7 @@ aa
|
||||
aa
|
||||
aa
|
||||
Fa
|
||||
Fh
|
||||
Md
|
||||
Fp
|
||||
FC
|
||||
Fh
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
"a" = (/turf/open/space,/area/space)
|
||||
"a" = (/turf/open/space/basic,/area/space)
|
||||
|
||||
(1,1,1) = {"
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
"a" = (/turf/open/space,/area/space)
|
||||
"a" = (/turf/open/space/basic,/area/space)
|
||||
"b" = (/obj/docking_port/stationary{dheight = 0;dir = 2;dwidth = 11;height = 22;id = "whiteship_away";name = "Deep Space";width = 35},/turf/open/space,/area/space)
|
||||
|
||||
(1,1,1) = {"
|
||||
|
||||
Reference in New Issue
Block a user