diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index 3349bd433f..a5cab0546f 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -36,7 +36,7 @@ var/vore_stomach_flavor // The flavortext for the first belly if not the default var/vore_default_item_mode = IM_DIGEST_FOOD //How belly will interact with items - var/vore_default_contaminates = TRUE //Will it contaminate? + var/vore_default_contaminates = FALSE //Will it contaminate? var/vore_default_contamination_flavor = "Generic" //Contamination descriptors var/vore_default_contamination_color = "green" //Contamination color diff --git a/code/modules/recycling/disposal_vr.dm b/code/modules/recycling/disposal_vr.dm new file mode 100644 index 0000000000..b1d09cfa97 --- /dev/null +++ b/code/modules/recycling/disposal_vr.dm @@ -0,0 +1,12 @@ +/obj/machinery/disposal/wall/cleaner + name = "resleeving equipment deposit" + desc = "Automatically cleans and transports items to the local resleeving facilities." + icon = 'icons/obj/pipes/disposal_vr.dmi' + icon_state = "bluewall" + +/obj/machinery/disposal/wall/cleaner/flush() + flick("[icon_state]-flush", src) + for(var/obj/item/i in src) + if(istype(i, /obj/item)) + i.decontaminate() + . = ..() \ No newline at end of file diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 351ca2191e..554dac57f1 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -147,7 +147,7 @@ "Their %belly looks larger than usual.") var/item_digest_mode = IM_DIGEST_FOOD // Current item-related mode from item_digest_modes - var/contaminates = TRUE // Whether the belly will contaminate stuff + var/contaminates = FALSE // Whether the belly will contaminate stuff var/contamination_flavor = "Generic" // Determines descriptions of contaminated items var/contamination_color = "green" // Color of contamination overlay diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 362e74502f..a84bbd4526 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -701,7 +701,7 @@ host.vore_selected.item_digest_mode = new_mode host.vore_selected.items_preserved.Cut() //Re-evaltuate all items in belly on belly-mode change . = TRUE - if("b_contaminates") + if("b_contaminate") host.vore_selected.contaminates = !host.vore_selected.contaminates . = TRUE if("b_contamination_flavor") diff --git a/icons/obj/pipes/disposal_vr.dmi b/icons/obj/pipes/disposal_vr.dmi new file mode 100644 index 0000000000..71c05c2871 Binary files /dev/null and b/icons/obj/pipes/disposal_vr.dmi differ diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index b143563843..3ad0e1b8c4 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -574,6 +574,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "bB" = ( @@ -669,6 +673,10 @@ /obj/structure/sign/painting/library_secure{ pixel_x = 30 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) "bO" = ( @@ -1767,9 +1775,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) @@ -1873,11 +1880,11 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/eva) "eI" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/westspur) +/turf/simulated/floor/tiled/dark, +/area/groundbase/medical/resleeving) "eJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ @@ -2283,6 +2290,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "fQ" = ( @@ -2539,6 +2550,15 @@ /obj/structure/railing/grey, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/northspur) +"gu" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/groundbase/medical/lhallway) "gv" = ( /turf/simulated/wall/r_wall, /area/groundbase/security/hos) @@ -2586,6 +2606,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/northspur) "gC" = ( @@ -3587,6 +3611,10 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/westspur) "jj" = ( @@ -3848,6 +3876,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "jS" = ( @@ -3855,10 +3887,11 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "jT" = ( -/obj/machinery/washing_machine, +/obj/structure/disposaloutlet, /obj/machinery/light{ dir = 1 }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "jU" = ( @@ -4114,6 +4147,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c{ outdoors = 0 }, @@ -4178,6 +4214,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "kF" = ( @@ -4357,6 +4394,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "kX" = ( @@ -5528,6 +5568,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) "nR" = ( @@ -5585,6 +5628,18 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/iaa2) +"nZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "ob" = ( /obj/effect/landmark/vines, /turf/simulated/floor/outdoors/grass/virgo3c, @@ -6049,6 +6104,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "ph" = ( @@ -7961,6 +8020,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/centsquare) "tQ" = ( @@ -8203,6 +8265,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/northspur) "uv" = ( @@ -8381,6 +8446,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "uV" = ( @@ -8962,6 +9031,11 @@ /obj/effect/floor_decal/corner/pink{ dir = 6 }, +/obj/structure/disposalpipe/tagger{ + dir = 2; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) "wn" = ( @@ -9604,6 +9678,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{ outdoors = 0 }, @@ -9792,6 +9869,12 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/disposal/wall/cleaner{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "yi" = ( @@ -9870,6 +9953,7 @@ /obj/machinery/firealarm{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "ys" = ( @@ -9951,6 +10035,19 @@ /obj/structure/sign/department/ass, /turf/simulated/wall, /area/groundbase/civilian/toolstorage) +"yC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/pink{ + dir = 6 + }, +/obj/machinery/disposal/wall/cleaner{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "yD" = ( /obj/structure/table/standard, /obj/item/weapon/aiModule/oxygen, @@ -10095,6 +10192,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/centsquare) "yV" = ( @@ -10172,6 +10272,7 @@ /obj/effect/floor_decal/corner/pink{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) "zd" = ( @@ -10617,6 +10718,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "Ab" = ( @@ -10823,6 +10928,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "AC" = ( @@ -10913,6 +11022,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level1/westspur) "AN" = ( @@ -11009,6 +11119,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "Bd" = ( @@ -11128,6 +11241,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c{ outdoors = 0 }, @@ -11985,6 +12101,18 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) +"Dy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/medical/lhallway) "Dz" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -12514,6 +12642,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/civilian/bar) "ET" = ( @@ -12671,6 +12802,9 @@ /obj/effect/floor_decal/corner/pink{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) "Fm" = ( @@ -13011,6 +13145,22 @@ /obj/machinery/firealarm, /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) +"Gj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level1/centsquare) "Gk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/tiled/dark, @@ -13114,6 +13264,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) "Gu" = ( @@ -13138,6 +13291,15 @@ /obj/item/device/geiger, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) +"Gx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/outdoors/sidewalk/virgo3c, +/area/groundbase/level1/centsquare) "Gy" = ( /obj/structure/cable{ icon_state = "1-2" @@ -13437,6 +13599,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "Hl" = ( @@ -13689,9 +13852,10 @@ /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/centsquare) "HN" = ( -/obj/machinery/disposal/wall{ +/obj/machinery/disposal/wall/cleaner{ + desc = "Automatically cleans and transports items to the local auto-resleeving facilities."; dir = 1; - name = "Auto-Resleeving Item Deposit" + name = "auto-resleeving equipment deposit" }, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/white, @@ -14374,6 +14538,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "JE" = ( @@ -14424,6 +14592,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/resleeving) "JK" = ( @@ -14565,6 +14734,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "JZ" = ( @@ -14786,6 +14958,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "Kv" = ( @@ -15433,9 +15606,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/westspur) @@ -15699,6 +15872,7 @@ /area/groundbase/medical/resleeving) "MG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "MI" = ( @@ -16025,6 +16199,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) "NA" = ( @@ -16138,6 +16315,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/northspur) "NN" = ( @@ -16372,6 +16552,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "On" = ( @@ -17072,6 +17253,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/bmarble, /area/groundbase/civilian/womensrestroom) "Qq" = ( @@ -17124,6 +17308,21 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/cargo/mining) +"Qy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, +/area/groundbase/level1/centsquare) "Qz" = ( /obj/machinery/gateway{ dir = 10 @@ -17149,6 +17348,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "QC" = ( @@ -17654,6 +17857,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "RR" = ( @@ -17666,6 +17873,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "RS" = ( @@ -18477,6 +18687,12 @@ /obj/item/weapon/circuitboard/partslathe, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) +"TM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level1/centsquare) "TN" = ( /obj/machinery/computer/rcon{ dir = 1 @@ -18657,6 +18873,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level1/centsquare) "Uk" = ( @@ -18772,6 +18989,10 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) "UC" = ( @@ -19146,6 +19367,17 @@ outdoors = 0 }, /area/maintenance/groundbase/level1/nwtunnel) +"VG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/pink{ + dir = 6 + }, +/obj/structure/sign/painting/library_secure{ + pixel_x = 30 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "VH" = ( /mob/living/simple_mob/vore/alienanimals/catslug/custom/gatslug{ ghostjoin = 1 @@ -19416,6 +19648,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "Ws" = ( @@ -19438,6 +19671,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/bmarble, /area/groundbase/medical/lhallway) "Wu" = ( @@ -19470,6 +19706,11 @@ dir = 8 }, /obj/machinery/light, +/obj/structure/disposalpipe/tagger{ + dir = 8; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "WA" = ( @@ -19540,6 +19781,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "WI" = ( @@ -20431,8 +20676,10 @@ "YW" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 4; + name = "Resleeving"; + sortType = "Resleeving" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -20547,6 +20794,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/ce) +"Zf" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level1/centsquare) "Zg" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20554,6 +20808,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/chamber) "Zh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/centsquare) "Zj" = ( @@ -20807,6 +21064,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/resleeving) "ZX" = ( @@ -26697,7 +26955,7 @@ GF ht pJ yI -KR +nZ vE af pj @@ -28158,7 +28416,7 @@ QD QD cB cB -eI +mk YM cB cB @@ -28300,7 +28558,7 @@ QD QD cB cB -eI +mk cB cB cB @@ -28442,7 +28700,7 @@ cB cB cB YM -eI +mk cB cB cB @@ -30139,10 +30397,10 @@ Oz Oz Oz RQ -LA -LA -LA -LA +CH +CH +CH +CH bA LA LA @@ -30816,24 +31074,24 @@ tG gM tG gB -ay -ay -ay -ay -ay -ay -ay +Gx +Gx +Gx +Gx +Gx +Gx +Gx Om -ay -ay -ay -ay -ay -ay -ay -ay -ay -ay +Gx +Gx +Gx +Gx +Gx +Gx +Gx +Gx +Gx +Gx YW ay ay @@ -30853,7 +31111,7 @@ Nv Nv Eb Eb -OA +TM Eb eR eR @@ -31559,11 +31817,11 @@ ay ay ay QB -Vs -Vs -Vs -Vs -OA +lT +lT +lT +lT +Zf ds eR eR @@ -31700,7 +31958,7 @@ Gv Ge Eb Eb -TK +Qy Eb Eb qI @@ -31842,7 +32100,7 @@ eR eR eR eR -TK +Qy Eb Eb Eb @@ -31946,12 +32204,12 @@ jn jn pP wB -wB +eI wB Ap jn IY -Gu +Dy qO nb ZG @@ -31984,7 +32242,7 @@ eR eR eR eR -TK +Qy Eb Nv Eb @@ -32092,7 +32350,7 @@ Aa Wr kE JJ -Fc +gu UA WS ZO @@ -32126,7 +32384,7 @@ pc pc pc eR -TK +Qy Eb Nv Nv @@ -32268,7 +32526,7 @@ pc pc eR eR -TK +Qy Eb Nv Nv @@ -32410,7 +32668,7 @@ pc eR eR eR -TK +Qy Eb Eb Nv @@ -32554,9 +32812,9 @@ Bv Bv WH Ku -ay -ay -QB +Gx +Gx +Gj Nv Eb Eb @@ -33410,9 +33668,9 @@ bg rg bM zc -HO +VG wm -HO +yC gy HO Ue diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 3e9cffc768..b9e9767171 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -478,6 +478,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/bathroom) "bo" = ( @@ -6354,6 +6355,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/groundbase/dorms/bathroom) "sK" = ( @@ -9381,6 +9386,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/tagger{ + dir = 8; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, /turf/simulated/floor/tiled/white, /area/groundbase/dorms/bathroom) "BV" = ( @@ -9452,10 +9462,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) "Cc" = ( @@ -11885,6 +11892,12 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/disposal/wall/cleaner{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/groundbase/dorms/bathroom) "IX" = ( diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm index d8c8e607f1..b256138555 100644 --- a/maps/stellardelight/stellar_delight1.dmm +++ b/maps/stellardelight/stellar_delight1.dmm @@ -327,6 +327,7 @@ /obj/structure/sign/directions/evac{ pixel_x = -32 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "aO" = ( @@ -547,8 +548,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm/angled{ - dir = 4 +/obj/machinery/disposal/wall/cleaner{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) @@ -641,6 +645,7 @@ /obj/structure/sign/painting/public{ pixel_x = -30 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "bv" = ( @@ -986,7 +991,11 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/dark, /area/stellardelight/deck1/resleeving) @@ -1074,7 +1083,7 @@ }, /obj/structure/curtain/open/shower/medical, /obj/structure/window/reinforced{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/stellardelight/deck1/resleeving) @@ -1756,6 +1765,10 @@ /obj/structure/cable/white{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "dQ" = ( @@ -3400,6 +3413,7 @@ /obj/machinery/door/airlock/angled_bay/double/glass{ name = "glass airlock" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/port) "hq" = ( @@ -3720,6 +3734,7 @@ /obj/machinery/power/apc/angled{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "hS" = ( @@ -3802,6 +3817,16 @@ /obj/structure/closet/bombcloset, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) +"ia" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm/angled{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/port) "ib" = ( /obj/machinery/power/pointdefense{ id_tag = "sd_pd" @@ -4151,6 +4176,7 @@ /obj/machinery/camera/network/halls{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "iK" = ( @@ -4228,6 +4254,16 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) +"iR" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "iS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -4809,6 +4845,7 @@ /obj/machinery/alarm/angled{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "kf" = ( @@ -4974,6 +5011,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "kz" = ( @@ -6533,6 +6571,7 @@ /obj/machinery/door/airlock/angled_bay/double/glass{ name = "glass airlock" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/port) "nK" = ( @@ -6684,6 +6723,12 @@ /obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled/dark, /area/security/warden) +"ob" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/port) "oc" = ( /obj/machinery/light{ dir = 4 @@ -6726,9 +6771,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the cleaning room exit."; dir = 4; @@ -6743,6 +6785,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/stellardelight/deck1/resleeving) "oi" = ( @@ -6883,6 +6928,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "oz" = ( @@ -6940,6 +6988,10 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "oD" = ( @@ -7102,6 +7154,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "oW" = ( @@ -7807,6 +7863,7 @@ /obj/structure/sign/deck1{ pixel_x = -32 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "qw" = ( @@ -7982,7 +8039,6 @@ /turf/simulated/floor/carpet, /area/chapel/main) "qR" = ( -/obj/machinery/transhuman/autoresleever, /turf/simulated/floor/tiled/dark, /area/stellardelight/deck1/resleeving) "qS" = ( @@ -8100,6 +8156,7 @@ /obj/structure/sign/painting/public{ pixel_x = -30 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "rf" = ( @@ -8113,6 +8170,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "rh" = ( @@ -8771,6 +8829,18 @@ }, /turf/simulated/wall/bay/r_wall/steel, /area/security/armoury) +"sw" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/port) "sx" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -9769,6 +9839,7 @@ dir = 8; pixel_x = -27 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "uH" = ( @@ -10554,6 +10625,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "wv" = ( @@ -11068,6 +11140,16 @@ }, /turf/simulated/floor/wood, /area/library) +"xC" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/port) "xD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -13871,6 +13953,7 @@ /obj/machinery/newscaster{ pixel_x = -29 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "Ds" = ( @@ -14445,20 +14528,9 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck1/paramedic) "EN" = ( -/obj/structure/mirror{ - pixel_y = 38 - }, -/obj/structure/sink{ - pixel_y = 20 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/toilet) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/port) "EO" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 @@ -14512,6 +14584,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "EU" = ( @@ -14767,6 +14840,9 @@ name = "Unisex Restrooms"; stripe_color = "#89bd66" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/toilet) "Fv" = ( @@ -15434,6 +15510,7 @@ /obj/structure/sign/painting/library_secure{ pixel_y = 30 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/stellardelight/deck1/resleeving) "Ha" = ( @@ -15515,6 +15592,10 @@ /area/maintenance/stellardelight/deck1/portcent) "Hi" = ( /obj/machinery/computer/timeclock/premade/west, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "Hj" = ( @@ -16421,6 +16502,7 @@ pixel_x = -32; pixel_y = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "IX" = ( @@ -16660,6 +16742,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "JB" = ( @@ -16888,12 +16971,11 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/oreprocessing) "Kc" = ( -/obj/machinery/washing_machine, -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/item/device/radio/intercom{ dir = 1; pixel_y = 24 }, +/obj/machinery/transhuman/autoresleever, /turf/simulated/floor/tiled/dark, /area/stellardelight/deck1/resleeving) "Kd" = ( @@ -16903,6 +16985,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "Ke" = ( @@ -17628,6 +17711,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "LD" = ( @@ -17788,9 +17872,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -17798,6 +17879,11 @@ dir = 4 }, /obj/machinery/alarm/angled, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Resleeving"; + sortType = "Resleeving" + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "LW" = ( @@ -17976,6 +18062,9 @@ "Mq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "Mr" = ( @@ -18091,6 +18180,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "MJ" = ( @@ -19577,6 +19667,12 @@ /area/crew_quarters/toilet) "PV" = ( /obj/machinery/light/small, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/stellardelight/deck1/resleeving) "PW" = ( @@ -19661,6 +19757,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "Qg" = ( @@ -19788,6 +19885,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "Qw" = ( @@ -19979,6 +20077,7 @@ dir = 8; pixel_x = 24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "QU" = ( @@ -20190,6 +20289,9 @@ req_access = list(5); stripe_color = "#5a96bb" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/resleeving) "Ro" = ( @@ -20442,6 +20544,12 @@ /obj/machinery/alarm/angled{ dir = 8 }, +/obj/machinery/disposal/wall/cleaner{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "RL" = ( @@ -20588,6 +20696,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 4 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "Sb" = ( @@ -20849,6 +20958,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "SH" = ( @@ -22859,6 +22969,7 @@ /obj/machinery/camera/network/halls{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "WA" = ( @@ -23475,6 +23586,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "XQ" = ( @@ -24018,6 +24132,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "YT" = ( @@ -24428,6 +24543,7 @@ dir = 4; pixel_x = -32 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "ZP" = ( @@ -32003,7 +32119,7 @@ Ki IY vd IY -EN +Um XP NH in @@ -32571,7 +32687,7 @@ oC ky QS SG -LR +iR RK NH Ew @@ -32850,9 +32966,9 @@ rg JA wu Kd -rg +ia Sa -rg +xC hR ke rg @@ -32979,7 +33095,7 @@ jJ qm Vw ug -YT +ob nS Ov zM @@ -32994,7 +33110,7 @@ ut WK wW oU -WK +sw Jv cK qy @@ -33121,7 +33237,7 @@ ew AG ms CZ -CZ +ms hk YF YF @@ -33135,7 +33251,7 @@ KF KF KF uk -YT +ob HW TT Fk @@ -33263,7 +33379,7 @@ YT WF Pt SL -YT +ob Je YF Vv @@ -33277,7 +33393,7 @@ TN pm KF kU -YT +ob BI Wf Jt @@ -33403,9 +33519,9 @@ Ku hY Ku LV -YT -YT -YT +EN +EN +Pt Sh Wn SY @@ -33561,7 +33677,7 @@ Li WW KF uS -YT +ob YT cO cd diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm index 885fec6121..11b77c12a5 100644 --- a/maps/stellardelight/stellar_delight2.dmm +++ b/maps/stellardelight/stellar_delight2.dmm @@ -3281,6 +3281,10 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "he" = ( @@ -3547,7 +3551,6 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portfore) "hP" = ( -/obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/industrial/outline, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -3559,11 +3562,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/item/clothing/shoes/black, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/device/communicator, +/obj/machinery/disposal/wall/cleaner{ + dir = 4 + }, /turf/simulated/floor/holofloor/tiled/dark, /area/crew_quarters/locker) "hQ" = ( @@ -3587,6 +3591,15 @@ /obj/effect/floor_decal/milspec/cargo, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) +"hT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/tagger{ + dir = 2; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker) "hU" = ( /obj/structure/disposalpipe/tagger/partial{ dir = 8; @@ -4213,6 +4226,14 @@ }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) +"jw" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/angled_bay/standard/glass{ + name = "glass airlock" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel_ridged, +/area/stellardelight/deck2/port) "jx" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4334,6 +4355,12 @@ }, /turf/simulated/floor/wood, /area/medical/psych) +"jJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/fore) "jK" = ( /obj/structure/table/glass, /obj/machinery/camera/network/medbay{ @@ -4492,6 +4519,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "ke" = ( @@ -5072,6 +5100,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "lk" = ( @@ -7826,6 +7858,9 @@ /obj/effect/floor_decal/emblem/stellardelight{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "rk" = ( @@ -8126,6 +8161,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "rR" = ( @@ -8166,6 +8205,9 @@ name = "Laundry"; stripe_color = "#89bd66" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/locker) "rY" = ( @@ -9312,6 +9354,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "uF" = ( @@ -9423,6 +9468,10 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/atmos) +"uT" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/fore) "uU" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -10020,6 +10069,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "wu" = ( @@ -10158,6 +10208,9 @@ /obj/effect/floor_decal/emblem/stellardelight{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "wL" = ( @@ -10325,6 +10378,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "xh" = ( @@ -10662,6 +10716,15 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/stellardelight/deck2/combustionworkshop) +"xT" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/fore) "xU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -11497,6 +11560,18 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) +"zP" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/port) "zQ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -12685,6 +12760,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "CG" = ( @@ -14240,6 +14319,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "FV" = ( @@ -14618,6 +14700,9 @@ dir = 8 }, /obj/effect/floor_decal/emblem/stellardelight/center, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "GJ" = ( @@ -14981,8 +15066,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) +"Hz" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/angled_bay/hatch{ + name = "maintenance access"; + stripe_color = "#454545" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/stellardelight/deck2/port) "HA" = ( /obj/item/device/radio/intercom{ dir = 1; @@ -15599,6 +15703,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "IL" = ( @@ -17125,6 +17232,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "Mj" = ( @@ -19348,6 +19458,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "QY" = ( @@ -19699,6 +19812,10 @@ }, /turf/simulated/floor/tiled/eris/white/cargo, /area/stellardelight/deck2/triage) +"RR" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/port) "RS" = ( /obj/structure/cable/blue{ icon_state = "1-8" @@ -20135,6 +20252,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "SV" = ( @@ -20978,6 +21096,12 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) +"UR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/bay/r_wall/steel, +/area/stellardelight/deck2/port) "US" = ( /obj/machinery/door/firedoor/glass/hidden/steel, /obj/structure/sign/directions/bar{ @@ -21775,6 +21899,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "WI" = ( @@ -21995,6 +22120,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "Xj" = ( @@ -22763,6 +22891,13 @@ "YU" = ( /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) +"YV" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/port) "YW" = ( /obj/random/vendordrink, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -31129,7 +31264,7 @@ AR KK bP kK -Rp +Hz gm PG PG @@ -31271,7 +31406,7 @@ mS KK mY qy -Bw +UR Aa sg sg @@ -31413,7 +31548,7 @@ jo KK Bw Bw -Bw +UR pw Yk Ce @@ -31555,7 +31690,7 @@ Qe nS Vw eL -pA +zP VP VP VP @@ -31693,11 +31828,11 @@ XO XO XO hd -sO -sO -Vw -Ve -Ve +uT +uT +jw +RR +YV VP VP VP @@ -34518,20 +34653,20 @@ iy mV XC rQ -ZM -ZM -ZM -ZM -ZM +xT +xT +xT +xT +xT kd SU -ZM +xT WH -ZM -ZM -ZM +xT +xT +xT xg -ji +jJ lj ji ji @@ -34945,7 +35080,7 @@ Rm WZ CF wt -eM +hT hP fl ZA diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 841506ae97..9cd83ea37d 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -2847,7 +2847,8 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/disposal/wall{ +/obj/machinery/disposal/wall/cleaner{ + desc = "Automatically cleans and transports items to the local auto-resleeving facilities."; dir = 8; name = "auto-resleeving equipment deposit" }, @@ -27305,6 +27306,10 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 4 }, +/obj/machinery/disposal/wall/cleaner{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "aUm" = ( @@ -27408,6 +27413,10 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aUt" = ( @@ -27444,6 +27453,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aUv" = ( @@ -27632,6 +27642,11 @@ /obj/effect/floor_decal/corner/white/bordercorner2{ dir = 5 }, +/obj/structure/disposalpipe/tagger{ + dir = 2; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "aUP" = ( @@ -27756,7 +27771,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 10 }, @@ -27776,6 +27793,10 @@ dir = 9 }, /obj/effect/landmark/vines, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "aVd" = ( @@ -28049,9 +28070,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -28071,6 +28092,9 @@ /obj/effect/floor_decal/corner/grey/border{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVB" = ( @@ -28091,6 +28115,9 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVC" = ( @@ -28276,6 +28303,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVQ" = ( @@ -28815,6 +28843,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aXa" = ( @@ -30797,6 +30826,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "bcl" = ( @@ -30945,6 +30975,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "bcG" = ( @@ -33259,6 +33290,10 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "gAn" = ( @@ -33920,6 +33955,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "igw" = ( @@ -34640,6 +34676,11 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/tagger{ + dir = 4; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "kuB" = ( @@ -39025,6 +39066,21 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/atmos/airlock/gas) +"wxO" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/machinery/disposal/wall/cleaner{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "wzA" = ( /obj/structure/catwalk, /obj/machinery/alarm{ @@ -55319,7 +55375,7 @@ aUP aXb aUm bcH -bcJ +wxO bcN aUm aUm diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 35d25f9501..22d24ad6cf 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -84,6 +84,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aah" = ( @@ -183,6 +186,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aap" = ( @@ -197,6 +203,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aaq" = ( @@ -313,6 +323,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aaA" = ( @@ -375,6 +386,7 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aaF" = ( @@ -463,6 +475,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aaM" = ( @@ -878,6 +891,7 @@ "abj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "abk" = ( @@ -1221,10 +1235,11 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/medical/cmo) "abK" = ( -/obj/machinery/washing_machine, /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "abL" = ( @@ -1372,6 +1387,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "abV" = ( @@ -1744,6 +1760,7 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "acF" = ( @@ -1818,6 +1835,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acK" = ( @@ -1827,6 +1848,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acL" = ( @@ -1994,6 +2018,9 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acY" = ( @@ -2012,6 +2039,9 @@ name = "Resleeving Lab"; req_access = list(5) }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acZ" = ( @@ -2155,6 +2185,10 @@ /obj/machinery/shower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "adk" = ( @@ -2169,6 +2203,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "adl" = ( @@ -2181,6 +2218,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "adm" = ( @@ -2263,6 +2303,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "ads" = ( @@ -2270,6 +2313,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "adt" = ( @@ -2414,6 +2461,7 @@ /obj/structure/flora/skeleton{ name = "\proper Sheb" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "adK" = ( @@ -2850,6 +2898,7 @@ "aes" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aet" = ( @@ -3304,6 +3353,9 @@ dir = 4 }, /obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "afh" = ( @@ -4502,6 +4554,7 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "agY" = ( @@ -4534,6 +4587,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/tether/surfacebase/medical/centralhall) "ahb" = ( @@ -14447,6 +14501,7 @@ pixel_x = 5; pixel_y = 29 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "axw" = ( @@ -32800,6 +32855,7 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "cMd" = ( @@ -33044,6 +33100,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +"fDK" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) "fIS" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/glass, @@ -33532,6 +33592,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) +"kvN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "kAa" = ( /obj/machinery/porta_turret/ai_defense, /obj/effect/floor_decal/techfloor{ @@ -33844,6 +33919,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) +"nyJ" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall, +/area/tether/surfacebase/medical/breakroom) "nAh" = ( /obj/structure/table/standard, /obj/item/weapon/aiModule/asimov, @@ -33893,6 +33972,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, /obj/item/weapon/deck/cah, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "nSl" = ( @@ -34184,6 +34264,16 @@ "rlN" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +"rnx" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/green/border, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 4; + name = "Resleeving"; + sortType = "Resleeving" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "roB" = ( /obj/structure/cable{ d1 = 1; @@ -34448,6 +34538,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "tfK" = ( @@ -34605,6 +34696,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "usS" = ( @@ -34645,6 +34737,10 @@ }, /turf/simulated/floor/bluegrid, /area/ai) +"uDI" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall, +/area/tether/surfacebase/medical/resleeving) "uFL" = ( /obj/structure/railing{ dir = 1 @@ -35049,6 +35145,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "xWd" = ( @@ -45874,7 +45971,7 @@ aab ahc abK abU -abU +uDI acE adj adX @@ -47452,17 +47549,17 @@ unM nPO axv adJ -ajG -anC +nyJ +fDK sZp -anC -anC +fDK +fDK xSO -anC -anC -axp -ayd -ayI +fDK +fDK +kvN +azC +rnx azc azI aAk diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 8af1218af8..be5642fd3b 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -5858,6 +5858,10 @@ }, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/lightgrey/bordercorner2, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aiH" = ( @@ -5872,6 +5876,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/tagger{ + dir = 2; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_restroom) "aiI" = ( @@ -10493,6 +10502,10 @@ d2 = 8; icon_state = "0-8" }, +/obj/machinery/disposal/wall/cleaner, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) "aqE" = ( @@ -13048,6 +13061,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "avk" = ( @@ -16464,6 +16481,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aAG" = ( @@ -16473,6 +16493,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aAH" = ( @@ -21035,6 +21058,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aIg" = ( @@ -22268,7 +22294,9 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aKr" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aKs" = ( @@ -27949,6 +27977,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aVx" = ( @@ -32913,6 +32942,11 @@ pixel_x = -28; pixel_y = 29 }, +/obj/structure/disposalpipe/tagger{ + dir = 2; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "beh" = ( @@ -33535,6 +33569,9 @@ "bfl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bfn" = ( @@ -33619,6 +33656,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bfu" = ( @@ -34024,6 +34064,10 @@ name = "north bump"; pixel_y = 24 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bgk" = ( @@ -34387,6 +34431,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bgS" = ( @@ -37173,6 +37220,10 @@ d2 = 8; icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "bnF" = ( @@ -39688,6 +39739,7 @@ /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/barrestroom) "ioG" = ( @@ -41437,6 +41489,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) "oqz" = ( @@ -42860,6 +42916,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +"sUg" = ( +/obj/machinery/disposal/wall/cleaner{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "sVC" = ( /obj/machinery/door/firedoor/glass/hidden/shuttle, /obj/machinery/door/blast/shuttle/open{ @@ -42959,6 +43024,23 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"twM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "txo" = ( /obj/structure/cable/green{ d1 = 2; @@ -53310,7 +53392,7 @@ amw amw akZ apr -apQ +twM aiG afj aqD @@ -60868,7 +60950,7 @@ bgH asX aGK qum -aTE +sUg aGK bfM aGK diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 24fc7c1c79..749e3f0c21 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -1891,6 +1891,9 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/station/restroom) "adk" = ( @@ -1999,6 +2002,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/station/restroom) "adr" = ( @@ -5902,6 +5908,12 @@ /obj/structure/sink{ pixel_y = 20 }, +/obj/machinery/disposal/wall/cleaner{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/station/restroom) "amJ" = ( @@ -11321,6 +11333,11 @@ /obj/structure/sink{ pixel_y = 20 }, +/obj/structure/disposalpipe/tagger{ + dir = 4; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, /turf/simulated/floor/tiled/white, /area/tether/station/restroom) "aDR" = ( @@ -11681,6 +11698,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/station/restroom) "aFJ" = ( @@ -17441,7 +17461,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -17453,6 +17472,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "dzT" = ( @@ -29142,6 +29162,10 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/station/restroom) "oRO" = ( @@ -29819,6 +29843,10 @@ /obj/machinery/vending/wallmed1/public{ pixel_y = 28 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/station/restroom) "pOc" = ( diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 7b85f946b7..ebb03d86b3 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -430,7 +430,7 @@ const VoreSelectedBellyOptions = (props, context) => {