Merge pull request #8908 from Cerebulon/xenotrash

Xeno Trash Of The Galaxy
This commit is contained in:
Spookerton
2023-02-04 20:41:05 +00:00
committed by GitHub
+130 -8
View File
@@ -484,6 +484,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/surface/outpost/research/xenoarcheology)
"bc" = (
@@ -1494,6 +1495,9 @@
d2 = 8;
icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"dk" = (
@@ -2173,6 +2177,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/neutral,
/area/surface/outpost/research/xenoarcheology/entrance)
"eG" = (
@@ -2819,6 +2826,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/surface/outpost/research/xenoarcheology/entrance)
"gh" = (
@@ -3046,6 +3054,7 @@
/obj/random/tool,
/obj/random/tool,
/obj/item/storage/briefcase/inflatable,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"gI" = (
@@ -3686,6 +3695,9 @@
icon_state = "4-8"
},
/obj/structure/anomaly_container,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"hX" = (
@@ -5605,6 +5617,9 @@
/obj/structure/bed/chair/office/dark{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/neutral,
/area/surface/outpost/research/xenoarcheology/entrance)
"lR" = (
@@ -5820,6 +5835,10 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"mh" = (
@@ -6023,6 +6042,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/surface/outpost/research/xenoarcheology/entrance)
"mA" = (
@@ -6134,6 +6154,10 @@
icon_state = "1-2"
},
/obj/effect/catwalk_plated/white,
/obj/machinery/disposal{
name = "non-hazardous waste disposal unit"
},
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology)
"mM" = (
@@ -8560,6 +8584,19 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/surface/station/hallway/primary/bmt/north)
"rT" = (
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/effect/floor_decal/rust,
/obj/effect/floor_decal/milspec/box,
/obj/structure/closet/crate/trashcart{
opened = 1
},
/turf/simulated/floor/plating/sif/planetuse{
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology/smes)
"rU" = (
/obj/machinery/portable_atmospherics/powered/scrubber,
/obj/structure/cable/cyan{
@@ -9580,6 +9617,7 @@
dir = 4;
pixel_x = -22
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"tX" = (
@@ -10624,6 +10662,9 @@
name = "Xenoarchelogy Maintenance";
req_one_access = list(11,24,47)
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"wm" = (
@@ -10712,6 +10753,7 @@
icon_state = "1-2"
},
/obj/machinery/meter,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"wt" = (
@@ -11026,6 +11068,20 @@
},
/turf/simulated/floor/plating,
/area/surface/station/maintenance/security)
"xd" = (
/obj/effect/floor_decal/rust,
/obj/effect/floor_decal/industrial/warning/dust{
dir = 4
},
/obj/effect/floor_decal/rust/part_rusted3{
dir = 8
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
initial_flooring = /decl/flooring/tiling/steel_dirty;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology/smes)
"xe" = (
/obj/structure/cable{
d1 = 1;
@@ -11707,6 +11763,10 @@
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"yB" = (
@@ -12447,6 +12507,7 @@
dir = 5
},
/obj/effect/floor_decal/steeldecal/steel_decals_central5,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/neutral,
/area/surface/outpost/research/xenoarcheology)
"Ad" = (
@@ -12699,6 +12760,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/neutral,
/area/surface/outpost/research/xenoarcheology/entrance)
"AC" = (
@@ -12878,6 +12942,7 @@
dir = 10
},
/obj/machinery/hologram/holopad,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/neutral,
/area/surface/outpost/research/xenoarcheology/entrance)
"AS" = (
@@ -12997,6 +13062,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"Be" = (
@@ -13214,6 +13282,7 @@
icon_state = "1-2"
},
/obj/effect/catwalk_plated/white,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology)
"Bw" = (
@@ -13304,6 +13373,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/surface/outpost/research/xenoarcheology/entrance)
"BJ" = (
@@ -13864,6 +13936,10 @@
/obj/random/powercell,
/obj/random/maintenance/clean,
/obj/random/maintenance/clean,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"CT" = (
@@ -15753,6 +15829,10 @@
/obj/machinery/cell_charger,
/turf/simulated/floor/plating,
/area/surface/station/engineering/auxiliary_engineering)
"Hh" = (
/obj/structure/grille,
/turf/simulated/mineral/floor/ignore_mapgen/sif,
/area/surface/outpost/research/xenoarcheology/smes)
"Hi" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/wall/concrete,
@@ -17532,6 +17612,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/neutral,
/area/surface/outpost/research/xenoarcheology)
"Lb" = (
@@ -17761,6 +17842,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/surface/outpost/research/xenoarcheology/entrance)
"LD" = (
@@ -17791,6 +17873,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"LI" = (
@@ -18262,6 +18347,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/neutral,
/area/surface/outpost/research/xenoarcheology/entrance)
"MH" = (
@@ -18404,6 +18492,7 @@
d2 = 4;
icon_state = "2-4"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/surface/outpost/research/xenoarcheology)
"MW" = (
@@ -18517,6 +18606,7 @@
/turf/simulated/floor/plating,
/area/surface/station/maintenance/security)
"Nh" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"Ni" = (
@@ -19175,6 +19265,21 @@
/obj/machinery/space_heater,
/turf/simulated/floor/plating,
/area/surface/station/maintenance/incineratormaint)
"Ox" = (
/obj/effect/floor_decal/rust,
/obj/structure/sign/warning/moving_parts{
pixel_y = 32
},
/obj/machinery/door/window/eastleft{
name = "Garbage Outlet";
req_one_access = list(65, 26)
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
initial_flooring = /decl/flooring/tiling/steel_dirty;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology/smes)
"Oy" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4
@@ -19388,6 +19493,10 @@
icon_state = "1-8"
},
/obj/effect/catwalk_plated/white,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/entrance)
"OQ" = (
@@ -20145,6 +20254,10 @@
/obj/machinery/ai_status_display,
/turf/simulated/wall/r_wall,
/area/surface/outpost/research/xenoarcheology/analysis)
"Qm" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/wall/r_wall,
/area/surface/outpost/research/xenoarcheology/smes)
"Qo" = (
/obj/structure/sign/warning/fire,
/turf/simulated/wall/r_wall,
@@ -20825,6 +20938,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/surface/outpost/research/xenoarcheology/entrance)
"RF" = (
@@ -21068,6 +21182,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 4
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/surface/outpost/research/xenoarcheology/entrance)
"Sc" = (
@@ -21530,6 +21645,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"Tf" = (
@@ -23546,6 +23662,9 @@
icon_state = "4-8"
},
/obj/random/mob/mouse,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/surface/outpost/research/xenoarcheology/smes)
"Xx" = (
@@ -23696,6 +23815,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/neutral,
/area/surface/outpost/research/xenoarcheology/entrance)
"XQ" = (
@@ -51563,8 +51685,8 @@ Iw
Bd
fU
aW
HE
HE
Hh
Hh
HE
HE
HE
@@ -51819,9 +51941,9 @@ tK
Rr
mg
Nh
aW
HE
HE
Qm
rT
Hh
HE
HE
HE
@@ -52077,8 +52199,8 @@ Yj
PH
ys
aW
HE
HE
Ox
Hh
HE
HE
HE
@@ -52334,7 +52456,7 @@ gt
aW
bl
aW
HE
xd
HE
HE
HE