Skip to content

Commit

Permalink
ревью фиксы
Browse files Browse the repository at this point in the history
  • Loading branch information
konushi committed Jan 8, 2025
1 parent 455df48 commit 07ac3f9
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 14 deletions.
1 change: 0 additions & 1 deletion modular_bandastation/mapping/code/templates.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
prefix = "_maps/shuttles/ss220/"

/datum/map_template/shuttle/specops/basic

suffix = "basic"
name = "basic specops shuttle"
description = "Base Specops shuttle."
Expand Down
14 changes: 7 additions & 7 deletions modular_bandastation/objects/code/machinery/vending/vending.dm
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -22,7 +22,7 @@
)
. = ..()

//CentCom NT Ammunition
// CentCom NT Ammunition
/obj/machinery/vending/nta
name = "\improper NT Ammunition"
desc = "A special equipment vendor."
Expand All @@ -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 = "Слава Нанотрейзен!"

Expand Down Expand Up @@ -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(
Expand Down
12 changes: 9 additions & 3 deletions modular_bandastation/objects/code/mecha/mecha.dm
Original file line number Diff line number Diff line change
@@ -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),
)
Expand All @@ -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(),
)
Expand Down
2 changes: 1 addition & 1 deletion modular_bandastation/objects/code/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions modular_bandastation/objects/code/structures/fake_light.dm
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 07ac3f9

Please sign in to comment.