Commit Graph

125 Commits

Author SHA1 Message Date
Ignaz "Ian" Kraft
dfe71c8f64 replace all instances of "department-{id}" with department.name (#34607)
replace all instances of "department-{id}" with department.name"

(cherry picked from commit 371b1f80125857669f43e2e9f6842dd5513bee6b)
2025-10-04 12:50:55 +03:00
eoineoineoin
685b1f68ac Minor fixes to character profile editor save/reset buttons (#31505)
Merge SetDirty() with preview reload

People were forgetting to SetDirty() when changing a property; move SetDirty()
into preview reloading, since if the preview is being reloaded, some property
has definitely changed anyway.

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>

(cherry picked from commit 55771cab745bf45e4756ded41382ef990b84d505)
2025-10-04 12:50:54 +03:00
Errant
32f3c8de31 Lobby chat width and custom lobby titles (#33783)
* lobby name cvar

* panel width

* skrek

* server name localization fix

* comment format fix

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* remove redundant newline

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* string.empty

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* use SetWidth

* Update Resources/Locale/en-US/lobby/lobby-gui.ftl

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

(cherry picked from commit a55dc4d3bb006f29ca5535cc2f38878f8a498a50)
2025-10-04 12:50:44 +03:00
Spatison
d0dc86ab38 Fix CharacterPickerButton.xaml.cs 2025-09-27 12:19:07 +03:00
RedFoxIV
50b19259b8 Re: ghost (#849)
* it just works

* why hasn't it catastrophically failed yet

* not just gotta do the ui

oh god the ui

* that was easier than expected

* a devious misdirection

* touchups

* svin

* loc+fix

* touchups

* shitfix

* touchups x3

* for further use

* i hate this piece of shit engine

* touchups x4

* ribbit

also i'm retarded x2

* big tard energy

* bb

* rabbitson

* ?

* forgor

* k

* whoops

* fug
2025-09-27 08:38:24 +03:00
Spatison
487e361de8 [Fix] Invalid Job (#848)
fix
2025-09-25 09:41:17 +03:00
SlamBamActionman
163ac8bc69 Lower in-round votekick requirements (#32953)
Initial commit

(cherry picked from commit b3190b89359ffe6e4e1d58e1c1ef69b8d7f70476)
2025-09-20 20:33:34 +03:00
Pieter-Jan Briers
b7a348a8b9 Give silicons proper lobby/character editor previews (#33763)
* Give silicons proper lobby/character editor previews

No more naked dummies, properly show a borg/AI sprite now.

This means taking the JobEntity into account when spawning the dummy. For AIs I had to add a "JobPreviewEntity" field because they'd look like a posibrain otherwise. AI therefore uses a custom dummy entity I defined.

Also I had to add some margins to the UI, because otherwise the 32x32 sprite of the AI would look bad.

* Update Content.Shared/Roles/JobPrototype.cs

* Update Content.Client/Lobby/LobbyUIController.cs

* Update Resources/Prototypes/Entities/Mobs/Player/silicon.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

(cherry picked from commit 299b13f21b91166fa0db6a4dd97578a03a1ef966)
2025-09-20 20:33:31 +03:00
dffdff2423
de406dd5b8 Add admin remarks button to lobby (#31761)
(cherry picked from commit 2c82a2dfc0cf0cf52f6045c2b59d2232e3714897)
2025-09-20 20:33:31 +03:00
Spatison
462ecb429e [Tweak] Hud UI (#834)
* combat mode ui

* movement ui

* some fix

* fix

* more fix

* fix
2025-09-13 17:38:24 +03:00
Cinkafox
916d889fc4 - add: Bark (#827)
* - add: bark

* - tweak: Bark now in client side

* - add: bark config in options

* - add: migration prepare

* - add: Migrations

* - add: more barks

* - add: bark preference in character profile

* - add: knob

* - add: change value by mouse wheel

* - tweak: optimise WWDP thinks

* - tweak: improve NeoTabContainer optimisation

* - add: limit of barks

* - fix: кролькины фиксы

* - fix: change things in tab id

* Update Content.Client/_White/TTS/TTSSystem.cs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* - fix: спатисон дурак блин ты сломал что то..

* - fix: спатисонов фиксы

* Update Content.Server/_White/Bark/BarkSystem.cs

* - fix: буковки

* Apply suggestions from code review

---------

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
2025-09-06 03:37:39 +10:00
Yarik
7b502a53fc Biggest books update (#772)
* Большое обновление книжек

* Remove dotnet tool cache artifacts

* Remove dotnet tool cache artifacts 2

* All comments on English

* Add all validation

* All localization, code reduction, named bookmarks system

* Add "try catch" because coderabbitai asked

* Add base check content length

* Fix "\\n"

* the "BookRandomStory" system has been fix and translate

* little fix "BookRandomStory" system

* 2 little fix "BookRandomStory" system

* 3 little fix "BookRandomStory" system

* 4 little fix "BookRandomStory" system

* 5 little fix "BookRandomStory" system

* Improved handling of UTF-8 character truncation

* 2 Improved validation and handling of UTF-8 character truncation

* Mini-up for author_books

* add new author book for botany

* Smaller long of text on one page

* translation of the new janitor's book

* Spelling lesson

* Make TODO notes

* Translate TODO notes...

* little fix "Check the status of the dialog before using it."

* DONE: Create new pages to transfer text, not replace old ones

* DONE: Make it visible when the text limit per page is exceeded

* DONE: Make it possible to delete unnecessary pages

* Fall protection on incorrect markings

* fix ".ftl"

* Text length limit for SplitContentIntoPages

* change limits

* Add sound

* Add placeholder to loadouts and new symbol for CreateNewPage

* Apply some suggestions from code review

All changes, except moving files into White folders

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Apply some suggestions from code review 2

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Transfering into "_White" folder

* Remove dublicate code

* Added the necessary code

* Add method

* BookSystem has been transfered into "Shared" folder

* Add attributions for ".ogg"

* changes for tools have been canceled

* Apply some suggestions from code review 3

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* content have been transfered into "_White" folder 2

* Little fix locales

* Apply some suggestions from code review 4

Add comments in "Resources/Prototypes/Entities/Objects/Misc/books_author.yml"

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* content have been transfered into "_White" folder and translate

* English spelling lesson

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Add BookRandomeStorySystem

* Apply some suggestions from code review 5

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* rolling back some changes from "code review 5"

* Spelling lesson 2

* tweak BookSystem. (Apply suggestion from code review)

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Little fix bookmark-default-title

* Apply some suggestions from code review 6

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* fix code review changes and transfer "BookRandomStorySystem.cs" into "Content.System"

* Half of good locales

* full good locales of RandomStorySystem

* Spelling lesson 3

* Removed unnecessary StoryGen file

* Fixed bookmarks pos after del any page

* Transd files into _White folder

* Fixed the constant activity of the add page button

* Correction at the request of coderabbitai

* Transfered at the request of code review

* Transfered at the request of code review 2

* Fix transfer

* Apply suggestions from code review 7

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Apply suggestions from code review 8

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Apply and fix all suggestions from code review of file "BookWindow.xaml.cs"

* Fix formated

* Apply some suggestions from code review 9

maybe last...

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Add try catch on texture loading

* Add Dispose method

* Correct display of blank pages

* Little fix eng locale

* Unnecessary code removed

* A Little Defense Against NRE/KeyNotFound.

* Highlighting the current page in the bookmarks drop-down list.

* Added fallback for the save button when there is no hotkey.

* Correct unsubscribing from events.

* Little fix save button

* Little fix formated

* Locales transfered fix

---------

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
2025-08-30 17:35:36 +03:00
Remuchi
fc3f79b398 Revert "[ADD] Возможность выбора аплинка" (#806)
Revert "[ADD] Возможность выбора аплинка (#800)"

This reverts commit 46670110ab.
2025-08-21 10:02:03 +07:00
Kutosss
46670110ab [ADD] Возможность выбора аплинка (#800)
* типпи

* Возможность выбора аплинка

* greeting

* дю

* Update TipsSystem.cs

* Update TraitorRuleSystem.cs

* Update tippy-command.ftl
2025-08-19 10:24:26 +03:00
Kutosss
c2b1ec174c [ADD] "кличка для мима" (#676)
* кличка для мима

* Apply suggestions from code review

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

---------

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-07-23 10:38:47 +10:00
VMSolidus
9fcefbd521 Profile Loading Extensions 2025-07-20 22:33:40 +10:00
Repo
00e173e2b2 Fix late join & observe to de-admin admins. (#28319)
(cherry picked from commit eb3f27526bc8748a45c3f56de97a982747e51842)
2025-07-20 14:18:35 +10:00
metalgearsloth
640d8b4c11 Add sprite exporting (#29874)
* Redo of code

* Dump IDs on lobby exports
2025-07-17 11:32:57 +10:00
ShadowCommander
b80c7a5d53 Fix profile editor save buttons disappearing at small resolutions (#28001)
(cherry picked from commit 63c551b20d28e7572833d7e3b5b6e706947167ae)
2025-07-16 17:32:17 +10:00
Winkarst-cpu
82ebe4a360 Character menu asks if you want to save your character on exit (#29875)
* Character menu asks if you want to save your character on exit

* Fix

* Another fix, little mistake by me

* Update Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

(cherry picked from commit adcbe8d0be2ccdc76dd5e17af0206c623786874b)
2025-07-16 17:22:59 +10:00
Spatison
ed336144ab content change for JobRequirementOverride 2025-07-14 17:22:07 +10:00
Leon Friedrich
6849be2d9c Add Job preference tests (#28625) 2025-07-14 12:27:43 +10:00
Spatison
54086988e3 Mass clean up (#587)
* mass clean up

(cherry picked from commit 12bb873b02c1ef50e20763542b030452cc0613da)

* Revert "Centrifuge buff (#393)"

This reverts commit 2a59a18230.

(cherry picked from commit 9ee495ab4bb365e1ccd3dc627ecb55114fea6944)

* Shoving merge conflict

* fix rich traitor

* fix test

* yml

* fix test

* fix test

* ohh
2025-06-16 20:35:48 +03:00
Cinkafox
65208f0165 [Add] new ui (#497)
* - add: StyleSheetify

* - add: APC style

* - tweak: Select only APC now!

* - fix: Window positioning

* - fix: animations

* - add: Fancy chat

* - tweak: change some margin think

* - fix: add assemblies of stylesheetify for packaging

* - tweak: update StyleSheetify

* - add: custom LauncherConnection

* - tweak: change to paper

* - tweak: Update StyleSheetify

* - add: fancy lobby screen

* - tweak: some beauty think in lobby screen

* - add: new icons

* - tweak: change icons

* - tweak: //WWDP EDIT

* - fix: disable style while testing

* - fix: Channel Popup button style revert

* - fix: test again

* - tweak: Update StyleSheetify
2025-05-17 14:30:12 +03:00
ilmenwe
432042e945 Logger Sawmill Cleanup (#2413)
# Description
Cleaned up Logger obsolete compiler warnings in non robust code.
Should probably be changed to a ISawmill reference in classes to avoid
repeated lookups in heavy logging logic.
---

# Changelog

🆑

- tweak: Logger to Logger.GetSawmill("name");

---------

Co-authored-by: ilmenwe <no@mail.com>

(cherry picked from commit 2e8ffd971716d38dc6d5a520bebdf88b743045a3)
2025-05-10 01:00:05 +03:00
DEATHB4DEFEAT
b7a8f31167 Character Editor Fixes (#2332)
(cherry picked from commit 1bd872222d8221afa42469675642192b7980f4c6)
2025-05-09 23:56:44 +03:00
Spatison
03b978754f big nope 2025-04-26 15:20:25 +03:00
DEATHB4DEFEAT
dd52b11780 General Character Editor Improvements (#2252)
# Description

This sucked, this sucks less now.

---

# TODO

- [x] Use ABGC on Jobs
- [x] Use ABGC on Antags
- [x] Improve marking editor
	- [x] Make it use real toggleable Buttons
	- [x] Remove the enabled/sort order side
	- [x] Make buttons bigger and improve previews
- Move it to the Appearance tab
https://github.com/Simple-Station/Einstein-Engines/pull/2241
	- [x] Add a Clear button to the search
- [x] Display all 4 sprite directions at once instead of using the
stupid rotation thing
- [x] Move import/export/save buttons
- [x] Move name somewhere within the tabs
- Load markings after other stuff in the profile

<!--
Another PR
CharacterRequirements don't need to be given dependencies
Markings use CharacterRequirements
-->

---

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/c2d0e8dd-7f8a-4a21-a7f2-c1ca93f20a74)

![image](https://github.com/user-attachments/assets/3024b84d-2114-4659-92d1-fd22a75cac78)

![image](https://github.com/user-attachments/assets/f471ab02-eabb-4d1b-92d7-22e15b74110b)

![image](https://github.com/user-attachments/assets/225ab764-40d7-4c64-825a-d88e0aeab4c9)

![image](https://github.com/user-attachments/assets/e5ccc05c-3c86-43ec-bbc7-9cbf500044a0)

![image](https://github.com/user-attachments/assets/e1e3562f-9bcc-405a-82e4-a35838e63b8a)

</p>
</details>

---

# Changelog

🆑
- tweak: Improved readability of many parts of the character editor with
colored rows
- tweak: Cleaned up some little bits of the character editor, most
notably removing a tiny margin that was shrinking every tab
- fix: Fixed the style of the Background tab of the character editor
being very wonky due to misplaced UI elements
- tweak: Made the Jobs tab use proper headers for the department titles
- tweak: Improved the Marking editor
- tweak: Improved the layout of the character editor
- tweak: Improved some button names in the character editor
- add: The character editor now shows all 4 directions of your character
preview at once

---------

Co-authored-by: VMSolidus <evilexecutive@gmail.com>

(cherry picked from commit 7e5b3345409dfdabde4ea56d3ecdd34a5ecdd46f)
2025-04-26 12:12:47 +03:00
Remuchi
1e363c7346 Revert "Merge pull request #462 from WWhiteDreamProject/revert-460-upstream"
This reverts commit 092dba42e5, reversing
changes made to e6315c2320.
2025-04-20 11:15:45 +07:00
DVONIKS
6c19771020 Revert "Upstream 04.04-18.04" 2025-04-20 06:34:09 +03:00
VMSolidus
59e061de63 Bonus Traits (#2222)
# Description

Adds a datafield for Species to define having bonus trait points or
penalty trait points. Currently only used by Human because they have
literally nothing. But you could for example make a particularly
"powerful' species such as Oni have negative bonus trait points.

# TODO

<details><summary><h1>Media</h1></summary>
<p>
Felinid(Default 10 points):

![image](https://github.com/user-attachments/assets/1fe4ba3d-f8f5-4bb9-903e-23db534cef5b)

Human: (+2 trait points)

![image](https://github.com/user-attachments/assets/cba0c006-b059-4f7f-b461-ed40fdc94576)

</p>
</details>

# Changelog

🆑
- add: Humans now have +2 bonus trait points. It's also possible now for
"overpowered" species to have fewer trait points, although this is not
currently used.

(cherry picked from commit f1c29573cbe9918c833f180a121f26a2d2ad5a94)
2025-04-18 19:33:54 +03:00
Spatison
a069c5d076 trait disable fix 2025-04-18 19:30:22 +03:00
DEATHB4DEFEAT
af6125fbbb Cooler More Readable Loadout Tooltips (#2221)
# Description

I like doing stupid stuff with UI

---

<details><summary><h1>Media</h1></summary>
<p>

I can't take a picture of tooltip, so I got this through a video

![image](https://github.com/user-attachments/assets/3bcee967-2626-4d79-9a03-e32cca219d62)

</p>
</details>

---

# Changelog

🆑
- tweak: Loadouts' and traits' tooltips are much easier to read and look
better (and cooler of course)

(cherry picked from commit 5ae4b44e9fff1b6ca53df9f3795ef47e357e9b75)
2025-04-18 19:23:34 +03:00
VMSolidus
b6d96474b8 Loadout And Trait Slot Cost (#2170)
# Description

This PR gently reworks the traits and loadouts system to where both
systems have a new Datafield for "Slots", which declares how many
selections the trait/loadout occupies. The actual implementation of
these differs between the two, since Traits has an actual selection
limit, while Loadouts do not(but instead respect CharacterItemGroups).
In both cases, Slots are defaulted to 1, and can be omitted in most
cases.

Where this shines particularly is in Traits, where it serves as a new
second line for trait balancing. Traits such as Accents, which are
completely worthless, otherwise would never be taken at all since they
compete with other traits for Opportunity Cost. Conversely, there's only
so many points we can increase a powerful trait to, (literally, they
cannot cost more than the current trait maximum). So traits can be made
to occupy >1 slot selections.

Slots can be defined for Item Groups as well, which is what this
datafield does on Loadouts, which both of these share. But since Traits
have two different places that their slots are used, I've opted to
create a split slot datafield for Traits. To simplify things, their
ItemGroupSlots defaults to their Slots datafield, but can be
independently changed as desired.

<details><summary><h1>Media</h1></summary>
<p>

https://github.com/user-attachments/assets/99dddfe1-76d2-445a-a94a-1998d3d39c51

</p>
</details>

# Changelog

🆑
- tweak: Accents no longer cost trait slots.

(cherry picked from commit d760c5813d5dd29b3eddebd8d671bf3ed6e86b3e)
2025-04-18 17:40:59 +03:00
VMSolidus
cd52641be9 Various Bugfixes (Mostly Traits System) (#2154)
# Description

![faridaiscute](https://github.com/user-attachments/assets/a251d7d5-b80c-4ba5-9d03-3071ffdb8c94)

Mfw a downstream fixes things only for themselves, leaving me to hear
hundreds of complaints constantly about bugs that I don't have the time
or manpower to fix upstream.

# Changelog

🆑
- fix: Fixed an issue that prevented players from saving item
customizations if they didn't have enough loadout points to buy the item
a second time.
- add: Traits can now define the order in which they are applied.
- fix: Fixed RGBee pushie not working.

(cherry picked from commit bf3a0ec705acb9781ca5f5c2d200857b6a964a07)
2025-04-18 17:01:09 +03:00
Kutosss
a54f0a4ebc [ADD] Кличка клоуна йопт (#433)
* Кличка клоуна йопт

* фикс

* Update HumanoidProfileEditor.xaml.cs

* Update HumanoidProfileEditor.xaml.cs

* Update GameTicker.Spawning.cs

* Update HumanoidCharacterProfile.cs

* еще фикс

* кролик посоветовал

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server.Database/Model.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Shared/Preferences/HumanoidCharacterProfile.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Resources/Locale/ru-RU/_white/clownname.ftl

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Database/ServerDbBase.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Database/ServerDbBase.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/GameTicking/GameTicker.Spawning.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Shared/Preferences/HumanoidCharacterProfile.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Resources/Locale/en-US/_white/clownname.ftl

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Shared/Preferences/HumanoidCharacterProfile.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Shared/Preferences/HumanoidCharacterProfile.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* То что спатион прописал

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Shared/Humanoid/NamingSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Shared/Humanoid/NamingSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* фиксим

* Update Content.Server/GameTicking/GameTicker.Spawning.cs

---------

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-04-18 08:18:56 +03:00
Spatison
9f2a8733e4 Lobby ui tweak 2025-04-04 16:31:36 +03:00
Timfa
60053a10d4 Coat and Scrubs Restricted to Respective Employers (#2134)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Some coats and scrubs in loadout are branded with specific corporation
logo's.
This PR restricts specifically those items to the employers that they
are from.

Note that we have coats from other companies currently not listed as
available employers too. Perhaps we should consider adding them?

# Updated:
This PR now also includes CCVars that can disable a part, or the
entirety, of Contractors for downstreams that prefer free-form RP over
gameplay.
While I was at it, I made it so that AI and Borgs don't get Passports.

---

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑
- tweak: Restricted some corporate jackets and scrubs to that specific
corporation.
- tweak: Downstreams can now disable Contractors entirely or partially
if they prefer freeform-rp over gameplay facilitating RP
- tweak: Station AI and Borg are no longer people and don't get
passports.

(cherry picked from commit 445bdc5c1b04c9f41460fb1cc6986e736732508e)
2025-04-04 15:01:26 +03:00
Will-Oliver-Br
7d77f79b83 Port Ready Manifest to Pre-Round Lobby (#2058)
# Description

Port ready manifest to pre-round lobby from [Imp
Station](https://github.com/impstation/imp-station-14)
Prs:
https://github.com/impstation/imp-station-14/pull/43
https://github.com/impstation/imp-station-14/pull/63

---

<details><summary><h1>Media</h1></summary>
<p>

![Captura de tela 2025-03-22
230115](https://github.com/user-attachments/assets/b923d8a4-2104-40da-9aba-63ba303c6a40)
![Captura de tela 2025-03-22
230131](https://github.com/user-attachments/assets/774bf6eb-ce2b-465d-bc9f-67c7b770f22b)

</p>
</details>

---

# Changelog

🆑 12rabbits and Will-Oliver-Br
add: Added a ready manifest display to the pre-round lobby.

---------

Co-authored-by: 12rabbits <53499656+12rabbits@users.noreply.github.com>

(cherry picked from commit 6f69f5a80188e73980b24d5f8a127146a98965d1)
2025-04-04 14:45:36 +03:00
DEATHB4DEFEAT
32f538d2ba Fix Buttons Being Yellow Instead of Red (#2129)
# Description

I changed something so long ago but didn't make sure others were changed
to follow.

---

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/9328cf6f-907f-4051-a972-5ae6579e6b01)

![image](https://github.com/user-attachments/assets/fa9e3e7d-3d0a-4193-b51f-20449c068751)

![image](https://github.com/user-attachments/assets/301debf9-0623-4a69-8334-0205ac8ae2a0)

![image](https://github.com/user-attachments/assets/afcc12a4-8068-4091-aa3f-427559b7d1ac)

![image](https://github.com/user-attachments/assets/77c62f0c-8356-4772-ab01-8af543b0f050)

</p>
</details>

---

# Changelog

🆑
- fix: Fixed many buttons being yellow instead of red

---------

Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: Timfa <timfalken@hotmail.com>
(cherry picked from commit ca703ab8d367bbdfc4ab115af4a01964ff597e5f)
2025-04-04 14:31:36 +03:00
Timfa
b17f94712a Show the Description (#2113)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Adds a description to your chosen lifepath, employer or nationality.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/5f7b0120-babb-4fe0-b825-2a547e80ed6d)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑
- add: Moved Nationality, Employer, and Lifepath to a new Background
tab. They now also show descriptions for the chosen selections.

(cherry picked from commit 862b95e92b44f34379187111c8505395ff9f3473)
2025-04-04 14:21:36 +03:00
Timfa
e3cc62ef8c Contractors V1 (#2030)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Contractors v1 is the first version of a system that will allow you to
set a nationality and an employer to your character. Initially, this
will determine the availability of some loadout items, jobs and traits,
but this is built to expand upon later.

As of this moment, the PR will let you select a nationality, an employer
and a lifepath. Nationalities give you a language and a passport, while
the other two don't do a lot yet. (except Command can only be NanoTrasen
and most other jobs can't be unemployed)

The passport functions, and the CharacterRequirements do as well.

there's still a lot more that can be done--tying jobs to certain
employers, items or traits to nationalities or lifepaths, but the reason
I want to merge it before that's done is primarily so that I don't need
to be the sole person working on it anymore. The C# is done, the rest is
YAML, and we have a bunch of competent YAML warriors who will do great
stuff with this, no doubt.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Create Nationality and Employer Prototype code
- [x] Create Nationality and Employer Character Requirements
- [x] Add both fields to the Character Creation menu
- [x] Create Nationality and Employer Prototypes
- [x] Create Nationality and Employer Prototypes YAML
- [x] Add requirements to a few jobs
- [ ] Add requirements to a few traits
- [ ] Add requirements to a few loadout items
- [x] create a passport item that can be opened and closed
- [x] Give each nationality a passport item valid for their species

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/9c44cf11-766b-4368-af69-8655048e992a)

https://github.com/user-attachments/assets/9e61aed8-2e07-4d44-89c7-595a170df8c7

</p>
</details>

---

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑
- add: Contractors. Be sure to edit your character to set an employer
and nationality!
- add: Nationality, Lifepath, and Employer have been added to character
creation. These don't currently do much except spawn a passport
containing information about where your character is from and who they
are, but they are fully integrated with Character Requirements, and by
extension can be used for and alongside Traits, Loadouts, Jobs,
Antagonists, etc.

---------

Signed-off-by: Timfa <timfalken@hotmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>

(cherry picked from commit c3b12c62ee3bd226b57022690d1b24cb7cf54e3f)
2025-03-29 17:52:53 +03:00
dootythefrooty
b93d7a936d how did i forget that
(cherry picked from commit 86225de6d86056d7e7e07ede65f5f2da83912291)
2025-03-29 17:34:21 +03:00
dootythefrooty
592d6e230c bug fixes
(cherry picked from commit 843f96aa167e238076120533883bc87ba11270d3)
2025-03-29 17:34:05 +03:00
Leon Friedrich
3738303535 Give jobs & antags prototypes a guide field (#28614)
* Give jobs & antags prototypes a guide field

* A

* space

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Add todo

* Fix merge errors

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

(cherry picked from commit e7f2ae52ab24dddc8f3c94cb84b751482700e3da)
(cherry picked from commit 4cee20b913a1de0cd6f8ee7d02c2bf55e3e75298)
2025-03-29 17:33:51 +03:00
vanx
7d6b224d8b [Tweak] Character Creation Cleanup (#334)
* roles

* ui

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-03-13 15:06:33 +03:00
Spatison
c9b961c300 Update HumanoidProfileEditor.xaml.cs 2025-03-11 17:10:00 +03:00
Spatison
7ad215a5a9 traits 2025-03-11 17:05:26 +03:00
Spatison
2549ec061e [Feature] Body Types (#180)
* feature: body types

# Conflicts:
#	Content.Shared/Humanoid/Markings/MarkingManager.cs
#	Resources/Prototypes/Nyanotrasen/Species/Oni.yml
#	Resources/Prototypes/Nyanotrasen/Species/felinid.yml
#	Resources/Prototypes/Species/arachne.yml
#	Resources/Prototypes/Species/dwarf.yml
#	Resources/Prototypes/Species/harpy.yml
#	Resources/Prototypes/Species/human.yml
#	Resources/Prototypes/Species/ipc.yml
#	Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json

* feature: body types: 2

* add: loc

* fix: rsi validate

* tweak: displasment jumpsuit

* tweak: clean up

* tweak: displasment shoes

* tweak: displasment gloves

* tweak: clean up

* tweak: displasment outerClothing

* Revert "tweak: displasment outerClothing"

This reverts commit 698fd688591a6c00a4cd19eebac7a204dce18e98.

* fix

* fix

* fix

* fix

* tweak: dwarf, Oni and Felenid now can choose slim body type

* add: outer displacement

* some fix

* some fix

* no more tags shitcode

* Reptilian body type

* harpy body type

* some fix

* rsi validator fix

* Update ClientClothingSystem.cs

* Update Model.cs

* Update MarkingManager.cs

* Update ClientClothingSystem.cs

* Update reptilian.yml
2025-03-03 18:03:18 +02:00
SX-7
ff3595de9e Tajara (#1647)
# Description

~~On user end Felinids are removed and replaced with Tajara, mostly
inspired by the ParadiseStation sprites.~~

~~Most things from Felinids are ported over, either being untouched (in
which case they're left in the nyanotrasen directory), or somewhat
modified and copied to tajara directories. This is done because both
shadowkin and humans reference these files quite a bit, so we don't want
to break anything forwards/backwards,~~

~~Under the hood, felinid components are untouched, just simply set to
`abstract: true` and `roundstart: false`, once again to prevent any
breakage.~~

There's been like 50 changes all the ways, but basically, felinids are
staying, tajara get a few languages, they also are more "specialized"
than felinids due to big upsides and downsides (funny :)

---

# TODO

- [X] Add tajara
~~- [X] Hide felinids~~
~~- [x] Analyze and find now-orphaned felinid
protorypes/textures/references and remove them (optional)~~
- [x] Fix graphical bugs (if any)
- [x] Ensure the code structure is compliant with repo practices

---

<details><summary><h1>Media</h1></summary>
<p>

In captain attire

![{3169C46E-BABB-466F-BD75-D8A00D8F9105}](https://github.com/user-attachments/assets/74a7c43f-9d5d-440f-9c18-f1eb386ad3d7)
Testing emotes and languages

![{7EE18197-E788-46BF-9DA3-97B0718A2F0B}](https://github.com/user-attachments/assets/74dd9c17-92a2-4760-99f8-1bb893fa969d)
Emotes still working, same with hairballs

![{346EB863-EF92-4D82-8E72-409437372DC3}](https://github.com/user-attachments/assets/91b61aae-d460-4373-a0ba-79cbd64f8ec4)
Few character selector pictures
- The previously shown off tajaran

![{559C39A8-5333-4787-A3B7-2F882EB6B5E2}](https://github.com/user-attachments/assets/38d77c48-caa2-461f-858a-a6b1a235cc0f)
- Markingless male body

![{9D762061-C1F8-40A5-9F14-5809E803820C}](https://github.com/user-attachments/assets/719c18ba-0230-4b17-9166-fdd15cb67526)

![{98AFAEF1-D49A-4951-A18E-5E55ACC05A26}](https://github.com/user-attachments/assets/6f848c0a-9a1e-4aed-aeb7-0bbf7c1dab62)
- Markingless female body

![{8F42252C-DDC4-43FD-8B8F-BFF0FBD971CD}](https://github.com/user-attachments/assets/92ea11bc-2ddc-4569-b166-0380b34ee946)

![{EE2B152D-97AD-4C39-B51E-8D89E4C4B097}](https://github.com/user-attachments/assets/c6f3a8ee-20be-486a-bea8-b862cf2ea12e)
- Traits are updated, as is the case with other texts

![{6F1E0309-7262-48BA-ABF6-C2048E087437}](https://github.com/user-attachments/assets/778ede7d-3069-4b81-b09d-32aadb6c6b76)
~~- And a neon colored specimen to show off some markings~~ No longer
the case, fur hue is clamped to some reasonable colors

![{381F7D38-1ABE-4434-8F29-95908E8F1A4B}](https://github.com/user-attachments/assets/1ef52004-db37-4127-a113-0b5640087cc1)

</p>
</details>

---

# Changelog

🆑
- add: Added Tajara and related content

---------

Signed-off-by: SX-7 <92227810+SX-7@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
(cherry picked from commit b7660b95566c8e138cb458a3d70732c1d3ea4602)
2025-01-29 20:19:56 +03:00