From 1c198da6b809f3a630cf2e2d5cfdd454ce2b5bb4 Mon Sep 17 00:00:00 2001 From: AlexTheEng1neer <128976622+AlexTheEng1neer@users.noreply.github.com> Date: Tue, 25 Nov 2025 01:02:02 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B2=D0=B5=D0=BD=D0=B4=D0=BE=D1=80=D1=8B,=20?= =?UTF-8?q?=D0=BC=D0=B0=D1=8F=D0=BA=20=D0=B8=20resupply=20canister?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлены вендоры для ОБР Blue, Amber, RED, SRT (попытка в аналог БЩ для ЦКшников) и вендор с оборудованием для мехов --- .../code/ERT_equipment_vendor.dm | 413 ++++++++++++++++++ .../icons/obj/ERT_equipment_vendor.dmi | Bin 0 -> 4740 bytes tgstation.dme | 1 + 3 files changed, 414 insertions(+) create mode 100644 tff_modular/modules/ERT_equipment_vending_machines/code/ERT_equipment_vendor.dm create mode 100644 tff_modular/modules/ERT_equipment_vending_machines/icons/obj/ERT_equipment_vendor.dmi diff --git a/tff_modular/modules/ERT_equipment_vending_machines/code/ERT_equipment_vendor.dm b/tff_modular/modules/ERT_equipment_vending_machines/code/ERT_equipment_vendor.dm new file mode 100644 index 00000000000..e828e70d3d4 --- /dev/null +++ b/tff_modular/modules/ERT_equipment_vending_machines/code/ERT_equipment_vendor.dm @@ -0,0 +1,413 @@ +// Базовый вариант вендора как темплейт для всех "специализированных" версий +/obj/machinery/vending/ertvend + name = "\improper ERT Equipment Vend" + desc = "Equipment for those cases where everything has gone wrong at the station. Do you still have time to read this description? Get to work now!" + icon = 'tff_modular/modules/ERT_equipment_vending_machines/icons/obj/ERT_equipment_vendor.dmi' + icon_state = "ERTvend" + icon_deny = "ERTvend-deny" + panel_type = "panelERTvend" + light_mask = "ERTvend-light-mask" + light_color = "#a5aae7ff" + onstation = 0 + all_products_free = 1 + allow_custom = 0 + // scan_id = 1 + // контроль доступов у вендоров не работает + // req_access = list("cent_general") + + product_ads = "Every second counts!;Get the equipment NOW! Manage your inventory on the ERT shuttle!;The maximum response time according to the corporate standard is 3 minutes. HURRY UP!" + vend_reply = "Move out! Fire at will!" + + product_categories = list( + list( + "name" = "Weapons", + "icon" = "gun", + "products" = list( + + ), + ), + list( + "name" = "Ammo", + "icon" = "box-archive", + "products" = list( + + ), + ), + list( + "name" = "Accessories", + "icon" = "person-military-rifle", + "products" = list( + /obj/item/storage/belt/security/webbing = 4, + /obj/item/clothing/accessory/cqd_holster = 8, + /obj/item/flashlight/seclite = 8, + /obj/item/storage/pouch/ammo = 4, + /obj/item/shield/riot/tele = 4, + /obj/item/shield/ballistic = 4, + /obj/item/screwdriver = 8, + /obj/item/wirecutters = 8, + /obj/item/mod/module/jetpack = 4, + /obj/item/mod/module/magboot = 4, + /obj/item/firing_pin/implant/mindshield = 8 + ), + ), + ) + contraband = list( + /obj/item/clothing/under/costume/playbunny/centcom = 1, + /obj/item/clothing/suit/armor/security_tailcoat/centcom = 1, + /obj/item/clothing/neck/bunny/bunnytie/centcom = 1, + /obj/item/clothing/head/playbunnyears/centcom = 1, + /obj/item/clothing/shoes/fancy_heels/green = 1, + /obj/item/clothing/shoes/fancy_heels/darkgreen = 1 + ) + premium = list( + /obj/item/stock_parts/power_store/cell/lead = 1 + ) + refill_canister = /obj/item/vending_refill/ertvend + +// в теории это сделает вендоры бесплатными при спавне, а не только при загрузке карт и темплейтов +/obj/machinery/vending/ertvend/Initialize() + . = ..() + all_products_free = TRUE + qdel(GetComponent(/datum/component/payment)) + +// Вендор для ОБР Blue. Снаряжение примерно аналогично раундстартовой оружейке СБ +/obj/machinery/vending/ertvend/blue + name = "\improper ERT Equipment Vend - Blue" + product_categories = list( + list( + "name" = "Weapons", + "icon" = "gun", + "products" = list( + /obj/item/gun/energy/disabler = 4, + /obj/item/gun/energy/disabler/smg = 4, + /obj/item/gun/ballistic/automatic/pistol/sol = 4, + /obj/item/gun/energy/e_gun/dragnet = 2, + /obj/item/gun/energy/modular_laser_rifle/carbine = 2, + /obj/item/gun/ballistic/automatic/sol_smg = 2, + /obj/item/gun/ballistic/automatic/wt550 = 2, + /obj/item/gun/ballistic/shotgun/riot/sol = 2 + ), + ), + list( + "name" = "Ammo", + "icon" = "box-archive", + "products" = list( + /obj/item/ammo_box/magazine/c35sol_pistol = 8, + /obj/item/ammo_box/magazine/c35sol_pistol/stendo = 8, + /obj/item/ammo_box/magazine/wt550m9 = 8, + /obj/item/ammo_box/advanced/s12gauge/rubber = 8, + /obj/item/ammo_box/advanced/s12gauge/bean = 8, + /obj/item/ammo_box/advanced/s12gauge/antitide = 8, + /obj/item/ammo_box/advanced/s12gauge = 8, + /obj/item/ammo_box/advanced/s12gauge/incendiary = 8, + /obj/item/ammo_box/advanced/s12gauge/hunter = 8, + /obj/item/ammo_box/advanced/s12gauge/flechette = 8 + ), + ), + list( + "name" = "Accessories", + "icon" = "person-military-rifle", + "products" = list( + /obj/item/storage/belt/security/webbing = 4, + /obj/item/clothing/accessory/cqd_holster = 8, + /obj/item/flashlight/seclite = 8, + /obj/item/storage/pouch/ammo = 4, + /obj/item/shield/riot/tele = 4, + /obj/item/shield/ballistic = 4, + /obj/item/screwdriver = 8, + /obj/item/wirecutters = 8, + /obj/item/mod/module/jetpack = 4, + /obj/item/mod/module/magboot = 4, + /obj/item/firing_pin/implant/mindshield = 8 + ), + ), + ) + premium = list( + /obj/item/stock_parts/power_store/cell/lead = 1 + ) + +// Вендор для ОБР Amber. Снаряга примерно аналогична тому, что можно заказать в карго + +/obj/machinery/vending/ertvend/amber + name = "\improper ERT Equipment Vend - Amber" + icon_state = "ERTvend-amber" + product_categories = list( + list( + "name" = "Weapons", + "icon" = "gun", + "products" = list( + /obj/item/gun/ballistic/automatic/proto/unrestricted = 2, + /obj/item/gun/ballistic/automatic/pistol/trappiste = 4, + /obj/item/gun/ballistic/revolver/takbok = 4, + /obj/item/gun/ballistic/automatic/pistol/m1911 = 4, + /obj/item/gun/ballistic/automatic/xhihao_smg = 2, + /obj/item/gun/ballistic/automatic/nt20 = 2, + /obj/item/gun/ballistic/automatic/laser = 2, + /obj/item/gun/energy/laser/carbine/cybersun/black_market_trader = 2, + /obj/item/gun/ballistic/shotgun/automatic/combat/compact = 2, + /obj/item/gun/ballistic/shotgun/automatic/combat = 2, + /obj/item/gun/ballistic/automatic/sol_rifle/marksman = 2, + /obj/item/gun/ballistic/automatic/sol_rifle = 2 + ), + ), + list( + "name" = "Ammo", + "icon" = "box-archive", + "products" = list( + /obj/item/ammo_box/magazine/smgm9mm = 8, + /obj/item/ammo_box/magazine/c585trappiste_pistol = 20, + /obj/item/ammo_box/c585trappiste = 8, + /obj/item/ammo_box/magazine/m45 = 8, + /obj/item/ammo_box/magazine/recharge = 16, + /obj/item/ammo_box/magazine/c40sol_rifle = 8, + /obj/item/ammo_box/magazine/c40sol_rifle/standard =8, + /obj/item/ammo_box/magazine/smgm45 = 8, + /obj/item/ammo_box/advanced/s12gauge/rubber = 8, + /obj/item/ammo_box/advanced/s12gauge/bean = 8, + /obj/item/ammo_box/advanced/s12gauge/antitide = 8, + /obj/item/ammo_box/advanced/s12gauge = 8, + /obj/item/ammo_box/advanced/s12gauge/buckshot = 8, + /obj/item/ammo_box/advanced/s12gauge/incendiary = 8, + /obj/item/ammo_box/advanced/s12gauge/hunter = 8, + /obj/item/ammo_box/advanced/s12gauge/flechette = 8 + ), + ), + list( + "name" = "Accessories", + "icon" = "person-military-rifle", + "products" = list( + /obj/item/storage/belt/security/webbing = 4, + /obj/item/clothing/accessory/cqd_holster = 8, + /obj/item/flashlight/seclite = 8, + /obj/item/storage/pouch/ammo = 4, + /obj/item/shield/riot/tele = 4, + /obj/item/shield/ballistic = 4, + /obj/item/screwdriver = 8, + /obj/item/wirecutters = 8, + /obj/item/mod/module/jetpack = 4, + /obj/item/mod/module/magboot = 4, + /obj/item/firing_pin/implant/mindshield = 8 + ), + ), + ) + premium = list( + /obj/item/stock_parts/power_store/cell/lead = 1 + ) + +// Вендор для ОБР RED. Сильное лазерное оружие и баллистика с уроном от выстрела/очереди >= 50 единиц + +/obj/machinery/vending/ertvend/red + name = "\improper ERT Equipment Vend - RED" + icon_state = "ERTvend-red" + product_categories = list( + list( + "name" = "Weapons", + "icon" = "gun", + "products" = list( + /obj/item/gun/ballistic/automatic/pistol/deagle = 4, + /obj/item/gun/ballistic/revolver/mateba = 4, + /obj/item/gun/ballistic/automatic/ar = 2, + /obj/item/gun/energy/laser/hellgun/blueshield = 2, + /obj/item/gun/energy/laser/captain/scattershot = 2, + /obj/item/gun/ballistic/automatic/lanca = 2, + /obj/item/gun/ballistic/automatic/sniper_rifle/modular = 2 + ), + ), + list( + "name" = "Ammo", + "icon" = "box-archive", + "products" = list( + /obj/item/grenade/c4 = 3, + /obj/item/grenade/frag = 3, + /obj/item/ammo_box/magazine/m50 = 16, + /obj/item/ammo_box/speedloader/c357 = 16, + /obj/item/ammo_box/magazine/m223 = 16, + /obj/item/ammo_box/magazine/lanca = 16, + /obj/item/ammo_box/magazine/sniper_rounds = 16 + ), + ), + list( + "name" = "Accessories", + "icon" = "person-military-rifle", + "products" = list( + /obj/item/storage/belt/security/webbing = 4, + /obj/item/clothing/accessory/cqd_holster = 8, + /obj/item/flashlight/seclite = 8, + /obj/item/storage/pouch/ammo = 4, + /obj/item/shield/riot/tele = 4, + /obj/item/shield/ballistic = 4, + /obj/item/screwdriver = 8, + /obj/item/wirecutters = 8, + /obj/item/mod/module/jetpack = 4, + /obj/item/mod/module/magboot = 4, + /obj/item/firing_pin/implant/mindshield = 8 + ), + ), + ) + premium = list( + /obj/item/stock_parts/power_store/cell/lead = 1, + /obj/item/storage/belt/military/assault = 4 + ) +// Вендор ЦКшной версии БЩ. Для тех случаев, когда нужна охрана для "личной беседы" с командованием на станции + +/obj/machinery/vending/ertvend/srt + name = "\improper Blueshield SRT Vend" + icon_state = "ERTvend-srt" + icon_deny = "ERTvend-srt-deny" + product_categories = list( + list( + "name" = "Apparel", + "icon" = "shirt", + "products" = list( + /obj/item/storage/bag/garment/blueshield = 4, + /obj/item/clothing/shoes/combat/swat = 4, + /obj/item/clothing/gloves/combat = 4, + /obj/item/card/id/advanced/centcom/ert/security = 4, + /obj/item/modular_computer/pda/blueshield = 4, + /obj/item/radio/headset/headset_bs/alt = 4, + /obj/item/clothing/glasses/hud/security/sunglasses/blue = 4, + /obj/item/clothing/glasses/hud/security/sunglasses = 4, + /obj/item/clothing/glasses/hud/health/sunglasses = 4, + /obj/item/storage/backpack/blueshield = 4, + /obj/item/storage/backpack/duffelbag/blueshield = 4, + /obj/item/storage/backpack/messenger/blueshield = 4, + /obj/item/storage/backpack/satchel/blueshield = 4, + /obj/item/mod/control/pre_equipped/blueshield = 4, + /obj/item/storage/box/survival/centcom = 4, + /obj/item/storage/medkit/tactical/blueshield = 4, + /obj/item/storage/belt/security/full = 4, + /obj/item/implanter/mindshield = 4, + /obj/item/clothing/under/syndicate/rus_army/cin_surplus/marine = 4, + /obj/item/clothing/suit/armor/vest/peacekeeper/spacecoat = 4, + /obj/item/clothing/suit/armor/vest/nt_police = 4 + ), + ), + list( + "name" = "Weapons", + "icon" = "gun", + "products" = list( + /obj/item/knife/combat = 8, + /obj/item/book/granter/martial/cqc = 4, + /obj/item/choice_beacon/blueshield = 4, + /obj/item/gun/ballistic/automatic/proto/unrestricted = 4, + ), + ), + list( + "name" = "Ammo", + "icon" = "box-archive", + "products" = list( + /obj/item/ammo_box/magazine/smgm9mm = 20, + /obj/item/stock_parts/power_store/cell/bluespace = 20, + /obj/item/ammo_box/magazine/smgm45 = 16, + /obj/item/ammo_box/magazine/katyusha/empty = 16, + /obj/item/ammo_box/advanced/s12gauge/rubber = 8, + /obj/item/ammo_box/advanced/s12gauge/bean = 8, + /obj/item/ammo_box/advanced/s12gauge/antitide = 8, + /obj/item/ammo_box/advanced/s12gauge = 8, + /obj/item/ammo_box/advanced/s12gauge/buckshot = 8, + /obj/item/ammo_box/advanced/s12gauge/incendiary = 8, + /obj/item/ammo_box/advanced/s12gauge/hunter = 8, + /obj/item/ammo_box/advanced/s12gauge/flechette = 8 + ), + ), + list( + "name" = "Accessories", + "icon" = "person-military-rifle", + "products" = list( + /obj/item/storage/pouch/ammo = 4, + /obj/item/storage/belt/security/webbing = 4, + /obj/item/flashlight/seclite = 8, + /obj/item/clothing/accessory/cqd_holster = 4, + /obj/item/shield/riot/tele = 4, + /obj/item/shield/ballistic = 4, + /obj/item/screwdriver = 4, + /obj/item/wirecutters = 4, + /obj/item/slimepotion/speed= 4, + /obj/item/mod/paint = 2, + /obj/item/toy/crayon/spraycan = 2 + ), + ) + ) + premium = list( + /obj/item/stock_parts/power_store/cell/lead = 2, + /obj/item/autosurgeon/medical_hud = 2 + ) + +// Вендор оборудования для мехов. Вообще стоит сделать отдельные "preloaded" мехи в коде +/obj/machinery/vending/ertvend/sci + name = "\improper ERT Equipment Vend - Mech" + icon_state = "ERTvend-sci" + icon_deny = "ERTvend-sci-deny" + product_categories = list( + list( + "name" = "Weapons", + "icon" = "gun", + "products" = list( + /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy = 5, + /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser = 5, + /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion = 5, + /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot = 5, + /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg = 5, + /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang = 5 + ), + ), + list( + "name" = "Ammo", + "icon" = "box-archive", + "products" = list( + /obj/item/mecha_ammo/scattershot = 20, + /obj/item/mecha_ammo/lmg = 20, + /obj/item/mecha_ammo/flashbang = 20 + ), + ), + list( + "name" = "Auxiliary Equipment", + "icon" = "wrench", + "products" = list( + /obj/item/stock_parts/power_store/cell/bluespace = 8, + /obj/item/mecha_parts/mecha_equipment/armor/anticcw_armor_booster = 5, + /obj/item/mecha_parts/mecha_equipment/armor/antiproj_armor_booster = 5, + /obj/item/mecha_parts/mecha_equipment/repair_droid = 5, + /obj/item/mecha_parts/mecha_equipment/thrusters/ion = 5, + /obj/item/mecha_parts/mecha_equipment/air_tank/full = 5, + /obj/item/mecha_parts/mecha_equipment/radio = 5 + ), + ) + ) + premium = list( + /obj/item/stock_parts/power_store/cell/lead = 2, + /obj/item/toy/crayon/spraycan/roboticist = 2, + /obj/item/weldingtool/experimental = 2, + /obj/item/screwdriver/power = 2, + /obj/item/crowbar/power = 2 + ) +// Пополняшка для всех вышеперечисленных вендоров + +/obj/item/vending_refill/ertvend + machine_name = "ERT Equipment Vend" + icon_state = "refill_centdrobe" + +// Маяк вызова всех вышеперечисленных вендоров и пополняшки +// 'modular_nova/modules/modular_items/icons/remote.dmi' +// icon state = "self_delivery" + +/obj/item/choice_beacon/ertvend + name = "ERT Vendors choice beacon" + desc = "A single-use beacon to deliver ERT vendors." + icon_state = "self_delivery" + inhand_icon_state = "electronic" + icon = 'modular_nova/modules/modular_items/icons/remote.dmi' + company_source = "Nanotrasen Rapid Equipment Deployment Division" + company_message = span_bold("Supply Pod incoming, please stand by.") + +/obj/item/choice_beacon/ertvend/generate_display_names() + var/static/list/selectable_types = list( + "ERT generic vending machine" = /obj/machinery/vending/ertvend, + "ERT Code Blue" = /obj/machinery/vending/ertvend/blue, + "ERT Code Amber" = /obj/machinery/vending/ertvend/amber, + "ERT Code Red" = /obj/machinery/vending/ertvend/red, + "ERT Mech Equipment" = /obj/machinery/vending/ertvend/sci, + "ERT SRT Blueshield" = /obj/machinery/vending/ertvend/srt, + "ERT Vending Refill" = /obj/item/vending_refill/ertvend, + ) + return selectable_types diff --git a/tff_modular/modules/ERT_equipment_vending_machines/icons/obj/ERT_equipment_vendor.dmi b/tff_modular/modules/ERT_equipment_vending_machines/icons/obj/ERT_equipment_vendor.dmi new file mode 100644 index 0000000000000000000000000000000000000000..0a063d796611f1700027af5e88a09e6c6dcaf198 GIT binary patch literal 4740 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 literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 0d956ada28e..ee1ecdac9f4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9541,6 +9541,7 @@ #include "tff_modular\modules\drinks\skrelluq\reaction.dm" #include "tff_modular\modules\drinks\skrelluq\reagent.dm" #include "tff_modular\modules\drone\code\droneDispenser.dm" +#include "tff_modular\modules\ERT_equipment_vending_machines\code\ERT_equipment_vendor.dm" #include "tff_modular\modules\eventers\eventmaker.dm" #include "tff_modular\modules\eventers\eventmaker_verbs.dm" #include "tff_modular\modules\eventers\random_stuff_ban.dm" From 301904519ec9bfd84cd55718dfae62636a24bfb2 Mon Sep 17 00:00:00 2001 From: Cornka <112967882+Kocma-san@users.noreply.github.com> Date: Sun, 7 Dec 2025 19:13:31 +0700 Subject: [PATCH 2/2] Apply suggestion from @Kocma-san --- .../ERT_equipment_vending_machines/code/ERT_equipment_vendor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tff_modular/modules/ERT_equipment_vending_machines/code/ERT_equipment_vendor.dm b/tff_modular/modules/ERT_equipment_vending_machines/code/ERT_equipment_vendor.dm index e828e70d3d4..b75079ac354 100644 --- a/tff_modular/modules/ERT_equipment_vending_machines/code/ERT_equipment_vendor.dm +++ b/tff_modular/modules/ERT_equipment_vending_machines/code/ERT_equipment_vendor.dm @@ -143,7 +143,7 @@ /obj/item/gun/ballistic/automatic/xhihao_smg = 2, /obj/item/gun/ballistic/automatic/nt20 = 2, /obj/item/gun/ballistic/automatic/laser = 2, - /obj/item/gun/energy/laser/carbine/cybersun/black_market_trader = 2, + /obj/item/gun/energy/laser/cybersun/black_market_trader = 2, /obj/item/gun/ballistic/shotgun/automatic/combat/compact = 2, /obj/item/gun/ballistic/shotgun/automatic/combat = 2, /obj/item/gun/ballistic/automatic/sol_rifle/marksman = 2,