From 09f3ae47467d4153a76132f7d7b4ea0e94aae889 Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Mon, 4 Mar 2024 13:36:49 +1000 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=BC=D0=BD=D0=BE=D0=B6=D0=B8=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=20=D0=B7=D0=B0=20=D1=82=D0=B5=D1=85=D0=BD?= =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=B3=D0=B8=D0=B8,=20=D0=B2=D0=B5=D0=B4?= =?UTF-8?q?=D1=8C=20=D0=BC=D1=8B=20=D0=BB=D1=8E=D0=B1=D0=B8=D0=BC=20=D1=82?= =?UTF-8?q?=D0=B5=D1=85=D0=BD=D0=BE=D0=BB=D0=BE=D0=B3=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../antagonists/code/vox_raider/objects/vox_shop.dm | 3 --- .../antagonists/code/vox_raider/objects/vox_trade.dm | 10 +++------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/modular_ss220/antagonists/code/vox_raider/objects/vox_shop.dm b/modular_ss220/antagonists/code/vox_raider/objects/vox_shop.dm index 31b496387314..18b354a64000 100644 --- a/modular_ss220/antagonists/code/vox_raider/objects/vox_shop.dm +++ b/modular_ss220/antagonists/code/vox_raider/objects/vox_shop.dm @@ -61,9 +61,6 @@ /obj/machinery/vox_shop/proc/check_usable(mob/user) . = FALSE - - return TRUE // !!!!! времянка - if(issilicon(user)) return if(!isvox(user)) diff --git a/modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm b/modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm index a8c39a895975..600a993bb407 100644 --- a/modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm +++ b/modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm @@ -39,7 +39,7 @@ // ========= МНОЖИТЕЛИ ========= // произведения за параметры - var/tech_mult = 3 + var/tech_mult = 6 var/weight_mult = 3 var/force_mult = 5 @@ -58,7 +58,7 @@ var/valuable_highrisk_reward = 500 var/value_access_reward = 100 var/valuable_access_reward = 500 - var/unique_tech_level_reward = 50 + var/unique_tech_level_reward = 50 // учитываем также множитель за технологии // дополнительные списки var/highrisk_list = list() @@ -88,7 +88,6 @@ return FALSE // Ха-ха, глупая железяка не понимает как пользоваться технологиями ВОКСов! /obj/machinery/vox_trader/proc/check_usable(mob/user) - return TRUE // !!!!!! ВРЕМЕННО . = FALSE if(issilicon(user)) return @@ -249,11 +248,8 @@ if(tech in valuable_tech_list) temp_mult = tech_value is_tech_valuable = TRUE - if(!is_tech_unique) // ценим уникальные разработки, а не спам продукцией абдукторов из протолата - temp_mult /= no_unique_tech_div var/excess_mult = text2num(tech_value) > 7 ? 2 : 1 // переизбыток - var/tech_value = round(tech_value * tech_mult * temp_mult * excess_mult) - temp_values_sum += tech_value + temp_values_sum += round(tech_value * temp_mult * excess_mult) is_tech = TRUE if(istype(I, /obj/item/stack))