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

Колизей #84

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3a02b29
Оружия и боеприпасы для колизея
FireFoxPhoenix Nov 13, 2024
278629c
Закручивание пушек и КолизейМат
FireFoxPhoenix Nov 16, 2024
834ac7a
Merge branch 'Corvax-Frontier:master' into Coliseum
FireFoxPhoenix Nov 16, 2024
a7391d5
Запускаем консоль верфи для колизеи
mersen-tyn Nov 18, 2024
57a2744
Merge branch 'Corvax-Frontier:master' into Coliseum
FireFoxPhoenix Nov 18, 2024
c8cb413
Консоль и ваунчер
FireFoxPhoenix Nov 18, 2024
0c9a3e2
Шаттлы
FireFoxPhoenix Nov 19, 2024
0fe8a22
Колизей
FireFoxPhoenix Nov 21, 2024
15e63c5
Новая текстура КолизейМат
FireFoxPhoenix Nov 21, 2024
4a499e7
Обменник и жетоны
FireFoxPhoenix Nov 22, 2024
64b5ddd
Жетоны на шаттлы
FireFoxPhoenix Nov 22, 2024
0218876
Merge branch 'Corvax-Frontier:master' into Coliseum
FireFoxPhoenix Nov 22, 2024
321dc4f
Merge branch 'Coliseum' of https://github.com/FireFoxPhoenix/Frontier…
FireFoxPhoenix Nov 22, 2024
eb7560f
Фикс шаттла
FireFoxPhoenix Nov 22, 2024
4eb4b8f
Merge branch 'Corvax-Frontier:master' into Coliseum
FireFoxPhoenix Nov 29, 2024
3237c99
Спавн колизея
FireFoxPhoenix Dec 7, 2024
b9aaa5e
Merge branch 'Corvax-Frontier:master' into Coliseum
FireFoxPhoenix Dec 12, 2024
62d36e8
Merge branch 'Corvax-Frontier:master' into Coliseum
FireFoxPhoenix Dec 15, 2024
809f085
Удаление колизея
FireFoxPhoenix Dec 15, 2024
ed0806d
Возвращение колизея
FireFoxPhoenix Dec 15, 2024
7628c5c
Колизея всё ещё нет на другой карте...
mersen-tyn Dec 15, 2024
cfaac94
Merge branch 'Corvax-Frontier:master' into Coliseum
FireFoxPhoenix Dec 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Content.Server/Shuttles/Components/StationColiseumComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using Robust.Shared.Map;
using Robust.Shared.Utility;

namespace Content.Server.Shuttles.Components;

[RegisterComponent]
public sealed partial class StationColiseumComponent : Component
{
[DataField]
public float ShuttleIndex;

[DataField]
public ResPath Map = new("/Maps/Corvax/POI/coliseum.yml");

[DataField]
public EntityUid? Entity;

[DataField]
public EntityUid? MapEntity;
}
1 change: 1 addition & 0 deletions Content.Shared/Shipyard/SharedShipyardSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public enum ShipyardConsoleUiKey : byte
Scrap,
Sr,
// Add ships to this key if they are only available from mothership consoles. Shipyards using it are inherently empty and are populated using the ShipyardListingComponent.
Coliseum, // Corvax-Frontier
Custom
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ShipVoucherColiseum = ваунчер шаттла колизея
.desc = Время для боя. Зачем вы на это решились...
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-ColiseumCoin = колизейный жетон
.desc = Может быть обменян на деньги в разменнике.
ent-ColiseumCoinBlocked = заблокированный колизейный жетон
.desc = Дождитесь окончания тамера для разблокировки.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-ColiseumGrenadeBaton = шоковая граната для колизея
.desc = { ent-BaseGrenade.desc }
ent-ColiseumGrenadeBlast = фугасная граната для колизея
.desc = { ent-BaseGrenade.desc }
ent-ColiseumGrenadeFlash = светошумовая граната для колизея
.desc = { ent-BaseGrenade.desc }
ent-ColiseumGrenadeFrag = осколочная граната для колизея
.desc = { ent-BaseGrenade.desc }
ent-ColiseumGrenadeEMP = ЭМИ граната для колизея
.desc = { ent-BaseGrenade.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ent-ColiseumMagazineGrenadeEmpty = картридж гранат для колизея
.desc = { ent-BaseItem.desc }
ent-ColiseumMagazineGrenadeFrag = картридж осколочных гранат для колизея
.desc = { ent-BaseMagazineGrenade.desc }
ent-ColiseumMagazineGrenadeEMP = картридж ЭМИ гранат для колизея
.desc = { ent-BaseMagazineGrenade.desc }
ent-ColiseumMagazineGrenadeFlash = картридж светошумовых гранат для колизея
.desc = { ent-BaseMagazineGrenade.desc }
ent-ColiseumMagazineGrenadeBlast = картридж фугасных гранат для колизея
.desc = { ent-BaseMagazineGrenade.desc }
ent-ColiseumMagazineGrenadeBaton = картридж шоковых гранат для колизея
.desc = { ent-BaseMagazineGrenade.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ColiseumExchanger = обменник жетонов
.desc = Здесь можно обменять жетоны с колизея на деньги.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ComputerShipyardColiseum = консоль верфи колизея
.desc = Купи шаттл и в бой! Сзади консоли имеется записка - "проспонсировано лучшими мапперами на свете". Стоп, кто такие мапперы...
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ColiseumVendingMachine = КолизейМат
.desc = Купи вещи для красивого боя в колизее!
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
materials-coliseum-coin = колизейный жетон
12,718 changes: 12,718 additions & 0 deletions Resources/Maps/Corvax/POI/coliseum.yml

Large diffs are not rendered by default.

Loading
Loading