From 62b8fb368f9f6a67261376705d081f33b80213f0 Mon Sep 17 00:00:00 2001 From: Venngedi <135035236+Venngedi@users.noreply.github.com> Date: Sun, 22 Sep 2024 21:04:18 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=8D=D0=B2=D0=B0=D0=BA=D1=83=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=88=D0=B0=D1=82?= =?UTF-8?q?=D1=82=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/locations/shuttles/floor.dm | 2 + maps/centcom/centcom.dmm | 196 ++++++++++++----------- 2 files changed, 103 insertions(+), 95 deletions(-) diff --git a/code/modules/locations/shuttles/floor.dm b/code/modules/locations/shuttles/floor.dm index 17a21459a146..3f8c382ece39 100644 --- a/code/modules/locations/shuttles/floor.dm +++ b/code/modules/locations/shuttles/floor.dm @@ -29,6 +29,7 @@ /turf/simulated/shuttle/floor/evac/eng1 icon_state = "flooreng1" + footstep = FOOTSTEP_CATWALK /turf/simulated/shuttle/floor/evac/eng2 icon_state = "flooreng2" @@ -36,6 +37,7 @@ /turf/simulated/shuttle/floor/evac/sec1 icon = 'icons/locations/shuttles/evac_shuttle.dmi' icon_state = "floorsec" + footstep = FOOTSTEP_CATWALK /turf/simulated/shuttle/floor/evac/sec2 icon = 'icons/locations/shuttles/evac_shuttle.dmi' diff --git a/maps/centcom/centcom.dmm b/maps/centcom/centcom.dmm index c8f3f5f20100..6bd8adc35f7e 100644 --- a/maps/centcom/centcom.dmm +++ b/maps/centcom/centcom.dmm @@ -17,8 +17,10 @@ /turf/environment/space, /area/space) "aac" = ( -/obj/structure/stool/bed/chair/schair/wagon/green, -/turf/simulated/shuttle/floor/evac, +/obj/structure/stool/bed/chair/schair{ + dir = 1 + }, +/turf/simulated/shuttle/floor/erokez, /area/shuttle/escape/centcom) "aad" = ( /obj/structure/object_wall/evac{ @@ -749,9 +751,9 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular, /obj/machinery/vending/wallmed1{ - pixel_y = -32 + name = "Emergency NanoMed"; + pixel_y = -30 }, /turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) @@ -1010,10 +1012,7 @@ /turf/simulated/shuttle/floor/evac/eng2, /area/shuttle/escape/centcom) "acw" = ( -/obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/crowbar, -/turf/simulated/shuttle/floor/evac/place2, +/turf/simulated/shuttle/floor/erokez, /area/shuttle/escape/centcom) "acx" = ( /obj/structure/stool/bed/chair/schair/wagon/yellow{ @@ -1213,6 +1212,7 @@ /obj/machinery/door/airlock/erokez/med{ name = "Medbay Airlock" }, +/obj/structure/curtain/open, /turf/simulated/shuttle/floor/evac/medbay, /area/shuttle/escape/centcom) "adg" = ( @@ -1336,20 +1336,21 @@ /turf/simulated/shuttle/floor/vox, /area/shuttle/vox/arkship_hold) "adw" = ( -/obj/structure/stool/bed/chair/schair/wagon/blue{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, +/obj/structure/stool/bed/chair/schair/wagon/blue, /turf/simulated/shuttle/floor/evac/medbay, /area/shuttle/escape/centcom) "adx" = ( /turf/unsimulated/wall/cult/runed/anim, /area/space) "ady" = ( -/obj/structure/stool/bed/chair/schair/wagon/blue{ - dir = 1 +/obj/machinery/life_assist/cardiopulmonary_bypass, +/obj/item/weapon/defibrillator/loaded, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = -30 }, /turf/simulated/shuttle/floor/evac/medbay, /area/shuttle/escape/centcom) @@ -1515,7 +1516,7 @@ /turf/environment/space, /area/shuttle/escape/centcom) "adW" = ( -/obj/item/weapon/flora/pottedplant/orientaltree, +/obj/item/weapon/flora/random, /turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "adX" = ( @@ -1585,10 +1586,16 @@ /turf/unsimulated/floor, /area/centcom/waitingroom) "aeg" = ( -/obj/structure/closet/toolcloset, /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, +/obj/structure/closet/crate, +/obj/item/stack/sheet/glass{ + amount = 10 + }, +/obj/item/stack/sheet/metal{ + amount = 15 + }, /turf/simulated/shuttle/floor/evac/eng2, /area/shuttle/escape/centcom) "aeh" = ( @@ -1656,13 +1663,13 @@ /obj/machinery/door/airlock/erokez/eng{ name = "Engineering Airlock" }, -/turf/simulated/shuttle/floor/evac, +/turf/simulated/shuttle/floor/evac/eng2, /area/shuttle/escape/centcom) "aeq" = ( /obj/structure/window/thin/reinforced, /obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_y = 4 +/obj/machinery/recharger/wallcharger{ + pixel_x = -25 }, /turf/simulated/shuttle/floor/evac/sec2, /area/shuttle/escape/centcom) @@ -1740,16 +1747,8 @@ }, /area/centcom/tdome) "aeB" = ( -/obj/structure/window/thin/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/cakeslice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/structure/table, -/obj/item/toy/plushie/space_whale{ - name = "Plushie Oculus" - }, -/turf/simulated/shuttle/floor/erokez{ - icon_state = "sign_2" - }, +/obj/machinery/vending/donut, +/turf/simulated/shuttle/floor/erokez, /area/shuttle/escape/centcom) "aeC" = ( /turf/simulated/shuttle/floor/evac/sec1, @@ -1850,19 +1849,11 @@ /turf/environment/space, /area/shuttle/escape/centcom) "aeU" = ( -/obj/structure/window/thin/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/friedbanana, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, /obj/structure/table, /obj/machinery/light{ dir = 4 }, -/obj/item/toy/plushie/tabby_cat{ - name = "Plushie Bucherck" - }, -/turf/simulated/shuttle/floor/erokez{ - icon_state = "sign_2" - }, +/turf/simulated/shuttle/floor/erokez, /area/shuttle/escape/centcom) "aeV" = ( /obj/structure/object_wall/evac{ @@ -2014,13 +2005,9 @@ charge = 100; maxcharge = 15000 }, -/obj/item/device/assembly/signaler{ - pixel_x = 3; - pixel_y = 1 - }, /obj/item/device/multitool{ - pixel_x = -3; - pixel_y = -2 + pixel_x = 12; + pixel_y = 5 }, /turf/simulated/shuttle/floor/evac/eng2, /area/shuttle/escape/centcom) @@ -2038,18 +2025,11 @@ /area/shuttle/escape/centcom) "afz" = ( /obj/structure/window/thin/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/applepie, -/obj/item/weapon/reagent_containers/food/drinks/bottle/beer, /obj/machinery/light{ dir = 8 }, -/obj/structure/table, -/obj/item/toy/plushie/orange_fox{ - name = "Plushie Wendy" - }, -/turf/simulated/shuttle/floor/erokez{ - icon_state = "sign_2" - }, +/obj/random/vending/snack, +/turf/simulated/shuttle/floor/erokez, /area/shuttle/escape/centcom) "afA" = ( /obj/structure/object_wall/standart{ @@ -2241,15 +2221,8 @@ /area/shuttle/vox/arkship) "aga" = ( /obj/structure/window/thin/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/carrotfries, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/structure/table, -/obj/item/toy/plushie/white_cat{ - name = "Plushie Scinia" - }, -/turf/simulated/shuttle/floor/erokez{ - icon_state = "sign_2" - }, +/obj/structure/closet/crate/bin, +/turf/simulated/shuttle/floor/erokez, /area/shuttle/escape/centcom) "agb" = ( /obj/machinery/door/airlock/centcom{ @@ -2896,10 +2869,7 @@ }, /obj/item/weapon/storage/toolbox/mechanical, /obj/item/clothing/head/welding, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 26 - }, +/obj/item/weapon/weldpack, /turf/simulated/shuttle/floor/evac/eng2, /area/shuttle/escape/centcom) "ahT" = ( @@ -7565,12 +7535,9 @@ /turf/environment/space, /area/shuttle/vox/arkship) "arD" = ( -/obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 6 +/obj/structure/stool/bed/chair/schair/wagon/blue{ + dir = 8 }, -/obj/item/weapon/defibrillator/loaded, /turf/simulated/shuttle/floor/evac/medbay, /area/shuttle/escape/centcom) "arE" = ( @@ -20083,8 +20050,8 @@ /turf/unsimulated/beach/sand, /area/custom/beach) "aWq" = ( -/obj/machinery/computer/security/wooden_tv/miami, /obj/structure/table, +/obj/machinery/computer/security/wooden_tv, /turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "aWw" = ( @@ -23729,7 +23696,10 @@ /area/velocity/waitingroom) "cYR" = ( /obj/structure/stool/bed/roller, -/obj/machinery/life_assist/artificial_ventilation, +/obj/machinery/iv_drip, +/obj/effect/decal/turf_decal/alpha/yellow{ + icon_state = "box_white" + }, /turf/simulated/shuttle/floor/evac/medbay, /area/shuttle/escape/centcom) "cZb" = ( @@ -24706,6 +24676,12 @@ opacity = 0 }, /area/custom/abductor_ship) +"eBp" = ( +/obj/effect/decal/turf_decal/alpha/yellow{ + icon_state = "box_white" + }, +/turf/simulated/shuttle/floor/evac/medbay, +/area/shuttle/escape/centcom) "eCb" = ( /obj/effect/decal/turf_decal{ dir = 1; @@ -25203,6 +25179,10 @@ }, /turf/unsimulated/floor, /area/centcom/prison) +"fsd" = ( +/obj/structure/stool/bed/chair/schair, +/turf/simulated/shuttle/floor/erokez, +/area/shuttle/escape/centcom) "ftb" = ( /obj/structure/object_wall/velocity{ dir = 8; @@ -27883,6 +27863,11 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/life_assist/artificial_ventilation, +/obj/structure/stool/bed/roller, +/obj/effect/decal/turf_decal/alpha/yellow{ + icon_state = "box_white" + }, /turf/simulated/shuttle/floor/evac/medbay, /area/shuttle/escape/centcom) "kdb" = ( @@ -30213,7 +30198,7 @@ /turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "oCb" = ( -/obj/structure/curtain/open, +/obj/machinery/door/airlock/wagon, /turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "oCX" = ( @@ -30264,8 +30249,7 @@ /turf/environment/space, /area/shuttle/escape/centcom) "oKb" = ( -/obj/structure/stool/bed/roller, -/obj/machinery/iv_drip, +/obj/structure/stool/bed/chair/schair/wagon/blue, /turf/simulated/shuttle/floor/evac/medbay, /area/shuttle/escape/centcom) "oKs" = ( @@ -30349,15 +30333,20 @@ }, /area/centcom/control) "oTb" = ( +/obj/structure/table, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 6; + pixel_y = 6 + }, /obj/item/weapon/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, -/obj/structure/table, -/obj/machinery/recharger/wallcharger{ - pixel_x = 34 - }, -/obj/item/weapon/storage/firstaid/adv, /turf/simulated/shuttle/floor/evac/medbay, /area/shuttle/escape/centcom) "oUb" = ( @@ -30688,10 +30677,6 @@ pixel_y = 4 }, /obj/structure/table, -/obj/machinery/vending/wallmed1{ - pixel_x = 32; - pixel_y = 2 - }, /obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/firstaid/o2{ pixel_x = 4; @@ -30705,6 +30690,10 @@ pixel_x = 6; pixel_y = 6 }, +/obj/machinery/vending/wallmed2{ + pixel_x = 32; + pixel_y = 2 + }, /turf/simulated/shuttle/floor/evac/medbay, /area/shuttle/escape/centcom) "pIJ" = ( @@ -30924,6 +30913,10 @@ icon_state = "dark" }, /area/velocity) +"qwu" = ( +/obj/random/vending/cola, +/turf/simulated/shuttle/floor/erokez, +/area/shuttle/escape/centcom) "qym" = ( /obj/effect/decal/turf_decal{ icon_state = "warn" @@ -31665,6 +31658,15 @@ name = "plating" }, /area/velocity) +"xqz" = ( +/obj/machinery/computer/guestpass/dark{ + pixel_x = 28 + }, +/obj/structure/stool/bed/chair/schair/wagon/blue{ + dir = 8 + }, +/turf/simulated/shuttle/floor/evac, +/area/shuttle/escape/centcom) "xrP" = ( /turf/simulated/shuttle/floor/vox{ icon_state = "floorcatwalk" @@ -31813,6 +31815,10 @@ }, /turf/unsimulated/floor, /area/centcom/waitingroom) +"ylj" = ( +/obj/machinery/vending/junkfood, +/turf/simulated/shuttle/floor/erokez, +/area/shuttle/escape/centcom) (1,1,1) = {" ahG @@ -51035,14 +51041,14 @@ aaM aaM aaM aRs -aac +qwu aeB -aac +ylj afz adW -aRG +adW oFb -oLb +eBp kcE cYR oKb @@ -51292,10 +51298,10 @@ aaM aaM aaM aUE -aRG -aRG -aRG -aRG +acw +acw +acw +acw aRG aRG adf @@ -51549,7 +51555,7 @@ aaM aaM aaM aVM -aac +fsd aeU aac aga @@ -53090,7 +53096,7 @@ ppb pvb mRb qab -iPu +xqz abI aeT aWR @@ -53862,7 +53868,7 @@ aaM aaM aaM aRs -acw +aYJ aRG aRG aRG From 42fe22f851c7dd15ba4e9a0d67b9a3980e6efce1 Mon Sep 17 00:00:00 2001 From: Venngedi <135035236+Venngedi@users.noreply.github.com> Date: Mon, 23 Sep 2024 18:16:10 +0300 Subject: [PATCH 2/3] Update centcom.dmm --- maps/centcom/centcom.dmm | 108 ++++++++++++++++++++++++++++----------- 1 file changed, 77 insertions(+), 31 deletions(-) diff --git a/maps/centcom/centcom.dmm b/maps/centcom/centcom.dmm index 6bd8adc35f7e..3025af891624 100644 --- a/maps/centcom/centcom.dmm +++ b/maps/centcom/centcom.dmm @@ -17,10 +17,15 @@ /turf/environment/space, /area/space) "aac" = ( -/obj/structure/stool/bed/chair/schair{ - dir = 1 +/obj/item/weapon/reagent_containers/food/snacks/carrotfries, +/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/structure/table, +/obj/item/toy/plushie/white_cat{ + name = "Plushie Scinia" + }, +/turf/simulated/shuttle/floor/erokez{ + icon_state = "sign_2" }, -/turf/simulated/shuttle/floor/erokez, /area/shuttle/escape/centcom) "aad" = ( /obj/structure/object_wall/evac{ @@ -1012,7 +1017,8 @@ /turf/simulated/shuttle/floor/evac/eng2, /area/shuttle/escape/centcom) "acw" = ( -/turf/simulated/shuttle/floor/erokez, +/obj/item/weapon/flora/pottedplant/orientaltree, +/turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "acx" = ( /obj/structure/stool/bed/chair/schair/wagon/yellow{ @@ -1516,7 +1522,7 @@ /turf/environment/space, /area/shuttle/escape/centcom) "adW" = ( -/obj/item/weapon/flora/random, +/obj/structure/closet/crate/bin, /turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "adX" = ( @@ -1747,8 +1753,11 @@ }, /area/centcom/tdome) "aeB" = ( -/obj/machinery/vending/donut, -/turf/simulated/shuttle/floor/erokez, +/obj/structure/window/thin/reinforced, +/obj/structure/stool/bed/chair/schair/wagon/green{ + dir = 1 + }, +/turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "aeC" = ( /turf/simulated/shuttle/floor/evac/sec1, @@ -1849,11 +1858,14 @@ /turf/environment/space, /area/shuttle/escape/centcom) "aeU" = ( -/obj/structure/table, +/obj/structure/window/thin/reinforced, +/obj/structure/stool/bed/chair/schair/wagon/green{ + dir = 1 + }, /obj/machinery/light{ dir = 4 }, -/turf/simulated/shuttle/floor/erokez, +/turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "aeV" = ( /obj/structure/object_wall/evac{ @@ -1917,7 +1929,9 @@ /obj/structure/closet/emergency_wall{ pixel_y = 32 }, -/obj/structure/stool/bed/chair/schair/wagon/green, +/obj/structure/stool/bed/chair/schair/wagon/green{ + dir = 1 + }, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "afh" = ( @@ -1953,7 +1967,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/stool/bed/chair/schair/wagon/green, +/obj/structure/stool/bed/chair/schair/wagon/green{ + dir = 1 + }, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "afq" = ( @@ -2025,11 +2041,13 @@ /area/shuttle/escape/centcom) "afz" = ( /obj/structure/window/thin/reinforced, +/obj/structure/stool/bed/chair/schair/wagon/green{ + dir = 1 + }, /obj/machinery/light{ dir = 8 }, -/obj/random/vending/snack, -/turf/simulated/shuttle/floor/erokez, +/turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "afA" = ( /obj/structure/object_wall/standart{ @@ -2220,9 +2238,8 @@ /turf/environment/space, /area/shuttle/vox/arkship) "aga" = ( -/obj/structure/window/thin/reinforced, -/obj/structure/closet/crate/bin, -/turf/simulated/shuttle/floor/erokez, +/obj/machinery/vending/junkfood, +/turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "agb" = ( /obj/machinery/door/airlock/centcom{ @@ -20165,7 +20182,9 @@ /turf/environment/space, /area/shuttle/vox/arkship) "aWR" = ( -/obj/structure/stool/bed/chair/schair/wagon/green, +/obj/structure/stool/bed/chair/schair/wagon/green{ + dir = 1 + }, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "aWS" = ( @@ -22782,7 +22801,9 @@ pixel_x = -31; pixel_y = 4 }, -/obj/structure/stool/bed/chair/schair/wagon/green, +/obj/structure/stool/bed/chair/schair/wagon/green{ + dir = 1 + }, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "bJz" = ( @@ -24486,7 +24507,9 @@ pixel_x = 31; pixel_y = 4 }, -/obj/structure/stool/bed/chair/schair/wagon/green, +/obj/structure/stool/bed/chair/schair/wagon/green{ + dir = 1 + }, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "eib" = ( @@ -25180,8 +25203,15 @@ /turf/unsimulated/floor, /area/centcom/prison) "fsd" = ( -/obj/structure/stool/bed/chair/schair, -/turf/simulated/shuttle/floor/erokez, +/obj/item/weapon/reagent_containers/food/snacks/friedbanana, +/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/structure/table, +/obj/item/toy/plushie/tabby_cat{ + name = "Plushie Bucherck" + }, +/turf/simulated/shuttle/floor/erokez{ + icon_state = "sign_2" + }, /area/shuttle/escape/centcom) "ftb" = ( /obj/structure/object_wall/velocity{ @@ -30288,7 +30318,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/stool/bed/chair/schair/wagon/green, +/obj/structure/stool/bed/chair/schair/wagon/green{ + dir = 1 + }, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "oPb" = ( @@ -30914,8 +30946,15 @@ }, /area/velocity) "qwu" = ( -/obj/random/vending/cola, -/turf/simulated/shuttle/floor/erokez, +/obj/item/weapon/reagent_containers/food/snacks/cakeslice, +/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, +/obj/structure/table, +/obj/item/toy/plushie/space_whale{ + name = "Plushie Oculus" + }, +/turf/simulated/shuttle/floor/erokez{ + icon_state = "sign_2" + }, /area/shuttle/escape/centcom) "qym" = ( /obj/effect/decal/turf_decal{ @@ -31816,8 +31855,15 @@ /turf/unsimulated/floor, /area/centcom/waitingroom) "ylj" = ( -/obj/machinery/vending/junkfood, -/turf/simulated/shuttle/floor/erokez, +/obj/item/weapon/reagent_containers/food/snacks/applepie, +/obj/item/weapon/reagent_containers/food/drinks/bottle/beer, +/obj/structure/table, +/obj/item/toy/plushie/orange_fox{ + name = "Plushie Wendy" + }, +/turf/simulated/shuttle/floor/erokez{ + icon_state = "sign_2" + }, /area/shuttle/escape/centcom) (1,1,1) = {" @@ -51045,7 +51091,7 @@ qwu aeB ylj afz -adW +aga adW oFb eBp @@ -51299,9 +51345,9 @@ aaM aaM aUE acw -acw -acw -acw +aRG +aRG +aRG aRG aRG adf @@ -51558,7 +51604,7 @@ aVM fsd aeU aac -aga +aeB aRG aRG bOb From 449544fedde882f41c273a320926760230251e9c Mon Sep 17 00:00:00 2001 From: Venngedi <135035236+Venngedi@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:22:15 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D0=BE=D0=B2=D0=B5=D1=80=D0=BD=D1=83?= =?UTF-8?q?=D0=BB=20=D0=BA=D1=80=D0=B5=D1=81=D0=BB=D0=B0,=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BD=D1=83=D0=BB=20=D1=88=D0=BA=D0=B0=D1=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maps/centcom/centcom.dmm | 129 ++++++++++++++------------------------- 1 file changed, 47 insertions(+), 82 deletions(-) diff --git a/maps/centcom/centcom.dmm b/maps/centcom/centcom.dmm index a05d6a12ab2a..c655702ac86d 100644 --- a/maps/centcom/centcom.dmm +++ b/maps/centcom/centcom.dmm @@ -17,11 +17,12 @@ /turf/environment/space, /area/space) "aac" = ( -/obj/item/weapon/reagent_containers/food/snacks/carrotfries, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/structure/window/thin/reinforced, +/obj/item/weapon/reagent_containers/food/snacks/cakeslice, +/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, /obj/structure/table, -/obj/item/toy/plushie/white_cat{ - name = "Plushie Scinia" +/obj/item/toy/plushie/space_whale{ + name = "Plushie Oculus" }, /turf/simulated/shuttle/floor/erokez{ icon_state = "sign_2" @@ -1016,10 +1017,6 @@ /obj/structure/reagent_dispensers/aqueous_foam_tank, /turf/simulated/shuttle/floor/evac/eng2, /area/shuttle/escape/centcom) -"acw" = ( -/obj/item/weapon/flora/pottedplant/orientaltree, -/turf/simulated/shuttle/floor/evac, -/area/shuttle/escape/centcom) "acx" = ( /obj/structure/stool/bed/chair/schair/wagon/yellow{ dir = 1 @@ -1595,13 +1592,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/structure/closet/crate, -/obj/item/stack/sheet/glass{ - amount = 10 - }, -/obj/item/stack/sheet/metal{ - amount = 15 - }, +/obj/structure/closet/firecloset/full, /turf/simulated/shuttle/floor/evac/eng2, /area/shuttle/escape/centcom) "aeh" = ( @@ -1754,10 +1745,15 @@ /area/centcom/tdome) "aeB" = ( /obj/structure/window/thin/reinforced, -/obj/structure/stool/bed/chair/schair/wagon/green{ - dir = 1 +/obj/item/weapon/reagent_containers/food/snacks/carrotfries, +/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/structure/table, +/obj/item/toy/plushie/white_cat{ + name = "Plushie Scinia" + }, +/turf/simulated/shuttle/floor/erokez{ + icon_state = "sign_2" }, -/turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) "aeC" = ( /turf/simulated/shuttle/floor/evac/sec1, @@ -1859,13 +1855,18 @@ /area/shuttle/escape/centcom) "aeU" = ( /obj/structure/window/thin/reinforced, -/obj/structure/stool/bed/chair/schair/wagon/green{ - dir = 1 - }, +/obj/item/weapon/reagent_containers/food/snacks/friedbanana, +/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/structure/table, /obj/machinery/light{ dir = 4 }, -/turf/simulated/shuttle/floor/evac, +/obj/item/toy/plushie/tabby_cat{ + name = "Plushie Bucherck" + }, +/turf/simulated/shuttle/floor/erokez{ + icon_state = "sign_2" + }, /area/shuttle/escape/centcom) "aeV" = ( /obj/structure/object_wall/evac{ @@ -1929,9 +1930,7 @@ /obj/structure/closet/emergency_wall{ pixel_y = 32 }, -/obj/structure/stool/bed/chair/schair/wagon/green{ - dir = 1 - }, +/obj/structure/stool/bed/chair/schair/wagon/green, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "afh" = ( @@ -1967,9 +1966,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/stool/bed/chair/schair/wagon/green{ - dir = 1 - }, +/obj/structure/stool/bed/chair/schair/wagon/green, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "afq" = ( @@ -2038,13 +2035,18 @@ /area/shuttle/escape/centcom) "afz" = ( /obj/structure/window/thin/reinforced, -/obj/structure/stool/bed/chair/schair/wagon/green{ - dir = 1 - }, +/obj/item/weapon/reagent_containers/food/snacks/applepie, +/obj/item/weapon/reagent_containers/food/drinks/bottle/beer, /obj/machinery/light{ dir = 8 }, -/turf/simulated/shuttle/floor/evac, +/obj/structure/table, +/obj/item/toy/plushie/orange_fox{ + name = "Plushie Wendy" + }, +/turf/simulated/shuttle/floor/erokez{ + icon_state = "sign_2" + }, /area/shuttle/escape/centcom) "afA" = ( /obj/structure/object_wall/standart{ @@ -20031,9 +20033,7 @@ /turf/environment/space, /area/shuttle/vox/arkship) "aWR" = ( -/obj/structure/stool/bed/chair/schair/wagon/green{ - dir = 1 - }, +/obj/structure/stool/bed/chair/schair/wagon/green, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "aWS" = ( @@ -22637,9 +22637,7 @@ pixel_x = -31; pixel_y = 4 }, -/obj/structure/stool/bed/chair/schair/wagon/green{ - dir = 1 - }, +/obj/structure/stool/bed/chair/schair/wagon/green, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "bJz" = ( @@ -24451,9 +24449,7 @@ pixel_x = 31; pixel_y = 4 }, -/obj/structure/stool/bed/chair/schair/wagon/green{ - dir = 1 - }, +/obj/structure/stool/bed/chair/schair/wagon/green, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "eib" = ( @@ -25194,17 +25190,6 @@ }, /turf/unsimulated/floor, /area/centcom/prison) -"fsd" = ( -/obj/item/weapon/reagent_containers/food/snacks/friedbanana, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/structure/table, -/obj/item/toy/plushie/tabby_cat{ - name = "Plushie Bucherck" - }, -/turf/simulated/shuttle/floor/erokez{ - icon_state = "sign_2" - }, -/area/shuttle/escape/centcom) "ftb" = ( /obj/structure/object_wall/velocity{ dir = 8; @@ -30428,9 +30413,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/stool/bed/chair/schair/wagon/green{ - dir = 1 - }, +/obj/structure/stool/bed/chair/schair/wagon/green, /turf/simulated/shuttle/floor/evac/place, /area/shuttle/escape/centcom) "oPb" = ( @@ -31123,23 +31106,16 @@ icon_state = "dark" }, /area/velocity) -"qwu" = ( -/obj/item/weapon/reagent_containers/food/snacks/cakeslice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/structure/table, -/obj/item/toy/plushie/space_whale{ - name = "Plushie Oculus" - }, -/turf/simulated/shuttle/floor/erokez{ - icon_state = "sign_2" - }, -/area/shuttle/escape/centcom) "qwb" = ( /obj/structure/table, /obj/item/weapon/storage/box/drinkingglasses, /obj/item/weapon/reagent_containers/food/snacks/meatsteak, /turf/unsimulated/floor/carpet/blue2, /area/pluvian_heaven) +"qwu" = ( +/obj/structure/stool/bed/chair/schair/wagon/green, +/turf/simulated/shuttle/floor/evac, +/area/shuttle/escape/centcom) "qym" = ( /obj/effect/decal/turf_decal{ icon_state = "warn" @@ -32102,17 +32078,6 @@ }, /turf/unsimulated/floor, /area/centcom/waitingroom) -"ylj" = ( -/obj/item/weapon/reagent_containers/food/snacks/applepie, -/obj/item/weapon/reagent_containers/food/drinks/bottle/beer, -/obj/structure/table, -/obj/item/toy/plushie/orange_fox{ - name = "Plushie Wendy" - }, -/turf/simulated/shuttle/floor/erokez{ - icon_state = "sign_2" - }, -/area/shuttle/escape/centcom) (1,1,1) = {" ahG @@ -51336,8 +51301,8 @@ aaM aaM aRs qwu -aeB -ylj +aac +qwu afz aga adW @@ -51592,7 +51557,7 @@ aaM aaM aaM aUE -acw +aRG aRG aRG aRG @@ -51849,9 +51814,9 @@ aaM aaM aaM aVM -fsd +qwu aeU -aac +qwu aeB aRG aRG