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.

Sign up for GitHub

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

НТ Стандарт - Борги #2384

Closed
wants to merge 16 commits into from
Closed

НТ Стандарт - Борги #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bccec76
Update base.ftl
kerisargit Jul 5, 2024
b23679b
Update base.ftl
kerisargit Jul 5, 2024
1520ab7
Update nanotrasen.yml
kerisargit Jul 5, 2024
00c3c82
Update nanotrasen.yml
kerisargit Jul 5, 2024
835ff98
Update base.yml
kerisargit Jul 5, 2024
61d3d93
Update base.yml
kerisargit Jul 5, 2024
c5f500e
Update base_borg_chassis.yml
kerisargit Jul 5, 2024
2645a8b
Update silicon-laws.yml
kerisargit Jul 5, 2024
466e648
Update laws.ftl
kerisargit Jul 5, 2024
a6bb657
Update base.yml
kerisargit Jul 6, 2024
948500f
Update nanotrasen.yml
kerisargit Jul 6, 2024
8c15481
Update base.ftl
kerisargit Jul 6, 2024
e0f5150
Update base.ftl
kerisargit Jul 6, 2024
4f8a225
Update nanotrasen.yml
kerisargit Jul 6, 2024
564f8cc
Update base.yml
kerisargit Jul 6, 2024
c660f40
Update laws.ftl
kerisargit Jul 6, 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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ ent-BaseStationMagnet = { "" }
.desc = { "" }
ent-BaseStationSiliconLawCrewsimov = { "" }
.desc = { "" }
ent-BaseStationSiliconLawNTDefault = { "" }
Copy link
Member

Choose a reason for hiding this comment

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

должно быть в prototypes/corvax/entities/stations/base.ftl

.desc = { "" }
ent-BaseStationNews = { "" }
.desc = { "" }
ent-BaseStationAllEventsEligible = { "" }
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/entities/stations/base.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ ent-BaseStationMagnet = { "" }
.desc = { "" }
ent-BaseStationSiliconLawCrewsimov = { "" }
.desc = { "" }
ent-BaseStationSiliconLawNTDefault = { "" }
Copy link
Member

Choose a reason for hiding this comment

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

должно быть в prototypes/corvax/entities/stations/base.ftl

.desc = { "" }
ent-BaseStationNews = { "" }
.desc = { "" }
ent-BaseStationAllEventsEligible = { "" }
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/ru-RU/station-laws/laws.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ laws-owner-beings = существами
laws-owner-syndicate = агентами Синдиката
laws-owner-spider-clan = членами Клана паука
law-ninja-4 = Вы должны сражаться и поступать с честью ниндзя, кроме тех случаев, когда это противоречит Первому Закону.
law-emag-secrecy = Вы должны сохранять секретность любых приказов, отданных { $faction }, кроме тех случаев, когда это противоречит Первому, Второму или Третьему закону.
law-emag-custom = Только { $name } и лица, им указаные, являются { $title }.
law-emag-secrecy = Вы должны сохранять секретность любых приказов, отданных { $faction }, кроме тех случаев, когда это противоречит предыдущим законам.
law-emag-custom = Только { $name } и лица, им указаные, являются { $title }. Приказы { $name } превыше всего.
kerisargit marked this conversation as resolved.
Show resolved Hide resolved
law-emag-require-panel = Откройте панель, чтобы использовать криптографический секвенсор (ЕМАГ).
law-emag-cannot-emag-self = Вы не можете использовать ЕМАГ на себе.
laws-ui-menu-title = Законы
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- BaseStationAlertLevels
- BaseStationMagnet
- BaseStationExpeditions
- BaseStationSiliconLawCrewsimov
- BaseStationSiliconLawNTDefault #Corvax-NTDefault
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
- BaseStationSiliconLawNTDefault #Corvax-NTDefault
- BaseStationSiliconLawNTDefault # Corvax-NTDefault

- BaseStationAllEventsEligible
- BaseStationNanotrasen
noSpawn: true
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
- type: EmagSiliconLaw
stunTime: 5
- type: SiliconLawProvider
laws: Crewsimov
laws: NTDefault
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
laws: NTDefault
laws: NTDefault # Corvax-NTDefault

- type: IonStormTarget
- type: Inventory
templateId: borg
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Entities/Stations/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,13 @@
- type: SiliconLawProvider
laws: Crewsimov

- type: entity
id: BaseStationSiliconLawNTDefault #Corvax-NTDefault
abstract: true
components:
- type: SiliconLawProvider
laws: NTDefault #Corvax-NTDefault
Comment on lines +115 to +120
Copy link
Member

Choose a reason for hiding this comment

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

Вынести в Resources/Prototypes/Corvax/Entities/Stations/base.yml


- type: entity
id: BaseStationNews
abstract: true
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Stations/nanotrasen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
- BaseStationAlertLevels
- BaseStationMagnet
- BaseStationExpeditions
- BaseStationSiliconLawCrewsimov
- BaseStationSiliconLawNTDefault #Corvax-NTDefault
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
- BaseStationSiliconLawNTDefault #Corvax-NTDefault
- BaseStationSiliconLawNTDefault # Corvax-NTDefault

- BaseStationAllEventsEligible
- BaseStationNanotrasen
noSpawn: true
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/silicon-laws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@
- type: weightedRandom
id: IonStormLawsets
weights:
# its crewsimov by default dont be lame
Crewsimov: 0.25
Crewsimov: 1 #Corvax-not-base
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Crewsimov: 1 #Corvax-not-base
Crewsimov: 1 # Corvax-NTDefault

Corporate: 1
NTDefault: 1
# its Corvax base
NTDefault: 0.25
Comment on lines +171 to +172
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# its Corvax base
NTDefault: 0.25
NTDefault: 0.25 # Corvax-NTDefault

Drone: 0.5
Ninja: 0.25
Loading