From c44c8657737d418558b80ee27f036688b04ae5c4 Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 10 Mar 2022 14:33:34 -0500 Subject: [PATCH 1/3] kermit --- .../lavaland_surface_syndicate_base1.dmm | 109 +++++++++--------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index b56490670116..2af5376a1d07 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -145,6 +145,20 @@ }, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/arrivals) +"cb" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 30 + }, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/machinery/oven, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "cg" = ( /obj/structure/table, /obj/item/paper_bin, @@ -3718,26 +3732,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/ruin/unpowered/syndicate_lava_base/bar) -"lk" = ( -/obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 30 - }, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/item/book/manual/chef_recipes{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "ll" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5518,6 +5512,21 @@ }, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/main) +"zc" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/glass/rag{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/glass/mixbowl, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "zu" = ( /obj/machinery/door/poddoor/preopen{ id = "lavalandsyndi"; @@ -5657,10 +5666,6 @@ /obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/bar) -"Er" = ( -/obj/machinery/griddle, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "Ev" = ( /obj/structure/filingcabinet/medical, /turf/open/floor/plasteel/dark, @@ -5767,20 +5772,6 @@ }, /turf/open/floor/plasteel/white, /area/ruin/unpowered/syndicate_lava_base/medbay) -"FD" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/glass/rag{ - pixel_x = -4; - pixel_y = 9 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/kitchen/rollingpin, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "Gv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6326,6 +6317,14 @@ }, /turf/open/floor/circuit/telecomms, /area/ruin/unpowered/syndicate_lava_base/telecomms) +"Qc" = ( +/obj/machinery/griddle, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "Qg" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -6527,6 +6526,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/chemistry) +"Ty" = ( +/obj/structure/table/wood, +/obj/machinery/light/small, +/obj/structure/cable/yellow, +/obj/machinery/power/apc/syndicate{ + dir = 2; + name = "Bar APC"; + pixel_y = -23 + }, +/obj/item/paicard, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/book/manual/wiki/barman_recipes, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "TA" = ( /obj/machinery/door/airlock/public/glass{ name = "Dormitories" @@ -6733,18 +6746,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/white, /area/ruin/unpowered/syndicate_lava_base/chemistry) -"YQ" = ( -/obj/structure/table/wood, -/obj/machinery/light/small, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/syndicate{ - dir = 2; - name = "Bar APC"; - pixel_y = -23 - }, -/obj/item/paicard, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "Zi" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -7769,9 +7770,9 @@ jN jZ kJ yP -FD +zc eE -YQ +Ty jy jy nS @@ -7918,8 +7919,8 @@ jy nJ kq oK -lk -Er +cb +Qc lZ mx jy From 361ca5bf67a2d219b028f20d227c8c439c2898b1 Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 10 Mar 2022 14:33:47 -0500 Subject: [PATCH 2/3] Revert "kermit" This reverts commit c44c8657737d418558b80ee27f036688b04ae5c4. --- .../lavaland_surface_syndicate_base1.dmm | 109 +++++++++--------- 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 2af5376a1d07..b56490670116 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -145,20 +145,6 @@ }, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"cb" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 30 - }, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/machinery/oven, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "cg" = ( /obj/structure/table, /obj/item/paper_bin, @@ -3732,6 +3718,26 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/ruin/unpowered/syndicate_lava_base/bar) +"lk" = ( +/obj/structure/table/wood, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 30 + }, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/book/manual/wiki/barman_recipes, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "ll" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5512,21 +5518,6 @@ }, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/main) -"zc" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/glass/rag{ - pixel_x = -4; - pixel_y = 9 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/glass/mixbowl, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "zu" = ( /obj/machinery/door/poddoor/preopen{ id = "lavalandsyndi"; @@ -5666,6 +5657,10 @@ /obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/bar) +"Er" = ( +/obj/machinery/griddle, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "Ev" = ( /obj/structure/filingcabinet/medical, /turf/open/floor/plasteel/dark, @@ -5772,6 +5767,20 @@ }, /turf/open/floor/plasteel/white, /area/ruin/unpowered/syndicate_lava_base/medbay) +"FD" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/glass/rag{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/kitchen/rollingpin, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "Gv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6317,14 +6326,6 @@ }, /turf/open/floor/circuit/telecomms, /area/ruin/unpowered/syndicate_lava_base/telecomms) -"Qc" = ( -/obj/machinery/griddle, -/obj/item/book/manual/chef_recipes{ - pixel_x = 2; - pixel_y = 6 - }, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "Qg" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -6526,20 +6527,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/chemistry) -"Ty" = ( -/obj/structure/table/wood, -/obj/machinery/light/small, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/syndicate{ - dir = 2; - name = "Bar APC"; - pixel_y = -23 - }, -/obj/item/paicard, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/book/manual/wiki/barman_recipes, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "TA" = ( /obj/machinery/door/airlock/public/glass{ name = "Dormitories" @@ -6746,6 +6733,18 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/white, /area/ruin/unpowered/syndicate_lava_base/chemistry) +"YQ" = ( +/obj/structure/table/wood, +/obj/machinery/light/small, +/obj/structure/cable/yellow, +/obj/machinery/power/apc/syndicate{ + dir = 2; + name = "Bar APC"; + pixel_y = -23 + }, +/obj/item/paicard, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "Zi" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -7770,9 +7769,9 @@ jN jZ kJ yP -zc +FD eE -Ty +YQ jy jy nS @@ -7919,8 +7918,8 @@ jy nJ kq oK -cb -Qc +lk +Er lZ mx jy From 9d9d1a2ad310a9a8051728425ee3890b452949e1 Mon Sep 17 00:00:00 2001 From: Maxim Date: Fri, 1 Apr 2022 18:52:56 -0400 Subject: [PATCH 3/3] hahaha --- _maps/map_files/YogStation/YogStation.dmm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 0bb287008d65..5ccee793dfaa 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -7276,12 +7276,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aux" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) "auy" = ( /obj/machinery/computer/nanite_chamber_control{ dir = 4 @@ -42848,6 +42842,13 @@ }, /turf/open/space, /area/solar/port/fore) +"jEv" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/mob/living/simple_animal/hostile/alien/maid, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "jFB" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -99779,7 +99780,7 @@ arf asf ati ati -aux +jEv eOo axL bbl