diff --git a/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitComponent.cs b/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitComponent.cs index 8c7d981789..03deb5b847 100644 --- a/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitComponent.cs +++ b/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitComponent.cs @@ -9,10 +9,10 @@ public sealed partial class DirectBallsHitComponent : Component public TimeSpan KnockdownTime = TimeSpan.FromSeconds(2.0f); [DataField] - public TimeSpan JitterTime = TimeSpan.FromSeconds(2.0f); + public TimeSpan JitterTime = TimeSpan.FromSeconds(4.0f); [DataField] - public TimeSpan StutterTime = TimeSpan.FromSeconds(2.0f); + public TimeSpan StutterTime = TimeSpan.FromSeconds(4.0f); [DataField] public SharedStandingStateSystem.DropHeldItemsBehavior KnockDownBehavior = SharedStandingStateSystem.DropHeldItemsBehavior.AlwaysDrop; diff --git a/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitSystem.cs b/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitSystem.cs index 49d2feb519..d558a3992c 100644 --- a/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitSystem.cs +++ b/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitSystem.cs @@ -10,6 +10,7 @@ using Content.Shared.Popups; using Content.Shared._White.Implants.NeuroControl; using Robust.Shared.Timing; using Content.Server.Chat.Systems; +using Content.Server._White.Mood; namespace Content.Server._White._Engi.DirectBallsHit; @@ -21,6 +22,7 @@ public sealed class DirectBallsHitSystem : EntitySystem [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private readonly MoodSystem _mood = default!; public override void Initialize() { @@ -42,10 +44,15 @@ public sealed class DirectBallsHitSystem : EntitySystem foreach (var uid in args.HitEntities) { - _popupSystem.PopupEntity( - Loc.GetString("direct-balls-hit", ("uid", uid)), - uid, - PopupType.SmallCaution); + if (TryComp(uid, out var mood)) + { + _popupSystem.PopupEntity( + Loc.GetString("direct-balls-hit", ("uid", uid)), + uid, + PopupType.SmallCaution); + + _mood.ApplyEffect(uid, mood, "GotHitInTheBalls"); + } Timer.Spawn(TimeSpan.FromSeconds(0.5f), () => _chat.TryEmoteWithChat(uid, "Scream")); diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs index 82273f8784..42ee21d746 100644 --- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs @@ -136,7 +136,7 @@ public sealed class HungerSystem : EntitySystem return; //WD start - if (_net.IsServer && component.CurrentThreshold != HungerThreshold.Overfed) + if (_net.IsServer) { var ev = new MoodEffectEvent("Hunger" + component.CurrentThreshold); RaiseLocalEvent(uid, ev); diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs index 6190e7aa36..144ec5f538 100644 --- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs @@ -10,6 +10,7 @@ using Robust.Shared.Random; using Robust.Shared.Timing; using Content.Shared._White.Mood; using Robust.Shared.Utility; +using Robust.Shared.Network; namespace Content.Shared.Nutrition.EntitySystems; @@ -22,6 +23,7 @@ public sealed class ThirstSystem : EntitySystem [Dependency] private readonly AlertsSystem _alerts = default!; [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; [Dependency] private readonly SharedJetpackSystem _jetpack = default!; + [Dependency] private readonly INetManager _net = default!; // WD edit [ValidatePrototypeId] private const string ThirstIconOverhydratedId = "ThirstIconOverhydrated"; @@ -65,7 +67,7 @@ public sealed class ThirstSystem : EntitySystem UpdateEffects(uid, component); TryComp(uid, out MovementSpeedModifierComponent? moveMod); - _movement.RefreshMovementSpeedModifiers(uid, moveMod); + _movement.RefreshMovementSpeedModifiers(uid, moveMod); } private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args) @@ -172,7 +174,7 @@ public sealed class ThirstSystem : EntitySystem } // WD start - if (component.CurrentThirstThreshold != ThirstThreshold.OverHydrated) + if (_net.IsServer) { var ev = new MoodEffectEvent("Thirst" + component.CurrentThirstThreshold); RaiseLocalEvent(uid, ev); diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 96c53885ff..d3c2469178 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,13 +1,4 @@ Entries: -- author: Aviu - changes: - - message: "\u041F\u0440\u0435\u0434\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\ - \u0439 \u043D\u043E\u0436 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0432\ - \ \u0430\u043F\u043B\u0438\u043D\u043A." - type: Add - id: 153 - time: '2024-02-23T22:59:03.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/112 - author: Aviu changes: - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\ @@ -8899,3 +8890,25 @@ id: 652 time: '2025-01-05T20:40:31.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/872 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0441\u043F\u0440\ + \u0430\u0439\u0442 \u043A\u0435\u043F\u043A\u0438 \u0433\u0440\u0443\u0437\u0447\ + \u0438\u043A\u0430." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0433\ + \ \u0432 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0435 \u043B\u043E\ + \u0433\u0438\u043A\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D\u0438\ + \u044F \u043E\u0442 \u0433\u043E\u043B\u043E\u0434\u0430 \u0438 \u0436\u0430\ + \u0436\u0434\u044B." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0446\u0435\ + \u043D\u0430 \u0445\u0438\u043C\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043A\ + \u0430\u0440\u0442\u0440\u0438\u0434\u0436\u0435\u0439." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043C\u0435\ + \u043B\u043E\u0447\u0438." + type: Fix + id: 653 + time: '2025-01-06T21:03:52.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/874 diff --git a/Resources/Locale/ru-RU/reagents/generic.ftl b/Resources/Locale/ru-RU/reagents/generic.ftl index d7f970bf25..04acddaab0 100644 --- a/Resources/Locale/ru-RU/reagents/generic.ftl +++ b/Resources/Locale/ru-RU/reagents/generic.ftl @@ -7,3 +7,5 @@ generic-reagent-effect-tearing-up = Ваши глаза начинают сле generic-reagent-effect-nauseous = Вы чувствуете тошноту. generic-reagent-effect-parched = У вас першит в горле. generic-reagent-effect-thirsty = Вы чувствуете жажду. +generic-reagent-effect-sick = Вы чувствуете себя плохо после употребления этого... +generic-reagent-effect-slicing-insides = Вы чувствуете невероятно острую боль в животе! diff --git a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml index 03f5c13fb8..30dba1e91c 100644 --- a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml +++ b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml @@ -17,14 +17,12 @@ - !type:SpeciesRequirement species: - Human - - Felinid weight: 10 icon: "JobIconInspector" arrivalNotificationPrototype: InspectorArrivalNotification supervisors: job-supervisors-captain whitelistedSpecies: - Human - - Felinid canBeAntag: true access: - Service diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/containers.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/containers.yml index 5daf7fc4d4..4385dab3ad 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/containers.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/containers.yml @@ -32,7 +32,7 @@ - type: Spillable solution: beaker - type: StaticPrice - price: 150 + price: 15 - type: Label originalName: химический картридж - type: Tag diff --git a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml index 02e0b431b2..a20e5317b1 100644 --- a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml +++ b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml @@ -519,3 +519,12 @@ alpha: 0.9 ghostName: nekovich ghostDescription: Law's Left Hand. + +#Feda_Plevajecki +- type: customGhost + id: Feda_Plevajecki-ghost + ckey: Feda_Plevajecki + sprite: White/Ghosts/Feda_Plevajecki-ghost.rsi + alpha: 0.9 + ghostName: Шарки + ghostDescription: Буль-буль. diff --git a/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml b/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml index 296b3b4465..aef085a1d9 100644 --- a/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml +++ b/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml @@ -41,3 +41,9 @@ id: MobHighPressure description: "На меня оказывается огромное давление!" moodChange: enum.MoodChangeLevel.Medium + +- type: moodEffect + id: GotHitInTheBalls + description: "Господи... Как же больно..." + moodChange: enum.MoodChangeLevel.Large + timeout: 1 diff --git a/Resources/Prototypes/_White/Mood/moodEffects_needs.yml b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml index f99aac0ebc..b09f63408a 100644 --- a/Resources/Prototypes/_White/Mood/moodEffects_needs.yml +++ b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml @@ -1,8 +1,9 @@ #Hunger - type: moodEffect id: HungerOverfed - description: "Во мне столько жира..." - moodChange: enum.MoodChangeLevel.Small + description: "Мой желудок полон!" + moodChange: enum.MoodChangeLevel.Medium + positive: true category: "Hunger" - type: moodEffect @@ -24,11 +25,18 @@ moodChange: enum.MoodChangeLevel.Big category: "Hunger" +- type: moodEffect + id: HungerDead + description: "Умираю от голода!" + moodChange: enum.MoodChangeLevel.Huge + category: "Hunger" + #Thirst - type: moodEffect id: ThirstOverHydrated - description: "СЛИШКОМ МНОГО ВОДЫ..." - moodChange: enum.MoodChangeLevel.Small + description: "Не хочу пить." + moodChange: enum.MoodChangeLevel.Medium + positive: true category: "Thirst" - type: moodEffect @@ -46,10 +54,16 @@ - type: moodEffect id: ThirstParched - description: "ВОДЫ!" + description: "Хочу пить!" moodChange: enum.MoodChangeLevel.Big category: "Thirst" +- type: moodEffect + id: ThirstDead + description: "Умираю от жажды!" + moodChange: enum.MoodChangeLevel.Huge + category: "Thirst" + #Health - type: moodEffect id: HealthNoDamage diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png index f5372ea5a3..cb151419b4 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png index ccb11d2ead..f92cb44ad2 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png index 0ca7b1c25b..1ddb63fa52 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png index 1539d6af08..1b1a96ff3d 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png index c110321c31..b3f0a7936b 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png differ diff --git a/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/animated.png b/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/animated.png new file mode 100644 index 0000000000..0c62580a94 Binary files /dev/null and b/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/animated.png differ diff --git a/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json b/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json new file mode 100644 index 0000000000..6debd6afad --- /dev/null +++ b/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", +"copyright": "Made by Dosharus", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "animated", + "directions": 4 + } + ] +}