From 07ac3f934c47810a521d999e10b0e414d37c3f94 Mon Sep 17 00:00:00 2001 From: konushi Date: Wed, 8 Jan 2025 18:31:32 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D0=B2=D1=8C=D1=8E=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_bandastation/mapping/code/templates.dm | 1 - .../objects/code/machinery/vending/vending.dm | 14 +++++++------- modular_bandastation/objects/code/mecha/mecha.dm | 12 +++++++++--- modular_bandastation/objects/code/shuttles.dm | 2 +- .../objects/code/structures/fake_light.dm | 4 ++-- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/modular_bandastation/mapping/code/templates.dm b/modular_bandastation/mapping/code/templates.dm index 1637b5b76543a..4718371892c61 100644 --- a/modular_bandastation/mapping/code/templates.dm +++ b/modular_bandastation/mapping/code/templates.dm @@ -41,7 +41,6 @@ prefix = "_maps/shuttles/ss220/" /datum/map_template/shuttle/specops/basic - suffix = "basic" name = "basic specops shuttle" description = "Base Specops shuttle." diff --git a/modular_bandastation/objects/code/machinery/vending/vending.dm b/modular_bandastation/objects/code/machinery/vending/vending.dm index 841360ef15e5c..7670ba737dad9 100644 --- a/modular_bandastation/objects/code/machinery/vending/vending.dm +++ b/modular_bandastation/objects/code/machinery/vending/vending.dm @@ -1,6 +1,6 @@ -/*MARK Vending Machine*/ +//MARK: Vending Machines -//Robotics Wardrobe +// Robotics Wardrobe /obj/machinery/vending/wardrobe/robo_wardrobe icon = 'modular_bandastation/objects/icons/obj/machines/vending.dmi' icon_state = "robodrobe" @@ -22,7 +22,7 @@ ) . = ..() -//CentCom NT Ammunition +// CentCom NT Ammunition /obj/machinery/vending/nta name = "\improper NT Ammunition" desc = "A special equipment vendor." @@ -43,10 +43,10 @@ icon_state = "refill_nta" light_color = LIGHT_COLOR_BLUE -//Light Gear +// Light Gear /obj/machinery/vending/nta/light name = "\improper NT Ammunition - Light Gear" - desc = "A special equipment vendor. This one stores riot suppression equipment and non-lethal detention." + desc = "Раздатчик специального оборудования для отрядов быстрого реагирования от дочерней компании \"NT Ammunition\". На выбор средства для подавления беспорядков и нелетального задержания." product_ads = "Круши черепа синдиката!;Не забывай, спасать - полезно!;Бжж-Бзз-з!;Обезопасить, Удержать, Сохранить!;Стоять, снярядись на задание!" vend_reply = "Слава Нанотрейзен!" @@ -106,10 +106,10 @@ ), ) -//Heavy Gear +// Heavy Gear /obj/machinery/vending/nta/heavy name = "\improper NT Ammunition - Heavy Gear" - desc = "A special equipment vendor. This one stores heavy weapons for complex operations and assaults.." + desc = "Раздатчик специального оборудования для отрядов быстрого реагирования от дочерней компании \"NT Ammunition\". На выбор штурмовое снаряжение и средства для проведения сложных боевых операций." product_ads = "Круши черепа синдиката!;Не забывай, спасать - полезно!;Бжж-Бзз-з!;Обезопасить, Удержать, Сохранить!;Стоять, снярядись на задание!" vend_reply = "Слава Нанотрейзен!" product_categories = list( diff --git a/modular_bandastation/objects/code/mecha/mecha.dm b/modular_bandastation/objects/code/mecha/mecha.dm index 50a11a1077d52..52275c4aef930 100644 --- a/modular_bandastation/objects/code/mecha/mecha.dm +++ b/modular_bandastation/objects/code/mecha/mecha.dm @@ -1,11 +1,14 @@ -/* MARK Mecha*/ +// MARK: Mechas // Mecha CentCom /obj/vehicle/sealed/mecha/marauder/loaded/ert equip_by_category = list( MECHA_L_ARM = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy, MECHA_R_ARM = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/breaching, - MECHA_UTILITY = list(/obj/item/mecha_parts/mecha_equipment/radio, /obj/item/mecha_parts/mecha_equipment/air_tank/full, /obj/item/mecha_parts/mecha_equipment/thrusters/ion, /obj/item/mecha_parts/mecha_equipment/repair_droid), + MECHA_UTILITY = list(/obj/item/mecha_parts/mecha_equipment/radio, + /obj/item/mecha_parts/mecha_equipment/air_tank/full, + /obj/item/mecha_parts/mecha_equipment/thrusters/ion, + /obj/item/mecha_parts/mecha_equipment/repair_droid), MECHA_POWER = list(), MECHA_ARMOR = list(/obj/item/mecha_parts/mecha_equipment/armor/antiproj_armor_booster), ) @@ -14,7 +17,10 @@ equip_by_category = list( MECHA_L_ARM = /obj/item/mecha_parts/mecha_equipment/weapon/energy/disabler, MECHA_R_ARM = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, - MECHA_UTILITY = list(/obj/item/mecha_parts/mecha_equipment/radio, /obj/item/mecha_parts/mecha_equipment/air_tank/full, /obj/item/mecha_parts/mecha_equipment/thrusters/ion, /obj/item/mecha_parts/mecha_equipment/repair_droid), + MECHA_UTILITY = list(/obj/item/mecha_parts/mecha_equipment/radio, + /obj/item/mecha_parts/mecha_equipment/air_tank/full, + /obj/item/mecha_parts/mecha_equipment/thrusters/ion, + /obj/item/mecha_parts/mecha_equipment/repair_droid), MECHA_POWER = list(), MECHA_ARMOR = list(), ) diff --git a/modular_bandastation/objects/code/shuttles.dm b/modular_bandastation/objects/code/shuttles.dm index a48b16153ed58..d085906d6e54e 100644 --- a/modular_bandastation/objects/code/shuttles.dm +++ b/modular_bandastation/objects/code/shuttles.dm @@ -16,7 +16,7 @@ y_offset = 3 /obj/machinery/computer/camera_advanced/shuttle_docker/argos - name = "syndicate infiltrator navigation computer" + name = "argos shuttle navigation computer" desc = "Used to pilot Argos shuttle." icon_screen = "shuttle" icon_keyboard = "rd_key" diff --git a/modular_bandastation/objects/code/structures/fake_light.dm b/modular_bandastation/objects/code/structures/fake_light.dm index f4375151ec9b3..d976a887bd76f 100644 --- a/modular_bandastation/objects/code/structures/fake_light.dm +++ b/modular_bandastation/objects/code/structures/fake_light.dm @@ -1,7 +1,7 @@ -// ---- Fake small +// Fake small MAPPING_DIRECTIONAL_HELPERS(/obj/structure/light_fake/small, 0) -// -------- Fake tube +// Fake tube MAPPING_DIRECTIONAL_HELPERS(/obj/structure/light_fake/spot, 0) /obj/structure/light_fake