Skip to content

Commit

Permalink
Мелкоправки
Browse files Browse the repository at this point in the history
  • Loading branch information
PhantornRU committed Mar 7, 2024
1 parent 249a965 commit 6fceb22
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 18 deletions.
2 changes: 2 additions & 0 deletions modular_ss220/antagonists/code/guns/biogun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions modular_ss220/antagonists/code/guns/biogun_ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
33 changes: 19 additions & 14 deletions modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
add_team_objective(new picked_collect_objective_type())
// Конечная цель
add_team_objective(new /datum/objective/survive(
{"Не допустите гибели вас и остальных ВОКСов из команды."}))
{"Не допустите гибели вас и остальных Воксов из команды."}))


// !!!!!! Тест !!!!!!!
Expand Down

0 comments on commit 6fceb22

Please sign in to comment.