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

Предатели более 10 разновидностей [ONLY ROLE PLAY] #17

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

TokenStyle
Copy link

Описание PR

Добавляет более 10 "боссов" которые добавляют дополнительное РП описание для предателей. Кроме дополнительного лорного текста в меню персонажа, описания в чате ничего не меняет. Никаких "скидок" или "game changing" механик.
Взято с Traitor flavor (take 3)

Почему / Баланс

Потому-что РП всегда хорошо.

Технические детали

Изменил только Content.Server/GameTicking/Rules/TraitorRuleSystem.cs и Content.Server/Objectives/ObjectivesSystem.cs для отображения "боссов" в чате игры, меню персонажа. В конце игры поправил отображение антагонистов, чтобы показывались по "группам", в зависимости от "ключевых слов синдиката".

Медиа

Требования

traitor-flavor.2024-10-31.mp4

Критические изменения

Список изменений

🆑

  • add: Наниматели из Синдиката теперь выдают задания при получении роли Предателя в начале раунда, или "Спящего предателя" в середине раунда. У одного предателя может быть только один босс.
  • add: Синдикат теперь имеет более 10 фракций.

@TokenStyle TokenStyle requested a review from Morb0 as a code owner October 31, 2024 16:40
@github-actions github-actions bot added Status: Needs Review Changes: Localization Изменяет локализацию labels Oct 31, 2024
@lzk228
Copy link
Collaborator

lzk228 commented Oct 31, 2024

добавляет стену текста в чат, которую никто не будет читать, ура

@tripsov
Copy link

tripsov commented Oct 31, 2024

Небольшое, но очень приятное дополнение, дающее простор для отыгрыша

@Vonsant
Copy link
Collaborator

Vonsant commented Nov 2, 2024

@TokenStyle пофикси конфликты.

Copy link
Collaborator

@AwareFoxy AwareFoxy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Пожалуйста закрой всё // Corvax-Next-nazvanie-izmenenie

Просто представь насколько это будет потом не оч мерджить 🙏

@github-actions github-actions bot added the Merge Conflict МерджКонфликт label Nov 3, 2024
Copy link

github-actions bot commented Nov 3, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Content.Server/GameTicking/Rules/TraitorRuleSystem.cs Outdated Show resolved Hide resolved
Content.Server/GameTicking/Rules/TraitorRuleSystem.cs Outdated Show resolved Hide resolved
Content.Server/GameTicking/Rules/TraitorRuleSystem.cs Outdated Show resolved Hide resolved
@@ -37,6 +32,21 @@ traitor-role-uplink-code =
Set your ringtone to the notes [color = lightgray]{$code}[/color] to lock or unlock your uplink.
Remember to lock it after, or the stations crew will easily open it too!

traitor-role-moreinfo =
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Вынести в одну большую отдельную локаль(сделай ещё там папку _corvaxnext сразу)

@@ -0,0 +1,65 @@
traitor-arc-intro = You are the ARC terrorist.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

в папку _CorvaxNext

@@ -34,6 +29,22 @@ traitor-role-codewords =
traitor-role-uplink-code =
Установите рингтон Вашего КПК на [color = lightgray]{ $code }[/color] чтобы заблокировать или разблокировать аплинк.
Не забудьте заблокировать его и сменить код, иначе кто угодно из экипажа станции сможет открыть аплинк!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Вынести в одну большую отдельную локаль

@@ -0,0 +1,65 @@
traitor-arc-intro = Ты активист консилиума по борьбе за права животных - "ARC"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Вынести в одну большую отдельную локаль, в папку _CorvaxNext

@@ -1,9 +1,9 @@
- type: antag
id: Traitor
name: roles-antag-syndicate-agent-name
name: roles-antag-traitor-name
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Есть ли в этом смысл?

@Tornado-Technology
Copy link
Collaborator

Жду разрешение конфликтов и правок фокса

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the S: Merge Conflict У ПРа есть мердж конфликт label Nov 24, 2024
PuroSlavKing added a commit to PuroSlavKing/skibidi-station-69-next that referenced this pull request Nov 25, 2024
* [Port] Xenowears (space-syndicate#12)

* Xenowears (space-syndicate#519)

<!--
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
-->

<!--
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]?
-->

Add a bit of clothing specie related and some tiny misc changes.

Normally i wanted to add the spooders changes here but with the other
spider specie coming in il hold myself for now.

---

<!--
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] Add clothings
- [x] Loadouts/Vending machines

---

<!--
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/Simple-Station/Einstein-Engines/assets/45297731/47865d65-754d-4b70-9c10-19bc9aa55ac6)

</p>
</details>

---

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

:cl:
- add: Xenowears! new non-human related clothings.

---------

Signed-off-by: FoxxoTrystan <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Co-authored-by: VMSolidus <[email protected]>

* ooopsie

---------

Signed-off-by: FoxxoTrystan <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Co-authored-by: VMSolidus <[email protected]>

* [Port] Plushie (space-syndicate#11)

* Plushie Update! (space-syndicate#654)

<!--
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
-->

<!--
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]?
-->

By multiple requests i bring my PR from Frontier The [PLUSHIE
UPDATE!](new-frontiers-14/frontier-station-14#886)

This PR add a prize vendor machine where you can trade prize ticket for
a toy/plushie, to get ticket you win those in arcade machines.

This PR will give a chance for everyone to get the toys they need in a
special machine and will make plushies in general more random and fun,
in term of random spawns.

WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE
MAPPED.

---

<!--
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] Prize Vendor
- [x] Prize Tickets
- [x] New Toys/Plushies
- [x] Prizes

---

<!--
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/643e6c65-bba0-4eef-8e8e-d3510922e51e)

</p>
</details>

---

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

:cl:
- add: A ton of new plushies has arrived
- add: Prize counter are here, get your prizes by winning games and
getting prize tickets! and find prize balls!!

* prize counter to spawner

* Arachne Plushie (space-syndicate#531)

Added everyone's favorite Arachne as an adorable soft toy

---

- [x] Place plushie in spawn location(s)

---

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

![ArchnePlush](https://github.com/Simple-Station/Einstein-Engines/assets/114866135/1ec47181-4827-49f9-8605-9a16764dba89)

</p>
</details>

---

:cl:
- add: Plushie

* ooopsie

---------

Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: CodedCrow <[email protected]>

* [Fix] EE Migration (space-syndicate#14)

* [Tweak] Add Einstein Engines Folders (space-syndicate#17)

* [Tweak] EE Prototypes Folder

* [Tweak] EE RU FTL

* fix dublicate

* yaml fixes

---------

Signed-off-by: FoxxoTrystan <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: CodedCrow <[email protected]>
@Vonsant
Copy link
Collaborator

Vonsant commented Dec 3, 2024

@TokenStyle ты будешь допиливать?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменяет локализацию Merge Conflict МерджКонфликт S: Merge Conflict У ПРа есть мердж конфликт Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants