Skip to content

Commit

Permalink
выфвфы
Browse files Browse the repository at this point in the history
  • Loading branch information
Anorak2024 committed Oct 14, 2024
1 parent c0ff22d commit 88e3c8f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/datums/uplink_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2786,7 +2786,7 @@
desc = "Имплант разработанный на основе регенеративного стазиса генокрадов, позволяющий единоразово воскреснуть. \
Поставляется в автоимплантере."
item = /obj/item/implanter/cling_rejuv
cost = 49
cost = 38

/datum/uplink_item/affiliate/for_objective/cling_extract
name = "Инжектор с яйцом генокрада"
Expand Down
3 changes: 3 additions & 0 deletions code/modules/antagonists/traitor/affiliates/_affiliates.dm
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,13 @@
Спасибо что выбрали Gorlex Maraduers.\n\
Слава синдикату!"))
sleep(20 MINUTES - SSticker.round_start_time)
if (!istype(affiliate, /datum/affiliate/gorlex))
return

var/datum/antagonist/traitor/traitor = mind.has_antag_datum(/datum/antagonist/traitor)
if(!traitor)
return

affiliate.traitor = traitor
give_uplink()
affiliate.give_objectives(mind)
Expand Down
8 changes: 8 additions & 0 deletions code/modules/antagonists/traitor/affiliates/gorlex.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,21 @@
set_antag_hud(owner.current, "hudaffilgorlex")

/datum/affiliate/gorlex/get_weight(mob/living/carbon/human/H)
var/gorlexes = 0
for (var/datum/antagonist/traitor/traitor in GLOB.antagonists)
gorlexes += traitor?.affiliate?.type == /datum/affiliate/gorlex

if (gorlexes > 2)
return 0

switch (H.dna.species.type)
if(/datum/species/human)
return 1
if(/datum/species/machine)
return 0.2
if(/datum/species/slime)
return 0.2

return 0

/datum/affiliate/gorlex/give_bonus_objectives(datum/mind/mind)
Expand Down
3 changes: 1 addition & 2 deletions code/modules/antagonists/traitor/affiliates/mi13.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@
"Обменяться секретными документами с другим агентом",
"Выглядеть стильно")
slogan = "Да, я Бонд. Джеймс Бонд."
normal_objectives = 2
normal_objectives = 3
objectives = list(
// /datum/objective/steal/documents,
// list(/datum/objective/steal = 30, /datum/objective/maroon/blueshield = 70), // blueshield also has CQC.
/datum/objective/maroon/agent,
/datum/objective/maroon/agent,
/datum/objective/steal,
/datum/objective/escape
)

Expand Down
2 changes: 1 addition & 1 deletion paradise.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,6 @@
#include "code\game\objects\items\weapons\whetstone.dm"
#include "code\game\objects\items\weapons\grenades\atmosgrenade.dm"
#include "code\game\objects\items\weapons\grenades\bananade.dm"
#include "code\game\objects\items\weapons\grenades\bloodgrenade.dm"
#include "code\game\objects\items\weapons\grenades\chem_grenade.dm"
#include "code\game\objects\items\weapons\grenades\clowngrenade.dm"
#include "code\game\objects\items\weapons\grenades\clusterbuster.dm"
Expand Down Expand Up @@ -1698,6 +1697,7 @@
#include "code\modules\antagonists\traitor\affiliates\items\cybersun\proprietary_ssd.dm"
#include "code\modules\antagonists\traitor\affiliates\items\cybersun\syndie_patcher.dm"
#include "code\modules\antagonists\traitor\affiliates\items\hematogenic\blood_harvester.dm"
#include "code\modules\antagonists\traitor\affiliates\items\hematogenic\bloodgrenade.dm"
#include "code\modules\antagonists\traitor\affiliates\items\hematogenic\hemophagus_extract.dm"
#include "code\modules\antagonists\traitor\affiliates\items\hematogenic\stimulants_kit.dm"
#include "code\modules\antagonists\traitor\affiliates\items\mi13\agent_info.dm"
Expand Down

0 comments on commit 88e3c8f

Please sign in to comment.