Merge branch 'master' into SpaceRuins

This commit is contained in:
BlackMajor
2020-02-25 16:51:39 +13:00
94 changed files with 2078 additions and 1705 deletions
@@ -31389,6 +31389,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bzg" = (
@@ -55013,6 +55014,10 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
"jUN" = (
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"jVl" = (
/obj/structure/cable{
icon_state = "4-8"
+18 -1
View File
@@ -86375,6 +86375,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/storage)
"cPF" = (
@@ -127461,6 +127462,22 @@
/obj/machinery/light/small,
/turf/open/floor/plasteel,
/area/security/prison)
"vEq" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/storage)
"wei" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
@@ -174855,7 +174872,7 @@ cAm
cKO
cMm
cNO
cPF
vEq
cRi
cSV
cUN
@@ -52211,6 +52211,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/storage)
"bZZ" = (
@@ -54651,6 +54652,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/storage)
"cez" = (
+15 -2
View File
@@ -2034,6 +2034,13 @@
/obj/structure/stone_tile,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"DQ" = (
/obj/structure/stone_tile{
dir = 4
},
/obj/item/book/granter/crafting_recipe/bone_bow,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"Ef" = (
/obj/structure/stone_tile/block/cracked,
/turf/open/lava/smooth{
@@ -2401,6 +2408,7 @@
},
/obj/structure/table/wood,
/obj/item/kitchen/knife/combat/bone,
/obj/item/book/granter/crafting_recipe/bone_bow,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"TN" = (
@@ -2507,6 +2515,11 @@
/obj/structure/stone_tile/surrounding_tile/cracked,
/turf/closed/mineral/volcanic/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"WA" = (
/obj/structure/stone_tile/block/cracked,
/obj/item/book/granter/crafting_recipe/bone_bow,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"WL" = (
/obj/structure/stone_tile{
dir = 4
@@ -57415,7 +57428,7 @@ Ds
Ds
KV
nI
Ad
DQ
Si
aa
ab
@@ -57915,7 +57928,7 @@ aa
aa
Rk
Si
sR
WA
rz
qh
pq
+13 -2
View File
@@ -57031,6 +57031,10 @@
},
/turf/open/floor/engine,
/area/science/xenobiology)
"naS" = (
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"ncm" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
@@ -61095,6 +61099,13 @@
},
/turf/open/floor/wood,
/area/lawoffice)
"wtE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"wun" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -88795,7 +88806,7 @@ bzQ
ioj
bsA
bEw
bkh
naS
bkh
bId
bFO
@@ -89566,7 +89577,7 @@ bBc
bCm
bDr
bEz
bnF
wtE
buh
bIg
bjc