shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

April sync (#360)

Browse Source 
* 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
2017-04-13 23:37:00 -05:00
committed by GitHub
parent cdc32c98fa
commit 7e9b96a00f
1322 changed files with 174827 additions and 23888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_prisoner_crash.dmm
-593
View File
@@ -1,593 +0,0 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)
"b" = (
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"c" = (
/obj/item/weapon/shard,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"d" = (
/obj/item/weapon/shard{
icon_state = "medium"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"e" = (
/turf/closed/wall/mineral/plastitanium{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/lavaland/surface/outdoors)
"f" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"g" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered)
"h" = (
/turf/closed/wall/mineral/plastitanium{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/unpowered)
"i" = (
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/lavaland/surface/outdoors)
"j" = (
/obj/item/weapon/pickaxe,
/obj/item/weapon/pickaxe,
/obj/item/weapon/pickaxe,
/obj/item/weapon/pickaxe,
/obj/item/device/flashlight/lantern,
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
"k" = (
/obj/effect/mob_spawn/human/prisoner_transport,
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
"l" = (
/obj/item/weapon/shard,
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
"m" = (
/obj/effect/mob_spawn/human/nanotrasensoldier,
/obj/effect/decal/cleanable/blood,
/obj/item/device/flashlight/seclite,
/obj/effect/light_emitter,
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
"n" = (
/obj/item/weapon/gun/ballistic/automatic/pistol/m1911,
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
"o" = (
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
"p" = (
/obj/machinery/door/airlock/titanium,
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
"q" = (
/obj/item/weapon/shard,
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/lavaland/surface/outdoors)
"r" = (
/obj/machinery/door/airlock/titanium,
/turf/open/floor/plasteel/shuttle/red{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=16;n2=23"
},
/area/ruin/unpowered)
"s" = (
/obj/effect/mob_spawn/human/nanotrasensoldier,
/obj/item/weapon/gun/ballistic/automatic/pistol/m1911,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
"t" = (
/obj/structure/closet/crate/internals,
/obj/item/weapon/crowbar/large,
/turf/open/floor/mineral/plastitanium/brig{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/unpowered)
"u" = (
/obj/structure/lattice,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"v" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"w" = (
/obj/item/weapon/shard{
icon_state = "small"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"x" = (
/obj/item/weapon/gun/ballistic/automatic/pistol/m1911,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"y" = (
/obj/effect/mob_spawn/human/nanotrasensoldier,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"z" = (
/obj/effect/decal/cleanable/blood,
/obj/item/device/flashlight/seclite,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
(1,1,1) = {"
a
a
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
"}
(2,1,1) = {"
b
a
b
b
b
a
a
b
b
b
b
b
b
b
b
b
b
b
a
b
"}
(3,1,1) = {"
b
b
c
b
b
a
a
b
b
b
b
b
b
b
b
b
b
b
b
a
"}
(4,1,1) = {"
b
b
b
b
b
b
a
b
b
g
h
g
h
g
b
b
b
w
b
b
"}
(5,1,1) = {"
b
b
a
a
a
b
b
b
b
h
h
h
h
h
b
b
b
x
b
b
"}
(6,1,1) = {"
b
b
a
a
a
b
b
e
f
h
j
m
t
h
f
e
b
b
y
b
"}
(7,1,1) = {"
b
b
b
b
b
b
b
b
e
h
k
n
k
h
e
b
b
v
z
b
"}
(8,1,1) = {"
a
b
b
b
b
b
b
a
a
h
k
o
k
h
b
b
v
v
b
b
"}
(9,1,1) = {"
b
b
b
d
b
b
b
a
a
h
k
o
k
h
b
b
v
v
b
b
"}
(10,1,1) = {"
b
b
b
b
b
b
b
a
a
h
k
o
k
h
b
b
b
b
a
a
"}
(11,1,1) = {"
a
b
b
b
b
b
b
a
a
h
h
p
h
h
b
b
b
b
a
a
"}
(12,1,1) = {"
a
b
b
b
b
b
b
b
b
e
i
i
i
u
b
b
b
b
a
a
"}
(13,1,1) = {"
b
b
b
a
b
b
b
a
b
i
i
q
i
u
b
b
b
c
a
a
"}
(14,1,1) = {"
b
a
a
b
b
a
a
a
a
i
i
i
i
i
b
b
b
b
a
a
"}
(15,1,1) = {"
b
b
b
a
a
a
a
a
a
h
h
p
e
e
b
b
b
b
a
a
"}
(16,1,1) = {"
b
b
b
a
a
a
a
a
a
h
l
s
a
e
b
b
b
b
a
a
"}
(17,1,1) = {"
b
b
b
a
a
a
a
a
a
e
a
a
a
e
b
b
b
b
a
a
"}
(18,1,1) = {"
b
b
b
b
b
a
a
a
a
a
a
a
e
a
a
b
a
a
a
a
"}
(19,1,1) = {"
b
b
b
b
b
a
a
a
a
a
a
a
a
b
b
b
a
a
a
a
"}
(20,1,1) = {"
b
b
b
b
b
a
a
a
a
a
a
a
a
b
b
b
b
b
a
a
"}
_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm
+5 -30
View File
@@ -51,12 +51,7 @@
/obj/structure/alien/weeds{
icon_state = "weeds1"
},
/obj/structure/alien/weeds{
desc = "A large mottled egg.";
obj_integrity = 100;
icon_state = "egg_hatched";
name = "egg"
},
/obj/structure/alien/egg/burst,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
@@ -139,12 +134,7 @@
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/obj/structure/alien/weeds{
desc = "A large mottled egg.";
obj_integrity = 100;
icon_state = "egg_hatched";
name = "egg"
},
/obj/structure/alien/egg/burst,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
@@ -334,12 +324,7 @@
})
"x" = (
/obj/structure/alien/weeds,
/obj/structure/alien/weeds{
desc = "A large mottled egg.";
obj_integrity = 100;
icon_state = "egg_hatched";
name = "egg"
},
/obj/structure/alien/egg/burst,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
@@ -405,12 +390,7 @@
/obj/structure/alien/weeds{
icon_state = "weeds1"
},
/obj/structure/alien/weeds{
desc = "A large mottled egg.";
obj_integrity = 100;
icon_state = "egg_hatched";
name = "egg"
},
/obj/structure/alien/egg/burst,
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
@@ -424,12 +404,7 @@
})
"C" = (
/obj/structure/alien/weeds,
/obj/structure/alien/weeds{
desc = "A large mottled egg.";
obj_integrity = 100;
icon_state = "egg_hatched";
name = "egg"
},
/obj/structure/alien/egg/burst,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
_maps/RandomZLevels/Cabin.dmm
+2 -9
View File
@@ -778,9 +778,7 @@
/turf/open/floor/plasteel/freezer,
/area/awaymission/cabin)
"cH" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/wood,
/area/awaymission/cabin)
"cI" = (
@@ -974,12 +972,7 @@
/turf/open/floor/plating/snowed/temperatre,
/area/awaymission/snowforest)
"dt" = (
/obj/effect/landmark/mapGenerator/snowy{
endTurfX = 159;
endTurfY = 157;
startTurfX = 37;
startTurfY = 35
},
/obj/effect/landmark/mapGenerator/snowy,
/turf/open/floor/plating/asteroid/snow/temperatre,
/area/awaymission/snowforest)
"du" = (
_maps/RandomZLevels/caves.dmm
+10 -30
View File
@@ -1175,9 +1175,7 @@
},
/area/awaymission/BMPship)
"cz" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14"
},
@@ -1337,9 +1335,7 @@
name = "\improper BMP Asteroid Level 2"
})
"cR" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
@@ -1635,9 +1631,7 @@
"dw" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
@@ -1718,9 +1712,7 @@
"dH" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
@@ -1833,9 +1825,7 @@
/obj/structure/bed,
/obj/item/weapon/bedsheet,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
@@ -1874,9 +1864,7 @@
/area/awaymission/northblock)
"ed" = (
/obj/structure/bed,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
@@ -2082,9 +2070,7 @@
},
/area/awaymission/BMPship)
"eE" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
@@ -2151,9 +2137,7 @@
},
/area/awaymission/listeningpost)
"eO" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
@@ -2630,9 +2614,7 @@
},
/area/awaymission/BMPship)
"fU" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/elevatorshaft{
name = "elevator flooring";
initial_gas_mix = "n2=23;o2=14"
@@ -2768,9 +2750,7 @@
},
/area/awaymission/BMPship)
"gk" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14"
},
_maps/RandomZLevels/challenge.dmm
+2 -6
View File
@@ -43,9 +43,7 @@
/turf/open/floor/plasteel/airless,
/area/awaymission/challenge/start)
"aj" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/airless{
icon_state = "damaged3"
},
@@ -57,9 +55,7 @@
},
/area/awaymission/challenge/start)
"al" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/airless,
/area/awaymission/challenge/start)
"am" = (
_maps/RandomZLevels/moonoutpost19.dmm
+4 -12
View File
@@ -9085,9 +9085,7 @@
name = "MO19 Arrivals"
})
"ms" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
@@ -9097,9 +9095,7 @@
/obj/structure/chair{
dir = 8
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
@@ -9269,9 +9265,7 @@
name = "MO19 Arrivals"
})
"mI" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
@@ -9284,9 +9278,7 @@
icon_state = "beacon";
name = "tracking beacon"
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
_maps/RandomZLevels/research.dmm
+7 -21
View File
@@ -614,9 +614,7 @@
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"bR" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"bS" = (
@@ -686,9 +684,7 @@
/area/awaymission/research/interior/gateway)
"bZ" = (
/obj/machinery/gateway,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
@@ -774,9 +770,7 @@
/area/awaymission/research/interior/gateway)
"cj" = (
/obj/structure/window/reinforced,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"ck" = (
@@ -785,9 +779,7 @@
icon_state = "right";
dir = 2
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"cl" = (
@@ -3299,9 +3291,7 @@
icon_state = "toilet00";
dir = 8
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/obj/machinery/light/small{
dir = 4
},
@@ -3746,9 +3736,7 @@
"jU" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet/blue,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/wood,
/area/awaymission/research/interior/dorm)
"jV" = (
@@ -4489,9 +4477,7 @@
"lT" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet/patriot,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/wood,
/area/awaymission/research/interior/dorm)
"lU" = (
_maps/RandomZLevels/snowdin.dmm
+12 -36
View File
@@ -579,18 +579,14 @@
},
/area/awaymission/snowdin/base)
"bw" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
"bx" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -608,9 +604,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
@@ -710,9 +704,7 @@
d2 = 8;
icon_state = "4-8"
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
@@ -724,9 +716,7 @@
d2 = 8;
icon_state = "4-8"
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -739,9 +729,7 @@
/area/awaymission/snowdin/base)
"bK" = (
/obj/item/trash/pistachios,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
@@ -753,9 +741,7 @@
d2 = 8;
icon_state = "1-8"
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
@@ -780,9 +766,7 @@
"bP" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/carpet{
baseturf = /turf/open/floor/plating/asteroid/snow
},
@@ -1164,9 +1148,7 @@
},
/area/awaymission/snowdin/igloo)
"cU" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plating{
temperature = 220
},
@@ -2021,9 +2003,7 @@
},
/area/awaymission/snowdin/post)
"ft" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/snow
},
@@ -4222,9 +4202,7 @@
"lf" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/carpet{
baseturf = /turf/open/floor/plating/asteroid/snow
},
@@ -4442,9 +4420,7 @@
icon_state = "tube1";
dir = 4
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/carpet{
baseturf = /turf/open/floor/plating/asteroid/snow
},
_maps/RandomZLevels/spacebattle.dmm
+5 -15
View File
@@ -828,9 +828,7 @@
},
/area/awaymission/spacebattle/cruiser)
"cO" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"cP" = (
@@ -1053,9 +1051,7 @@
},
/area/awaymission/spacebattle/cruiser)
"dA" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/red/side{
dir = 1
},
@@ -1747,9 +1743,7 @@
/turf/open/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"fI" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/cafeteria{
dir = 2
},
@@ -2331,9 +2325,7 @@
/area/awaymission/spacebattle/cruiser)
"hC" = (
/obj/structure/chair,
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/bar,
/area/awaymission/spacebattle/cruiser)
"hD" = (
@@ -2928,9 +2920,7 @@
/obj/structure/chair{
dir = 8
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/bar,
/area/awaymission/spacebattle/cruiser)
"jD" = (
_maps/RandomZLevels/undergroundoutpost45.dmm
+5 -15
View File
@@ -250,9 +250,7 @@
name = "UO45 Central Hall"
})
"ax" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
@@ -265,9 +263,7 @@
icon_state = "comfychair";
dir = 4
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/grimy{
heat_capacity = 1e+006
},
@@ -282,9 +278,7 @@
icon_state = "beacon";
name = "tracking beacon"
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/neutral/side{
dir = 4;
heat_capacity = 1e+006
@@ -309,9 +303,7 @@
scrub_N2O = 0;
scrub_Toxins = 0
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/neutral/side{
dir = 4;
heat_capacity = 1e+006
@@ -498,9 +490,7 @@
name = "UO45 Central Hall"
})
"aT" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/grimy{
heat_capacity = 1e+006
},
_maps/RandomZLevels/wildwest.dmm
+1 -3
View File
@@ -2165,9 +2165,7 @@
},
/area/awaymission/wwrefine)
"gV" = (
/obj/effect/landmark{
name = "awaystart"
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plating/ironsand{
icon_state = "ironsand1"
},
_maps/cerestation.dm
+1
View File
@@ -0,0 +1 @@
#define FORCE_MAP "_maps/cerestation.json"
_maps/cerestation.json
+7
View File
@@ -0,0 +1,7 @@
{
"map_name": "CereStation",
"map_path": "map_files/Cerestation",
"map_file": "cerestation.dmm",
"minetype": "lavaland",
"transition_config": "default"
}
_maps/loadallmaps.dm
+2
View File
@@ -2,8 +2,10 @@
#include "map_files\debug\runtimestation.dmm"
#include "map_files\Deltastation\DeltaStation2.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\OmegaStation\OmegaStation.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\TgStation\tgstation.2.1.3.dmm"
#include "map_files\Cerestation\cerestation.dmm"
#include "map_files\CitadelStation\CitadelStation-1.2.1.dmm"
#include "map_files\generic\Centcomm.dmm"
_maps/map_files/Cerestation/cerestation.dmm
+151280
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Deltastation/DeltaStation2.dmm
+626 -1170
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+828 -1029
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/OmegaStation/OmegaStation.dmm
+264 -486
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/OmegaStation/job_changes.dm
+22 -22
View File
@@ -38,8 +38,8 @@
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)
access = list(GLOB.access_security, GLOB.access_sec_doors, GLOB.access_brig, GLOB.access_armory, GLOB.access_court, GLOB.access_maint_tunnels, GLOB.access_morgue, GLOB.access_weapons, GLOB.access_forensics_lockers)
minimal_access = list(GLOB.access_security, GLOB.access_sec_doors, GLOB.access_brig, GLOB.access_armory, GLOB.access_court, GLOB.access_maint_tunnels, GLOB.access_morgue, GLOB.access_weapons, GLOB.access_forensics_lockers)
/datum/outfit/job/officer/New()
..()
@@ -49,8 +49,8 @@
/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)
access = list(GLOB.access_security, GLOB.access_sec_doors, GLOB.access_brig, GLOB.access_armory, GLOB.access_court, GLOB.access_maint_tunnels, GLOB.access_morgue, GLOB.access_weapons, GLOB.access_forensics_lockers)
minimal_access = list(GLOB.access_security, GLOB.access_sec_doors, GLOB.access_brig, GLOB.access_armory, GLOB.access_court, GLOB.access_maint_tunnels, GLOB.access_morgue, GLOB.access_weapons, GLOB.access_forensics_lockers)
/datum/outfit/job/detective/New()
..()
@@ -65,8 +65,8 @@
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)
access = list(GLOB.access_medical, GLOB.access_morgue, GLOB.access_surgery, GLOB.access_chemistry, GLOB.access_virology, GLOB.access_genetics)
minimal_access = list(GLOB.access_medical, GLOB.access_morgue, GLOB.access_surgery, GLOB.access_chemistry, GLOB.access_virology, GLOB.access_genetics)
//Engineering
@@ -75,8 +75,8 @@
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)
access = list(GLOB.access_eva, GLOB.access_engine, GLOB.access_engine_equip, GLOB.access_tech_storage, GLOB.access_maint_tunnels, GLOB.access_external_airlocks, GLOB.access_construction, GLOB.access_atmospherics, GLOB.access_tcomsat)
minimal_access = list(GLOB.access_eva, GLOB.access_engine, GLOB.access_engine_equip, GLOB.access_tech_storage, GLOB.access_maint_tunnels, GLOB.access_external_airlocks, GLOB.access_construction, GLOB.access_atmospherics, GLOB.access_tcomsat)
/datum/outfit/job/engineer/New()
..()
@@ -96,8 +96,8 @@
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)
access = list(GLOB.access_robotics, GLOB.access_tox, GLOB.access_tox_storage, GLOB.access_research, GLOB.access_xenobiology, GLOB.access_mineral_storeroom, GLOB.access_tech_storage)
minimal_access = list(GLOB.access_robotics, GLOB.access_tox, GLOB.access_tox_storage, GLOB.access_research, GLOB.access_xenobiology, GLOB.access_mineral_storeroom, GLOB.access_tech_storage)
//Cargo
@@ -106,16 +106,16 @@
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)
access = list(GLOB.access_maint_tunnels, GLOB.access_mailsorting, GLOB.access_cargo, GLOB.access_cargo_bot, GLOB.access_qm, GLOB.access_mining, GLOB.access_mining_station, GLOB.access_mineral_storeroom)
minimal_access = list(GLOB.access_maint_tunnels, GLOB.access_mailsorting, GLOB.access_cargo, GLOB.access_cargo_bot, GLOB.access_qm, GLOB.access_mining, GLOB.access_mining_station, GLOB.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)
access = list(GLOB.access_maint_tunnels, GLOB.access_mailsorting, GLOB.access_cargo, GLOB.access_cargo_bot, GLOB.access_qm, GLOB.access_mining, GLOB.access_mining_station, GLOB.access_mineral_storeroom)
minimal_access = list(GLOB.access_maint_tunnels, GLOB.access_mailsorting, GLOB.access_cargo, GLOB.access_cargo_bot, GLOB.access_qm, GLOB.access_mining, GLOB.access_mining_station, GLOB.access_mineral_storeroom)
/datum/outfit/job/mining/New()
..()
@@ -126,27 +126,27 @@
/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)
access = list(GLOB.access_hydroponics, GLOB.access_bar, GLOB.access_kitchen, GLOB.access_morgue, GLOB.access_weapons)
minimal_access = list(GLOB.access_hydroponics, GLOB.access_bar, GLOB.access_kitchen, GLOB.access_morgue, GLOB.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)
access = list(GLOB.access_hydroponics, GLOB.access_bar, GLOB.access_kitchen, GLOB.access_morgue, GLOB.access_weapons)
minimal_access = list(GLOB.access_hydroponics, GLOB.access_bar, GLOB.access_kitchen, GLOB.access_morgue, GLOB.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)
access = list(GLOB.access_hydroponics, GLOB.access_bar, GLOB.access_kitchen, GLOB.access_morgue, GLOB.access_maint_tunnels)
minimal_access = list(GLOB.access_hydroponics, GLOB.access_bar, GLOB.access_kitchen, GLOB.access_morgue, GLOB.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)
access = list(GLOB.access_janitor, GLOB.access_hydroponics, GLOB.access_bar, GLOB.access_kitchen, GLOB.access_morgue, GLOB.access_maint_tunnels)
minimal_access = list(GLOB.access_janitor, GLOB.access_hydroponics, GLOB.access_bar, GLOB.access_kitchen, GLOB.access_morgue, GLOB.access_maint_tunnels)
//Civilian
_maps/map_files/PubbyStation/PubbyStation.dmm
+140 -396
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/PubbyStation/job_changes.dm
+6 -6
View File
@@ -3,20 +3,20 @@
/datum/job/hos/New()
..()
MAP_JOB_CHECK
access += access_crematorium
minimal_access += access_crematorium
access += GLOB.access_crematorium
minimal_access += GLOB.access_crematorium
/datum/job/warden/New()
..()
MAP_JOB_CHECK
access += access_crematorium
minimal_access += access_crematorium
access += GLOB.access_crematorium
minimal_access += GLOB.access_crematorium
/datum/job/officer/New()
..()
MAP_JOB_CHECK
access += access_crematorium
minimal_access += access_crematorium
access += GLOB.access_crematorium
minimal_access += GLOB.access_crematorium
MAP_REMOVE_JOB(librarian)
MAP_REMOVE_JOB(lawyer)
_maps/map_files/TgStation/tgstation.2.1.3.dmm
+3389 -990
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/debug/runtimestation.dmm
+2 -2
View File
@@ -1,4 +1,4 @@
"aa" = (/turf/open/space,/area/space)
"aa" = (/turf/open/space/basic,/area/space)
"ab" = (/obj/structure/lattice,/turf/open/space,/area/space)
"ac" = (/turf/open/space,/area/space/nearstation)
"ad" = (/turf/closed/wall/r_wall,/area/maintenance/maintcentral)
@@ -139,7 +139,7 @@
"cI" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/open/floor/plasteel/arrival{dir = 8},/area/hallway/secondary/entry)
"cJ" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/open/floor/plasteel/arrival{dir = 10},/area/hallway/secondary/entry)
"cK" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/rods{amount = 50},/obj/machinery/light,/turf/open/floor/plasteel/arrival,/area/hallway/secondary/entry)
"cL" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3;pixel_y = 7},/obj/item/weapon/pen,/turf/open/floor/plasteel/arrival,/area/hallway/secondary/entry)
"cL" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3;pixel_y = 7},/turf/open/floor/plasteel/arrival,/area/hallway/secondary/entry)
"cM" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/regular,/obj/item/device/healthanalyzer,/turf/open/floor/plasteel/arrival,/area/hallway/secondary/entry)
"cN" = (/turf/closed/wall/r_wall,/area/construction)
"cO" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/closed/wall/r_wall,/area/construction)
_maps/map_files/generic/Centcomm.dmm
+46 -116
View File
@@ -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
_maps/map_files/generic/Space.dmm
+1 -1
View File
@@ -1,4 +1,4 @@
"a" = (/turf/open/space,/area/space)
"a" = (/turf/open/space/basic,/area/space)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
_maps/map_files/generic/SpaceDock.dmm
+1 -1
View File
@@ -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) = {"
_maps/shuttles/emergency_bar.dmm
+1 -1
View File
@@ -250,7 +250,7 @@
"aN" = (
/obj/structure/chair/stool/bar{
can_buckle = 1;
name = "buckable bar stool"
name = "buckleable bar stool"
},
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)