Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

New japan food #348

Closed
wants to merge 316 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
316 commits
Select commit Hold shift + click to select a range
2eb75fe
Nonlethal Vending Machine (Practice Rounds & Etc) (#1352)
SirMcSlushers Jun 7, 2024
7e0de7c
Brown Flat Cap in Loadouts (#1483)
Hamblinius Jun 7, 2024
53dd031
Mail Buff (#1473)
dvir001 Jun 7, 2024
de8a049
Automatic Changelog (#1473)
FrontierATC Jun 7, 2024
e6506b4
Фиксы мерджей
Vonsant Jun 7, 2024
203a7ce
Merge pull request #275 from Corvax-Frontier/up070624
Vonsant Jun 7, 2024
63d35c4
Merge pull request #274 from NEirotoXiN00/AddMagInAmmoTech
Vonsant Jun 7, 2024
8342e26
Mail Truck (Update) (#1305)
dvir001 Jun 7, 2024
0ad77b4
Automatic Changelog (#1305)
FrontierATC Jun 7, 2024
e9c2534
Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709) (…
Leander-0 Jun 8, 2024
a8c22c7
Automatic Changelog (#1490)
FrontierATC Jun 8, 2024
73ecff4
Fix mech codes to stop AI abuse (#1492)
dvir001 Jun 8, 2024
de69cf9
Add wanted status, job icon, health icon to Brigmedic HUD (#1493)
whatston3 Jun 8, 2024
4792913
Automatic Changelog (#1493)
FrontierATC Jun 8, 2024
4825373
add Shuttle's and fix maps
mersen-tyn Jun 9, 2024
7c992e1
delete Dual.yml
mersen-tyn Jun 9, 2024
9e767f9
Fix's Zarya and Sunset
mersen-tyn Jun 9, 2024
55c772f
NSF Broadhead (New) - Medium Detective NSFD Vessel (#1214)
Tych0theSynth Jun 9, 2024
d4b5016
Automatic Changelog (#1214)
FrontierATC Jun 9, 2024
a120ab2
Merge pull request #1431 from dvir001/2024-05-28-HTNSystem
GreaseMonk Jun 10, 2024
510633a
Merge pull request #279 from mersen-tyn/maps_mersen
Vonsant Jun 10, 2024
328edff
Fix artifact fragment spawn rate (#1497)
GreaseMonk Jun 10, 2024
32df6dc
Automatic Changelog (#1497)
FrontierATC Jun 10, 2024
92cd1e9
Фикс мерджей
Vonsant Jun 10, 2024
dc6a8fa
Русификациия
Vonsant Jun 10, 2024
953ca6b
Merge pull request #280 from Corvax-Frontier/Up100624
Vonsant Jun 10, 2024
c7ca065
Add files via upload
Vonsant Jun 10, 2024
c0b52c2
Update boombox.yml
Vonsant Jun 10, 2024
82e8687
Починка моей фигни
Zekins3366 Jun 10, 2024
90de8df
Обновление ДСБФ
Zekins3366 Jun 11, 2024
f7b6eb0
Merge pull request #281 from Corvax-Frontier/NewNew
Zekins3366 Jun 11, 2024
88308a9
Откат автоудаления гилз
Zekins3366 Jun 11, 2024
1447747
Merge pull request #282 from Corvax-Frontier/Pitron
Zekins3366 Jun 11, 2024
4839227
Loadouts: add overrides for name, description, and preview entity (#1…
whatston3 Jun 11, 2024
df97e8b
Automatic Changelog (#1491)
FrontierATC Jun 11, 2024
3d61b18
Construction Bag (#1487)
ErhardSteinhauer Jun 11, 2024
4d053b7
Automatic Changelog (#1487)
FrontierATC Jun 11, 2024
d8f964c
Ads
Jun 11, 2024
f2076bb
Pen signing rework (#1500)
TsjipTsjip Jun 11, 2024
27356d5
Automatic Changelog (#1500)
FrontierATC Jun 11, 2024
0937fac
Cats Carp Suit (#1437)
dvir001 Jun 11, 2024
c7d7e7b
Automatic Changelog (#1437)
FrontierATC Jun 11, 2024
0dd1def
Опечатка
Jun 11, 2024
6df7891
New Lobby Art (Handsome Killer) (#1499)
dvir001 Jun 12, 2024
b7822c8
Automatic Changelog (#1499)
FrontierATC Jun 12, 2024
116945a
More hostile species for expeditions (#1329)
ErhardSteinhauer Jun 12, 2024
1751670
Automatic Changelog (#1329)
FrontierATC Jun 12, 2024
b9438a9
AI Tweaks (#1505)
dvir001 Jun 12, 2024
59fb524
Фиксы
Vonsant Jun 12, 2024
719049e
Merge pull request #283 from NEirotoXiN00/VendAds
Vonsant Jun 12, 2024
985536c
Meh
Vonsant Jun 12, 2024
f1ff541
Merge pull request #285 from Corvax-Frontier/Up120624
Vonsant Jun 12, 2024
0d3c825
сделал ползунок для бумбокса(куча багов, need fix)
Sh1ntra Jun 12, 2024
28fc992
Тут просто много чего
Zekins3366 Jun 12, 2024
141ab60
Fix
Zekins3366 Jun 12, 2024
6c3ab3e
Merge pull request #286 from Corvax-Frontier/mew
Zekins3366 Jun 12, 2024
2dc3f62
Fix Cartridge
Jun 12, 2024
fffd166
Исправление цены магмита
Zekins3366 Jun 12, 2024
c4f6ef3
Reclaimer update (#1506)
dvir001 Jun 12, 2024
cffcf25
Automatic Changelog (#1506)
FrontierATC Jun 12, 2024
7b867ef
Salvage Expedition Rebalance (Follow up, p. 1) (#1338)
ErhardSteinhauer Jun 12, 2024
26d8432
Automatic Changelog (#1338)
FrontierATC Jun 12, 2024
b84b35f
Update InflationCargoCrateSystem.cs
Vonsant Jun 12, 2024
3a1b4c6
Фикс акцентов
Zekins3366 Jun 12, 2024
c498f6c
Merge pull request #287 from NEirotoXiN00/FixCartridgeVector
Vonsant Jun 12, 2024
04fd93b
Merge pull request #289 from Corvax-Frontier/Accents
Zekins3366 Jun 12, 2024
3cebb7c
Фикс отображения для вульп
Zekins3366 Jun 13, 2024
7bafecc
Фикс
Vonsant Jun 13, 2024
5bce70a
Небольшой рефакто цен
Zekins3366 Jun 13, 2024
77e2c55
Merge pull request #293 from Corvax-Frontier/Change
Zekins3366 Jun 13, 2024
81fd213
Merge pull request #292 from Corvax-Frontier/Up130624
Vonsant Jun 13, 2024
85961b6
Временно удалить игральные карты
Vonsant Jun 13, 2024
1a27c7a
Uplink bundles and tracking dart (#1429)
Leander-0 Jun 13, 2024
3aea399
Automatic Changelog (#1429)
FrontierATC Jun 13, 2024
bc56204
Revolvers can reload from boxes and magazines. (#1434)
whatston3 Jun 13, 2024
6358d48
Automatic Changelog (#1434)
FrontierATC Jun 13, 2024
411cad8
Contraband Appraisal Gun (#1509)
dvir001 Jun 13, 2024
d1e1fdf
Automatic Changelog (#1509)
FrontierATC Jun 13, 2024
e4dfc0b
Add support for multiple grid paths in BluespaceErrorRule (#1508)
Vonsant Jun 13, 2024
5528647
Fix Oni accuracy with wielded weapons, and apply Oni accuracy to hand…
whatston3 Jun 13, 2024
2ddc85d
Automatic Changelog (#1498)
FrontierATC Jun 13, 2024
3901104
Add Pious trait, blessing water/blood requires faith (#1486)
whatston3 Jun 13, 2024
1cc4bb2
Automatic Changelog (#1486)
FrontierATC Jun 13, 2024
52d8a01
Dragon Egg Update (#1448)
Leander-0 Jun 14, 2024
de8386a
Automatic Changelog (#1448)
FrontierATC Jun 14, 2024
4586a34
Pirate Uplink and New Drip. (#1476)
Salvantrix Jun 14, 2024
8b23209
Fix ammunition icons in vendors (#1426)
whatston3 Jun 14, 2024
40eac27
Updated Pirate Captain Hardsuit (#1512)
Salvantrix Jun 14, 2024
3ca5f41
Мерджконфликты
Vonsant Jun 14, 2024
9e0e1aa
Update events_bluespace.yml
Vonsant Jun 14, 2024
3b837a1
Merge pull request #295 from Corvax-Frontier/Up14062024
Vonsant Jun 14, 2024
ce9ffe9
Антигиб
Vonsant Jun 14, 2024
920ec04
Update dragon.yml
Vonsant Jun 14, 2024
b2bcdea
Эксперименты (#296)
Vonsant Jun 14, 2024
68596a3
Add new pumps that start with map (#1514)
dvir001 Jun 14, 2024
e8934ca
Automatic Changelog (#1514)
FrontierATC Jun 14, 2024
b94e1b8
CE Suit rads fixup (#1515)
dvir001 Jun 14, 2024
eb82e53
FixPirateAccent
Jun 14, 2024
34ef1d0
Merge pull request #297 from NEirotoXiN00/FixTranslate
Vonsant Jun 14, 2024
d181543
Merge pull request #298 from new-frontiers-14/master
Vonsant Jun 14, 2024
7a44b78
Всякое неинтересное (#299)
Vonsant Jun 14, 2024
44474b7
Disable client replays (#1517)
Leander-0 Jun 14, 2024
ed91b98
Mail table rework (#1477)
whatston3 Jun 14, 2024
2de3b4f
Automatic Changelog (#1477)
FrontierATC Jun 14, 2024
17dc4a3
Аванпост улетел в космос
Vonsant Jun 14, 2024
4ec570a
Fixup (#1516)
dvir001 Jun 14, 2024
55c3507
YarrrDrobe (#1502)
Salvantrix Jun 14, 2024
2d0dcac
Cryogenics Overhaul (#1443)
neuPanda Jun 14, 2024
1d53375
Automatic Changelog (#1443)
FrontierATC Jun 14, 2024
3181b63
Update FrictionRemoverSystem.cs
Vonsant Jun 14, 2024
c0f75c9
Смена обозначения ключа для канала пиратов (удобно) (#301)
Sh1ntra Jun 14, 2024
4ca123e
Rules tweaks v3 (#1478)
Leander-0 Jun 14, 2024
113f236
Automatic Changelog (#1478)
FrontierATC Jun 14, 2024
b946f57
Multicoloured spesos: add layer function in StackComponent (#1496)
whatston3 Jun 14, 2024
b3ccc2f
Automatic Changelog (#1496)
FrontierATC Jun 14, 2024
7c31f66
Фиксы полетов аванпоста (#303)
Vonsant Jun 14, 2024
d394352
NM Spirit SAR Shuttle. (#1436)
Actualcatmoment Jun 15, 2024
5f937d0
The SBI Beaker (#1447)
UncaughtEx Jun 15, 2024
6c93a18
Automatic Changelog (#1447)
FrontierATC Jun 15, 2024
7517407
add shuttles, epsilon and minor fixes
mersen-tyn Jun 15, 2024
d557283
Merge pull request #304 from mersen-tyn/maps_mersen
Vonsant Jun 15, 2024
e67a12e
Revert "Фиксы полетов аванпоста (#303)"
Vonsant Jun 15, 2024
b95751f
Merge pull request #305 from Corvax-Frontier/revert-303-mehtest
Vonsant Jun 15, 2024
84d2c4a
Фикс
Vonsant Jun 15, 2024
46fd51f
Update mailDeliveries.yml
Vonsant Jun 15, 2024
9cd31a3
Update mailDeliveries.yml
Vonsant Jun 15, 2024
a6acf75
Merge pull request #308 from Corvax-Frontier/Up150624
Vonsant Jun 15, 2024
d0d39d9
Эмоциональный дракончик
Vonsant Jun 15, 2024
ad36f44
Add Old Mail to New Mail
Jun 15, 2024
2b46e0b
XDD
Jun 15, 2024
d6241ca
Update turrets.yml (#1526)
dvir001 Jun 15, 2024
571c56a
Fix NFSD-Lake sprite and darts (#1525)
Leander-0 Jun 15, 2024
540eb13
Salvage Outpost Dungeon Theme Backrooms-Fix (#1519)
ErhardSteinhauer Jun 15, 2024
16ada9e
Automatic Changelog (#1519)
FrontierATC Jun 15, 2024
a31dcbd
Merge pull request #310 from new-frontiers-14/master
Vonsant Jun 15, 2024
c0a3fb7
Merge pull request #309 from NEirotoXiN00/NFMail
Vonsant Jun 15, 2024
eec1a54
add destroyed shuttles for the event
mersen-tyn Jun 15, 2024
91a6724
delete atmos
mersen-tyn Jun 15, 2024
ddd3449
Merge pull request #311 from mersen-tyn/maps_mersen
Vonsant Jun 15, 2024
5c0c095
Fix purchase and add loadout
Jun 16, 2024
2cab272
fix prototypes
Jun 16, 2024
7f69084
Merge pull request #312 from NEirotoXiN00/FixPurchaseShuttle
Vonsant Jun 16, 2024
c6f6b2b
Donk co. microwave + microwave tweaks (#28951)
Vermidia Jun 15, 2024
af0291c
MMMMMMMMMM
Ian321 Jun 15, 2024
ea368b5
Update tags.yml
dvir001 Jun 16, 2024
781b9f1
Add data field for id card microwave behaviour (#28087)
DrSmugleaf May 17, 2024
072f6e9
MMMMMM Maps
dvir001 Jun 16, 2024
05d196b
fix baby dragon emote (#1530)
Leander-0 Jun 16, 2024
ade4031
Update production.yml
dvir001 Jun 16, 2024
4883e44
Cyberpunk themed clothes and armor (#1262)
ErhardSteinhauer Jun 16, 2024
ae1edc3
Automatic Changelog (#1262)
FrontierATC Jun 16, 2024
f58b320
meh
Vonsant Jun 16, 2024
6bc49c7
Merge pull request #314 from new-frontiers-14/master
Vonsant Jun 16, 2024
56f1745
Frontier Outpost (Update) (#1524)
dvir001 Jun 16, 2024
8c6dc9a
Automatic Changelog (#1524)
FrontierATC Jun 16, 2024
eb18955
Merge pull request #316 from new-frontiers-14/master
Vonsant Jun 17, 2024
1eec216
Немножко переводов...
Succuberry Jun 17, 2024
8079f52
Фикс вместимости вещмешков
Sh1ntra Jun 17, 2024
8f77a95
Теперь Месть Королевы Анны не ебет себя из за Димочки
Jun 17, 2024
2c969da
немного фиксов для бумбокса (теперь ползунок обновляется сам)
Sh1ntra Jun 17, 2024
5af6599
meow
Sh1ntra Jun 17, 2024
ccdb441
Merge pull request #318 from Corvax-Frontier/sh1ntra-fixduffel
Sh1ntra Jun 17, 2024
93c4d5f
УРААААААААААААААААААААААААААААААААААА
Sh1ntra Jun 17, 2024
df849a2
Merge pull request #320 from Corvax-Frontier/sh1ntra_boombox
Vonsant Jun 17, 2024
45f1cdb
Нужно больше переводов
Succuberry Jun 17, 2024
d75bb71
Сраные букавы
Succuberry Jun 17, 2024
8e9cc3b
Merge pull request #317 from Succuberry/Resources
Vonsant Jun 17, 2024
feca8d6
Searchlight Air-Alarm Fix (#1523)
Actualcatmoment Jun 18, 2024
dbd0284
Automatic Changelog (#1523)
FrontierATC Jun 18, 2024
4c17cb4
Merge pull request #321 from new-frontiers-14/master
Vonsant Jun 18, 2024
b717543
FixVendMachine
Jun 18, 2024
3ff4f9e
Переводчик в слот шеи и чуть-чуть ftl
Succuberry Jun 18, 2024
04315aa
Merge pull request #323 from NEirotoXiN00/FixVendingMachine
Vonsant Jun 18, 2024
ce3722a
Не рабочее гавно в процессе
Jun 18, 2024
46be072
Вы ничего не видели
Succuberry Jun 18, 2024
bf22b1b
Remove StampComponent from pens (#1540)
TsjipTsjip Jun 19, 2024
c82ca2e
Automatic Changelog (#1540)
FrontierATC Jun 19, 2024
3481d19
Dungeon Weapon Spawner Rebalance (#1543)
ErhardSteinhauer Jun 19, 2024
a8f1bb3
Revert "Эксперименты (#296)"
Vonsant Jun 19, 2024
e73e08e
Merge pull request #326 from Corvax-Frontier/revert-296-AirThrows
Vonsant Jun 19, 2024
4805fdb
Add missing suffixes. (#1544)
TsjipTsjip Jun 19, 2024
c82a922
Update backpacks.yml
Sh1ntra Jun 19, 2024
15279e5
Update duffel.yml
Sh1ntra Jun 19, 2024
aa1ee7b
Merge pull request #328 from Corvax-Frontier/sh1ntra-fixduffel
Sh1ntra Jun 19, 2024
0621b60
Merge branch 'Corvax-Frontier:master' into lie-down-2
user424242420 Jun 19, 2024
6198b86
Не фикс говна
Jun 19, 2024
3ee2dbf
IFF Strobe Buff (#1542)
ErhardSteinhauer Jun 19, 2024
a758a2e
Automatic Changelog (#1542)
FrontierATC Jun 19, 2024
3f00c53
Update Content.Shared/Standing/StandingStateComponent.cs
user424242420 Jun 19, 2024
6ba95d0
Update Content.Shared/LieDown/LyingDownComponent.cs
user424242420 Jun 19, 2024
a133d9e
Update Content.Shared/LieDown/SharedLieDownSystem.cs
user424242420 Jun 19, 2024
2721e62
Revert "Update Content.Shared/LieDown/SharedLieDownSystem.cs"
Jun 19, 2024
b1a80c4
fix
Jun 19, 2024
d6ab3d8
Эта хуйня работает
Jun 19, 2024
a04e75f
It's not much, but it's honest work
Jun 20, 2024
936cc5e
Merge pull request #329 from NEirotoXiN00/FixTrs
Vonsant Jun 20, 2024
4f7cc5b
Loadouts: fix empty SR messenger bag (#1545)
whatston3 Jun 20, 2024
40f49d8
GrapplingHook as a rope (just for real test) (#330)
Vonsant Jun 20, 2024
ae150bb
MergeConflict
Vonsant Jun 20, 2024
70ad4d6
Merge pull request #331 from Corvax-Frontier/Up200624
Vonsant Jun 20, 2024
14fd1c9
Final fix
Jun 20, 2024
b07b968
Фикс кошелей
Zekins3366 Jun 20, 2024
c8b01d0
Замена иконки пассажира на a
Zekins3366 Jun 20, 2024
c8b6966
Generic Message for FTL Events (#1552)
ErhardSteinhauer Jun 21, 2024
ed97f6f
Automatic Changelog (#1552)
FrontierATC Jun 21, 2024
235e359
Merge pull request #1531 from dvir001/2024-06-17-MMMMMMM
whatston3 Jun 21, 2024
39591e9
Cryogenics: restrict cryo pods to cryo meds, restore limited metaboli…
whatston3 Jun 21, 2024
c8bb112
Automatic Changelog (#1533)
FrontierATC Jun 21, 2024
ea7dc66
Реф... Респрайт медицины
Zekins3366 Jun 23, 2024
60dd5b6
fix conflict
Zekins3366 Jun 23, 2024
708a4f5
Merge pull request #332 from Corvax-Frontier/Mew
Zekins3366 Jun 23, 2024
d350bf2
fix reptilian helmets (#1554)
Leander-0 Jun 23, 2024
d6d587f
Merge pull request #319 from user424242420/fix-shooting
Vonsant Jun 23, 2024
1ac73bc
Ляжания вторая попытка - ДОДЕЛАННОЕ, РАБОЧЕЕ ГАВНО (#325)
user424242420 Jun 23, 2024
ae88b62
png
Succuberry Jun 23, 2024
34d0454
``
mersen-tyn Jun 23, 2024
2ddf990
Переводчик в слот шеи и чуть-чуть ftl (#324)
Succuberry Jun 23, 2024
ba60aaa
Merge pull request #333 from mersen-tyn/maps_mersen
Vonsant Jun 23, 2024
478e3b9
Пиратам аплинк пиратов
Zekins3366 Jun 23, 2024
6be289a
Обновление Фронтиры. (#334)
mersen-tyn Jun 23, 2024
45472db
Revert "Ляжания вторая попытка - ДОДЕЛАННОЕ, РАБОЧЕЕ ГАВНО (#325)"
Vonsant Jun 23, 2024
52d479a
Merge pull request #335 from Corvax-Frontier/revert-325-lie-down-2
Vonsant Jun 23, 2024
58404c5
Merge branch 'master' of https://github.com/Corvax-Frontier/corvax-fr…
Succuberry Jun 23, 2024
821b1d1
Какая-то Вера больше не следит на вами
Succuberry Jun 24, 2024
7e38e7d
Ship guide reworks (#1534)
Actualcatmoment Jun 24, 2024
20d5eb3
Automatic Changelog (#1534)
FrontierATC Jun 24, 2024
03db84c
Check outer clothing for footstep noise (#1553)
whatston3 Jun 24, 2024
0bd4a29
Ports coffee arabica plant from SS13. (#1546)
Iocanthos Jun 24, 2024
fb70c84
Automatic Changelog (#1546)
FrontierATC Jun 24, 2024
a548b70
Merge pull request #336 from Succuberry/Resources
Vonsant Jun 24, 2024
8fd329e
Фикс фикса
Jun 24, 2024
f614853
Делай для камина
Jun 24, 2024
afc4b4b
Chance Penetration
Jun 24, 2024
115c433
Merge pull request #337 from user424242420/lie-down-2
Vonsant Jun 24, 2024
db11f5c
Update elzuosa.yml
Sh1ntra Jun 24, 2024
dcf680f
фикс мержей
Vonsant Jun 25, 2024
d79811a
Русификациия
Vonsant Jun 25, 2024
0d3afdc
Merge pull request #340 from Corvax-Frontier/Up250624
Vonsant Jun 25, 2024
20e4499
ФИСК ХУЙНИ ЧАСТЬ 4
Jun 25, 2024
40a25c8
Блять я ебал
Jun 25, 2024
e2387a0
Merge pull request #341 from user424242420/lie-down-2
Vonsant Jun 25, 2024
9d1bfbd
Merge pull request #339 from NEirotoXiN00/ReworkPent
Vonsant Jun 25, 2024
47fa4f6
Merge pull request #338 from Corvax-Frontier/sh1ntra-elzuos
Zekins3366 Jun 25, 2024
41b0106
FAST FIX
Jun 25, 2024
8d91b4f
Merge pull request #342 from user424242420/lie-down-2
Vonsant Jun 25, 2024
d0c46cc
FIX ЛЯЖАНИЙ
Jun 26, 2024
05ff104
Merge pull request #344 from user424242420/lie-down-2
Vonsant Jun 26, 2024
f9d130e
Я пупик
Succuberry Jun 27, 2024
99450c8
Merge pull request #346 from Succuberry/1024
Zekins3366 Jun 27, 2024
bb86eb0
Merge branch 'Corvax-Frontier:master' into master
Chocosasel Jun 28, 2024
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/mapchecker/whitelist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Nfsd: true
LPBravo: true
Cove: true
Lodge: true
Trade: true

#Cove:
# - WallPlastitanium
Expand Down
8 changes: 7 additions & 1 deletion Content.Client/BoomBox/UI/BoomBoxBoundUi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ protected override void Open()
_window.PlusVolButtonPressed += OnPlusVolButtonPressed;
_window.StartButtonPressed += OnStartButtonPressed;
_window.StopButtonPressed += OnStopButtonPressed;
_window.PlaybackSliderChanged += OnPlaybackSliderChanged;
}

private void OnPlaybackSliderChanged(float newPosition)
{
SendMessage(new BoomBoxSetTimeMessage(newPosition)); // Отправка сообщения при изменении ползунка
}

private void OnMinusVolButtonPressed()
Expand Down Expand Up @@ -64,4 +70,4 @@ protected override void Dispose(bool disposing)
if (disposing)
_window?.Dispose();
}
}
}
7 changes: 4 additions & 3 deletions Content.Client/BoomBox/UI/BoomBoxWindow.xaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'boombox-ui-window'}"
MinSize="256 80"
SetSize="256 80">
MinSize="280 130"
SetSize="280 130">
<BoxContainer Orientation="Vertical" VerticalExpand="True">
<BoxContainer Orientation="Horizontal" HorizontalExpand="True">
<Button Name="MinusVolButton"
Expand All @@ -21,5 +21,6 @@
HorizontalExpand="True"
Disabled="True" />
</BoxContainer>
<Slider Name="PlaybackSlider" HorizontalExpand="True"/>
</BoxContainer>
</DefaultWindow>
</DefaultWindow>
9 changes: 8 additions & 1 deletion Content.Client/BoomBox/UI/BoomBoxWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ public sealed partial class BoomBoxWindow : DefaultWindow
public event Action? PlusVolButtonPressed;
public event Action? StartButtonPressed;
public event Action? StopButtonPressed;
public event Action<float>? PlaybackSliderChanged;

private bool _isSliderDragging = false;

public BoomBoxWindow()
{
Expand All @@ -22,6 +25,7 @@ public BoomBoxWindow()
PlusVolButton.OnPressed += _ => PlusVolButtonPressed?.Invoke();
StartButton.OnPressed += _ => StartButtonPressed?.Invoke();
StopButton.OnPressed += _ => StopButtonPressed?.Invoke();
PlaybackSlider.OnValueChanged += args => PlaybackSliderChanged?.Invoke(args.Value);
}

public void UpdateState(BoomBoxUiState state)
Expand All @@ -30,5 +34,8 @@ public void UpdateState(BoomBoxUiState state)
PlusVolButton.Disabled = !state.CanPlusVol;
StartButton.Disabled = !state.CanStart;
StopButton.Disabled = !state.CanStop;

PlaybackSlider.MaxValue = state.SoundDuration;
PlaybackSlider.SetValueWithoutEvent(state.PlaybackPosition);
}
}
}
23 changes: 23 additions & 0 deletions Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<tabs:DeltaTab xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:tabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
xmlns:xNamespace="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:Content.Client.Stylesheets">
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
<Label Text="{Loc 'ui-options-general-forknotice'}"
FontColorOverride="{xNamespace:Static s:StyleNano.ConcerningOrangeFore}"
StyleClasses="LabelKeyText"/>
<Label Text="{Loc 'ui-options-general-accessibility'}"
FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
StyleClasses="LabelKeyText"/>
<CheckBox Name="DisableFiltersCheckBox" Text="{Loc 'ui-options-no-filters'}" />
</BoxContainer>
<controls:StripeBack HasBottomEdge="False" HasMargins="False">
<Button Name="ApplyButton"
Text="{Loc 'ui-options-apply'}"
TextAlign="Center"
HorizontalAlignment="Right" />
</controls:StripeBack>
</BoxContainer>
</tabs:DeltaTab>
46 changes: 46 additions & 0 deletions Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
using Content.Shared.DeltaV.CCVars;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Configuration;

namespace Content.Client.DeltaV.Options.UI.Tabs;

[GenerateTypedNameReferences]
public sealed partial class DeltaTab : Control
{
[Dependency] private readonly IConfigurationManager _cfg = default!;

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

DisableFiltersCheckBox.OnToggled += OnCheckBoxToggled;
DisableFiltersCheckBox.Pressed = _cfg.GetCVar(DCCVars.NoVisionFilters);

ApplyButton.OnPressed += OnApplyButtonPressed;
UpdateApplyButton();
}

private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
{
UpdateApplyButton();
}

private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
{
_cfg.SetCVar(DCCVars.NoVisionFilters, DisableFiltersCheckBox.Pressed);

_cfg.SaveToFile();
UpdateApplyButton();
}

private void UpdateApplyButton()
{
var isNoVisionFiltersSame = DisableFiltersCheckBox.Pressed == _cfg.GetCVar(DCCVars.NoVisionFilters);

ApplyButton.Disabled = isNoVisionFiltersSame;
}
}
23 changes: 15 additions & 8 deletions Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Robust.Client.Player;
using Robust.Shared.Enums;
using Robust.Shared.Prototypes;
using Content.Shared.DeltaV.Abilities;
using Content.Shared.Abilities;

namespace Content.Client.DeltaV.Overlays;

Expand All @@ -23,22 +23,29 @@ public UltraVisionOverlay()
_ultraVisionShader = _prototypeManager.Index<ShaderPrototype>("UltraVision").Instance().Duplicate();
}

protected override bool BeforeDraw(in OverlayDrawArgs args)
{
if (_playerManager.LocalEntity is not { Valid: true } player
|| !_entityManager.HasComponent<UltraVisionComponent>(player))
{
return false;
}

return base.BeforeDraw(in args);
}

protected override void Draw(in OverlayDrawArgs args)
{
if (ScreenTexture == null)
if (ScreenTexture is null)
return;
if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} player)
return;
if (!_entityManager.HasComponent<UltraVisionComponent>(player))
return;

_ultraVisionShader?.SetParameter("SCREEN_TEXTURE", ScreenTexture);

_ultraVisionShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);

var worldHandle = args.WorldHandle;
var viewport = args.WorldBounds;
worldHandle.SetTransform(Matrix3.Identity);
worldHandle.UseShader(_ultraVisionShader);
worldHandle.DrawRect(viewport, Color.White);
worldHandle.UseShader(null); // important - as of writing, construction overlay breaks without this
}
}
36 changes: 33 additions & 3 deletions Content.Client/DeltaV/Overlays/UltraVisionSystem.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
using Content.Shared.DeltaV.Abilities;
using Content.Shared.Abilities;
using Content.Shared.DeltaV.CCVars;
using Robust.Client.Graphics;
using Robust.Shared.Configuration;
using Robust.Shared.Player;

namespace Content.Client.DeltaV.Overlays;

public sealed partial class UltraVisionSystem : EntitySystem
{
[Dependency] private readonly IOverlayManager _overlayMan = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly ISharedPlayerManager _playerMan = default!;

private UltraVisionOverlay _overlay = default!;

Expand All @@ -15,17 +20,42 @@ public override void Initialize()

SubscribeLocalEvent<UltraVisionComponent, ComponentInit>(OnUltraVisionInit);
SubscribeLocalEvent<UltraVisionComponent, ComponentShutdown>(OnUltraVisionShutdown);

SubscribeLocalEvent<UltraVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
SubscribeLocalEvent<UltraVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);

Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);

_overlay = new();
}

private void OnUltraVisionInit(EntityUid uid, UltraVisionComponent component, ComponentInit args)
{
_overlayMan.AddOverlay(_overlay);
if (uid == _playerMan.LocalEntity && !_cfg.GetCVar(DCCVars.NoVisionFilters))
_overlayMan.AddOverlay(_overlay);
}

private void OnUltraVisionShutdown(EntityUid uid, UltraVisionComponent component, ComponentShutdown args)
{
if (uid == _playerMan.LocalEntity)
_overlayMan.RemoveOverlay(_overlay);
}

private void OnPlayerAttached(EntityUid uid, UltraVisionComponent component, LocalPlayerAttachedEvent args)
{
if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
_overlayMan.AddOverlay(_overlay);
}

private void OnPlayerDetached(EntityUid uid, UltraVisionComponent component, LocalPlayerDetachedEvent args)
{
_overlayMan.RemoveOverlay(_overlay);
}

private void OnNoVisionFiltersChanged(bool enabled)
{
if (enabled)
_overlayMan.RemoveOverlay(_overlay);
else
_overlayMan.AddOverlay(_overlay);
}
}
1 change: 1 addition & 0 deletions Content.Client/Input/ContentContexts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public static void SetupContexts(IInputContextContainer contexts)
human.AddFunction(ContentKeyFunctions.Arcade1);
human.AddFunction(ContentKeyFunctions.Arcade2);
human.AddFunction(ContentKeyFunctions.Arcade3);
human.AddFunction(ContentKeyFunctions.LieDownStandUp);

// actions should be common (for ghosts, mobs, etc)
common.AddFunction(ContentKeyFunctions.OpenActionsMenu);
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Movement/Systems/WaddleAnimationSystem.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Numerics;
using System.Numerics;
using Content.Client.Buckle;
using Content.Client.Gravity;
using Content.Shared.ActionBlocker;
Expand Down
51 changes: 51 additions & 0 deletions Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
using Robust.Client.Graphics;
using Robust.Client.Player;
using Robust.Shared.Enums;
using Robust.Shared.Prototypes;
using Content.Shared.Abilities;

namespace Content.Client.Nyanotrasen.Overlays;

public sealed partial class DogVisionOverlay : Overlay
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] IEntityManager _entityManager = default!;


public override bool RequestScreenTexture => true;
public override OverlaySpace Space => OverlaySpace.WorldSpace;
private readonly ShaderInstance _dogVisionShader;

public DogVisionOverlay()
{
IoCManager.InjectDependencies(this);
_dogVisionShader = _prototypeManager.Index<ShaderPrototype>("DogVision").Instance().Duplicate();
}

protected override bool BeforeDraw(in OverlayDrawArgs args)
{
if (_playerManager.LocalEntity is not { Valid: true } player
|| !_entityManager.HasComponent<DogVisionComponent>(player))
{
return false;
}

return base.BeforeDraw(in args);
}

protected override void Draw(in OverlayDrawArgs args)
{
if (ScreenTexture is null)
return;

_dogVisionShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);

var worldHandle = args.WorldHandle;
var viewport = args.WorldBounds;
worldHandle.SetTransform(Matrix3.Identity);
worldHandle.UseShader(_dogVisionShader);
worldHandle.DrawRect(viewport, Color.White);
worldHandle.UseShader(null); // important - as of writing, construction overlay breaks without this
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
using Content.Shared.Abilities;
using Robust.Client.GameObjects;
using Content.Shared.DeltaV.CCVars;
using Robust.Client.Graphics;
using Robust.Client.Player;
using Robust.Shared.Configuration;
using Robust.Shared.Player;

namespace Content.Client.Nyanotrasen.Overlays;
public sealed class DogVisionSystem : EntitySystem

public sealed partial class DogVisionSystem : EntitySystem
{
[Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly IOverlayManager _overlayMan = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly ISharedPlayerManager _playerMan = default!;

private DogVisionOverlay _overlay = default!;

Expand All @@ -18,34 +20,42 @@ public override void Initialize()

SubscribeLocalEvent<DogVisionComponent, ComponentInit>(OnDogVisionInit);
SubscribeLocalEvent<DogVisionComponent, ComponentShutdown>(OnDogVisionShutdown);

SubscribeLocalEvent<DogVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
SubscribeLocalEvent<DogVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);

Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);

_overlay = new();
}

private void OnPlayerAttached(EntityUid uid, DogVisionComponent component, LocalPlayerAttachedEvent args)
private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
{
_overlayMan.AddOverlay(_overlay);
if (uid == _playerMan.LocalEntity && !_cfg.GetCVar(DCCVars.NoVisionFilters))
_overlayMan.AddOverlay(_overlay);
}

private void OnPlayerDetached(EntityUid uid, DogVisionComponent component, LocalPlayerDetachedEvent args)
private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
{
_overlayMan.RemoveOverlay(_overlay);
if (uid == _playerMan.LocalEntity)
_overlayMan.RemoveOverlay(_overlay);
}

private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
private void OnPlayerAttached(EntityUid uid, DogVisionComponent component, LocalPlayerAttachedEvent args)
{
if (_player.LocalPlayer?.ControlledEntity == uid)
if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
_overlayMan.AddOverlay(_overlay);
}

private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
private void OnPlayerDetached(EntityUid uid, DogVisionComponent component, LocalPlayerDetachedEvent args)
{
if (_player.LocalPlayer?.ControlledEntity == uid)
{
_overlayMan.RemoveOverlay(_overlay);
}

private void OnNoVisionFiltersChanged(bool enabled)
{
if (enabled)
_overlayMan.RemoveOverlay(_overlay);
}
else
_overlayMan.AddOverlay(_overlay);
}
}
Loading
Loading