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

Фантом, ревенант и вообще всякая паранормальщина #644

Open
wants to merge 544 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
544 commits
Select commit Hold shift + click to select a range
c283887
Merge pull request #717 from xtray85/remove_gamma_armory
Schrodinger71 May 21, 2024
56027fc
Merge pull request #710 from Lonkuk/unsleepyEnemies
Schrodinger71 May 21, 2024
8c8fd3b
Merge pull request #714 from Us3rn4me228/learned_spells
Schrodinger71 May 22, 2024
b78d285
resolve stupid things
1Stepka1 May 22, 2024
e5a6b36
resolve stupid things
1Stepka1 May 22, 2024
bbe52d8
да вы заебали
1Stepka1 May 22, 2024
422ae8b
pon
1Stepka1 May 22, 2024
88cce66
Merge branch 'master' into EntitiesSort
1Stepka1 May 22, 2024
f623524
fucking abomination
1Stepka1 May 22, 2024
d881091
Merge branch 'EntitiesSort' of https://github.com/1Stepka1/space_stat…
1Stepka1 May 22, 2024
694c165
Merge pull request #704 from Ratyyy/resprites
modern-nm May 22, 2024
442b674
resolve stupid things
1Stepka1 May 22, 2024
cfaec44
Merge branch 'master' into EntitiesSort
1Stepka1 May 22, 2024
384ca8d
resolve stupid thing
1Stepka1 May 22, 2024
e2cc24e
Merge branch 'EntitiesSort' of https://github.com/1Stepka1/space_stat…
1Stepka1 May 22, 2024
390a720
Merge pull request #713 from 1Stepka1/EntitiesSort
Schrodinger71 May 22, 2024
e0f147a
с ума сойти можно, я надеюсь всё нормально.
JustKekc May 22, 2024
3aa9d3f
исправления.
JustKekc May 22, 2024
6575da2
[add/tweak] Изменение и добавление новых кристаллов (#291)
Nov 20, 2023
c762f46
Merge branch 'xtray85:master' into crystal
Us3rn4me228 May 22, 2024
bdae5ed
fix_wintercoats
Schrodinger71 May 22, 2024
7196eb7
ыаааааааааав
JustKekc May 22, 2024
5be7294
Update meta.json
Us3rn4me228 May 22, 2024
5201a7f
Update meta.json
Us3rn4me228 May 22, 2024
3abcaa1
Update meta.json
Us3rn4me228 May 22, 2024
f35008f
Update meta.json
Us3rn4me228 May 22, 2024
a6e6d64
fix_map
Schrodinger71 May 22, 2024
641d38e
Update meta.json
Us3rn4me228 May 22, 2024
cbd9e0e
Update meta.json
Us3rn4me228 May 22, 2024
1a42315
Update meta.json
Us3rn4me228 May 22, 2024
34d43e0
Update meta.json
Us3rn4me228 May 22, 2024
f4bb584
Update meta.json
Us3rn4me228 May 22, 2024
f594301
Update meta.json
Us3rn4me228 May 22, 2024
dd39e7c
Update meta.json
Us3rn4me228 May 22, 2024
83b7b59
новый костюм горничной
Darkiich May 22, 2024
06a9a90
маленькие правки
Darkiich May 22, 2024
f933d0d
еще правки
Darkiich May 22, 2024
6514e72
Update meta.json
Darkiich May 22, 2024
13b94c8
Merge branch 'gornichaya' of https://github.com/Darki255/wpfork into …
Darkiich May 22, 2024
a562a2e
Revert "fix_map"
Schrodinger71 May 22, 2024
9f2bd04
решен конфликт RSI Validator'a
Darkiich May 22, 2024
18d48f7
нахер пустные папки с закоменченными файлами
Schrodinger71 May 22, 2024
7f3bb7c
Merge pull request #723 from Darki255/gornichaya
Schrodinger71 May 22, 2024
950f610
увеличил стату бензопилы
Darkiich May 22, 2024
c6ea428
бензопила в аплинке
Darkiich May 22, 2024
9293e94
чейнжлог
Darkiich May 22, 2024
2cb2801
old crystal shards 1984
Us3rn4me228 May 22, 2024
a04989c
Merge branch 'master' into benz
Darkiich May 22, 2024
2dfc910
Update ChangelogADT.yml
Us3rn4me228 May 22, 2024
16039f7
Merge branch 'master' into crystal
Us3rn4me228 May 22, 2024
0b786e1
Update crystal_shard.yml
Us3rn4me228 May 22, 2024
ed38138
Update crystals.yml
Us3rn4me228 May 22, 2024
2116600
Update blue.yml
Us3rn4me228 May 22, 2024
d33240b
Update cyan.yml
Us3rn4me228 May 22, 2024
22edb3c
Update blue.yml
Us3rn4me228 May 22, 2024
a65dce7
Update green.yml
Us3rn4me228 May 22, 2024
939f892
Update grey.yml
Us3rn4me228 May 22, 2024
cce86b9
Update orange.yml
Us3rn4me228 May 22, 2024
8a9fb99
Update pink.yml
Us3rn4me228 May 22, 2024
6535675
Update red.yml
Us3rn4me228 May 22, 2024
72191bc
shards buff
Us3rn4me228 May 22, 2024
f26e32b
locale and changelog fix
Us3rn4me228 May 22, 2024
a95cfdb
mewps
Ratyyy May 21, 2024
3a36708
FIX
Us3rn4me228 May 22, 2024
e5fbe36
Новая антаг вещь
Darkiich May 22, 2024
8153d71
Merge branch 'master' into podnos
Darkiich May 22, 2024
e294563
Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into…
Schrodinger71 May 22, 2024
ce13057
Носки ОСЩ
Schrodinger71 May 22, 2024
8c99479
Merge pull request #1 from Schrodinger71/blue_sheald
ITamiokiI May 22, 2024
61707fe
Merge pull request #720 from Us3rn4me228/crystal
Schrodinger71 May 23, 2024
413d3b2
Фикс дубликата id: ADTClothingBeltAssault
Schrodinger71 May 23, 2024
9150f1c
и ещё один дубликат..
Schrodinger71 May 23, 2024
6a8fb3b
id: JobADTBlueShieldOfficer дубликат
Schrodinger71 May 23, 2024
85875f8
Update satchels.yml
Schrodinger71 May 23, 2024
177c8d6
роль юриста на картах
Darkiich May 23, 2024
0f8a2e0
Фикс невозможнгости получить красные кристаллы без щитспавна
Us3rn4me228 May 23, 2024
67bcfa1
Merge branch 'xtray85:master' into crystal
Us3rn4me228 May 23, 2024
ba4e266
Merge pull request #727 from Us3rn4me228/crystal
Schrodinger71 May 23, 2024
dd52a35
Вернул текстуры
Schrodinger71 May 23, 2024
b59b439
Майор РХБЗЗ
Darkiich May 23, 2024
30cd30a
немного переместил лодаут
Darkiich May 23, 2024
e9ad072
fix
Schrodinger71 May 23, 2024
d5129af
Added Manual Anomaly Finder (#40)
Mar 24, 2023
81d2340
не используйте - type: BasicEntityAmmoProvider
Schrodinger71 May 23, 2024
47b94ed
Merge pull request #722 from Schrodinger71/fix_test
Schrodinger71 May 23, 2024
e5b62b6
фикс РПА и его респрайт
Us3rn4me228 May 23, 2024
d8e1a01
fixes
Us3rn4me228 May 23, 2024
e66a3a6
Merge branch 'xtray85:master' into anomaly_pinpointer
Us3rn4me228 May 24, 2024
b4c3abc
Update ChangelogADT.yml
Us3rn4me228 May 24, 2024
df9702e
Update ChangelogADT.yml
Us3rn4me228 May 24, 2024
6b259ca
fix
Us3rn4me228 May 24, 2024
8c07687
Merge branch 'anomaly_pinpointer' of https://github.com/Us3rn4me228/s…
Us3rn4me228 May 24, 2024
c8bbb27
Merge branch 'master' into podnos
Schrodinger71 May 24, 2024
d32f377
Merge pull request #726 from Darki255/karta
Schrodinger71 May 24, 2024
09e15c7
Update ChangelogADT.yml
Schrodinger71 May 24, 2024
bf3acfb
Merge branch 'master' into benz
Schrodinger71 May 24, 2024
ecac7ac
Fix YAMLiner
Schrodinger71 May 24, 2024
43d2c9e
Сортировка Entities
Schrodinger71 May 24, 2024
c518f42
Delete Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_t…
Schrodinger71 May 24, 2024
203f0bf
Merge pull request #728 from Darki255/maiorcburn
Schrodinger71 May 24, 2024
4f561d6
Merge pull request #724 from Darki255/benz
Schrodinger71 May 24, 2024
eb3b97e
Merge branch 'master' into podnos
Schrodinger71 May 24, 2024
2e3746e
Merge pull request #725 from Darki255/podnos
Schrodinger71 May 24, 2024
7b58e96
Merge branch 'master' into anomaly_pinpointer
Schrodinger71 May 24, 2024
3ff3c21
исправляем ошибку с uid 0 на картах
Schrodinger71 May 24, 2024
7bfa966
conflict fix
Us3rn4me228 May 25, 2024
c732890
Brigmedic rofls (Not finished)
ITamiokiI May 25, 2024
967b996
Merge pull request #729 from Us3rn4me228/anomaly_pinpointer
Schrodinger71 May 26, 2024
2f231a4
Merge pull request #730 from Schrodinger71/fix_map
Schrodinger71 May 27, 2024
7de9fe1
Добавление противогаза старшего инженера, изменение локализации, соде…
Alazell May 28, 2024
e26c82d
ПАТЧ (теперь работает задача вора на кражу маски)
Alazell May 28, 2024
3614523
ПАТЧ (теперь в принципе работает противогаз-защита)
Alazell May 28, 2024
1e22eef
Ещё немного поправил у маски СИ защиту
Alazell May 28, 2024
a6fff42
Да, я торопливый огузок..
Alazell May 28, 2024
5a21fdc
добавляем контрибьютеров и попытка фикса визора
Schrodinger71 May 29, 2024
ba86a90
Merge branch 'уааааааааааааааааааа' of https://github.com/JustKekc/sp…
JustKekc May 30, 2024
dadeae2
ываваываыв. ЫВ.
JustKekc May 30, 2024
b54383e
убрал мщ у парамеда и атмоса, км и НР не будут антагами. парамед и ат…
Darkiich May 30, 2024
a44ed5a
чейнджлог
Darkiich May 30, 2024
4590c57
Merge branch 'master' into msh
Darkiich May 30, 2024
61c6cc5
Update ChangelogADT.yml
Darkiich May 30, 2024
c5d5c1a
localisation
Lonkuk May 30, 2024
c5e65c5
bag
Lonkuk May 30, 2024
f121575
A
Lonkuk May 30, 2024
1abede1
Атмос с МШ и без антажки
Schrodinger71 May 30, 2024
c63e370
#- id: JawsOfLife # Парамед теперь без МЩ и может быть антагом
Schrodinger71 May 30, 2024
3353571
Update duffelbag.yml
Schrodinger71 May 30, 2024
d4d00dc
Update satchel.yml
Schrodinger71 May 30, 2024
95ed12d
Update atmospheric_technician.yml
Schrodinger71 May 30, 2024
80b3ced
Новая заставка png во время загрузки клиента
Schrodinger71 May 30, 2024
250a29a
lobbyScreens
Lonkuk May 30, 2024
c17a080
Changelog correction
jungarikjan May 31, 2024
8902292
Update backpack - paramedic
jungarikjan May 31, 2024
93075ec
Update duffelbag - paramedic.yml
jungarikjan May 31, 2024
0e4b1e9
Update paramedic - mindshield and noantag.yml
jungarikjan May 31, 2024
752fbb1
Update satchel - paramed-jaws.yml
jungarikjan May 31, 2024
74c35da
Fixes
ITamiokiI May 31, 2024
661f95b
Update EntityHealthBarOverlay.cs
Schrodinger71 May 31, 2024
e8645d4
забыл using
Schrodinger71 May 31, 2024
5283e9b
Fix
Schrodinger71 May 31, 2024
053195e
Merge branch 'fix_visor' of https://github.com/Schrodinger71/space_st…
Schrodinger71 May 31, 2024
850c3b5
briigigigigigimeidik
Ratyyy May 31, 2024
1aee3af
Merge pull request #738 from Lonkuk/lobbyArts
Schrodinger71 May 31, 2024
65c8994
Merge pull request #736 from Darki255/msh
Schrodinger71 May 31, 2024
501536c
MicroRoflFixes
ITamiokiI Jun 1, 2024
3feec85
Dmgfix
ITamiokiI Jun 1, 2024
13502af
Texture changes
ITamiokiI Jun 1, 2024
72b0cab
Fixes
ITamiokiI Jun 1, 2024
997fc28
Merge branch 'master' into Brigmedic
ITamiokiI Jun 1, 2024
20f0084
Fixes
ITamiokiI Jun 1, 2024
debff4e
Merge branch 'Brigmedic' of https://github.com/ITamiokiI/space_statio…
ITamiokiI Jun 1, 2024
d592ba9
Лютое изменение с одним словом
ITamiokiI Jun 1, 2024
9ae9612
sghj
ITamiokiI Jun 1, 2024
6709029
Ещё миграция
ITamiokiI Jun 1, 2024
887bbd0
перенос states меты плюшевая мио в ADT
Darkiich Jun 1, 2024
f535155
ГРЁБАНЫЕ КОРВАКСЫ
ITamiokiI Jun 1, 2024
bd72e8d
ДА БЛЯЯЯЯЯЯТЬ
ITamiokiI Jun 1, 2024
40e8bc8
перенос states меты и картинки шарика НТ в ADT
Darkiich Jun 1, 2024
936308f
перенос states меты плюшевого голокарпа в ADT
Darkiich Jun 1, 2024
e5b5043
пеоенос стейт меты и иконки меджик карпа в ADT
Darkiich Jun 1, 2024
2775f23
перенос стейт меты и иконки шарика НТ в руках в ADT
Darkiich Jun 1, 2024
9a9307e
перенос стейт меты и иконки радужного карпа в ADT
Darkiich Jun 1, 2024
d7c2bee
добавил к пути шарика НТ папку ADT и убрал не нужные states не в ADT
Darkiich Jun 1, 2024
63ef9c5
фикс
Darkiich Jun 1, 2024
3268721
Merge branch 'master' into BSH
Schrodinger71 Jun 1, 2024
2a5a805
Убрал дубликат в meta.json
Schrodinger71 Jun 1, 2024
eaa7051
возможный фикс yaml лайнтер
Darkiich Jun 1, 2024
878dc2e
Merge branch 'issue' of https://github.com/Darki255/wpfork into issue
Darkiich Jun 1, 2024
19cc529
тоже фикс
Darkiich Jun 1, 2024
804c520
еще фиксик
Darkiich Jun 1, 2024
f719964
Merge pull request #741 from Darki255/issue
Schrodinger71 Jun 1, 2024
da554a1
Merge pull request #740 from ITamiokiI/Brigmedic
Schrodinger71 Jun 1, 2024
5fd85b2
Merge branch 'master' into уааааааааааааааааааа
Schrodinger71 Jun 1, 2024
77d39c1
Пытаемся фиксить билд тест
Schrodinger71 Jun 1, 2024
7fd5a3f
А если так?
Schrodinger71 Jun 1, 2024
7f81fd3
Правим
Schrodinger71 Jun 2, 2024
438665e
Правка имени в construction name`s
Schrodinger71 Jun 2, 2024
18fe63a
Fix YAMLiner
Schrodinger71 Jun 2, 2024
1b9ec9e
слова закончились, закончились слова
JustKekc Jun 2, 2024
624291b
Merge pull request #734 from Schrodinger71/fix_visor
Schrodinger71 Jun 2, 2024
843ec8b
Merge pull request #739 from Schrodinger71/new_logo
Schrodinger71 Jun 2, 2024
7ab7562
Merge pull request #735 from JustKekc/уааааааааааааааааааа
Schrodinger71 Jun 2, 2024
58d2b41
Merge pull request #733 from Alazell/Chief-Engineer's-gas-mask
Schrodinger71 Jun 2, 2024
abd56d5
оно живое
JustKekc Jun 2, 2024
fb812fc
Merge pull request #742 from JustKekc/уааааааааааааааааааа
Schrodinger71 Jun 2, 2024
e65162b
Merge branch 'master' into BSH
ITamiokiI Jun 4, 2024
41db3c7
добавил строку - type: entity
Schrodinger71 Jun 4, 2024
4b5df39
Rofls
ITamiokiI Jun 4, 2024
a3f3acf
Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into…
ITamiokiI Jun 5, 2024
7b98cbc
Fix impact effect
ITamiokiI Jun 5, 2024
5b77958
Fuckoff
ITamiokiI Jun 5, 2024
ca1a4f4
Lightfix
ITamiokiI Jun 5, 2024
99c846d
Suka blyat
ITamiokiI Jun 5, 2024
0a814f7
Возвращаем крафт мех фабрикатора
Us3rn4me228 Jun 5, 2024
46d6e78
ТА ти заебав + Респрайт Чёрного берета.
ITamiokiI Jun 5, 2024
4c40220
Suka
ITamiokiI Jun 5, 2024
2eb3b04
Merge pull request #744 from Us3rn4me228/mech-fix
Schrodinger71 Jun 5, 2024
3b2ea56
Revert "Возвращаем крафт мех фабрикатора"
Schrodinger71 Jun 5, 2024
6e9b012
Merge pull request #745 from xtray85/revert-744-mech-fix
Schrodinger71 Jun 6, 2024
1989675
Merge pull request #737 from Lonkuk/translator
Schrodinger71 Jun 6, 2024
c4064ef
fix
Ratyyy Jun 7, 2024
314fddb
fix?
Ratyyy Jun 7, 2024
00798fe
uhhh?
Ratyyy Jun 8, 2024
be4fca7
Мммм... Попытка добавить книгу РНД
Bolper Jun 8, 2024
2ce8283
uh?
Ratyyy Jun 9, 2024
b1c6be8
what if....
Ratyyy Jun 9, 2024
89c0dd8
hmmm....
Ratyyy Jun 9, 2024
6c4c860
Update global.json
xtray85 Jun 9, 2024
4e17bee
ADD changelog
ITamiokiI Jun 9, 2024
c7c65a3
Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into…
ITamiokiI Jun 9, 2024
1ac7fbe
addded Mindshield for centcom and ert
nixsilvam404 Jun 10, 2024
fcfb53c
added mindshied for ETR
nixsilvam404 Jun 10, 2024
5b629c3
add plushie pochita
Schrodinger71 Jun 10, 2024
83fcfd2
Merge branch 'xtray85:master' into new_plushie
Schrodinger71 Jun 10, 2024
eca67aa
minor Fix
Schrodinger71 Jun 10, 2024
6f8da30
Merge pull request #748 from Schrodinger71/new_plushie
Schrodinger71 Jun 10, 2024
3a71128
Merge pull request #747 from nixsilvam404/test_try
Schrodinger71 Jun 11, 2024
9a95663
Merge pull request #705 from ITamiokiI/BSH
Schrodinger71 Jun 11, 2024
5b55f85
еще конструкт добавил в секретку
Bolper Jun 16, 2024
fb58dcc
changed name of goal paper
nixsilvam404 Jun 16, 2024
0083783
changed colour of stamp on the goal paper
nixsilvam404 Jun 16, 2024
9c12b95
Merge pull request #2 from Bolper/bR
Bolper Jun 16, 2024
e403b2f
it`s okay
Bolper Jun 16, 2024
b5fce97
Merge pull request #753 from Bolper/Book
Schrodinger71 Jun 16, 2024
795cc34
Merge pull request #752 from nixsilvam404/goal_paper_fix
Schrodinger71 Jun 16, 2024
0f5baca
fix carpets lmao
Us3rn4me228 Jun 17, 2024
9b5124d
Merge branch 'xtray85:master' into fix-carpets
Us3rn4me228 Jun 17, 2024
37b13f0
Merge pull request #756 from Us3rn4me228/fix-carpets
Schrodinger71 Jun 17, 2024
dafc495
Добавление гемофилии
AnderFan Jun 21, 2024
3f1d2c6
fix-beretCE
TORGOVEC471 Jun 22, 2024
5e248d4
Предпоследний апдейт ветки
FaDeOkno Jun 22, 2024
35ee45b
fix update console interface
modern-nm Jun 22, 2024
6e56ef6
new_posters
TORGOVEC471 Jun 23, 2024
05da97e
Merge pull request #762 from TORGOVEC471/bubgfix-eating-SE-beret
modern-nm Jun 23, 2024
c1d8190
fixed my error
TORGOVEC471 Jun 23, 2024
0422241
Merge pull request #764 from modern-nm/fix/update-console-interface
modern-nm Jun 23, 2024
4b289d6
fixed the error with opened clockworck airlock
nixsilvam404 Jun 23, 2024
e31b8e3
Merge pull request #766 from nixsilvam404/clockwork_airlock_opened_err
modern-nm Jun 23, 2024
00bc3ab
"Документация" pt. 1
FaDeOkno Jun 23, 2024
76dd6b5
fix
FaDeOkno Jun 23, 2024
75b5480
правка copyright в meta.json
Schrodinger71 Jun 23, 2024
d959d8a
Merge pull request #765 from TORGOVEC471/added_new_posters
modern-nm Jun 24, 2024
066f294
fix2
FaDeOkno Jun 24, 2024
5e361ed
Merge pull request #760 from AnderFan/hemophilia
Schrodinger71 Jun 24, 2024
b44166d
Merge branch 'phantom-and-revenant' of https://github.com/FaDeOkno/AD…
Schrodinger71 Jun 25, 2024
056e4a0
Fix YAMl validator, delete dublicate id
Schrodinger71 Jun 25, 2024
5b8e994
Update changeling.yml
Schrodinger71 Jun 25, 2024
f901ab0
Delete dublicate, fix yaml
Schrodinger71 Jun 25, 2024
78ee83d
ОПЯть чистим дубликаты
Schrodinger71 Jun 25, 2024
7f6c71d
Фикс Меты
Schrodinger71 Jun 26, 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
  •  
  •  
  •  
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/setup-dotnet@v3.2.0
with:
dotnet-version: 8.0.x
dotnet-version: 8.0.203

- 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 @@ -77,7 +77,7 @@ jobs:
with:
host: ${{ secrets.BUILDS_HOST }}
username: ${{ secrets.BUILDS_USERNAME }}
password: ${{ secrets.BUILD_PASSWORD }}
key: ${{ secrets.BUILDS_SSH_KEY }}
port: ${{ secrets.BUILDS_PORT }}
script: python3 ~/manifest.py --version ${{ github.sha }}

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/setup-dotnet@v3.2.0
with:
dotnet-version: 8.0.x
dotnet-version: 8.0.203

- 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/setup-dotnet@v3.2.0
with:
dotnet-version: 8.0.x
dotnet-version: 8.0.203
- name: Install dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion ADT_STATION
104 changes: 104 additions & 0 deletions Content.Client/ADT/Changeling/ChangelingPanelSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/// Made for Adventure Time Project by ModerN. https://github.com/modern-nm mailto:modern-nm@yandex.by
/// see also https://github.com/DocNITE/liebendorf-station/tree/feature/emote-radial-panel
using Content.Client.Humanoid;
using Content.Client.UserInterface.Systems.Radial;
using Content.Client.UserInterface.Systems.Radial.Controls;
using Content.Shared.Changeling;
using Content.Shared.Humanoid.Prototypes;
using Robust.Client.GameObjects;
using Robust.Client.Player;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Utility;
using System.Numerics;

namespace Content.Client.ADT.Language;

public sealed class ChangelingPanelSystem : EntitySystem
{
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IPlayerManager _playerMan = default!;
[Dependency] private readonly SpriteSystem _spriteSystem = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly HumanoidAppearanceSystem _appearanceSystem = default!;

/// <summary>
/// We should enable radial for single target
/// </summary>
private RadialContainer? _openedMenu;

private const string DefaultIcon = "/Textures/Interface/AdminActions/play.png";

private const string EmptyIcon = "/Textures/Interface/AdminActions/emptyIcon.png";

public override void Initialize()
{
base.Initialize();

SubscribeLocalEvent<PlayerAttachedEvent>(OnPlayerAttached);
SubscribeLocalEvent<PlayerDetachedEvent>(OnPlayerDetached);

SubscribeNetworkEvent<RequestChangelingFormsMenuEvent>(HandleChangelingFormsMenuEvent);
}

private void HandleChangelingFormsMenuEvent(RequestChangelingFormsMenuEvent args)
{
if (_openedMenu != null)
return;
if (_playerMan.LocalEntity == null)
{
return;
}

//if (!TryComp<ChangelingComponent>(_playerMan.LocalEntity.Value, out var changelingComponent)) // нет на клиенте
// return;

_openedMenu = _userInterfaceManager.GetUIController<RadialUiController>()
.CreateRadialContainer();

foreach (var humanoid in args.HumanoidData)
{
var dummy = _entManager.SpawnEntity(_proto.Index<SpeciesPrototype>(humanoid.Species).DollPrototype, MapCoordinates.Nullspace);
//var humanoidEntityUid = GetEntity(humanoid); // Entities on the client outside of the FOV are nonexistant. You can see that if you zoom out. //So it'll give you UID 0 which is EntityUid.Invalid.
_appearanceSystem.LoadProfile(dummy, humanoid.Profile);
var face = new SpriteView();
face.SetEntity(dummy);

var actionName = humanoid.Name;
var texturePath = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath(EmptyIcon)));

var emoteButton = _openedMenu.AddButton(actionName, texturePath, face);
emoteButton.Opacity = 210;
emoteButton.Tooltip = null;
emoteButton.Controller.OnPressed += (_) =>
{
var ev = new SelectChangelingFormEvent(args.Target, entitySelected: humanoid.NetEntity);
RaiseNetworkEvent(ev);
_openedMenu.Dispose();
};
}
_openedMenu.OnClose += (_) =>
{
_openedMenu = null;
};
if (_playerMan.LocalEntity != null)
_openedMenu.OpenAttached(_playerMan.LocalEntity.Value);

}

private void OnPlayerAttached(PlayerAttachedEvent args)
{
_openedMenu?.Dispose();
}

private void OnPlayerDetached(PlayerDetachedEvent args)
{
_openedMenu?.Dispose();
}
}
53 changes: 53 additions & 0 deletions Content.Client/ADT/Chaplain/ChaplainSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
using Content.Shared.Bible.Components;
using Content.Shared.Phantom.Components;
using Robust.Client.GameObjects;
using Robust.Client.Player;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Content.Client.UserInterface.Systems.Radial;
using Content.Client.UserInterface.Systems.Radial.Controls;
using Robust.Shared.Random;
using Robust.Shared.Utility;
using Robust.Client.UserInterface;
using Content.Shared.StatusIcon.Components;
using Content.Shared.Ghost;
using Content.Shared.Antag;
using Content.Shared.Actions;
using Robust.Client.Graphics;
using Robust.Client.Utility;
using Content.Shared.Humanoid;
using Content.Shared.Humanoid.Prototypes;
using Content.Client.Humanoid;
using System.Numerics;
using Content.Shared.Preferences;

namespace Content.Client.Chaplain;

public sealed class ChaplainSystem : EntitySystem
{
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IPlayerManager _playerMan = default!;
[Dependency] private readonly SpriteSystem _spriteSystem = default!;
[Dependency] private readonly HumanoidAppearanceSystem _appearanceSystem = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
public override void Initialize()
{
base.Initialize();

SubscribeLocalEvent<ChaplainComponent, CanDisplayStatusIconsEvent>(OnCanDisplayStatusIcons);
}

private void OnCanDisplayStatusIcons(EntityUid uid, ChaplainComponent component, ref CanDisplayStatusIconsEvent args)
{
if (HasComp<PhantomComponent>(args.User) || HasComp<ChaplainComponent>(args.User) || HasComp<ShowChaplainIconsComponent>(args.User))
return;

if (component.IconVisibleToGhost && HasComp<GhostComponent>(args.User))
return;

args.Cancelled = true;
}
}
46 changes: 46 additions & 0 deletions Content.Client/ADT/Chaplain/EUI/AcceptReligionEui.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
using Content.Client.Eui;
using Content.Shared.Cloning;
using JetBrains.Annotations;
using Robust.Client.Graphics;
using Content.Shared.Chaplain;
using Content.Shared.Bible.Components;

namespace Content.Client.Chaplain;

[UsedImplicitly]
public sealed class AcceptReligionEui : BaseEui
{
private readonly AcceptReligionWindow _window;

public AcceptReligionEui()
{
_window = new AcceptReligionWindow();

_window.DenyButton.OnPressed += _ =>
{
SendMessage(new AcceptReligionChoiceMessage(AcceptReligionButton.Deny));
_window.Close();
};

_window.OnClose += () => SendMessage(new AcceptReligionChoiceMessage(AcceptReligionButton.Deny));

_window.AcceptButton.OnPressed += _ =>
{
SendMessage(new AcceptReligionChoiceMessage(AcceptReligionButton.Accept));
_window.Close();
};
}

public override void Opened()
{
IoCManager.Resolve<IClyde>().RequestWindowAttention();
_window.OpenCentered();
}

public override void Closed()
{
_window.Close();
}

}

61 changes: 61 additions & 0 deletions Content.Client/ADT/Chaplain/EUI/AcceptReligionEuiWindow.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
using System.Numerics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Localization;
using static Robust.Client.UserInterface.Controls.BoxContainer;

namespace Content.Client.Chaplain;

public sealed class AcceptReligionWindow : DefaultWindow
{
public readonly Button DenyButton;
public readonly Button AcceptButton;

public AcceptReligionWindow()
{

Title = Loc.GetString("accept-religion-window-title");

Contents.AddChild(new BoxContainer
{
Orientation = LayoutOrientation.Vertical,
Children =
{
new BoxContainer
{
Orientation = LayoutOrientation.Vertical,
Children =
{
(new Label()
{
Text = Loc.GetString("accept-religion-window-prompt-text-part")
}),
new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
Align = AlignMode.Center,
Children =
{
(AcceptButton = new Button
{
Text = Loc.GetString("accept-religion-window-accept-button"),
}),

(new Control()
{
MinSize = new Vector2(20, 0)
}),

(DenyButton = new Button
{
Text = Loc.GetString("accept-religion-window-deny-button"),
})
}
},
}
},
}
});
}
}
45 changes: 45 additions & 0 deletions Content.Client/ADT/Phantom/EUI/AcceptHelpingHandEui.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
using Content.Client.Eui;
using Content.Shared.Cloning;
using JetBrains.Annotations;
using Robust.Client.Graphics;
using Content.Shared.Phantom;

namespace Content.Client.Phantom;

[UsedImplicitly]
public sealed class AcceptHelpingHandEui : BaseEui
{
private readonly AcceptHelpingHandWindow _window;

public AcceptHelpingHandEui()
{
_window = new AcceptHelpingHandWindow();

_window.DenyButton.OnPressed += _ =>
{
SendMessage(new AcceptHelpingHandChoiceMessage(AcceptHelpingHandButton.Deny));
_window.Close();
};

_window.OnClose += () => SendMessage(new AcceptHelpingHandChoiceMessage(AcceptHelpingHandButton.Deny));

_window.AcceptButton.OnPressed += _ =>
{
SendMessage(new AcceptHelpingHandChoiceMessage(AcceptHelpingHandButton.Accept));
_window.Close();
};
}

public override void Opened()
{
IoCManager.Resolve<IClyde>().RequestWindowAttention();
_window.OpenCentered();
}

public override void Closed()
{
_window.Close();
}

}

Loading
Loading