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,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
|
||||
"}
|
||||
@@ -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{
|
||||
|
||||
Reference in New Issue
Block a user