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

The Greate Upstream + TG Meta updates + Fixes #187

Merged
merged 705 commits into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
705 commits
Select commit Hold shift + click to select a range
0b1dd2c
Corpses spawners (#16615)
Kit0vras Jun 15, 2023
35c838c
Added a new cryogenics chemical - Doxarubixadone! (#16568)
Dynexust Jun 15, 2023
43ea9d2
Automatic changelog update
PJBot Jun 15, 2023
2929797
Connect to the closest ExtensionCable instead of the first (#17271)
deepy Jun 15, 2023
e6bf18c
Automatic changelog update
PJBot Jun 15, 2023
247c7a1
Fix PDA capitalization to be PascalCase (#17335)
0x6273 Jun 15, 2023
7c6d217
wallmount gen board cheaper (#17316)
deltanedas Jun 15, 2023
bf13e9e
Automatic changelog update
PJBot Jun 15, 2023
8d2d42f
devmap cargo (#17339)
Emisse Jun 15, 2023
ecffece
half bloodred slowdown (#17336)
deltanedas Jun 15, 2023
bf3198c
multitool in susbox (#17322)
deltanedas Jun 15, 2023
4359729
robust harvest 1984 (#17331)
deltanedas Jun 15, 2023
93cbc78
Update departments.yml (#17272)
lzk228 Jun 15, 2023
1569daf
Automatic changelog update
PJBot Jun 15, 2023
8dae049
EVA suit resprite (+ new fluff hardsuit) (#17268)
Flareguy Jun 15, 2023
3338a4b
Change PvsOverrideSystem captialization (#17314)
ElectroJr Jun 15, 2023
f30e838
Add network configurator to non-engi utility belt fill (#17250)
0x6273 Jun 15, 2023
7ec218e
Update submodule to 0.127.0.0 (#17343)
metalgearsloth Jun 15, 2023
a16fd49
Automatic changelog update
PJBot Jun 15, 2023
780d525
[Add] Adds pirate accent trait (#17258)
OctoRocket Jun 15, 2023
c63ede2
Condiment bottle tweaks (#17132)
MisterMecky Jun 15, 2023
93f8db5
Automatic changelog update
PJBot Jun 15, 2023
a83b03c
Fix cables getting 1 morbillion serializations (#17201)
metalgearsloth Jun 15, 2023
3af05a6
allow grilles to be placed on lattice (#17073)
Slava0135 Jun 15, 2023
ec5ac5e
Automatic changelog update
PJBot Jun 15, 2023
0ee2a4e
adds a link to the science entry from robotics (#17196)
Nails-n-Tape Jun 15, 2023
d026b03
Automatic changelog update
PJBot Jun 15, 2023
7c609c9
Dumplings (#16966)
SonicHDC Jun 15, 2023
0794043
Automatic changelog update
PJBot Jun 15, 2023
4322faf
Behonker and Clown Spider (ready for merge) (#16678)
brainfood1183 Jun 15, 2023
372735f
Automatic changelog update
PJBot Jun 15, 2023
78939b4
Crazy Glue Fix (#17262)
brainfood1183 Jun 15, 2023
fa23d57
Remove cloning tech, add bluespace chemistry tech (#17345)
EmoGarbage404 Jun 15, 2023
4837ae0
Automatic changelog update
PJBot Jun 15, 2023
de63c52
More user friendly crew monitor UI (#17328)
Ahion Jun 15, 2023
60d06a2
Automatic changelog update
PJBot Jun 15, 2023
a27bd8d
In game guide books (#17304)
laok233 Jun 15, 2023
59457fa
Automatic changelog update
PJBot Jun 15, 2023
f5837f3
give shuttle airlocks a wire layout (#17318)
deltanedas Jun 15, 2023
d1587e6
Automatic changelog update
PJBot Jun 15, 2023
d0195fe
fix bluespace syringe test fails (#17347)
EmoGarbage404 Jun 15, 2023
34bdb77
Mass hallucinations event (#17321)
Slava0135 Jun 15, 2023
b72ab3b
Automatic changelog update
PJBot Jun 15, 2023
bc3f42d
ECS Arcade Machines (#16791)
TemporalOroboros Jun 15, 2023
d86effe
Fix foam artifacts (#17332)
EmoGarbage404 Jun 15, 2023
c6a1895
Automatic changelog update
PJBot Jun 15, 2023
b31c848
[Sprites] guitar back and some resprites (#16611)
lzk228 Jun 15, 2023
416faa4
Automatic changelog update
PJBot Jun 15, 2023
dbc180b
canister refactor + fixes (#17317)
deltanedas Jun 15, 2023
f513cc9
Automatic changelog update
PJBot Jun 15, 2023
6ce6aa1
make mice not eat uranium bananium and pills (#17110)
deltanedas Jun 15, 2023
652a2e2
Automatic changelog update
PJBot Jun 15, 2023
23b6d87
Hotfix NPC pathfinding (#17360)
metalgearsloth Jun 15, 2023
f8888b0
Allow specific entities to bypass DoAfter delays (#17349)
Vordenburg Jun 15, 2023
704b908
Give female dwarves female laughs (#17362)
Partmedia Jun 15, 2023
db1e9ed
Automatic changelog update
PJBot Jun 15, 2023
18837c3
Fix action bar not filling with mappables (#17218)
Vordenburg Jun 15, 2023
39a4255
Ice anomaly buff (anti-box maneuvers) (#17293)
EmoGarbage404 Jun 16, 2023
e22607a
Automatic changelog update
PJBot Jun 16, 2023
553ac14
Update submodule to 0.127.1.0 (#17365)
metalgearsloth Jun 16, 2023
bec6415
Color Coded Anchor Examine Text (#17363)
Nairodian Jun 16, 2023
0e06e01
Automatic changelog update
PJBot Jun 16, 2023
f7e4a69
Move PKA to a tech (#17043)
metalgearsloth Jun 16, 2023
b9f24b2
expedition rewards (#16972)
deltanedas Jun 16, 2023
f089668
Automatic changelog update
PJBot Jun 16, 2023
41fae6e
expedition air mod (#17369)
deltanedas Jun 16, 2023
2ae76f7
Automatic changelog update
PJBot Jun 16, 2023
626b275
fix transit power (#17200)
deltanedas Jun 16, 2023
548d2ca
arrivals (#17373)
Emisse Jun 16, 2023
d604349
bagel silly update (#17375)
Emisse Jun 16, 2023
0eea58e
add strip attempt logs (#17376)
Chief-Engineer Jun 16, 2023
bfa5ce4
add airlock pry logs (#17377)
Chief-Engineer Jun 16, 2023
9bdaca5
ClownHardsuit Fix (#17386)
brainfood1183 Jun 16, 2023
cae037d
Zooming for everyone with keyboard keys (#16605)
Arteben Jun 16, 2023
7804368
Automatic changelog update
PJBot Jun 16, 2023
ef0248c
Remove static ILocalizationManager resolves. (#17392)
ElectroJr Jun 17, 2023
eb11467
move hamtr to civilian services tech (#17393)
EmoGarbage404 Jun 17, 2023
a3c37ed
use parts crates for rewards, show rewards in ui (#17374)
deltanedas Jun 17, 2023
596216c
Automatic changelog update
PJBot Jun 17, 2023
00cdac3
Update submodule to 0.128.0.0 (#17394)
metalgearsloth Jun 17, 2023
99cfe77
Automatic changelog update
PJBot Jun 17, 2023
8ed4dcf
shield values examine (#17245)
Slava0135 Jun 17, 2023
6120907
Automatic changelog update
PJBot Jun 17, 2023
b67209c
Revert "Door opening tweaks" (#17395)
metalgearsloth Jun 17, 2023
e03cf59
Update barratry (#17247)
EEASAS Jun 17, 2023
b7ee34f
Fix buildies (#17396)
metalgearsloth Jun 17, 2023
0bb9c6e
Fix gas tile overlays (#17397)
metalgearsloth Jun 17, 2023
393122a
Automatic changelog update
PJBot Jun 17, 2023
7024863
Fixed armour for biosuits and winter coats. (#17402)
Siigiil Jun 17, 2023
602d0f4
Automatic changelog update
PJBot Jun 17, 2023
e441bda
fix transit atmos (#17404)
qwerltaz Jun 17, 2023
941a3cd
Arachnid sprite changes (#17412)
PixelTheKermit Jun 17, 2023
6e924ea
Pill Renames, add Cryo Bottle and Derma Pill, Burn kit Update (#17414)
Owai-Seek Jun 17, 2023
4ecca01
Automatic changelog update
PJBot Jun 17, 2023
bb45db7
cargo guidebook (#17342)
Nails-n-Tape Jun 18, 2023
b075912
slimes.yml cleaning (#17406)
lzk228 Jun 18, 2023
7376539
Automatic changelog update
PJBot Jun 18, 2023
f6d658d
remove zombie bundle from nukie uplink (#17418)
Chief-Engineer Jun 18, 2023
fa7a696
Automatic changelog update
PJBot Jun 18, 2023
ac9d6c9
Add bananium ore to expedition loot (#17421)
EmoGarbage404 Jun 18, 2023
b9451e5
Automatic changelog update
PJBot Jun 18, 2023
291ae0b
Dwarf Accent Expansion (#17411)
Alekshhh Jun 18, 2023
bea9a41
Automatic changelog update
PJBot Jun 18, 2023
0b5ccf3
Artifact Fragments (#17420)
EmoGarbage404 Jun 18, 2023
0467182
Automatic changelog update
PJBot Jun 18, 2023
0d0bef4
artifact resprite (#17417)
EmoGarbage404 Jun 18, 2023
26014a7
Automatic changelog update
PJBot Jun 18, 2023
1646f4c
Remove spare CE belt (#17430)
EmoGarbage404 Jun 18, 2023
acc4dbf
Automatic changelog update
PJBot Jun 18, 2023
0709660
Fix bagel test (#17428)
metalgearsloth Jun 18, 2023
4f8ea0c
Fix damage visuals not resetting in some cases (#17399)
ElectroJr Jun 18, 2023
cc81a75
Fix monkey jumpsuits (#17410)
ElectroJr Jun 18, 2023
b03d9a9
Add support for client-side replays (#17168)
ElectroJr Jun 18, 2023
b826980
Automatic changelog update
PJBot Jun 18, 2023
f9bfdb6
Update engine (#17432)
ElectroJr Jun 18, 2023
8a943fb
Make suit storage units anchored, heavier, thicker (#17433)
Vordenburg Jun 18, 2023
dd7032a
Mind ECS (#16826)
ShadowCommander Jun 18, 2023
422a84e
Adds Double bladed Esword (#17227)
FacePluslll Jun 18, 2023
6c76dc7
Automatic changelog update
PJBot Jun 18, 2023
78e2f92
Update engine (#17437)
ElectroJr Jun 18, 2023
b1b6a63
Update engine again (#17442)
ElectroJr Jun 18, 2023
714d84c
Origin Update 18.06.2023 (fix atmos) (#17441)
brainfood1183 Jun 18, 2023
7c432b0
update command role requirements (#17366)
Chief-Engineer Jun 18, 2023
e8b766d
Automatic changelog update
PJBot Jun 18, 2023
8cd6067
Changing default fuel consumption for weldable components, and increa…
Wirdal Jun 18, 2023
3975578
Arsenal tech discipline (#17400)
EmoGarbage404 Jun 18, 2023
c6cc55f
Automatic changelog update
PJBot Jun 18, 2023
8411739
Fix secfab being able to print protolathe items (#17443)
EmoGarbage404 Jun 18, 2023
82d54d1
Automatic changelog update
PJBot Jun 18, 2023
7ea7e3f
Set marker drawdepth to Overdoors (#17438)
Vordenburg Jun 18, 2023
c893010
CE belt in locker again, CE doesn't spawn with it. (#17445)
PJB3005 Jun 18, 2023
9797a0d
ert and death squad gas mask (#17444)
Nimfar11 Jun 18, 2023
b51a699
Automatic changelog update
PJBot Jun 18, 2023
9c1c7ca
machine part resprite (#17447)
EmoGarbage404 Jun 18, 2023
230a503
Automatic changelog update
PJBot Jun 18, 2023
b8fb9aa
Make BOH require less uranium (#17449)
EmoGarbage404 Jun 18, 2023
580c579
Remove security techfab board from expedition loot (#17448)
EmoGarbage404 Jun 18, 2023
9750a58
Automatic changelog update
PJBot Jun 18, 2023
0e238da
Adds the SWAT Helmet (#17384)
Flareguy Jun 18, 2023
5df1552
Automatic changelog update
PJBot Jun 18, 2023
21b583a
add pkas back to salv vendor (#17446)
deltanedas Jun 19, 2023
d9714c0
Automatic changelog update
PJBot Jun 19, 2023
acf102b
add suffix for rigged gloves (#17287)
lzk228 Jun 19, 2023
ac63a7c
Minor changes to Janitorial and Cryogenics Guidebooks (#17282)
Owai-Seek Jun 19, 2023
1026bb1
Automatic changelog update
PJBot Jun 19, 2023
78adc99
Artifact crafting fix (#17454)
EmoGarbage404 Jun 19, 2023
7e1183d
Automatic changelog update
PJBot Jun 19, 2023
ea767b7
Buff ores, add quartz (#17453)
EmoGarbage404 Jun 19, 2023
8ba5ef3
Automatic changelog update
PJBot Jun 19, 2023
f9f8bb2
add tile pry and place logs (#17461)
Chief-Engineer Jun 19, 2023
bf8fa41
comit (#17462)
lzk228 Jun 19, 2023
ec78673
Merge remote-tracking branch 'space-station-14/master' into master-ru
MilenVolf Jun 19, 2023
e7e5a19
Update english locale files
MilenVolf Jun 19, 2023
2b80423
Update russian locale files
MilenVolf Jun 19, 2023
76369ef
Merge remote-tracking branch 'space-station-14/master' into master-ru
MilenVolf Jun 19, 2023
1ce19e5
Another update russian locale files
MilenVolf Jun 19, 2023
bc68a40
Add en-us as fallback locale
AruMoon Jun 19, 2023
135e396
Fix tips yaml
AruMoon Jun 19, 2023
56a99a9
Update english locale files
AruMoon Jun 19, 2023
5fe52c9
Update russian locale files
AruMoon Jun 19, 2023
69c6ab5
Add dungeon templates as uninitialized maps (#17468)
Vordenburg Jun 19, 2023
6099072
Я лапочка
Cooderer Jun 19, 2023
3d98319
Add more windoors (#17471)
lzk228 Jun 19, 2023
83aaeb3
Automatic changelog update
PJBot Jun 19, 2023
3cb919f
Small addition to mercenary items (#17464)
Jackal298 Jun 19, 2023
8610249
Automatic changelog update
PJBot Jun 19, 2023
910c2da
fix-lathe-recipe-dupes (#17473)
EmoGarbage404 Jun 19, 2023
0435361
Automatic changelog update
PJBot Jun 19, 2023
d4c8715
Nerf stims (#17485)
metalgearsloth Jun 20, 2023
67089e3
Automatic changelog update
PJBot Jun 20, 2023
55690f6
Remove cat ear guaranteed spawns (#17488)
metalgearsloth Jun 20, 2023
41244b7
Automatic changelog update
PJBot Jun 20, 2023
9fc4fc6
Fix some Mind ECS bugs (#17480)
ElectroJr Jun 20, 2023
f7e44b9
Automatic changelog update
PJBot Jun 20, 2023
34e03a0
Improve HandLabeler and AgentID UI (#16902)
Vordenburg Jun 20, 2023
41f4bed
Automatic changelog update
PJBot Jun 20, 2023
56cb07e
saltern 4.12 (#17481)
deltanedas Jun 20, 2023
763f604
make taser require silver (#17477)
deltanedas Jun 20, 2023
a01f26d
fix lathe syncing and tweak ui (#17489)
EmoGarbage404 Jun 20, 2023
8e372ef
Automatic changelog update
PJBot Jun 20, 2023
ec71f1b
update stimpack desc (#17496)
MisterMecky Jun 20, 2023
50c278b
Station command improvements (#17431)
PJB3005 Jun 20, 2023
c271857
updates supply department jumpsuits (#17506)
Flareguy Jun 20, 2023
1ef0076
Automatic changelog update
PJBot Jun 20, 2023
b795479
buff atmos firesuits, nerf atmos hardsuits (#17507)
CrigCrag Jun 20, 2023
b15a6d1
Automatic changelog update
PJBot Jun 20, 2023
4c43e20
Vend contraband/emag inventory expansion (#17503)
misandrie Jun 20, 2023
c1a971f
dorf (#17475)
Alekshhh Jun 20, 2023
c5323b7
Automatic changelog update
PJBot Jun 20, 2023
f15a11b
bagel test fixes (#17510)
Emisse Jun 20, 2023
8a28d7b
Bagel fix (#17514)
metalgearsloth Jun 20, 2023
c130c1e
Remove chemistry from nukieplanet (#17518)
metalgearsloth Jun 21, 2023
1e9d2e3
Automatic changelog update
PJBot Jun 21, 2023
1dde5f3
Fix ghost respawn bug (#17511)
ElectroJr Jun 21, 2023
049281c
Automatic changelog update
PJBot Jun 21, 2023
6485dba
Fix round end window (#17512)
ElectroJr Jun 21, 2023
567490b
Automatic changelog update
PJBot Jun 21, 2023
7f203be
Fix throw hotkey also focusing UI (#17493)
Aexxie Jun 21, 2023
3fa99b8
Slight mind test cleanup (#17521)
ElectroJr Jun 21, 2023
e199150
Upstream localization part 1
MilenVolf Jun 21, 2023
276f181
Bleed Tweaks (#17528)
QuietlyWhisper Jun 21, 2023
f14f09c
remove armor from uniforms (#17523)
Chief-Engineer Jun 21, 2023
9849737
Cleans up warnings in disposals (#17419)
TemporalOroboros Jun 21, 2023
362974e
Automatic changelog update
PJBot Jun 21, 2023
cd949bc
some more netsync: false removing (#17472)
lzk228 Jun 21, 2023
3f946bb
secure windoor id standartization (#17531)
lzk228 Jun 21, 2023
779db9f
marathon update (#17534)
Emisse Jun 21, 2023
742bc77
meta update (#17535)
Emisse Jun 21, 2023
2ece4e4
fland update (#17536)
Emisse Jun 21, 2023
881902b
bagel update (#17537)
Emisse Jun 21, 2023
96c414a
Omega (#17539)
Emisse Jun 21, 2023
53bd13f
animals.yml pets.yml cleaning (#17533)
lzk228 Jun 21, 2023
a20fa2a
modify medkit fill (#17527)
liltenhead Jun 21, 2023
729eeee
Automatic changelog update
PJBot Jun 21, 2023
966345a
Add missing border colors on PDAs (#17541)
EmoGarbage404 Jun 21, 2023
6e82906
Automatic changelog update
PJBot Jun 21, 2023
a23a7fe
Research console auto syncing (#17540)
EmoGarbage404 Jun 22, 2023
7a33826
Automatic changelog update
PJBot Jun 22, 2023
501bc4b
Try fix random TestGhostToAghost test failures (#17546)
ElectroJr Jun 22, 2023
4ed11ca
Energy Shield (#16996)
Nimfar11 Jun 22, 2023
ad89184
Automatic changelog update
PJBot Jun 22, 2023
7ab5127
Cargo Bounties (#17344)
EmoGarbage404 Jun 22, 2023
67f4932
Automatic changelog update
PJBot Jun 22, 2023
26e5249
Dwarf Accent Fix (#17561)
Alekshhh Jun 22, 2023
e3e0de6
Automatic changelog update
PJBot Jun 22, 2023
384da9b
bagel cargo bounty (#17566)
Emisse Jun 22, 2023
4c474c5
box cargo bounty (#17567)
Emisse Jun 22, 2023
6cd36ce
fland cargo bounty (#17568)
Emisse Jun 22, 2023
501b14a
marathon cargo bounty (#17569)
Emisse Jun 22, 2023
5641803
meta cargo bounty (#17570)
Emisse Jun 22, 2023
95d6f82
omega cargo bounty (#17571)
Emisse Jun 22, 2023
878a684
Maybe fix more mind test failures (#17577)
ElectroJr Jun 23, 2023
be9e91d
Upstream localization part 2
MilenVolf Jun 23, 2023
2353d55
Transl fix (these did not fit in textbox)
MilenVolf Jun 23, 2023
a73e9f6
Merge remote-tracking branch 'space-station-14/master' into master-ru
MilenVolf Jun 23, 2023
764d3f5
Update english locale files
MilenVolf Jun 23, 2023
598986f
Update russian locale files
MilenVolf Jun 23, 2023
f125230
Upstream localization part 3
MilenVolf Jun 23, 2023
6d54b8b
Upstream localization part 4 (Guidebooks)
MilenVolf Jun 24, 2023
8d4f8e7
Cleaning unused locale + locale fixes
MilenVolf Jun 24, 2023
f3a8afe
Merge branch 'master-ru' into Test-merge
MilenVolf Jun 26, 2023
3bf44d6
Update locale
MilenVolf Jun 26, 2023
8141906
Fixing failures #1
MilenVolf Jun 26, 2023
c0df1e7
Fixing failures part 2
MilenVolf Jun 26, 2023
ca8920b
TG Meta Resave
MilenVolf Jun 26, 2023
6d8eba4
TG Meta update, locale book fix
MilenVolf Jun 26, 2023
3bc4421
Chameleon Hat Fix
MilenVolf Jun 27, 2023
9f552cb
Nukieplanet chem fix & doors + infiltrator doors
MilenVolf Jun 27, 2023
3613553
Maps: Cleaning prototypes
MilenVolf Jun 27, 2023
e717815
Nukeops rule fix (Infiltrator fix)
MilenVolf Jun 27, 2023
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
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
fi
use flake
13 changes: 9 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
# Last match in file takes precedence.

# Sorting by path instead of by who added it one day :(
/Resources/ConfigPresets/WizardsDen/ @Chief-Engineer

# Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short.
# You need to add your name to these entries, not make a new one, if you care about them.
/Content.*/Bql/ @moonheart08
/Content.*/Administration/ @moonheart08 @PaulRitter @DrSmugleaf
/Content.*/Administration/ @moonheart08 @PaulRitter @DrSmugleaf @Chief-Engineer
/Content.*/Station/ @moonheart08
/Content.*/Maps/ @moonheart08
/Content.*/GameTicking/ @moonheart08
/Resources/Server\ Info/ @moonheart08
/Resources/engineCommandPerms.yml @moonheart08
/Resources/clientCommandPerms.yml @moonheart08
/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
/Resources/ServerInfo/Guidebook/ @moonheart08
/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
/Resources/Prototypes/species.yml @moonheart08
/Resources/Prototypes/Body/ @moonheart08 @mirrorcult @DrSmugleaf # suffering
/Resources/Prototypes/Maps/ @moonheart08 @Emisse
Expand Down Expand Up @@ -50,5 +54,6 @@

# SKREEEE
/Content.*.Database/ @PJB3005 @DrSmugleaf
/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
/Pow3r/ @PJB3005
/Content.Server/Power/Pow3r/ @PJB3005
2 changes: 1 addition & 1 deletion .run/Content Server+Client.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
<toRun name="Content.Server" type="DotNetProject" />
<method v="2" />
</configuration>
</component>
</component>
4 changes: 2 additions & 2 deletions Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ protected override void Open()
_window.OpenCentered();

_window.OnClose += Close;
_window.OnNameEntered += OnNameChanged;
_window.OnJobEntered += OnJobChanged;
_window.OnNameChanged += OnNameChanged;
_window.OnJobChanged += OnJobChanged;
}

private void OnNameChanged(string newName)
Expand Down
12 changes: 7 additions & 5 deletions Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@ namespace Content.Client.Access.UI
[GenerateTypedNameReferences]
public sealed partial class AgentIDCardWindow : DefaultWindow
{
public event Action<string>? OnNameEntered;

public event Action<string>? OnJobEntered;
public event Action<string>? OnNameChanged;
public event Action<string>? OnJobChanged;

public AgentIDCardWindow()
{
RobustXamlLoader.Load(this);

NameLineEdit.OnTextEntered += e => OnNameEntered?.Invoke(e.Text);
JobLineEdit.OnTextEntered += e => OnJobEntered?.Invoke(e.Text);
NameLineEdit.OnTextEntered += e => OnNameChanged?.Invoke(e.Text);
NameLineEdit.OnFocusExit += e => OnNameChanged?.Invoke(e.Text);

JobLineEdit.OnTextEntered += e => OnJobChanged?.Invoke(e.Text);
JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
}

public void SetCurrentName(string name)
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Actions/ActionsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public void UnlinkAllActions()
public void LinkAllActions(ActionsComponent? actions = null)
{
var player = _playerManager.LocalPlayer?.ControlledEntity;
if (player == null || !Resolve(player.Value, ref actions))
if (player == null || !Resolve(player.Value, ref actions, false))
{
return;
}
Expand Down
Loading
Loading