From 6fceb22e529f6319475da9cf7ea0ce62aa0cc365 Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Fri, 8 Mar 2024 02:37:05 +1000 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/antagonists/code/guns/biogun.dm | 2 ++ .../antagonists/code/guns/biogun_ammo.dm | 2 -- .../code/vox_raider/clothing/vox_clothing.dm | 2 +- .../code/vox_raider/objects/vox_trade.dm | 33 +++++++++++-------- .../code/vox_raider/vox_raider_team.dm | 2 +- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/modular_ss220/antagonists/code/guns/biogun.dm b/modular_ss220/antagonists/code/guns/biogun.dm index 40340559fa7f..eb62d96f6512 100644 --- a/modular_ss220/antagonists/code/guns/biogun.dm +++ b/modular_ss220/antagonists/code/guns/biogun.dm @@ -9,6 +9,8 @@ var/inhand_charge_sections = 3 w_class = WEIGHT_CLASS_HUGE max_capacity = 3 + projectile_speed = 2 + projectile_range = 30 valid_projectile_type = /obj/item/biocore /obj/item/gun/throw/biogun/Initialize(mapload) diff --git a/modular_ss220/antagonists/code/guns/biogun_ammo.dm b/modular_ss220/antagonists/code/guns/biogun_ammo.dm index a590681958ed..6610a3d229bc 100644 --- a/modular_ss220/antagonists/code/guns/biogun_ammo.dm +++ b/modular_ss220/antagonists/code/guns/biogun_ammo.dm @@ -29,8 +29,6 @@ . = ..() /obj/item/biocore/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) - if(!isliving(hit_atom)) - return . = ..() spawn_mobs() hurt_impact(hit_atom) diff --git a/modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm b/modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm index 97ba7c5fb3b5..143a879c9593 100644 --- a/modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm +++ b/modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/vox/jumpsuit name = "vox jumpsuit" - desc = "Рабочая одежда ВОКСа." + desc = "Рабочая одежда вокса." icon_state = "vox-jumpsuit" item_color = "vox-jumpsuit" item_state = "syndicate-black" 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 995e4d6ab332..50798deb3e0d 100644 --- a/modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm +++ b/modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm @@ -267,7 +267,8 @@ if(istype(I, /obj/item/disk/tech_disk)) var/obj/item/disk/tech_disk/disk = I var/datum/tech/tech = disk.stored - I.origin_tech = "[tech.id]=[tech.level]" + if(tech) + I.origin_tech = "[tech.id]=[tech.level]" if(I.origin_tech) var/list/tech_list = params2list(I.origin_tech) @@ -281,7 +282,7 @@ is_tech_unique = TRUE else values_sum_precious += unique_tech_level_reward * tech_value - collected_tech_dict += list(tech = tech_value) + collected_tech_dict += list("[tech]" = tech_value) is_tech_unique = TRUE if(tech in valuable_tech_list) temp_mult = tech_value @@ -322,7 +323,8 @@ temp_value += permeability_reward * (1 - item.permeability_coefficient) if(item.w_class) temp_value += item.w_class * weight_mult - is_weight = TRUE + if(item.w_class >= WEIGHT_CLASS_BULKY) + is_weight = TRUE temp_values_sum += round(temp_value) for(var/datum/theft_objective/objective in highrisk_list) @@ -366,15 +368,16 @@ if(temp_values_sum >= 0 && !is_visuale_only) qdel(I) - // Заносим наши принятые списки - if(!is_need_grading) - collected_access_list += accepted_access - var/addition_text = "" - if(accepted_access) - addition_text += span_boldnotice("\nОценка не имеющихся доступов: \n") + if(length(accepted_access)) + if(is_need_grading) // Заносим наши принятые доступы + collected_access_list += accepted_access + addition_text += span_boldnotice("\nОценка имеющихся доступов: \n") for(var/access in accepted_access) - addition_text += span_notice("[get_access_desc(access)]; ") + var/access_desc = get_access_desc(access) + if(!access_desc) + continue + addition_text += span_notice("[access_desc]; ") if(is_access_unique) addition_text += span_good("\nИмеются ценные доступы. Очень ценно!") if(is_weight) @@ -419,12 +422,14 @@ /obj/machinery/vox_trader/proc/update_precious_collected_dict(object_name, object_value) if(!correct_precious_value()) return + object_value \= denomination_div if(object_value >= precious_value) - if(object_name in precious_collected_dict) - precious_collected_dict[object_name]["count"] += 1 - precious_collected_dict[object_name]["value"] += object_value + var/precious_data = precious_collected_dict[object_name] + if(!precious_data) + precious_collected_dict[object_name] = list("count" = 1, value = object_value) else - precious_collected_dict += list("[object_name]" = list("count" = 1, "value" = object_value)) + precious_data["count"]++ + precious_data["value"] += object_value /obj/machinery/vox_trader/proc/synchronize_traders_stats() for(var/obj/machinery/vox_trader/trader in GLOB.machines) diff --git a/modular_ss220/antagonists/code/vox_raider/vox_raider_team.dm b/modular_ss220/antagonists/code/vox_raider/vox_raider_team.dm index 1f9aee894972..52cdda83b65e 100644 --- a/modular_ss220/antagonists/code/vox_raider/vox_raider_team.dm +++ b/modular_ss220/antagonists/code/vox_raider/vox_raider_team.dm @@ -20,7 +20,7 @@ add_team_objective(new picked_collect_objective_type()) // Конечная цель add_team_objective(new /datum/objective/survive( - {"Не допустите гибели вас и остальных ВОКСов из команды."})) + {"Не допустите гибели вас и остальных Воксов из команды."})) // !!!!!! Тест !!!!!!!