From 0b3c31a60219e342981fedaa3899bc96dc4768f3 Mon Sep 17 00:00:00 2001 From: gl0ck Date: Thu, 13 Feb 2025 23:05:52 -0500 Subject: [PATCH 1/2] adds fax machine, kills jagged wall edges --- .../Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm | 382 +++++++++--------- 1 file changed, 191 insertions(+), 191 deletions(-) diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index c69eb191aa72..cffab142cee6 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -25,6 +25,12 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/inside/caves/tunnel) +"af" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_x = -32 + }, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/cic) "ag" = ( /obj/structure/machinery/door/poddoor{ desc = "A podlock that leads to the main Marine base on LV-624. It requires power from the outpost to stay shut. Better not let anything get through this..."; @@ -55,6 +61,13 @@ "ak" = ( /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/cic) +"al" = ( +/obj/effect/landmark/start/whiskey/synthetic, +/obj/structure/closet/secure_closet/surgical{ + pixel_x = -30 + }, +/turf/open/floor/almayer/cargo, +/area/whiskey_outpost/inside/cic) "am" = ( /obj/structure/window/reinforced{ dir = 8; @@ -97,6 +110,10 @@ }, /turf/open/floor/whitegreenfull, /area/whiskey_outpost/inside/hospital) +"ar" = ( +/obj/structure/machinery/cm_vending/gear/synth, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/cic) "as" = ( /obj/effect/decal/warning_stripes/asteroid{ icon_state = "warning_s" @@ -126,6 +143,10 @@ /obj/structure/machinery/light/small, /turf/open/floor/whitegreen, /area/whiskey_outpost/inside/hospital/triage) +"aw" = ( +/obj/structure/machinery/cm_vending/own_points/experimental_tools, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/cic) "ax" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/storage/fancy/cigar, @@ -146,9 +167,26 @@ }, /turf/open/floor/wood, /area/whiskey_outpost/inside/cic) +"aB" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + name = "Emergency NanoMed"; + pixel_x = -30; + req_access = null + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/flora/pottedplant/random, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/cic) "aC" = ( /turf/open/floor/almayer/cargo, /area/whiskey_outpost/inside/cic) +"aD" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/uscm, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/cic) "aE" = ( /obj/structure/bed, /obj/item/bedsheet/hop, @@ -195,6 +233,15 @@ "aK" = ( /turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/two_south) +"aL" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper_bin, +/obj/item/tool/pen, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/cic) "aM" = ( /obj/effect/decal/cleanable/blood/writing{ dir = 10 @@ -232,10 +279,29 @@ }, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) +"aR" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/cic) "aS" = ( /obj/structure/machinery/optable, /turf/open/floor/whitegreenfull, /area/whiskey_outpost/inside/hospital) +"aT" = ( +/turf/open/floor/prison/kitchen, +/area/whiskey_outpost/inside/cic) +"aU" = ( +/obj/structure/mirror{ + pixel_y = 30 + }, +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/prison/kitchen, +/area/whiskey_outpost/inside/cic) "aV" = ( /turf/open/floor/whitegreen/southwest, /area/whiskey_outpost/inside/hospital) @@ -616,12 +682,6 @@ }, /turf/open/floor/prison/kitchen, /area/whiskey_outpost/inside/cic) -"cF" = ( -/obj/structure/mirror{ - pixel_y = 30 - }, -/turf/open/floor/prison/kitchen, -/area/whiskey_outpost/inside/cic) "cG" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Bathroom" @@ -811,12 +871,6 @@ /obj/structure/sign/poster, /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/bunker/bunker/front) -"dz" = ( -/obj/structure/toilet{ - dir = 8 - }, -/turf/open/floor/prison/kitchen, -/area/whiskey_outpost/inside/cic) "dA" = ( /obj/structure/surface/table, /obj/item/facepaint/brown, @@ -968,12 +1022,6 @@ }, /turf/open/floor/whitegreen/southwest, /area/whiskey_outpost/inside/hospital) -"ea" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "eb" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -1080,10 +1128,6 @@ /obj/structure/platform/metal/almayer, /turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/east) -"eF" = ( -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "eG" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/two_north) @@ -1909,10 +1953,9 @@ /turf/open/floor/whitegreen, /area/whiskey_outpost/inside/hospital) "ih" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/prison, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/landmark/start/whiskey/synthetic, +/turf/open/floor/almayer/cargo, /area/whiskey_outpost/inside/cic) "ii" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ @@ -2805,12 +2848,6 @@ }, /area/whiskey_outpost/outside/lane/four_north) "lW" = ( -/obj/structure/flora/pottedplant/random, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - name = "Emergency NanoMed"; - pixel_x = -30; - req_access = null - }, /obj/structure/machinery/light/small{ dir = 8 }, @@ -2993,11 +3030,6 @@ }, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) -"mN" = ( -/obj/structure/window/framed/colony/reinforced, -/obj/structure/disposalpipe/segment, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "mQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/window/framed/colony/reinforced, @@ -3706,13 +3738,6 @@ /obj/item/tool/hand_labeler, /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/engineering) -"qe" = ( -/obj/structure/closet/secure_closet/surgical{ - pixel_x = -30 - }, -/obj/effect/landmark/start/whiskey/synthetic, -/turf/open/floor/almayer/cargo, -/area/whiskey_outpost/inside/cic) "qf" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/prison/cell_stripe/north, @@ -6913,10 +6938,6 @@ "EK" = ( /turf/open/jungle/impenetrable, /area/whiskey_outpost/outside/north/northwest) -"EL" = ( -/obj/structure/machinery/cm_vending/gear/synth, -/turf/open/floor/plating/plating_catwalk, -/area/whiskey_outpost/inside/cic) "EN" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/asteroidfloor/north, @@ -7200,13 +7221,6 @@ }, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/bunker/bunker/front) -"Gx" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "Gy" = ( /obj/effect/landmark/start/whiskey/leader, /turf/open/floor/almayer/bluefull, @@ -8270,10 +8284,6 @@ icon_state = "diagrasputin" }, /area/whiskey_outpost/outside/lane/four_south) -"Mo" = ( -/obj/structure/machinery/recharge_station, -/turf/open/floor/almayer/cargo, -/area/whiskey_outpost/inside/cic) "Mp" = ( /obj/structure/machinery/m56d_hmg/mg_turret{ dir = 8; @@ -8433,12 +8443,6 @@ /obj/structure/barricade/sandbags/wired, /turf/open/floor/plating/warnplate, /area/whiskey_outpost/outside/north/beach) -"Nr" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_x = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/whiskey_outpost/inside/cic) "Nt" = ( /obj/structure/barricade/sandbags/wired, /obj/structure/barricade/sandbags/wired{ @@ -8828,8 +8832,8 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/three_north) "PB" = ( -/obj/effect/landmark/start/whiskey/synthetic, -/turf/open/floor/almayer/cargo, +/obj/structure/machinery/recharge_station, +/turf/open/floor/plating/plating_catwalk, /area/whiskey_outpost/inside/cic) "PC" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, @@ -10161,10 +10165,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/asteroidwarning/east, /area/whiskey_outpost/outside/north) -"WK" = ( -/obj/structure/machinery/cm_vending/own_points/experimental_tools, -/turf/open/floor/plating/plating_catwalk, -/area/whiskey_outpost/inside/cic) "WL" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, /obj/structure/disposalpipe/segment{ @@ -16310,11 +16310,11 @@ mT mT mT mT -mT -mT -mT -mT -mT +ak +ak +ak +ak +ak mT mT mT @@ -16512,11 +16512,11 @@ mT mT mT mT -mT -mT -mT -mT -mT +ak +ar +al +af +ak mT mT mT @@ -16713,12 +16713,12 @@ mT mT mT mT +mT ak +aw +aC +PM ak -ak -mT -mT -mT mT mT mT @@ -16903,6 +16903,10 @@ mT mT mT mT +ak +ak +ak +ak mT mT mT @@ -16912,14 +16916,10 @@ mT mT mT mT -mT -mT -mT -ak -WK -ak -ak ak +ai +aC +Ed nK nK nK @@ -17105,23 +17105,23 @@ mT mT mT mT +ak +cE +ds +ak +mT mT ak ak ak ak -mT -mT -mT -mT -mT -mT ak -ai -aC -qe +ak +ak +ak +Vy ih -Nr +PM nK uM rq @@ -17307,23 +17307,23 @@ mT mT mT mT -mT ak -cE -ds +aU +aT ak -mT -mT -mT -mT -mT -mT ak -Vy -aC +ak +ak +ak +hj +iQ +ak +jY +li +ak PB -PM -Ed +fx +fx nK pk sP @@ -17509,23 +17509,23 @@ mT mT mT mT -mT -ak -cF -dz -ak -mT -ak ak ak +cG ak +aL +aD +gp +gT +kK +ee +iT +jN +Ez ak ak ak -EL -Mo -Gx -PM +uI nK qu re @@ -17712,22 +17712,22 @@ mT ak ak ak +bR +cz ak -cG -ak -ak -ak -ak -ak -hj -iQ -ak -jY -li -ak -ak +fx +fx +lm +fx +lm +lm +lm +lm +lm +aB ak -uI +mh +mh nK qx ri @@ -17914,21 +17914,21 @@ mT ak au cz -bR +cz cz dF -ea -ft -gp -gT -kK -ee -iT -jN -Ez -ak -ak -mh +fx +fx +lm +fx +lm +lm +lm +lm +lm +lm +mL +nv mh nK qu @@ -18120,16 +18120,16 @@ bs cI ak eb +fA +gA fx -ea +hk +iS +jo +iS fx -lm -lm -lm -lm -lm lW -mL +mM nv nI Kr @@ -18322,16 +18322,16 @@ bs cL ak et -fA -gA -fx -hk -iS -jo -iS -fx +fB +gC +gV +hu +iT +jp +kk +lr mi -mM +mL nv mh nK @@ -18524,16 +18524,16 @@ bT cM ex fx -fB -gC -gV -hu -iT -jp -kk -lr +fF +gE +fx +hw +iS +jq +iS +fx mo -mN +mM nw nL nK @@ -18726,16 +18726,16 @@ bs cp ak rc -fF -gE fx -hw -iS -jq -iS +lm fx +lm +lm +lm +lm +lm mi -mM +mL nv mZ nK @@ -18926,8 +18926,8 @@ aN bs bs cq -ak -eF +dF +fx fx eM fx @@ -18937,7 +18937,7 @@ lm lm lm mx -mL +ak nv nM nK @@ -19128,8 +19128,8 @@ aN cz bV cz -dF -eM +ak +aR ft gp gW @@ -19140,7 +19140,7 @@ EZ Vq mz ak -nv +mh nM nK oC From 43ac89b5f5b49538c8ffd71f649b43f8c0545528 Mon Sep 17 00:00:00 2001 From: gl0ck Date: Fri, 14 Feb 2025 14:00:34 -0500 Subject: [PATCH 2/2] symmetry good --- maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index cffab142cee6..f7f17e964b94 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -2941,7 +2941,7 @@ /obj/structure/machinery/light/small{ dir = 4 }, -/turf/open/floor/prison/cell_stripe, +/turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) "my" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, @@ -17926,7 +17926,7 @@ lm lm lm lm -lm +mi mL nv mh @@ -18938,7 +18938,7 @@ lm lm mx ak -nv +mh nM nK oy