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/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" = (