Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing #75

Merged
merged 107 commits into from
Jan 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
d8ae58e
Station AI (#30944)
metalgearsloth Aug 28, 2024
c866ffb
Verb tweaks (#31309)
metalgearsloth Aug 25, 2024
d6b0b99
ItemToggle + slots stuff (#31312)
metalgearsloth Aug 25, 2024
56451fa
Station AI (#30944)
ElectroJr Jun 18, 2024
bdafdeb
Move SleepingSystem to Shared & cleanup (#28672)
Tayrtahn Jun 14, 2024
ede16f0
Potentially re-add EE changes?
sleepyyapril Jan 4, 2025
661bdba
Fix build errors
sleepyyapril Jan 4, 2025
006acf3
Add ContainerComp (#31311)
metalgearsloth Aug 25, 2024
b7e34aa
Localize ai dataset names (#33608)
MilenVolf Dec 6, 2024
b8e2844
Add LocalizedDatasetPrototype (#28310)
Tayrtahn May 28, 2024
c9e0e5d
SetStationAiName for testing
sleepyyapril Jan 4, 2025
0334cc6
Use EntityManager.System<>
sleepyyapril Jan 4, 2025
00adaa3
Re-add improved random sentience event (#29123)
Psychpsyo Aug 18, 2024
b262e8f
no name!
Psychpsyo Sep 8, 2024
385b667
fix shitcode
sleepyyapril Jan 4, 2025
f5e6583
HideSpawnMenu
sleepyyapril Jan 4, 2025
1b7d820
Merge branch 'master' into station-ai
sleepyyapril Jan 4, 2025
1ad367b
Yippee
sleepyyapril Jan 4, 2025
1f416da
Merge branch 'station-ai' of https://github.com/sleepyyapril/Einstein…
sleepyyapril Jan 4, 2025
ca0b40a
The Den Mass Cherry-Pick 01/06/25 (#1443)
angelofallars Jan 5, 2025
975c905
Automatic Changelog Update (#1443)
SimpleStation14 Jan 5, 2025
632cf60
Merge branch 'master' into station-ai
VMSolidus Jan 5, 2025
cc38b03
started site agenda, started the system, comp and then the objective …
gusxyz Jan 7, 2025
cca05bf
actual progress
gusxyz Jan 7, 2025
800b5bd
minor changes
gusxyz Jan 7, 2025
eb5b8bc
added completed variable to the objective prototype
gusxyz Jan 7, 2025
b90d3ea
Merge remote-tracking branch 'upstream/main' into Site-Agenda
gusxyz Jan 9, 2025
b29d012
update
gusxyz Jan 9, 2025
34c9d69
reworked with protid instead of type serializers
gusxyz Jan 9, 2025
f8782d5
Update prototype
gusxyz Jan 9, 2025
9c65527
Merge branch 'master' into station-ai
VMSolidus Jan 10, 2025
559eba0
w
gusxyz Jan 10, 2025
df8ffb0
Assay Psionic Power (#1450)
VMSolidus Jan 11, 2025
f0a9bbd
Automatic Changelog Update (#1450)
SimpleStation14 Jan 11, 2025
6941a01
Update dev_map.yml
VMSolidus Jan 11, 2025
5a13b27
How the fuck did AI not have these?
VMSolidus Jan 11, 2025
4ffa548
things
gusxyz Jan 11, 2025
0b0e9a8
I managed to get both AI Latejoin and Prisoner Latejoin working at th…
metalgearsloth Aug 29, 2024
5242ceb
Make AI Not Spawn With Clothes
VMSolidus Jan 11, 2025
6903924
Station AI (#1423)
VMSolidus Jan 11, 2025
14f738d
Automatic Changelog Update (#1423)
SimpleStation14 Jan 11, 2025
d662644
Hiding and clearing department prototype code (#28114)
Peptide90 Jan 11, 2025
a89b6cb
Meta with AI
Mike32oz Jan 11, 2025
1a6bd6f
Fixup playerspawn stuff (#31546)
Fildrance Sep 27, 2024
a906ed7
feat: now when research is unlocked in console, approver of reasearch…
Fildrance Sep 3, 2024
c4d14da
Update SharedStationAiSystem.Held.cs
VMSolidus Jan 11, 2025
d7317a7
Update SharedStationAiSystem.Held.cs
VMSolidus Jan 11, 2025
f293d7e
add access reader log wire (#29094)
deltanedas Jun 22, 2024
1709427
Update AccessReaderSystem.cs
VMSolidus Jan 11, 2025
0f7a662
wheeee
VMSolidus Jan 11, 2025
e2526ec
Meta with AI (#1484)
VMSolidus Jan 11, 2025
12bf563
Automatic Changelog Update (#1484)
SimpleStation14 Jan 11, 2025
0ce4d63
Update silicon.yml
VMSolidus Jan 11, 2025
fa35a3a
Hiding and Clearing Department Prototype Code (#28114) (#1483)
VMSolidus Jan 11, 2025
81bab8a
Fix Ai Accessible Consoles (#1485)
VMSolidus Jan 11, 2025
19f894d
Add Station AI To Gax (#1486)
VMSolidus Jan 11, 2025
afa2085
Automatic Changelog Update (#1486)
SimpleStation14 Jan 11, 2025
7485e8d
Senior Physician CPR (#1476)
VMSolidus Jan 11, 2025
2f6f7be
Fix AbsorbentTest & Shadowkin Test Fail (#1458)
sleepyyapril Jan 11, 2025
02dfa2e
Radstation AI (#1487)
VMSolidus Jan 11, 2025
3ebe76e
Automatic Changelog Update (#1487)
SimpleStation14 Jan 11, 2025
e389dff
Porting over My Cruise Control Code From Frontier (#1482)
neuPanda Jan 11, 2025
07401aa
Automatic Changelog Update (#1482)
SimpleStation14 Jan 11, 2025
e2d4a32
Port Frontier Guns And The Den PRs For Them (#1490)
VMSolidus Jan 11, 2025
634ace4
Automatic Changelog Update (#1490)
SimpleStation14 Jan 11, 2025
c2c18f5
Fix Announcement Spam (#1491)
sleepyyapril Jan 11, 2025
a050d4e
Automatic Changelog Update (#1491)
SimpleStation14 Jan 11, 2025
9897094
Material Silo (#1488)
Spatison Jan 11, 2025
289a2a7
Automatic Changelog Update (#1488)
SimpleStation14 Jan 11, 2025
afec1f9
Add Exclusivity Between Visual Traits and Cyber-Eyes Functionality (#…
Tirochora Jan 11, 2025
1547782
Automatic Changelog Update (#1492)
SimpleStation14 Jan 11, 2025
bcb1ccf
Update SharedStationAiSystem.cs (#1494)
VMSolidus Jan 11, 2025
7e13e06
Shadow Shackles Do After (#1466)
Spatison Jan 11, 2025
60d7733
Automatic Changelog Update (#1466)
SimpleStation14 Jan 11, 2025
7adee59
[Fix] Fixed Shadowking Throwing Errors when Spawning as a Random Huma…
Remuchi Jan 11, 2025
d2ef7e2
Add Station AI And Ore Silo To (Almost) All Maps (#1499)
VMSolidus Jan 11, 2025
3b5303c
Automatic Changelog Update (#1499)
SimpleStation14 Jan 11, 2025
1f6e1cb
Remove NPC Stormtrooper Mode (#1500)
VMSolidus Jan 11, 2025
28415f1
Fixes Weather Soundspam(And Crash) (#1501)
VMSolidus Jan 11, 2025
2a6107b
Automatic Changelog Update (#1500)
SimpleStation14 Jan 11, 2025
d7955f5
Automatic Changelog Update (#1501)
SimpleStation14 Jan 11, 2025
5ebee12
PlayTime Unlock Command (#1464)
sleepyyapril Jan 11, 2025
5943790
Automatic Changelog Update (#1464)
SimpleStation14 Jan 11, 2025
64a389a
v239.0.0 + .NET 9 (#1475)
sleepyyapril Jan 11, 2025
5b21f40
Fix Db Migrations (#1503)
sleepyyapril Jan 12, 2025
34c2bbc
Fix Silo Distation (#1502)
Spatison Jan 12, 2025
7de438e
Automatic Changelog Update (#1502)
SimpleStation14 Jan 12, 2025
80ff268
Fix Spawnpoint Test Fail (#1505)
sleepyyapril Jan 12, 2025
d478720
.NET Fix (#1506)
sleepyyapril Jan 12, 2025
a848973
Finish Command Jobs (#1495)
sleepyyapril Jan 12, 2025
3377c00
Automatic Changelog Update (#1495)
SimpleStation14 Jan 12, 2025
650c20f
fixedsofar
gusxyz Jan 12, 2025
4f26ab9
removed alerttype
gusxyz Jan 12, 2025
11ee2cb
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
gusxyz Jan 12, 2025
df51595
Merge branch 'Site-Agenda' into fixing
gusxyz Jan 12, 2025
f1c864c
Revert "Merge branch 'Site-Agenda' into fixing"
gusxyz Jan 12, 2025
08c588d
launches now
gusxyz Jan 12, 2025
42b0865
renamed statusIcon to jobIcon
gusxyz Jan 12, 2025
0f6e793
fixed ftls
gusxyz Jan 12, 2025
e618635
fixed upstreamsecoff error
gusxyz Jan 12, 2025
de6d296
readded nullable warning as errors
gusxyz Jan 12, 2025
1938cb0
woops arachne got nuked
gusxyz Jan 12, 2025
c1af8ea
disabled shadowkin and arachne
gusxyz Jan 12, 2025
5e3e709
in a physical fight with whoever fucked up the ui systems
gusxyz Jan 12, 2025
5550596
made me do 2x the work??!?!
gusxyz Jan 12, 2025
ce40faa
Revert "made me do 2x the work??!?!"
gusxyz Jan 12, 2025
b117a8e
finally ready for merge
gusxyz Jan 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/build-docfx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x

- name: Install dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-map-renderer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x

- name: Install dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x

- name: Install dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x

- name: Get Engine Tag
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x

- name: Install dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yaml-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x
- name: Install dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public BanPanel()
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
foreach (var proto in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
{
CreateRoleGroup(proto.ID, proto.Roles, proto.Color);
CreateRoleGroup(proto.ID, proto.Roles.Select(p => p.Id), proto.Color);
}

CreateRoleGroup("Antagonist", prototypeManager.EnumeratePrototypes<AntagPrototype>().Select(p => p.ID), Color.Red);
Expand Down
8 changes: 0 additions & 8 deletions Content.Client/Bed/SleepingSystem.cs

This file was deleted.

13 changes: 5 additions & 8 deletions Content.Client/Chat/UI/EmotesMenu.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,15 @@ public sealed partial class EmotesMenu : RadialMenu
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly ISharedPlayerManager _playerManager = default!;

private readonly SpriteSystem _spriteSystem;
private readonly EntityWhitelistSystem _whitelistSystem;

public event Action<ProtoId<EmotePrototype>>? OnPlayEmote;

public EmotesMenu()
{
IoCManager.InjectDependencies(this);
RobustXamlLoader.Load(this);

_spriteSystem = _entManager.System<SpriteSystem>();
_whitelistSystem = _entManager.System<EntityWhitelistSystem>();
var spriteSystem = _entManager.System<SpriteSystem>();
var whitelistSystem = _entManager.System<EntityWhitelistSystem>();

var main = FindControl<RadialContainer>("Main");

Expand All @@ -40,8 +37,8 @@ public EmotesMenu()
var player = _playerManager.LocalSession?.AttachedEntity;
if (emote.Category == EmoteCategory.Invalid ||
emote.ChatTriggers.Count == 0 ||
!(player.HasValue && _whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) ||
_whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value))
!(player.HasValue && whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) ||
whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value))
continue;

if (!emote.Available &&
Expand All @@ -63,7 +60,7 @@ public EmotesMenu()
{
VerticalAlignment = VAlignment.Center,
HorizontalAlignment = HAlignment.Center,
Texture = _spriteSystem.Frame0(emote.Icon),
Texture = spriteSystem.Frame0(emote.Icon),
TextureScale = new Vector2(2f, 2f),
};

Expand Down
1 change: 1 addition & 0 deletions Content.Client/Commands/SetMenuVisibilityCommand.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Content.Client.Verbs;
using Content.Shared.Verbs;
using JetBrains.Annotations;
using Robust.Shared.Console;

Expand Down
19 changes: 16 additions & 3 deletions Content.Client/ContextMenu/UI/EntityMenuUIController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using Content.Shared.Examine;
using Content.Shared.IdentityManagement;
using Content.Shared.Input;
using Content.Shared.Verbs;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Client.Input;
Expand Down Expand Up @@ -194,8 +195,20 @@ public override void FrameUpdate(FrameEventArgs args)
return;

// Do we need to do in-range unOccluded checks?
var ignoreFov = !_eyeManager.CurrentEye.DrawFov ||
(_verbSystem.Visibility & MenuVisibility.NoFov) == MenuVisibility.NoFov;
var visibility = _verbSystem.Visibility;

if (!_eyeManager.CurrentEye.DrawFov)
{
visibility &= ~MenuVisibility.NoFov;
}

var ev = new MenuVisibilityEvent()
{
Visibility = visibility,
};

_entityManager.EventBus.RaiseLocalEvent(player, ref ev);
visibility = ev.Visibility;

_entityManager.TryGetComponent(player, out ExaminerComponent? examiner);
var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
Expand All @@ -209,7 +222,7 @@ public override void FrameUpdate(FrameEventArgs args)
continue;
}

if (ignoreFov)
if ((visibility & MenuVisibility.NoFov) == MenuVisibility.NoFov)
continue;

var pos = new MapCoordinates(_xform.GetWorldPosition(xform, xformQuery), xform.MapID);
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Interaction/DragDropSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ private void RemoveHighlights()
// CanInteract() doesn't support checking a second "target" entity.
// Doing so manually:
var ev = new GettingInteractedWithAttemptEvent(user, dragged);
RaiseLocalEvent(dragged, ev, true);
RaiseLocalEvent(dragged, ref ev);

if (ev.Cancelled)
return false;
Expand Down
Loading
Loading