diff --git a/Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs b/Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs index f9c3d2c61bf3..2d2975af411b 100644 --- a/Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs +++ b/Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs @@ -7,7 +7,6 @@ using Content.Server.SS220.GameTicking.Rules.Components; using Content.Server.Station.Systems; using Content.Server.SS220.CultYogg.Sacraficials; -using Content.Server.SS220.CultYogg.Nyarlathotep; using Content.Server.RoundEnd; using Content.Server.Zombies; using Content.Shared.Audio; diff --git a/Content.Shared/SS220/CultYogg/Corruption/SharedCultYoggCorruptedSystem.cs b/Content.Shared/SS220/CultYogg/Corruption/SharedCultYoggCorruptedSystem.cs index 5d18c723843b..97e3828b438f 100644 --- a/Content.Shared/SS220/CultYogg/Corruption/SharedCultYoggCorruptedSystem.cs +++ b/Content.Shared/SS220/CultYogg/Corruption/SharedCultYoggCorruptedSystem.cs @@ -34,7 +34,7 @@ public sealed class SharedCultYoggCorruptedSystem : EntitySystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly SharedSoftDeleteSystem _softDeleteSystem = default!; - private readonly TimeSpan _corruptionDuration = TimeSpan.FromSeconds(2); + private readonly TimeSpan _corruptionDuration = TimeSpan.FromSeconds(1.8); private readonly Dictionary, CultYoggCorruptedPrototype> _recipesBySourcePrototypeId = []; private readonly Dictionary, CultYoggCorruptedPrototype> _recipesBySourceStackType = []; private readonly Dictionary, CultYoggCorruptedPrototype> _recipiesByParentPrototypeId = []; @@ -145,7 +145,7 @@ public bool TryCorruptContinuously(EntityUid user, EntityUid entity, bool isInHa return false; } var e = new CultYoggCorruptDoAfterEvent(recipe, isInHand, callback); - var doafterArgs = new DoAfterArgs(EntityManager, user, _corruptionDuration, e, user, entity) //ToDo estimate time for corruption + var doafterArgs = new DoAfterArgs(EntityManager, user, _corruptionDuration, e, user, entity) { Broadcast = false, BreakOnDamage = true, diff --git a/Content.Shared/SS220/CultYogg/MiGo/SharedMiGoSystem.cs b/Content.Shared/SS220/CultYogg/MiGo/SharedMiGoSystem.cs index 2b85ad918ec5..869e569a955c 100644 --- a/Content.Shared/SS220/CultYogg/MiGo/SharedMiGoSystem.cs +++ b/Content.Shared/SS220/CultYogg/MiGo/SharedMiGoSystem.cs @@ -33,7 +33,7 @@ using Content.Shared.Verbs; using Robust.Shared.Utility; using Content.Shared.Mobs.Components; - +using Robust.Shared.Audio; namespace Content.Shared.SS220.CultYogg.MiGo; @@ -58,9 +58,6 @@ public abstract class SharedMiGoSystem : EntitySystem [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly SharedMindSystem _mind = default!; - - //[Dependency] private readonly CultYoggRuleSystem _cultYoggRule = default!; //maybe use this for enslavement - public override void Initialize() { base.Initialize(); @@ -319,7 +316,7 @@ public override void Update(float delta) ChangeForm(uid, comp, true); if (!comp.AudioPlayed) { - _audio.PlayPredicted(comp.SoundMaterialize, uid, uid); + _audio.PlayPredicted(comp.SoundMaterialize, uid, uid, AudioParams.Default.WithMaxDistance(0.5f)); comp.AudioPlayed = true; } _actions.StartUseDelay(comp.MiGoAstralActionEntity); @@ -358,7 +355,7 @@ private void MiGoAstral(Entity uid, ref MiGoAstralEvent args) var started = _doAfter.TryStartDoAfter(doafterArgs); if (started) { - _audio.PlayPredicted(uid.Comp.SoundDeMaterialize, uid, uid); + _audio.PlayPredicted(uid.Comp.SoundDeMaterialize, uid, uid, AudioParams.Default.WithMaxDistance(0.5f)); } } } @@ -367,7 +364,7 @@ private void OnAfterMaterialize(Entity uid, ref AfterMaterialize args.Handled = true; _physics.SetBodyType(uid, BodyType.KinematicController); - _audio.PlayPredicted(uid.Comp.SoundMaterialize, uid, uid); + _audio.PlayPredicted(uid.Comp.SoundMaterialize, uid, uid, AudioParams.Default.WithMaxDistance(0.5f)); if (!args.Cancelled) { diff --git a/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_consumable.ftl b/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_consumable.ftl index 86c5df1a4a10..1b76f0793cfb 100644 --- a/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_consumable.ftl +++ b/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_consumable.ftl @@ -7,7 +7,7 @@ ent-FoodNullificationShroomCult = Нулевой гриб ent-NullificationShroomSeeds = пакет спор (Нулевой гриб) .desc = Семена странного типа, использующиеся в основном для травли насекомых. ent-FoodSidiousShroomCult = Сидиус гриб - .desc = Ktutylfhysq + .desc = Невероятно питательный и водянистыый, но до ужаса отторгающий, любого не подготовленного гурмана. ent-SidiousShroomSeeds = пакет спор (Сидиус гриб) .desc = Семена, использующиеся для выращивания невероятно питательных грибов ent-HolyWaterJug = кувшин святой воды diff --git a/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_cultists_actions.ftl b/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_cultists_actions.ftl index 464d13d99795..ad6a70a61501 100644 --- a/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_cultists_actions.ftl +++ b/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_cultists_actions.ftl @@ -1,7 +1,7 @@ ent-ActionCultYoggCorruptItem = Преобразовать предмет через прикосновение .desc = Исказить предмет даровав ему форму заложенную создателем. ent-ActionCultYoggCorruptItemInHand = Преобразовать предмет в руках - .desc = Исказить предмет даровав ему форму заложенную создателем. + .desc = Исказить предмет у вас в руках даровав ему форму заложенную создателем. ent-ActionCultYoggPukeShroom = Извергнуть .desc = Извергнуть выращенный в желудке гриб. ent-ActionCultYoggDigest = Микоз @@ -17,4 +17,4 @@ ent-ActionMiGoAstral = Выход в астрал ent-ActionMiGoErect = Воздвигнуть .desc = Воплотите основание великих алтарей. ent-ActionMiGoSacrifice = Призыв - .desc = Соберитесь с другими Ми-Го у алтаря, чтобы принести жертву. \ No newline at end of file + .desc = Исполните обряд над закрепленной на алтаре жертвой. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/roles/antags.ftl b/Resources/Locale/ru-RU/ss220/prototypes/roles/antags.ftl index 63ecaa9b86a3..356c2d93b403 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/roles/antags.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/roles/antags.ftl @@ -1,2 +1,2 @@ -roles-antag-cult-yogg-name = Культ Йог-Сотот +roles-antag-cult-yogg-name = Культист Йог-Сотот roles-antag-cult-yogg-objective = Вы преданный член культа. Завербуйте как можно больше последователей. Совершите обряд призыва своего хозяина. diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/CultYogg/migo.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/CultYogg/migo.yml index 5ff192f0451e..9ee261a16edb 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/CultYogg/migo.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/CultYogg/migo.yml @@ -36,6 +36,8 @@ telepathyChannelPrototype: TelepathyChannelYoggSothothCult - type: RandomMetadata nameSegments: [ cult_yogg_migo ] + - type: Speech + speechVerb: LargeMob - type: TTS voice: forester - type: UserInterface @@ -53,6 +55,8 @@ #situational for logic - type: NoSlip - type: Insulated + - type: FlashImmunity + - type: IgnoreOnfloorSlowers #visual - type: Sprite drawdepth: Mobs @@ -101,6 +105,10 @@ - !type:GibBehavior { } - type: Stamina critThreshold: 200 + - type: Temperature + heatDamageThreshold: 360 + coldDamageThreshold: -150 + currentTemperature: 310.15 - type: Tag tags: - CannotSuicide diff --git a/Resources/Prototypes/SS220/Entities/Objects/CultYogg/spitballer.yml b/Resources/Prototypes/SS220/Entities/Objects/CultYogg/spitballer.yml index df88b8f99a82..de378b954a92 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/CultYogg/spitballer.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/CultYogg/spitballer.yml @@ -11,8 +11,8 @@ - type: Gun soundGunshot: /Audio/SS220/Weapons/Guns/CultYogg/spitballer_shot.ogg soundEmpty: null - fireRate: 20 - projectileSpeed: 5 + fireRate: 13 + projectileSpeed: 9 - type: BasicEntityAmmoProvider proto: SpitballerGunBullet capacity: 1 @@ -26,11 +26,6 @@ - type: Appearance - type: Item size: Ginormous - - type: IncreaseDamageOnWield - damage: - types: - Brute: 30 - Stamina: 80 - type: GenericVisualizer visuals: enum.AmmoVisuals.HasAmmo: @@ -72,9 +67,9 @@ - type: ExplodeOnTrigger - type: Explosive explosionType: Default - totalIntensity: 30 + totalIntensity: 28 intensitySlope: 3 - maxIntensity: 3.7 + maxIntensity: 4 canCreateVacuum: false - type: Tag tags: