Skip to content

Commit

Permalink
patch 3
Browse files Browse the repository at this point in the history
Для спор распределенных нейронов отключено 10-тисекундное голосование с оповещением. Теперь чтобы играть за спору этого реагента нужно нажать на нее с помощью лкм.
Убрано разрушение полов блобом на верхних этажах. Теперь такой пол разрушается только при разрастании сквозь уровни(рост вверх, рост вниз)
Убрано дублирование бонуса от хранилища
Споры и зомби теперь не могут таскать ничего кроме других мобов.
Убрана проверка на тач протекшн у взрывного блоба, тк у него уже есть проверка на броню от взрыва, что приводило к неадекватно низкому урону у реагента.
Репликационная пена более не расширяется от горения.
  • Loading branch information
dageavtobusnick committed Dec 24, 2024
1 parent 1125799 commit 197701b
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 7 deletions.
8 changes: 7 additions & 1 deletion code/modules/antagonists/blob/blob_minions/blob_spore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@
. = ..()
stat_attack = initial(stat_attack)

/mob/living/simple_animal/hostile/blob_minion/spore/pull_constraint(atom/movable/pulled_atom, state, supress_message = FALSE) //Prevents spore from pulling things
if(istype(pulled_atom, /mob/living))
return TRUE // Get dem
if(!supress_message)
to_chat(src, span_warning("Вы не можете таскать ничего кроме других существ и их тел."))
return FALSE

/mob/living/simple_animal/hostile/blob_minion/spore/AttackingTarget()
. = ..()
Expand Down Expand Up @@ -111,7 +117,7 @@
AddComponent(\
/datum/component/ghost_direct_control,\
ban_type = ROLE_BLOB,\
poll_candidates = TRUE,\
poll_candidates = FALSE,\
)
else
qdel(GetComponent(/datum/component/ghost_direct_control))
Expand Down
7 changes: 7 additions & 0 deletions code/modules/antagonists/blob/blob_minions/blob_zombie.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@
corpse = null
death()

/mob/living/simple_animal/hostile/blob_minion/zombie/pull_constraint(atom/movable/pulled_atom, state, supress_message = FALSE) //Prevents spore from pulling things
if(istype(pulled_atom, /mob/living))
return TRUE // Get dem
if(!supress_message)
to_chat(src, span_warning("Вы не можете таскать ничего кроме других существ и их тел."))
return FALSE

/mob/living/simple_animal/hostile/blob_minion/zombie/CanAllowThrough(atom/movable/mover, border_dir)
. = ..()
if(istype(mover, /obj/structure/blob))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
taste_description = "бомба"
color = "#8B2500"

/datum/reagent/blob/explosive_lattice/return_mob_expose_reac_volume(mob/living/exposed_mob, methods=REAGENT_TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/overmind)
if(exposed_mob.stat == DEAD || HAS_TRAIT(exposed_mob, TRAIT_BLOB_ALLY))
return 0 //the dead, and blob mobs, don't cause reactions
return reac_volume

/datum/reagent/blob/explosive_lattice/reaction_mob(mob/living/exposed_mob, methods=REAGENT_TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/overmind)
. = ..()
var/brute_loss = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
/datum/blobstrain/reagent/replicating_foam/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag)
if(damage_type == BRUTE)
damage = damage * 2
else if(damage_type == BURN && damage > 0 && B.get_integrity() - damage > 0 && prob(50))
else if(damage_type == BURN && damage > 0 && B.get_integrity() - damage > 0 && prob(50))
if(damage_flag == FIRE)
return ..()
var/obj/structure/blob/newB = B.expand(null, null, 0)
if(newB)
newB.update_integrity(B.get_integrity() - damage)
Expand Down
5 changes: 4 additions & 1 deletion code/modules/antagonists/blob/structures/_blob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,13 @@
offstation = TRUE
B.update_blob()
var/reaction_result = TRUE
var/turf/total_turf = get_turf(src)
if(B.overmind && expand_reaction)
reaction_result = B.overmind.blobstrain.expand_reaction(src, B, T, controller, offstation)
if(reaction_result && is_there_multiz() && check_level_trait(T.z, ZTRAIT_DOWN) && !isopenspaceturf(T))
if(reaction_result && is_there_multiz() && check_level_trait(T.z, ZTRAIT_DOWN) && T.z != total_turf.z && !isopenspaceturf(T))
T.ChangeTurf(/turf/simulated/openspace)
if(reaction_result && is_there_multiz() && check_level_trait(total_turf.z, ZTRAIT_DOWN) && T.z != total_turf.z && !isopenspaceturf(total_turf))
total_turf.ChangeTurf(/turf/simulated/openspace)
return B
else
blob_attack_animation(T, controller)
Expand Down
4 changes: 0 additions & 4 deletions code/modules/antagonists/blob/structures/storage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
fire_resist = BLOB_STORAGE_FIRE_RESIST
point_return = BLOB_REFUND_STORAGE_COST

/obj/structure/blob/storage/Initialize(mapload, owner_overmind)
. = ..()
update_max_blob_points(BLOB_STORAGE_MAX_POINTS_BONUS)

/obj/structure/blob/storage/link_to_overmind(mob/camera/blob/owner_overmind)
. = ..()
update_max_blob_points(BLOB_STORAGE_MAX_POINTS_BONUS)
Expand Down

0 comments on commit 197701b

Please sign in to comment.