From 27af827eda918de664407ab7f398f5072368f469 Mon Sep 17 00:00:00 2001 From: CallmeHouston <145014422+CallmeHouston@users.noreply.github.com> Date: Sun, 2 Feb 2025 02:03:16 +0800 Subject: [PATCH] Cyberiad: smes (#1107) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Добавление больше смесов в инженерку. Теперь в телекомах полностью заряженный смес. ## Почему это хорошо для игры Станция большая, станции нужно много электричества, больше смесов дадут больше электричества. Заряженный смес у телекомов, как на других картах, чтобы связь не падала через минуту от начала раунда. ## Изображения изменений ![StrongDMM-2025-01-31 17 02 13](https://github.com/user-attachments/assets/4dd3ac7b-866b-4d4a-86b6-96325ac5399b) ## Changelog :cl: map: Кибериада: добавлено 2 дополнительных смеса в инженерный, смес в телекомах заменён на полностью заряженный /:cl: --- _maps/map_files/Cyberiad/Cyberiad.dmm | 113 +++++++++++--------------- 1 file changed, 48 insertions(+), 65 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index ff07bae96295e..bb636f42fac71 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -1134,14 +1134,13 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "aoY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, /obj/machinery/camera/directional/south{ c_tag = "Engineering - SMES Room"; network = list("ss13","engineering") }, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/engine_smes) "apb" = ( @@ -1898,16 +1897,12 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix/ghetto) "ayW" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow/full, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/light_switch/directional/west, /obj/structure/cable, +/obj/machinery/power/terminal, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/engineering/engine_smes) "azb" = ( @@ -11018,10 +11013,11 @@ /area/station/maintenance/ghetto/central) "cKg" = ( /obj/structure/cable, -/obj/machinery/power/smes/engineering, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/table, /turf/open/floor/iron, /area/station/engineering/engine_smes) "cKl" = ( @@ -20284,9 +20280,9 @@ /turf/open/floor/iron/white, /area/station/medical/psychology) "fdw" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/engine_smes) "fdy" = ( @@ -28261,10 +28257,11 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "hch" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/cable, +/obj/machinery/power/terminal, +/obj/effect/turf_decal/tile/yellow/full, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/engineering/engine_smes) "hcl" = ( @@ -33637,15 +33634,11 @@ /area/station/hallway/primary/starboard) "ius" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/power/terminal{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow/full, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/cable, +/obj/machinery/power/terminal, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/engineering/engine_smes) "iux" = ( @@ -36247,6 +36240,13 @@ /obj/item/radio/intercom/directional/south, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/engine_smes) "jcP" = ( @@ -36957,10 +36957,11 @@ /area/station/medical/medbay) "jmE" = ( /obj/structure/cable, -/obj/machinery/power/smes/engineering, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, +/obj/structure/table, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/engineering/engine_smes) "jmF" = ( @@ -38831,15 +38832,11 @@ /area/station/ai_monitored/security/armory) "jLz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/terminal{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow/full, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/cable, +/obj/machinery/power/terminal, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/engineering/engine_smes) "jLB" = ( @@ -50540,14 +50537,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) -"mFR" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron, -/area/station/engineering/engine_smes) "mFW" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 @@ -53811,12 +53800,6 @@ "nvj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/structure/cable/layer1, /turf/open/floor/iron, /area/station/engineering/engine_smes) @@ -56271,10 +56254,6 @@ /obj/item/stack/sheet/iron/fifty, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"oaI" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron, -/area/station/engineering/engine_smes) "oaQ" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance/two, @@ -57721,10 +57700,10 @@ /area/station/maintenance/starboard/aft) "orZ" = ( /obj/structure/cable, -/obj/machinery/power/smes/engineering, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/engineering/engine_smes) "osh" = ( @@ -59126,6 +59105,14 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"oKz" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) "oKA" = ( /obj/structure/cable, /obj/effect/decal/cleanable/blood/old, @@ -65041,10 +65028,11 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "qjh" = ( -/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 }, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/engine_smes) "qjk" = ( @@ -67988,11 +67976,9 @@ /turf/open/floor/grass, /area/station/maintenance/ghetto/garden) "qWK" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, /obj/item/radio/intercom/directional/north, /obj/structure/cable, +/obj/machinery/power/smes/full, /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) "qWL" = ( @@ -77001,13 +76987,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/holopad, +/obj/structure/cable/multilayer/connected, +/obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 + dir = 8 }, -/obj/structure/cable/multilayer/connected, /turf/open/floor/iron, /area/station/engineering/engine_smes) "tmR" = ( @@ -79764,6 +79748,8 @@ /area/station/medical/virology) "tVG" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/engine_smes) "tVJ" = ( @@ -84698,15 +84684,12 @@ /turf/open/floor/wood/parquet, /area/station/maintenance/department/security/ghetto) "vlU" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow/full, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/cable, +/obj/machinery/power/terminal, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/engineering/engine_smes) "vmb" = ( @@ -191022,9 +191005,9 @@ pPI jLC yfl alL -orZ +oKz ius -mFR +fdw qHG wAJ xKA @@ -191281,7 +191264,7 @@ aPB tey lFU hch -oaI +fdw qHG nle svV