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

Фиксики ГАНДОНЫ

Browse Source
This commit is contained in:
Jabak
2024-08-24 14:25:47 +03:00
parent c647c0fd8f
commit 359fc93111
11 changed files with 5 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Tips/TippyUIController.cs
View File

@@ -136,7 +136,7 @@ public sealed class TippyUIController : UIController
}
else
{
_entity = EntityManager.SpawnEntity(_cfg.GetCVar(CCVars.TippyEntity), MapCoordinates.Nullspace);
_entity = EntityManager.SpawnEntity(_cfg.GetCVar(CCVars.ClippyEntity), MapCoordinates.Nullspace);
tippy.ModifyLayers = true;
}
if (!EntityManager.TryGetComponent(_entity, out sprite))

3
Content.Server/Chemistry/ReagentEffects/GenderChange.cs
View File

@@ -25,7 +25,6 @@ public sealed partial class GenderChange : ReagentEffect
{
var uid = args.SolutionEntity;
var newGender = NewGender;
var grammarSystem = args.EntityManager.System<GrammarSystem>();
var identitySystem = args.EntityManager.System<IdentitySystem>();
// bleh, this probably should not be here but I have no clue where to put it
@@ -39,8 +38,6 @@ public sealed partial class GenderChange : ReagentEffect
if (newGender.HasValue)
{
grammarSystem.SetGender((uid, grammar), newGender);
if (args.EntityManager.HasComponent<IdentityComponent>(uid))
identitySystem.QueueIdentityUpdate(uid);
}

2
Content.Server/Implants/SubdermalImplantSystem.cs
View File

@@ -19,7 +19,6 @@ using Robust.Shared.Physics.Components;
using Robust.Shared.Random;
using System.Numerics;
using Content.Server.IdentityManagement;
using Content.Shared._Amour.GrammarSystem;
using Content.Shared.IdentityManagement.Components;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Systems;
@@ -27,6 +26,7 @@ using Robust.Shared.Collections;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects.Components.Localization;
using Robust.Shared.Map.Components;
using GrammarSystem = Content.Shared._Amour.GrammarSystem.GrammarSystem;
namespace Content.Server.Implants;

1
Content.Server/Tips/TipsSystem.cs
View File

@@ -28,7 +28,6 @@ public sealed class TipsSystem : EntitySystem
[Dependency] private readonly GameTicker _ticker = default!;
[Dependency] private readonly IConsoleHost _conHost = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IConsoleHost _conHost = default!;
private bool _tipsEnabled;
private float _tipTimeOutOfRound;

1
Content.Server/_Amour/Hole/HoleSystem.Inventory.cs
View File

@@ -1,6 +1,5 @@
using Content.Server.Body.Systems;
using Content.Server.Chat.Systems;
using Content.Server.HealthExaminable;
using Content.Server.Mind;
using Content.Shared._Amour.Hole;
using Content.Shared.Damage;

2
Content.Server/_Amour/StationEvents/SpaceLawChange.cs
View File

@@ -2,8 +2,10 @@
using Content.Server._Amour.StationEvents.Components;
using Content.Server.Chat.Systems;
using Content.Server.Fax;
using Content.Server.GameTicking.Components;
using Content.Server.GameTicking.Rules.Components;
using Content.Server.StationEvents.Events;
using Content.Shared.Fax.Components;
using Content.Shared.Paper;
using Robust.Shared.Random;

1
Content.Server/_Honk/Aspects/DeleteVendingMachineAspect.cs
View File

@@ -1,4 +1,5 @@
using Content.Server._White.AspectsSystem.Base;
using Content.Server.GameTicking.Components;
using Content.Server.GameTicking.Rules.Components;
using Content.Shared.VendingMachines;

102
Content.Server/_White/Wizard/Teleport/TeleportSpellEui.cs
View File

@@ -1,102 +0,0 @@
using System.Linq;
using Content.Server.EUI;
using Content.Server.Popups;
using Content.Server.Station.Systems;
using Content.Shared._White.Wizard.Teleport;
using Content.Shared.Eui;
using Robust.Shared.Timing;
using TeleportSpellEuiState = Content.Shared._White.Wizard.Teleport.TeleportSpellEuiState;
namespace Content.Server._White.Wizard.Teleport;
public sealed class TeleportSpellEui : BaseEui
{
[Dependency] private readonly EntityManager _entityManager = default!;
private readonly SharedTransformSystem _transformSystem;
private readonly StationSystem _station;
private readonly PopupSystem _popupSystem;
private readonly EntityUid _performer;
private bool _used;
public TeleportSpellEui(EntityUid performer)
{
IoCManager.InjectDependencies(this);
_transformSystem = _entityManager.System<SharedTransformSystem>();
_station = _entityManager.System<StationSystem>();
_popupSystem = _entityManager.System<PopupSystem>();
_performer = performer;
Timer.Spawn(TimeSpan.FromSeconds(10), Close);
}
public override EuiStateBase GetNewState()
{
var locationQuery = _entityManager.EntityQueryEnumerator<TeleportLocationComponent, TransformComponent>();
var state = new TeleportSpellEuiState();
while (locationQuery.MoveNext(out var locationUid, out var locationComponent, out var transformComponent))
{
var station = _station.GetOwningStation(locationUid, transformComponent);
if (_entityManager.EntityQuery<WizardRuleComponent>(true)
.Any(wizardRule => wizardRule.TargetStation == station))
{
state.Locations.Add((int) locationUid, locationComponent.Location);
}
}
return state;
}
public override void HandleMessage(EuiMessageBase msg)
{
base.HandleMessage(msg);
if (_used)
{
return;
}
if (msg is not TeleportSpellTargetLocationSelected cast)
{
return;
}
var transform = _entityManager.GetComponent<TransformComponent>(_performer);
var oldCoords = transform.Coordinates;
TransformComponent? locationTransform = null;
var teleportLocationQuery = _entityManager
.EntityQueryEnumerator<TeleportLocationComponent, TransformComponent>();
while (teleportLocationQuery.MoveNext(out var locationUid, out _, out var transformComponent))
{
if (locationUid == new EntityUid(cast.LocationUid))
{
locationTransform = transformComponent;
}
}
if (locationTransform is null)
{
_popupSystem.PopupEntity("Can't teleport", _performer, _performer);
DoStateUpdate();
return;
}
_used = true;
var coords = locationTransform.Coordinates;
_transformSystem.SetCoordinates(_performer, coords);
_transformSystem.AttachToGridOrMap(_performer, transform);
_entityManager.SpawnEntity("AdminInstantEffectSmoke10", oldCoords);
_entityManager.SpawnEntity("AdminInstantEffectSmoke10", coords);
Close();
}
}

2
Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
View File

@@ -1,6 +1,5 @@
using System.Linq;
using Content.Shared._Amour.Hole;
using Content.Shared._Amour.Hole;
using Content.Shared.Humanoid.Markings;
using Content.Shared.Humanoid.Prototypes;
using Robust.Shared.Prototypes;
@@ -283,7 +282,6 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance
skinColor = Humanoid.SkinColor.ValidSkinTone(speciesProto.SkinColoration, skinColor);
}
markingSet.GetForwardEnumerator().ToList(), appearance.Height, genitals);
markingSet.EnsureSpecies(species, bodyType, skinColor, markingManager);
// WD-EDIT
markingSet.FilterSponsor(sponsorMarkings, markingManager);

29
Resources/Prototypes/_Amour/Entities/Debugging/clippy.yml
View File

@@ -1,29 +0,0 @@
- type: entity
id: Tippy
components:
- type: Sprite
netsync: false
noRot: false
scale: 4,4
layers:
- sprite: _Amour/Tips/tippy.rsi
state: left
map: [ "revealing" ]
- sprite: _Amour/Tips/tippy.rsi
state: right
map: [ "hiding" ]
- sprite: _Amour/Tips/tippy.rsi
state: down
visible: false
map: [ "speaking" ]
# на экране раздаются звуки ковыляющих шагов.
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepClown
# визуальные эффекты для речевого пузыря.
# поддерживает только фоновое изображение.
- type: PaperVisuals
backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png"
backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0
backgroundModulate: "#ffffcc"
fontAccentColor: "#000000"

9
Resources/Prototypes/_White/Ghosts/custom_ghosts.yml
View File

@@ -483,15 +483,6 @@
ghostName: Ярик
ghostDescription: Дробилка, маска, плащ... Все эти вещи, казалось, сроднились с ним, сопровождая его даже после смерти.
#Jabak
- type: customGhost
id: jabak-ghost
ckey: Jabak
sprite: White/Ghosts/jabak-ghost.rsi
alpha: 0.9
ghostName: Жопа
ghostDescription: Хуй
#Devf_2
- type: customGhost
id: devf_2-ghost