From 5a616da70582bd16e9f8978f4cd869ae65ea5d77 Mon Sep 17 00:00:00 2001 From: MrCat15352 Date: Tue, 17 Sep 2024 10:12:02 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9E=D1=82=D1=80=D0=B5=D0=BC=D0=BE=D0=BD?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D1=82=D1=80?= =?UTF-8?q?=D1=83=D0=B1=D1=8B=20=D0=BC=D1=83=D1=81=D0=BE=D1=80=D0=BE=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=B2=20=D0=B1=D1=80?= =?UTF-8?q?=D0=B8=D0=B3=D0=B5.=20=D0=A2=D0=BE=D1=80=D0=B3=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8=D0=B8?= =?UTF-8?q?=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B8=20=D0=B1=D0=B5?= =?UTF-8?q?=D1=81=D0=BF=D0=BB=D0=B0=D1=82=D0=BD=D1=8B=D0=BC=20=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D0=BE=D1=80=D1=82=D0=B8=D0=BC=D0=B5=D0=BD=D1=82=D1=8B=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D1=85=20=D0=B0?= =?UTF-8?q?=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=BE=D0=B2=20=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=B0=D0=B2=D0=B0=D0=BD=D0=BF=D0=BE=D1=81=D1=82=D1=83.=20?= =?UTF-8?q?=D0=91=D1=83=D1=85=D0=BB=D0=BE=D0=BC=D0=B0=D1=82=20=D0=B1=D1=8B?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B1=D0=B0=D1=80=D0=BC=D0=B5=D0=BD=D0=B0,=20=D1=81?= =?UTF-8?q?=20=D0=B1=D0=B5=D1=81=D0=BF=D0=BB=D0=B0=D1=82=D0=BD=D1=8B=D0=BC?= =?UTF-8?q?=20=D0=B0=D1=81=D1=81=D0=BE=D1=80=D1=82=D0=B8=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=BE=D0=BC.=20=D0=90=D0=B2=D0=B0=D0=BD=D0=BF=D0=BE?= =?UTF-8?q?=D1=81=D1=82=20=D0=B1=D1=8B=D0=BB=20=D1=83=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=BF=D0=BB=D0=B5=D0=BA=D1=82=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=B0?= =?UTF-8?q?=D0=BF=D1=82=D0=B5=D1=87=D0=BA=D0=B0=D0=BC=D0=B8=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=BE=D0=B9=20=D0=BF=D0=BE=D0=BC=D0=BE=D1=89=D0=B8?= =?UTF-8?q?,=20=D0=B1=D0=B5=D1=81=D0=BF=D0=BB=D0=B0=D1=82=D0=BD=D0=BE!=20?= =?UTF-8?q?=D0=94=D0=BE=D0=BB=D0=BE=D0=B6=D0=B8=D0=BB=D0=B8=20=D0=BF=D0=BB?= =?UTF-8?q?=D0=B8=D1=82=D0=BA=D1=83=20=D0=BD=D0=B0=20=D0=BA=D1=83=D1=85?= =?UTF-8?q?=D0=BD=D0=B5,=20=D1=82=D1=80=D1=83=D0=B1=D1=8B=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D1=81=D1=82=D0=B0=D0=BB=D0=B8=20=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D1=87=D0=B0=D1=82=D1=8C=20=D0=B8=D0=B7=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D0=B0...=20=D0=91=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BD=D0=B5?= =?UTF-8?q?=20=D0=BD=D0=B0=D0=BD=D0=B8=D0=BC=D0=B0=D0=B5=D0=BC=20=D0=BA?= =?UTF-8?q?=D0=B5=D0=BF=D0=BE=D1=80=D1=80=D0=B8=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/_mod_celadon/outpost/elysium_ice.dmm | 266 ++++++++++++++------- 1 file changed, 182 insertions(+), 84 deletions(-) diff --git a/_maps/_mod_celadon/outpost/elysium_ice.dmm b/_maps/_mod_celadon/outpost/elysium_ice.dmm index 6554a1ee7fec..15a24f4ed4d2 100644 --- a/_maps/_mod_celadon/outpost/elysium_ice.dmm +++ b/_maps/_mod_celadon/outpost/elysium_ice.dmm @@ -174,7 +174,7 @@ /obj/item/radio/intercom/directional/west{ pixel_y = 7 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "ap" = ( /obj/structure/chair/stool/bar{ @@ -259,7 +259,7 @@ "ay" = ( /obj/effect/turf_decal/corner/opaque/neutral/mono, /obj/structure/table/reinforced, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "az" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, @@ -274,7 +274,7 @@ /obj/effect/turf_decal/corner/opaque/black/mono, /obj/effect/turf_decal/corner/opaque/neutral/diagonal, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "aB" = ( /obj/structure/table/wood/fancy/purple, @@ -361,6 +361,9 @@ /obj/effect/turf_decal/industrial/warning/cee{ dir = 4 }, +/obj/machinery/vending/wallmed{ + pixel_x = 23 + }, /turf/open/floor/plasteel/tech/techmaint, /area/outpost/security/checkpoint) "aN" = ( @@ -905,7 +908,7 @@ /obj/effect/turf_decal/corner/opaque/neutral/diagonal, /obj/machinery/newscaster/directional/west, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "bZ" = ( /turf/open/floor/plasteel/strongdark, @@ -1868,7 +1871,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "dU" = ( /obj/structure/closet/crate/freezer/surplus_limbs/organs, @@ -1960,6 +1963,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/outpost/maintenance/port) +"ed" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/wallmed{ + pixel_x = 23 + }, +/turf/open/floor/plasteel/patterned, +/area/outpost/security/hall) "ee" = ( /obj/structure/cable{ icon_state = "0-1" @@ -2049,14 +2069,15 @@ /obj/effect/turf_decal/corner/opaque/blue/half{ dir = 8 }, -/obj/machinery/vending/medical/syndicate_access{ - req_one_access_txt = "8123" - }, /obj/machinery/camera/autoname{ dir = 4; pixel_x = -9; network = list("outpostelysium") }, +/obj/machinery/vending/medical/syndicate_access{ + req_one_access_txt = "8123"; + all_items_free = 1 + }, /turf/open/floor/plasteel/white, /area/outpost/medical/hall_1) "ep" = ( @@ -2181,6 +2202,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel/tech, /area/outpost/security) "eB" = ( @@ -2276,7 +2300,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "eM" = ( /obj/effect/turf_decal/industrial/warning{ @@ -2479,7 +2503,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "fg" = ( /obj/effect/turf_decal/corner/opaque/black/mono, @@ -2487,7 +2511,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "fh" = ( /obj/structure/flora/tree/pine, @@ -2704,7 +2728,7 @@ /obj/effect/turf_decal/corner/opaque/neutral/diagonal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "fE" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -3222,6 +3246,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/vending/wallmed{ + pixel_x = 23 + }, /turf/open/floor/plasteel/white, /area/outpost/medical/hall_2) "gz" = ( @@ -3969,7 +3996,7 @@ pixel_y = 6 }, /obj/item/reagent_containers/glass/beaker, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "hZ" = ( /obj/effect/turf_decal/corner_techfloor_gray/diagonal{ @@ -4282,7 +4309,7 @@ dir = 6 }, /obj/machinery/light/dim/directional/west, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "iD" = ( /obj/effect/turf_decal/corner/opaque/lime{ @@ -4352,7 +4379,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "iM" = ( /obj/structure/dresser{ @@ -4451,6 +4478,9 @@ dir = 9; network = list("outpostelysium") }, +/obj/machinery/vending/wallmed{ + pixel_x = 23 + }, /turf/open/floor/plasteel/tech, /area/outpost/operations/outpost_command) "iV" = ( @@ -4648,7 +4678,8 @@ /area/outpost/fraction/separatist) "ju" = ( /obj/machinery/vending/sovietsoda{ - pixel_x = 5 + pixel_x = 5; + all_items_free = 1 }, /turf/open/floor/carpet/orange, /area/outpost/medical/relax_room) @@ -5037,7 +5068,7 @@ dir = 2; color = "#808080" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "ki" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, @@ -5180,7 +5211,9 @@ dir = 10 }, /obj/effect/turf_decal/box, -/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/machinery/vending/wardrobe/sec_wardrobe{ + all_items_free = 1 + }, /obj/machinery/door/window/northleft{ dir = 4; req_one_access_txt = "8101" @@ -5612,7 +5645,7 @@ pixel_y = 6; pixel_x = 9 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "lq" = ( /obj/effect/turf_decal/corner/opaque/lime{ @@ -5673,7 +5706,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "lx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ @@ -5723,7 +5756,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "lD" = ( /obj/item/radio/intercom/directional/north, @@ -6010,10 +6043,12 @@ /area/outpost/medical/hall_2) "mj" = ( /obj/machinery/vending/coffee{ - pixel_x = 14 + pixel_x = 14; + all_items_free = 1 }, /obj/machinery/vending/snack/random{ - pixel_x = -14 + pixel_x = -14; + all_items_free = 1 }, /turf/open/floor/plasteel/tech, /area/outpost/operations/outpost_command) @@ -6058,7 +6093,7 @@ /obj/effect/turf_decal/corner/opaque/black/mono, /obj/effect/turf_decal/corner/opaque/neutral/diagonal, /obj/machinery/firealarm/directional/north, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "mq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ @@ -6173,7 +6208,7 @@ /obj/effect/turf_decal/corner/opaque/green/mono, /obj/machinery/hydroponics/constructable, /obj/machinery/light/dim/directional/east, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "mF" = ( /obj/effect/turf_decal/corner/opaque/grey/full, @@ -6182,7 +6217,8 @@ }, /obj/effect/turf_decal/corner/opaque/grey/full, /obj/machinery/vending/wardrobe/jani_wardrobe{ - pixel_x = 1 + pixel_x = 1; + all_items_free = 1 }, /turf/open/floor/plating, /area/outpost/vacant_rooms/shop) @@ -6898,7 +6934,7 @@ "nR" = ( /obj/effect/turf_decal/corner/opaque/green/mono, /obj/machinery/hydroponics/constructable, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "nS" = ( /obj/item/reagent_containers/food/drinks/beer{ @@ -6968,7 +7004,7 @@ }, /obj/structure/closet/secure_closet/freezer/wall/directional/east, /obj/item/clothing/suit/apron/chef, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "nW" = ( /obj/effect/turf_decal/corner/opaque/black/mono, @@ -6992,7 +7028,7 @@ dir = 5 }, /obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "nX" = ( /obj/machinery/light/dim/directional/east, @@ -7087,7 +7123,7 @@ /obj/effect/turf_decal/corner/opaque/neutral/full, /obj/effect/turf_decal/corner/opaque/green/diagonal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "oi" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -7100,7 +7136,7 @@ /obj/effect/turf_decal/corner/opaque/neutral/full, /obj/effect/turf_decal/corner/opaque/green/diagonal, /obj/machinery/airalarm/directional/south, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "ok" = ( /obj/effect/turf_decal/corner/opaque/grey/full, @@ -7244,7 +7280,9 @@ /turf/open/floor/plasteel/white, /area/outpost/medical/hall_2) "oz" = ( -/obj/machinery/vending/clothing, +/obj/machinery/vending/clothing{ + all_items_free = 1 + }, /obj/effect/turf_decal/corner/opaque/grey/full, /obj/effect/turf_decal/borderfloorwhite{ dir = 5 @@ -7261,7 +7299,9 @@ /area/outpost/maintenance/starboard) "oB" = ( /obj/item/radio/intercom/directional/south, -/obj/machinery/vending/security, +/obj/machinery/vending/security{ + all_items_free = 1 + }, /turf/open/floor/plasteel/tech, /area/outpost/security/checkpoint) "oC" = ( @@ -7378,7 +7418,7 @@ /obj/effect/turf_decal/corner/opaque/green/mono, /obj/machinery/hydroponics/constructable, /obj/machinery/light/dim/directional/west, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "oS" = ( /turf/closed/wall/r_wall/rust, @@ -7792,7 +7832,9 @@ /turf/open/floor/plasteel/white, /area/outpost/medical/genetic) "pP" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe/all_access{ + all_items_free = 1 + }, /turf/open/floor/carpet/orange, /area/outpost/crew/bar) "pQ" = ( @@ -7890,7 +7932,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "qa" = ( /obj/structure/catwalk/over/plated_catwalk, @@ -7997,7 +8039,7 @@ pixel_y = -10; dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "qk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -8135,7 +8177,9 @@ }, /area/outpost/fraction/solfed) "qC" = ( -/obj/machinery/vending/cigarette, +/obj/machinery/vending/cigarette{ + all_items_free = 1 + }, /obj/machinery/light/directional/west, /turf/open/floor/carpet/orange, /area/outpost/medical/relax_room) @@ -8212,7 +8256,7 @@ pixel_x = 6; pixel_y = 6 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "qK" = ( /obj/effect/turf_decal/siding/white{ @@ -8427,7 +8471,7 @@ pixel_x = 5; pixel_y = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "rk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -9519,7 +9563,10 @@ /obj/effect/turf_decal/corner/opaque/neutral/full, /obj/effect/turf_decal/corner/opaque/green/diagonal, /obj/structure/closet/crate/hydroponics, -/turf/open/floor/plating, +/obj/machinery/vending/wallmed{ + pixel_x = 23 + }, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "tB" = ( /obj/machinery/door/firedoor/border_only{ @@ -10497,7 +10544,7 @@ color = "#808080" }, /obj/structure/table/reinforced, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "vk" = ( /obj/machinery/light/directional/west, @@ -10547,7 +10594,8 @@ dir = 8 }, /obj/machinery/vending/medical/syndicate_access{ - req_one_access_txt = "8123" + req_one_access_txt = "8123"; + all_items_free = 1 }, /turf/open/floor/plasteel/white, /area/outpost/medical/hall_1) @@ -11081,7 +11129,9 @@ }, /area/outpost/vacant_rooms/trash_factory) "wt" = ( -/obj/machinery/vending/boozeomat/syndicate_access, +/obj/machinery/vending/boozeomat/syndicate_access{ + all_items_free = 1 + }, /turf/closed/indestructible/reinforced, /area/outpost/fraction/syndi) "wu" = ( @@ -11277,9 +11327,10 @@ }, /obj/machinery/vending/dinnerware{ pixel_y = 6; - pixel_x = -6 + pixel_x = -6; + all_items_free = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "wP" = ( /obj/structure/flora/grass/both{ @@ -11344,7 +11395,7 @@ pixel_x = 9; pixel_y = -1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "wW" = ( /obj/effect/turf_decal/borderfloor{ @@ -11664,6 +11715,9 @@ /obj/effect/turf_decal/corner/opaque/nsorange/half{ dir = 4 }, +/obj/machinery/vending/wallmed{ + pixel_x = 23 + }, /turf/open/floor/plasteel/white, /area/outpost/medical/chemestry) "xF" = ( @@ -11844,7 +11898,7 @@ /turf/open/floor/plasteel/white, /area/outpost/medical/hall_1) "xW" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat/outpost_access, /turf/closed/indestructible/reinforced, /area/outpost/crew/bar/bar_zone) "xX" = ( @@ -12209,7 +12263,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "yK" = ( /obj/machinery/light/dim/directional/south, @@ -12525,7 +12579,7 @@ icon_state = "0-1" }, /obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "zs" = ( /obj/structure/chair/comfy/blue/directional{ @@ -12544,7 +12598,7 @@ }, /obj/structure/table, /obj/machinery/light/dim/directional/north, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "zu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ @@ -13850,7 +13904,8 @@ "BI" = ( /obj/machinery/light/directional/east, /obj/machinery/vending/wardrobe/cent_wardrobe{ - pixel_x = 5 + pixel_x = 5; + all_items_free = 1 }, /turf/open/floor/plasteel/tech, /area/outpost/operations/outpost_command) @@ -13925,7 +13980,11 @@ "BO" = ( /obj/effect/turf_decal/corner/opaque/black/mono, /obj/effect/turf_decal/corner/opaque/neutral/diagonal, -/turf/open/floor/plating, +/obj/machinery/vending/wallmed{ + pixel_x = -1; + pixel_y = 31 + }, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "BP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ @@ -13979,6 +14038,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/outpost/security) "BY" = ( @@ -14027,7 +14089,7 @@ /obj/machinery/processor{ pixel_y = 21 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "Ce" = ( /obj/effect/decal/cleanable/dirt, @@ -14244,6 +14306,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/vending/wallmed{ + pixel_x = 23 + }, /turf/open/floor/wood/walnut, /area/outpost/crew/bar) "Cw" = ( @@ -15454,7 +15519,7 @@ "EY" = ( /obj/effect/turf_decal/corner/opaque/green/mono, /obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "EZ" = ( /obj/structure/mineral_door/paperframe, @@ -15679,7 +15744,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "Fx" = ( /obj/effect/turf_decal/industrial/warning{ @@ -16068,6 +16133,9 @@ dir = 6 }, /obj/structure/closet/emcloset/wall/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel/tech, /area/outpost/security) "Gf" = ( @@ -16168,7 +16236,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "Gs" = ( /obj/machinery/chem_master, @@ -16404,7 +16472,7 @@ pixel_y = -3 }, /obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "Hb" = ( /obj/structure/railing/wood{ @@ -16438,7 +16506,8 @@ dir = 8 }, /obj/machinery/vending/medical/syndicate_access{ - req_one_access_txt = "8123" + req_one_access_txt = "8123"; + all_items_free = 1 }, /obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel/white, @@ -16736,7 +16805,7 @@ pixel_x = 8; layer = 3.09 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "HL" = ( /obj/item/reagent_containers/food/snacks/deadmouse{ @@ -17508,7 +17577,7 @@ /obj/structure/closet/secure_closet/personal{ pixel_x = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "Jp" = ( /obj/structure/table/wood, @@ -17940,7 +18009,9 @@ }, /area/outpost/medical/palata_2) "Kj" = ( -/obj/machinery/vending/wardrobe/chem_wardrobe, +/obj/machinery/vending/wardrobe/chem_wardrobe{ + all_items_free = 1 + }, /turf/open/floor/carpet/orange, /area/outpost/medical/relax_room) "Kk" = ( @@ -17997,6 +18068,9 @@ dir = 9; network = list("outpostelysium") }, +/obj/machinery/vending/wallmed{ + pixel_x = 23 + }, /turf/open/floor/plasteel/tech, /area/outpost/operations/outpost_command) "Kq" = ( @@ -21268,7 +21342,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 6 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "QQ" = ( /obj/effect/turf_decal/trimline/opaque/beige/filled/line{ @@ -21448,7 +21522,7 @@ pixel_y = 12 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "Rf" = ( /obj/structure/cable{ @@ -21615,6 +21689,25 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/tech, /area/outpost/cargo/office) +"Rx" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/wallmed{ + pixel_x = 23 + }, +/turf/open/floor/plasteel/patterned, +/area/outpost/security/hall) "Ry" = ( /obj/structure/chair/wood{ dir = 8 @@ -21753,9 +21846,10 @@ }, /obj/effect/turf_decal/corner/opaque/black/mono, /obj/machinery/vending/hydroseeds{ - can_be_unanchored = 1 + can_be_unanchored = 1; + all_items_free = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "RN" = ( /obj/effect/turf_decal/trimline/opaque/beige/filled/corner, @@ -22138,7 +22232,7 @@ /obj/item/pen{ pixel_x = 7 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "Sy" = ( /obj/effect/turf_decal/industrial/outline/yellow, @@ -22480,7 +22574,9 @@ /obj/effect/turf_decal/corner/opaque/lime{ dir = 6 }, -/obj/machinery/vending/cigarette, +/obj/machinery/vending/cigarette{ + all_items_free = 1 + }, /turf/open/floor/plasteel/white, /area/outpost/medical/hall_2) "Td" = ( @@ -22600,7 +22696,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "Tn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -22828,7 +22924,7 @@ color = "#808080" }, /obj/item/reagent_containers/glass/bowl, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "TQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -23170,9 +23266,10 @@ /obj/effect/turf_decal/industrial/traffic/cee, /obj/effect/turf_decal/corner/opaque/black/mono, /obj/machinery/vending/hydronutrients{ - can_be_unanchored = 1 + can_be_unanchored = 1; + all_items_free = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "Ur" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -23278,7 +23375,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "UC" = ( /obj/machinery/door/window/northleft{ @@ -23739,7 +23836,7 @@ dir = 4 }, /obj/machinery/airalarm/directional/south, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "Vx" = ( /obj/structure/flora/grass/jungle, @@ -23762,7 +23859,7 @@ /obj/item/reagent_containers/glass/bucket, /obj/item/clothing/suit/apron/overalls, /obj/item/clothing/suit/apron/overalls, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "Vz" = ( /obj/structure/catwalk/over/plated_catwalk, @@ -23989,7 +24086,7 @@ color = "#808080" }, /obj/item/reagent_containers/glass/bottle, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "VV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ @@ -24323,7 +24420,7 @@ "WE" = ( /obj/effect/turf_decal/corner/opaque/neutral/full, /obj/effect/turf_decal/corner/opaque/green/diagonal, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "WF" = ( /obj/structure/railing/wood{ @@ -24569,7 +24666,8 @@ /area/outpost/crew/cryo) "Xd" = ( /obj/machinery/vending/cigarette{ - pixel_x = 4 + pixel_x = 4; + all_items_free = 1 }, /turf/open/floor/plasteel/tech, /area/outpost/operations/outpost_command) @@ -24577,7 +24675,7 @@ /obj/effect/turf_decal/corner/opaque/black/mono, /obj/effect/turf_decal/corner/opaque/neutral/diagonal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "Xf" = ( /obj/item/kirbyplants{ @@ -25180,7 +25278,7 @@ dir = 2; color = "#808080" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "Yg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, @@ -25779,7 +25877,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/canteen) "Zw" = ( /obj/machinery/door/airlock/security/brig{ @@ -26022,7 +26120,7 @@ /obj/machinery/door/poddoor/ert{ id = "outpost_cook_botanic" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/outpost/crew/garden) "ZW" = ( /obj/effect/turf_decal/siding/white{ @@ -40417,7 +40515,7 @@ rg OF Xh QU -Xh +Rx QU WY WY @@ -40426,7 +40524,7 @@ uS ES TM HC -WY +ed Xh wy WY From 00ac0b4c21afe0c416d3108de6bab5c3c996138a Mon Sep 17 00:00:00 2001 From: MrCat15352 Date: Tue, 17 Sep 2024 10:12:35 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9D=D0=B0=20=D1=8D=D1=82=D0=BE=D0=BC=20?= =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D0=BD=D0=BF=D0=BE=D1=81=D1=82=D1=83=20=D1=82?= =?UTF-8?q?=D0=B0=D0=BA=D0=B6=D0=B5,=20=D0=B2=D0=B2=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B1=D0=B5=D1=81=D0=BF=D0=BB=D0=B0=D1=82=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B2=D0=B5=D0=BD=D0=B4=D0=BE=D0=BC=D0=B0=D1=82?= =?UTF-8?q?=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=B5=D0=B4=D0=B0=20=D0=B8?= =?UTF-8?q?=20=D0=B1=D0=B0=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_mod_celadon/outpost/nanotrasen_asteroid.dmm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm b/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm index 93e905328ca7..14b7a5fb2ed0 100644 --- a/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm +++ b/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm @@ -1325,7 +1325,7 @@ /turf/open/floor/grass, /area/outpost/hallway/fore) "fb" = ( -/obj/machinery/vending/boozeomat/syndicate_access, +/obj/machinery/vending/boozeomat/outpost_access, /turf/open/floor/plasteel/tech, /area/outpost/crew/bar) "fc" = ( @@ -1865,7 +1865,7 @@ /turf/closed/mineral/random/snow, /area/outpost/external) "gT" = ( -/obj/machinery/vending/boozeomat/syndicate_access, +/obj/machinery/vending/boozeomat/outpost_access, /turf/open/floor/plasteel/sepia, /area/outpost/crew/library) "gU" = ( @@ -2852,7 +2852,9 @@ /turf/open/floor/plasteel/dark, /area/outpost/operations) "kF" = ( -/obj/machinery/vending/medical/syndicate_access, +/obj/machinery/vending/medical/syndicate_access{ + all_items_free = 1 + }, /obj/effect/turf_decal/corner/opaque/blue/full, /obj/effect/turf_decal/techfloor{ dir = 1 @@ -9272,7 +9274,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/vending/clothing, +/obj/machinery/vending/clothing{ + all_items_free = 1 + }, /obj/machinery/newscaster/directional/north{ pixel_y = 33 }, @@ -14591,7 +14595,9 @@ /turf/closed/mineral/random/snow, /area/outpost/external) "Zr" = ( -/obj/machinery/vending/security, +/obj/machinery/vending/security{ + all_items_free = 1 + }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 6 },