Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Не должно ебануть (#170)"

Browse Source 
This reverts commit aabdcec60c.
This commit is contained in:
BIGZi0348
2024-11-12 20:48:25 +03:00
parent aabdcec60c
commit 55fe86dde4
70 changed files with 186 additions and 1097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Salvage/SalvageSystem.Runner.cs
View File

@@ -9,7 +9,6 @@ using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Salvage.Expeditions;
using Content.Shared.Shuttles.Components;
using Content.Shared.Localizations;
using Robust.Shared.Map.Components;
using Robust.Shared.Player;
@@ -104,10 +103,8 @@ public sealed partial class SalvageSystem
Announce(args.MapUid, Loc.GetString("salvage-expedition-announcement-countdown-minutes", ("duration", (component.EndTime - _timing.CurTime).Minutes)));
var directionLocalization = ContentLocalizationManager.FormatDirection(component.DungeonLocation.GetDir()).ToLower(); // WD Ahead of wizden
if (component.DungeonLocation != Vector2.Zero)
Announce(args.MapUid, Loc.GetString("salvage-expedition-announcement-dungeon", ("direction", directionLocalization))); // WD Ahead of wizden
Announce(args.MapUid, Loc.GetString("salvage-expedition-announcement-dungeon", ("direction", component.DungeonLocation.GetDir())));
component.Stage = ExpeditionStage.Running;
Dirty(args.MapUid, component);

53
Content.Server/_White/Implants/VoiceActivatedBomb/VoiceActivatedBomb.cs
View File

@@ -1,53 +0,0 @@
using Content.Shared._White.Implants.VoiceActivatedBomb;
using Content.Shared.Implants.Components;
using Content.Server.Explosion.Components;
using Content.Server.Speech.Components;
using Content.Shared.Popups;
using Content.Shared.Implants;
namespace Content.Server._White.Implants.VoiceActivatedBomb;
public sealed class VoiceActivatedBombSystem : SharedVoiceActivatedBombSystem
{
[Dependency] private readonly SharedPopupSystem _popup = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<SubdermalImplantComponent, InsertVoiceActivatedBombEvent>(OnTryInsertVoiceActivatedBombServer);
SubscribeLocalEvent<SubdermalImplantComponent, ImplanterUsed>(OnVoiceActivatedBombInserted);
}
private void OnTryInsertVoiceActivatedBombServer(Entity<SubdermalImplantComponent> ent, ref InsertVoiceActivatedBombEvent args)
{
if (!TryComp<TriggerOnVoiceComponent>(args.Implanter, out var implanterTrigger))
return;
if (implanterTrigger.KeyPhrase == null)
{
// TODO find some way to make it look good
// Right now it's overlaps with implanter-component-implant-failed popup
//var message = Loc.GetString("voice-activated-bomb-no-key-phrase");
//_popup.PopupEntity(message, args.Implanter, args.User);
args.Cancel();
return;
}
}
private void OnVoiceActivatedBombInserted(Entity<SubdermalImplantComponent> ent, ref ImplanterUsed args)
{
if (!Tag.HasTag(args.Implanter, VoiceActivatedBombTag))
return;
if (!TryComp<TriggerOnVoiceComponent>(args.Implanter, out var implanterTrigger))
return;
if (!TryComp<TriggerOnVoiceComponent>(args.Implant, out var implantTrigger))
return;
implantTrigger.KeyPhrase = implanterTrigger.KeyPhrase;
EnsureComp<ActiveListenerComponent>(args.Implant);
RemComp<TriggerOnVoiceComponent>(args.Implanter);
Tag.RemoveTag(args.Implanter, VoiceActivatedBombTag);
}
}

95
Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs
View File

@@ -76,41 +76,40 @@ public sealed class MeatyOreStoreSystem : EntitySystem
SubscribeLocalEvent<RoundRestartCleanupEvent>(OnPostRoundCleanup);
SubscribeNetworkEvent<MeatyOreShopRequestEvent>(OnShopRequested);
// SubscribeLocalEvent<GetVerbsEvent<Verb>>(MeatyOreVerbs);
//SubscribeLocalEvent<GetVerbsEvent<Verb>>(MeatyOreVerbs);
}
// private void MeatyOreVerbs(GetVerbsEvent<Verb> ev)
// {
// if (!_antagGrantEnabled)
// return;
//
// if (!EntityManager.TryGetComponent<ActorComponent>(ev.User, out var actorComponent))
// return;
//
// if (!_sponsorsManager.TryGetInfo(actorComponent.PlayerSession.UserId, out _))
// return;
//
// if (!HasComp<HumanoidAppearanceComponent>(ev.Target))
// return;
//
// if (!TryGetStore(actorComponent.PlayerSession, out var store, out var storeEntity))
// return;
//
// var verb = new Verb
// {
// Text = "Выдать роль.",
// ConfirmationPopup = true,
// Message = $"Цена - {MeatyOreCurrencyPrototype}:10",
// Act = () =>
// {
// TryAddRole(ev.User, ev.Target, store, storeEntity.Value);
// },
// Category = VerbCategory.MeatyOre
// };
//
// ev.Verbs.Add();
// }
// private void MeatyOreVerbs(GetVerbsEvent<Verb> ev)
// {
// if (!_antagGrantEnabled)
// return;
//
// if (!EntityManager.TryGetComponent<ActorComponent>(ev.User, out var actorComponent))
// return;
//
// if (!_sponsorsManager.TryGetInfo(actorComponent.PlayerSession.UserId, out _))
// return;
//
// if (!HasComp<HumanoidAppearanceComponent>(ev.Target))
// return;
//
// if (!TryGetStore(actorComponent.PlayerSession, out var store, out var storeEntity))
// return;
//
// var verb = new Verb
// {
// Text = "Выдать роль.",
// ConfirmationPopup = true,
// Message = $"Цена - {MeatyOreCurrencyPrototype}:10",
// Act = () =>
// {
// TryAddRole(ev.User, ev.Target, store, storeEntity.Value);
// },
// Category = VerbCategory.MeatyOre
// };
//
// ev.Verbs.Add();
// }
private void OnPanelEnableChanged(bool enabled)
{
@@ -270,21 +269,21 @@ public sealed class MeatyOreStoreSystem : EntitySystem
}
}
// private async void TryBanDolboeb(ICommonSession session)
// {
// if(_banManager.GetServerBans(session.UserId).Count > 0)
// return;
//
// _banManager.CreateServerBan(session.UserId,
// session.Name,
// null,
// null,
// null,
// 2880,
// NoteSeverity.Minor,
// "Кусок дерьма, блядина нахуй! У НАС АНТАЖКУ ВЫДАВАТЬ ЗАПРЕЩЕНО НАХУЙ!!!! ЧТОБ ТЯ ВЫЕБАЛИ СТО НЕГРОВ НАХУЙ!",
// false);
// }
// private async void TryBanDolboeb(ICommonSession session)
// {
// if(_banManager.GetServerBans(session.UserId).Count > 0)
// return;
//
// _banManager.CreateServerBan(session.UserId,
// session.Name,
// null,
// null,
// null,
// 2880,
// NoteSeverity.Minor,
// "Кусок дерьма, блядина нахуй! У НАС АНТАЖКУ ВЫДАВАТЬ ЗАПРЕЩЕНО НАХУЙ!!!! ЧТОБ ТЯ ВЫЕБАЛИ СТО НЕГРОВ НАХУЙ!",
// false);
// }
private async Task<bool> GrantAntagonist(string ckey, bool isFriend)
{

4
Content.Server/_White/Medical/BodyScanner/BodyScannerConsoleSystem.cs
View File

@@ -354,7 +354,7 @@ namespace Content.Server._White.Medical.BodyScanner
("amount", $"{state.CurrentThirst:f1}")));
text.AppendLine(Loc.GetString("body-scanner-console-window-thirst-current-thirst-status-text",
("status",
Loc.GetString("body-scanner-console-window-thirst-current-thirst-status-" +
Loc.GetString("body-scanner-console-window-hunger-current-hunger-status-" +
state.CurrentThirstThreshold))));
text.AppendLine();
@@ -363,7 +363,7 @@ namespace Content.Server._White.Medical.BodyScanner
("amount", $"{state.CurrentHunger:f1}")));
text.AppendLine(Loc.GetString("body-scanner-console-window-hunger-current-hunger-status-text",
("status",
Loc.GetString("body-scanner-console-window-hunger-current-hunger-status-" +
Loc.GetString("body-scanner-console-window-thirst-current-thirst-status-" +
state.CurrentHungerThreshold))));
text.AppendLine();