From 5581849bfb02572e4e8e117623b558b5dbbb4e7f Mon Sep 17 00:00:00 2001 From: Ghommie Date: Mon, 22 Jul 2019 11:46:56 +0200 Subject: [PATCH 1/3] Fixex Pubby Disposal. --- _maps/map_files/PubbyStation/PubbyStation.dmm | 125 +++++++++--------- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 0166dd6a84..5acfaaa16c 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -40,6 +40,58 @@ /obj/effect/spawner/lootdrop/bedsheet, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) +"aaf" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "garbage" + }, +/turf/open/floor/plating, +/area/maintenance/disposal) +"aag" = ( +/obj/machinery/mineral/stacking_unit_console{ + dir = 2; + machinedir = 8; + pixel_x = -32; + pixel_y = 32 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "EngLoad" + }, +/turf/open/floor/plating, +/area/maintenance/disposal) +"aah" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "EngLoad" + }, +/turf/open/floor/plating, +/area/maintenance/disposal) +"aai" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 1; + id = "garbage" + }, +/turf/open/floor/plating, +/area/maintenance/disposal) +"aaj" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, +/turf/open/floor/plating, +/area/maintenance/disposal) +"aak" = ( +/obj/machinery/recycler, +/obj/machinery/conveyor{ + dir = 4; + id = "garbage" + }, +/turf/open/floor/plating, +/area/maintenance/disposal) "abf" = ( /obj/structure/bed, /turf/open/floor/plating, @@ -16687,13 +16739,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"aNV" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "EngLoad" - }, -/turf/open/floor/plating, -/area/maintenance/disposal) "aNX" = ( /obj/machinery/disposal/deliveryChute{ dir = 8 @@ -17561,16 +17606,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"aQo" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/conveyor{ - dir = 2; - id = "garbage" - }, -/turf/open/floor/plating, -/area/maintenance/disposal) "aQp" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -51263,14 +51298,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) -"cvf" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "garbage" - }, -/obj/machinery/recycler, -/turf/open/floor/plating, -/area/maintenance/disposal) "cvg" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/brflowers, @@ -53693,19 +53720,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"eFG" = ( -/obj/machinery/mineral/stacking_unit_console{ - dir = 2; - machinedir = 8; - pixel_x = -32; - pixel_y = 32 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "EngLoad" - }, -/turf/open/floor/plating, -/area/maintenance/disposal) "eHI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, @@ -59043,14 +59057,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"rax" = ( -/obj/machinery/conveyor{ - icon_state = "conveyor_map"; - dir = 1; - id = "EngLoad" - }, -/turf/open/floor/plating, -/area/maintenance/disposal) "reH" = ( /obj/item/reagent_containers/food/drinks/bottle/vodka, /obj/structure/disposalpipe/segment{ @@ -61508,13 +61514,6 @@ /obj/structure/sign/warning/vacuum/external, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) -"xer" = ( -/obj/machinery/conveyor{ - dir = 2; - id = "garbage" - }, -/turf/open/floor/plating, -/area/maintenance/disposal) "xeB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, @@ -107513,8 +107512,8 @@ aaa aaa aLn aNT -xer -aQo +aaf +aai aPg aRu srZ @@ -107771,7 +107770,7 @@ aaa aLm aLm aNU -aNV +aaj dqY aRv sZh @@ -108027,8 +108026,8 @@ aaa aaa aLm aME -eFG -aNV +aag +aaj dqY aRw sqQ @@ -108284,9 +108283,9 @@ aaa aaa aLo aMF -aNV -aNV -cvf +aah +aaj +aak aQn sqQ aSm @@ -108542,8 +108541,8 @@ aaa aLo aMG aNX -aNV -rax +aaj +aaf aRy aSn aSn From 147b1144fd3eb0fc7fc77011a2635b00873a2210 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Mon, 22 Jul 2019 12:12:28 +0200 Subject: [PATCH 2/3] adding a second lawyer spawner to pubby. --- _maps/map_files/PubbyStation/PubbyStation.dmm | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 5acfaaa16c..a88ffae705 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -92,6 +92,20 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"aal" = ( +/obj/structure/chair/comfy/black, +/obj/structure/sign/plaques/kiddie{ + desc = "An embossed piece of paper from the Third University of Harvard."; + name = "\improper 'Diploma' frame"; + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" + }, +/obj/effect/landmark/start/lawyer, +/turf/open/floor/wood, +/area/lawoffice) "abf" = ( /obj/structure/bed, /turf/open/floor/plating, @@ -61767,19 +61781,6 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) -"xJy" = ( -/obj/structure/chair/comfy/black, -/obj/structure/sign/plaques/kiddie{ - desc = "An embossed piece of paper from the Third University of Harvard."; - name = "\improper 'Diploma' frame"; - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, -/turf/open/floor/wood, -/area/lawoffice) "xKc" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, @@ -81802,7 +81803,7 @@ ajM aiu aiu gSH -xJy +aal sJr sJr sJr From 4e62e076c8a6efe1776f013c3ac1572e36674792 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Mon, 22 Jul 2019 12:30:07 +0200 Subject: [PATCH 3/3] fixes. --- _maps/map_files/PubbyStation/PubbyStation.dmm | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index a88ffae705..228e90992e 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -56,14 +56,14 @@ }, /obj/machinery/conveyor{ dir = 4; - id = "EngLoad" + id = "garbagestacked" }, /turf/open/floor/plating, /area/maintenance/disposal) "aah" = ( /obj/machinery/conveyor{ dir = 4; - id = "EngLoad" + id = "garbagestacked" }, /turf/open/floor/plating, /area/maintenance/disposal) @@ -106,6 +106,22 @@ /obj/effect/landmark/start/lawyer, /turf/open/floor/wood, /area/lawoffice) +"aam" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "garbage" + }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/disposal) "abf" = ( /obj/structure/bed, /turf/open/floor/plating, @@ -17239,22 +17255,6 @@ /obj/item/shard, /turf/open/floor/plating, /area/maintenance/department/cargo) -"aPg" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "garbage" - }, -/obj/structure/disposaloutlet{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/disposal) "aPi" = ( /obj/machinery/light/small{ dir = 4 @@ -107515,7 +107515,7 @@ aLn aNT aaf aai -aPg +aam aRu srZ aLm