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

Update-1-11-2025 #126

Merged
merged 528 commits into from
Jan 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
528 commits
Select commit Hold shift + click to select a range
13b9ad9
sillyyy
sleepyyapril Dec 23, 2024
c2704bc
Fix some rounds failing to end due to mind roles (#32792)
PJB3005 Oct 13, 2024
b5ab695
Make tests automatically reset modified cvars (#28219)
ElectroJr May 31, 2024
9b6527b
Add random seed options to tests (#30735)
ElectroJr Aug 9, 2024
5f6701b
Test parallelization stuff. (#31650)
PJB3005 Sep 1, 2024
df49cff
Check
sleepyyapril Dec 23, 2024
4b1e01e
v238.0...1?
sleepyyapril Dec 23, 2024
2e038d9
Merge branch 'master' into wizmerge
sleepyyapril Dec 23, 2024
b3f5797
hm
sleepyyapril Dec 23, 2024
6a5865a
Merge branch 'wizmerge' of https://github.com/sleepyyapril/Einstein-E…
sleepyyapril Dec 23, 2024
2337463
Fix ERT becoming sleeper agents and add sleeper agent preferences (#2…
Dutch-VanDerLinde Jun 20, 2024
7ce56b2
fix lint?
sleepyyapril Dec 24, 2024
0181930
oops
sleepyyapril Dec 24, 2024
82c3f2e
Revert "Avoid using EntityUid as a networked dictionary's key until h…
sleepyyapril Dec 25, 2024
f2cbb27
Yeeeeeeeeeeeah.
sleepyyapril Dec 25, 2024
899c791
Fixed IP bans preventing non-banned players from connecting to SQLite…
TGRCdev Aug 18, 2024
197b065
Add CCVar
sleepyyapril Dec 25, 2024
670feb4
I fixed it!
sleepyyapril Dec 25, 2024
06bf52a
Partial port
sleepyyapril Dec 25, 2024
77f4c99
im so silly!
sleepyyapril Dec 25, 2024
acc59cb
woah
sleepyyapril Dec 25, 2024
b42ad79
No error
sleepyyapril Dec 25, 2024
5049739
pda messaging real (#2362)
MilonPL Nov 6, 2024
ec8f9f5
make cargo balance ui updating its own component (#28295)
deltanedas Jul 13, 2024
67e917d
stocks trading (#2103)
MilonPL Dec 10, 2024
0c70547
yeag
sleepyyapril Dec 25, 2024
3383b84
feat: now when research is unlocked in console, approver of reasearch…
Fildrance Sep 3, 2024
3876fce
Job title localization (#32338)
chavonadelal Oct 9, 2024
1931832
Automatic ACO procedure (#2351)
ewokswagger Dec 9, 2024
fee041e
fix auto aco timing (#2431)
ewokswagger Dec 12, 2024
57675a0
pass Actor to cartridge messages (#33210)
deltanedas Nov 8, 2024
b4f332a
Play deny sound if failed
sleepyyapril Dec 26, 2024
2cf5c10
Solar assembly crate buff (#33019)
K-Dynamic Nov 16, 2024
7179184
Fix utensils not being thrown away (#33326)
SaphireLattice Nov 16, 2024
e398c9c
Add StartDelay to actions (#33026)
lzk228 Oct 28, 2024
754275e
OnUIOpenAttempt!
sleepyyapril Dec 26, 2024
470d7ce
fix all rider errors
sleepyyapril Dec 26, 2024
a54aa83
small
sleepyyapril Dec 26, 2024
3a45387
fix locale
sleepyyapril Dec 26, 2024
ad52051
oops
sleepyyapril Dec 26, 2024
16a58d7
yeag
sleepyyapril Dec 26, 2024
4579c05
Revert "yeag"
sleepyyapril Dec 26, 2024
2a54f4f
fix?
sleepyyapril Dec 26, 2024
702cf74
waow
sleepyyapril Dec 26, 2024
4adc9b2
silly
sleepyyapril Dec 26, 2024
69510ab
Waow
sleepyyapril Dec 26, 2024
166dc62
oops
sleepyyapril Dec 26, 2024
6ec6789
siiigh
sleepyyapril Dec 26, 2024
b3a5d1c
yeag
sleepyyapril Dec 26, 2024
f684930
yeag
sleepyyapril Dec 26, 2024
91ca7e3
Update message for failing to spawn.
sleepyyapril Dec 26, 2024
8ae7651
Merge branch 'master' into wizmerge
sleepyyapril Dec 26, 2024
50bb5b7
remove bad cartridges
sleepyyapril Dec 26, 2024
a3df482
Merge branch 'wizmerge' of https://github.com/sleepyyapril/Einstein-E…
sleepyyapril Dec 26, 2024
6629ec7
salvage points shop (#2510)
deltanedas Dec 27, 2024
edf5038
MedTek Cartridge (#32450)
ArchRBX Oct 2, 2024
03e3092
AstroNav GPS Cartridge (#32194)
ArchRBX Sep 24, 2024
711367e
Added admin assistant
Radezolid Dec 25, 2024
54583f5
add mining points (#2419)
deltanedas Dec 13, 2024
3db9e75
Add space debris to salvage magnet (#31113)
EmoGarbage404 Aug 17, 2024
210d2f2
as an fyi, last commit is named wrong.
sleepyyapril Dec 28, 2024
007fa57
fix error
sleepyyapril Dec 28, 2024
f3cfe1f
i dunno
sleepyyapril Dec 28, 2024
0e9ed51
admin assistant
sleepyyapril Dec 28, 2024
3fe34da
fix test fails
sleepyyapril Dec 28, 2024
8322ccf
Use tag to avoid accidentally updates now that it's added.
sleepyyapril Dec 28, 2024
ad59231
Add codeword highlighting (#30092)
SlamBamActionman Aug 23, 2024
9753d46
Rubber should be rubber.
sleepyyapril Dec 28, 2024
395582e
Station Anchor (#26098)
juliangiebel Aug 31, 2024
c169f5a
Two additional checks to prevent FTLing stations (#32558)
Plykiya Oct 4, 2024
92b64de
Allow shuttles on planets to make FTL jump (#33507)
MilenVolf Nov 24, 2024
7044f01
Station Anchor (#26098)
lzk228 Sep 4, 2024
122508e
Last commit is: Add disabled station anchors version (#31794)
sleepyyapril Dec 28, 2024
69f6992
Adds Station Anchor Beacon (#33711)
IamVelcroboy Dec 6, 2024
51258ee
fix yml lint
sleepyyapril Dec 28, 2024
7818749
Inertia dampeners (#1620)
neuPanda Aug 7, 2024
c6bee33
fix build fails
sleepyyapril Dec 28, 2024
3363ddd
Merge branch 'master' into wizmerge
sleepyyapril Dec 29, 2024
60aa348
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
sleepyyapril Dec 30, 2024
2c55f0a
Merge branch 'wizmerge' of https://github.com/sleepyyapril/Einstein-E…
sleepyyapril Dec 30, 2024
56e4037
Rename several cyber-eyes traits
sleepyyapril Dec 30, 2024
e18d2aa
Fix communication console menu (#33655)
VlaDOS1408 Dec 20, 2024
cd08bb2
fix some bugs:tm:
sleepyyapril Dec 30, 2024
b099c37
Fix communications console.
sleepyyapril Dec 30, 2024
471c3c2
Change CyberEyes name back to original
sleepyyapril Dec 30, 2024
60382e2
NanoChat fixes
sleepyyapril Dec 30, 2024
2d2bfec
Add all ComponentStart features to OnMapInit function
sleepyyapril Dec 30, 2024
179c441
Disable setting to blue with sleeper agents.
sleepyyapril Dec 30, 2024
d8f6082
Fix aHelp menu sorting (#30518)
Titian3 Jul 31, 2024
0115861
Little note
sleepyyapril Dec 30, 2024
78be436
Fix Bwoink Player sorting again.... (#30580)
Titian3 Aug 2, 2024
c2bb333
Psych can scan, added NanoChat to medical.
sleepyyapril Dec 31, 2024
6716d6a
Editing contacts, enter to send messages.
sleepyyapril Dec 31, 2024
b710fda
Enable mail teleporters by default
sleepyyapril Dec 31, 2024
55f8a67
Revert "Enable mail teleporters by default"
sleepyyapril Dec 31, 2024
ffa033e
Reapply "Enable mail teleporters by default"
sleepyyapril Dec 31, 2024
7be5d94
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
sleepyyapril Dec 31, 2024
29b59e5
Fix errors
sleepyyapril Dec 31, 2024
2b57a26
Linter fixes
sleepyyapril Dec 31, 2024
0665242
BlackeyeSpawn doesn't exist, remove trait.
sleepyyapril Jan 1, 2025
103e552
Remove Blackeye
sleepyyapril Jan 1, 2025
ecd416a
Merge branch 'master' into wizmerge
sleepyyapril Jan 1, 2025
b2ac5fd
Notifications are more reliable.
sleepyyapril Jan 2, 2025
f52f88d
Merge branch 'wizmerge' of https://github.com/sleepyyapril/Einstein-E…
sleepyyapril Jan 2, 2025
48b435a
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
sleepyyapril Jan 2, 2025
c626df2
Fix error
sleepyyapril Jan 2, 2025
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
b8074ea
Use EnsureComp for StationSpawningSystem (#1424)
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
75bb8d3
[Port] Port Guidebook Tables From Wizden PR #28484 (#1427)
CerberusWolfie Jan 5, 2025
026d552
Automatic Changelog Update (#1427)
SimpleStation14 Jan 5, 2025
d17fe1a
Add Different Launch Types to VSCode (#1430)
CerberusWolfie Jan 5, 2025
1e1e36c
💅🏻 Lamia Markings + ♂️ Male Lamia (#1440)
angelofallars Jan 5, 2025
138048d
Automatic Changelog Update (#1440)
SimpleStation14 Jan 5, 2025
6c70875
Throwing Mini-Update 1 (#1434)
angelofallars Jan 5, 2025
5cb3d42
Automatic Changelog Update (#1434)
SimpleStation14 Jan 5, 2025
68a11db
New Traits: Steadfast And Feeble (#1431)
angelofallars Jan 5, 2025
136be4e
Automatic Changelog Update (#1431)
SimpleStation14 Jan 5, 2025
11678af
Footprints Performance Updates (#1439)
VMSolidus Jan 5, 2025
d2875c9
Automatic Changelog Update (#1439)
SimpleStation14 Jan 5, 2025
71e3c03
Pacification Prevents Throwing Weapons (#1433)
angelofallars Jan 5, 2025
06be5d3
Automatic Changelog Update (#1433)
SimpleStation14 Jan 5, 2025
8935492
Parkour Training Rework (#1432)
angelofallars Jan 5, 2025
72d6347
Automatic Changelog Update (#1432)
SimpleStation14 Jan 5, 2025
deecce3
Unlimited Face Markings (#1435)
angelofallars Jan 5, 2025
e41e12f
Automatic Changelog Update (#1435)
SimpleStation14 Jan 5, 2025
9a2eac3
Fix Lamia Footprints (#1425)
VMSolidus Jan 5, 2025
b2cf69c
Hotfix Material Arbitrage Test (#1392)
VMSolidus Jan 5, 2025
d29149b
Automatic Changelog Update (#1425)
SimpleStation14 Jan 5, 2025
1c75299
Fixed Monkey Skin Color (#1437)
VMSolidus Jan 5, 2025
cd29b5e
Automatic Changelog Update (#1437)
SimpleStation14 Jan 5, 2025
231a077
Fix Various Language Trait Issues (#1441)
VMSolidus Jan 5, 2025
48ac2d2
Port Frontier Clothes (#1388)
VMSolidus Jan 5, 2025
18adcc1
Automatic Changelog Update (#1441)
SimpleStation14 Jan 5, 2025
6547c10
Fix Pirate Radio Rule (#1438)
VMSolidus Jan 5, 2025
7cffc48
Automatic Changelog Update (#1388)
SimpleStation14 Jan 5, 2025
e31692d
Automatic Changelog Update (#1438)
SimpleStation14 Jan 5, 2025
360acd1
Merge pull request #8 from KyuPolaris/prescriptionfix
sleepyyapril Nov 5, 2024
02f53bc
Added Cap Trenchcoat (#108)
sleepyyapril Dec 31, 2024
d137d1e
Summer Security Uniform Sprite Fix (#116)
sleepyyapril Jan 1, 2025
ecd480f
Update humanoid-character-profile.ftl (#123)
sleepyyapril Jan 4, 2025
84aa94e
CMO Turtlenecks Loadout (Again) (#124)
sleepyyapril Jan 5, 2025
dcd258b
Merge pull request #31 from TheDenSS14/cmo-drip-dlc
sleepyyapril Nov 10, 2024
21a811a
Added Captain's Combat Gas Mask (#117)
sleepyyapril Jan 1, 2025
8961f61
Move The Den files to upstream namespace
angelofallars Jan 5, 2025
3922f11
Re-add head mirror to loadouts, add new items to loadout groups
angelofallars Jan 5, 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
c2cb910
Fix Elite Suit Being ONE FUCKING TC (#1449)
TwoDucksOnnaPlane Jan 7, 2025
cf914d9
Automatic Changelog Update (#1449)
SimpleStation14 Jan 7, 2025
73c2780
Merge branch 'wizmerge' of https://github.com/sleepyyapril/Einstein-E…
DEATHB4DEFEAT Jan 7, 2025
35afacf
Increase Trait Limit From 10 To 14 (#1446)
angelofallars Jan 7, 2025
613eb05
Automatic Changelog Update (#1446)
SimpleStation14 Jan 7, 2025
760596d
Fix Humanoid Color (#1454)
Spatison Jan 7, 2025
f6dec10
Automatic Changelog Update (#1454)
SimpleStation14 Jan 7, 2025
990a57c
Make Non-Verbal Langs Not Play Speech (#1448)
RadsammyT Jan 7, 2025
5353363
Automatic Changelog Update (#1448)
SimpleStation14 Jan 7, 2025
a05bbce
[Port] Add Time Transfer Panel From Goobstation (#1429)
CerberusWolfie Jan 7, 2025
bac302c
Automatic Changelog Update (#1429)
SimpleStation14 Jan 7, 2025
f026528
Fix Toolshed Crash (#1415)
sleepyyapril Jan 7, 2025
f11d2e7
NanoChat QoL And Bug Fixes (#1460)
angelofallars Jan 8, 2025
747cb50
Automatic Changelog Update (#1460)
SimpleStation14 Jan 8, 2025
f80f954
Increase Title/Content Text Limits For News Articles (#1447)
angelofallars Jan 8, 2025
4a806c8
Automatic Changelog Update (#1447)
SimpleStation14 Jan 8, 2025
e733fa0
Chem Colors (#1461)
aspiringLich Jan 8, 2025
64d4323
Automatic Changelog Update (#1461)
SimpleStation14 Jan 8, 2025
089a45e
Fix Cybersun Pen Damage (#1459)
angelofallars Jan 8, 2025
bea6ca7
Automatic Changelog Update (#1459)
SimpleStation14 Jan 8, 2025
70f7298
Fixed Shadow Shackles Not Activating for Blood Cultists (#1456)
Lumminal Jan 8, 2025
442e25b
Automatic Changelog Update (#1456)
SimpleStation14 Jan 8, 2025
8b5eec7
Fix Face Markings Rendering Above Clothing (#1467)
angelofallars Jan 8, 2025
998e0ea
Automatic Changelog Update (#1467)
SimpleStation14 Jan 8, 2025
b39e126
Prisoner Headset Box in Warden's Locker (#1470)
Lumminal Jan 9, 2025
4907639
Automatic Changelog Update (#1470)
SimpleStation14 Jan 9, 2025
86296da
Adds Missing Lathe Recipes (#1472)
BlueHNT Jan 10, 2025
b89412a
Some Surgery Fixs (#1471)
Spatison Jan 10, 2025
77a7295
Automatic Changelog Update (#1472)
SimpleStation14 Jan 10, 2025
ba616f0
Automatic Changelog Update (#1471)
SimpleStation14 Jan 10, 2025
0f48142
Night And Thermal Vision (#1462)
Spatison Jan 10, 2025
83fa923
Automatic Changelog Update (#1462)
SimpleStation14 Jan 10, 2025
9c65527
Merge branch 'master' into station-ai
VMSolidus Jan 10, 2025
b38b7f9
CyberEyes Night Vision And Thermal Vision Modules (#1477)
VMSolidus Jan 10, 2025
7f32e00
Automatic Changelog Update (#1477)
SimpleStation14 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
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
3dcba93
Merge remote-tracking branch 'EE-Master/master' into update-1-11-2025
VMSolidus Jan 11, 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
  •  
  •  
  •  
84 changes: 82 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
// CLIENT CONFIGS
{
"name": "Client",
"type": "coreclr",
Expand All @@ -14,14 +15,56 @@
"stopAtEntry": false
},
{
"name": "Client (Compatibility renderer)",
"name": "Client (Tools)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Tools)",
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
"args": [],
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Client (Release)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Release)",
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
"args": [],
"console": "internalConsole",
"stopAtEntry": false
},
// COMPATABILITY RENDERERS
{
"name": "Client (Compatibility Renderer)",
"type": "coreclr",
"request": "launch",
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
"args": "--cvar display.compat=true",
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Client (Tools) - (Compatability Renderer)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Tools)",
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
"args": ["--cvar display.compat=true"],
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Client (Release) - (Compatability Renderer)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Release)",
"program": "${workspaceFolder}/bin/Debug/Content.Client/Content.Client.dll",
"args": ["--cvar display.compat=true"],
"console": "internalConsole",
"stopAtEntry": false
},
// SERVER CONFIGS
{
"name": "Server",
"type": "coreclr",
Expand All @@ -31,6 +74,27 @@
"console": "integratedTerminal",
"stopAtEntry": false
},
{
"name": "Server (Tools)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Tools)",
"program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
"args": [],
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Server (Release)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Release)",
"program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
"args": [],
"console": "internalConsole",
"stopAtEntry": false
},
// LINTER
{
"name": "YAML Linter",
"type": "coreclr",
Expand All @@ -50,6 +114,22 @@
"Client"
],
"preLaunchTask": "build"
},
{
"name": "Server/Client (Tools)",
"configurations": [
"Server (Tools)",
"Client (Tools)"
],
"preLaunchTask": "build (Tools)"
},
{
"name": "Server/Client (Release)",
"configurations": [
"Server (Release)",
"Client (Release)"
],
"preLaunchTask": "build (Release)"
}
]
}
}
42 changes: 41 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,46 @@
},
"problemMatcher": "$msCompile"
},
{
"label": "build (Tools)",
"command": "dotnet",
"type": "shell",
"args": [
"build",
"--configuration",
"Tools",
"/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
"/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
],
"group": {
"kind": "build",
"isDefault": false
},
"presentation": {
"reveal": "silent"
},
"problemMatcher": "$msCompile"
},
{
"label": "build (Release)",
"command": "dotnet",
"type": "shell",
"args": [
"build",
"--configuration",
"Release",
"/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
"/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
],
"group": {
"kind": "build",
"isDefault": false
},
"presentation": {
"reveal": "silent"
},
"problemMatcher": "$msCompile"
},
{
"label": "build-yaml-linter",
"command": "dotnet",
Expand All @@ -34,4 +74,4 @@
"problemMatcher": "$msCompile"
}
]
}
}
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<cc:UICommandButton Command="callshuttle" Text="{Loc admin-player-actions-window-shuttle}" WindowType="{x:Type at:AdminShuttleWindow}"/>
<cc:CommandButton Command="adminlogs" Text="{Loc admin-player-actions-window-admin-logs}"/>
<cc:CommandButton Command="faxui" Text="{Loc admin-player-actions-window-admin-fax}"/>
<cc:CommandButton Command="timetransferpanel" Text="{Loc admin-player-actions-window-time-transfer}"/>
</GridContainer>
</BoxContainer>
</Control>
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc nano-chat-new-title}"
Title="{Loc nano-chat-edit-title}"
MinSize="300 200">
<PanelContainer StyleClasses="AngleRect">
<BoxContainer Orientation="Vertical" Margin="4">
Expand Down Expand Up @@ -42,8 +42,8 @@
Text="{Loc nano-chat-cancel}"
StyleClasses="OpenRight"
MinSize="80 0" />
<Button Name="CreateButton"
Text="{Loc nano-chat-create}"
<Button Name="ConfirmButton"
Text="{Loc nano-chat-confirm}"
StyleClasses="OpenLeft"
MinSize="80 0"
Disabled="True" />
Expand Down
Loading
Loading