From bccec76535548e4ea2bac25cf0db1a9bde038b73 Mon Sep 17 00:00:00 2001 From: kerisargit <108146620+kerisargit@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:23:19 +0300 Subject: [PATCH 1/9] Update base.ftl --- .../Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl index 9e61de12d78..c008cfc5599 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl @@ -24,6 +24,8 @@ ent-BaseStationMagnet = { "" } .desc = { "" } ent-BaseStationSiliconLawCrewsimov = { "" } .desc = { "" } +ent-BaseStationSiliconNTDefault = { "" } + .desc = { "" } ent-BaseStationNews = { "" } .desc = { "" } ent-BaseStationAllEventsEligible = { "" } From b23679b9167a928b202bcffd2997518d69d71581 Mon Sep 17 00:00:00 2001 From: kerisargit <108146620+kerisargit@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:24:09 +0300 Subject: [PATCH 2/9] Update base.ftl --- .../Locale/ru-RU/ss14-ru/prototypes/entities/stations/base.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/stations/base.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/stations/base.ftl index 9e61de12d78..c008cfc5599 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/stations/base.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/stations/base.ftl @@ -24,6 +24,8 @@ ent-BaseStationMagnet = { "" } .desc = { "" } ent-BaseStationSiliconLawCrewsimov = { "" } .desc = { "" } +ent-BaseStationSiliconNTDefault = { "" } + .desc = { "" } ent-BaseStationNews = { "" } .desc = { "" } ent-BaseStationAllEventsEligible = { "" } From 1520ab7f0a34b9639baa023892be81e9dabad943 Mon Sep 17 00:00:00 2001 From: kerisargit <108146620+kerisargit@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:25:14 +0300 Subject: [PATCH 3/9] Update nanotrasen.yml --- Resources/Prototypes/Entities/Stations/nanotrasen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml index 9090c81fd56..fc929d671c2 100644 --- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml +++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml @@ -23,7 +23,7 @@ - BaseStationAlertLevels - BaseStationMagnet - BaseStationExpeditions - - BaseStationSiliconLawCrewsimov + - BaseStationSiliconNTDefault #Corvax-NTDefault - BaseStationAllEventsEligible - BaseStationNanotrasen noSpawn: true From 00c3c829a0cc45e81fb4acb0d11b21fd2107a879 Mon Sep 17 00:00:00 2001 From: kerisargit <108146620+kerisargit@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:25:53 +0300 Subject: [PATCH 4/9] Update nanotrasen.yml --- Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml index 21b8566016a..b6b6f8a99f1 100644 --- a/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml +++ b/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml @@ -14,7 +14,7 @@ - BaseStationAlertLevels - BaseStationMagnet - BaseStationExpeditions - - BaseStationSiliconLawCrewsimov + - BaseStationSiliconNTDefault #Corvax-NTDefault - BaseStationAllEventsEligible - BaseStationNanotrasen noSpawn: true From 835ff98f9e265019b68c297e927c9096db48cdbe Mon Sep 17 00:00:00 2001 From: kerisargit <108146620+kerisargit@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:28:55 +0300 Subject: [PATCH 5/9] Update base.yml --- Resources/Prototypes/Entities/Stations/base.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml index 418321839ef..847c265ab94 100644 --- a/Resources/Prototypes/Entities/Stations/base.yml +++ b/Resources/Prototypes/Entities/Stations/base.yml @@ -106,11 +106,11 @@ - type: SalvageMagnetData - type: entity - id: BaseStationSiliconLawCrewsimov + id: BaseStationSiliconNTDefault abstract: true components: - type: SiliconLawProvider - laws: Crewsimov + laws: NTDefault - type: entity id: BaseStationNews From 61d3d933adbfb42c034f6fc1c31ea769d5e64bed Mon Sep 17 00:00:00 2001 From: kerisargit <108146620+kerisargit@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:31:29 +0300 Subject: [PATCH 6/9] Update base.yml --- Resources/Prototypes/Entities/Stations/base.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml index 847c265ab94..b25de8155d1 100644 --- a/Resources/Prototypes/Entities/Stations/base.yml +++ b/Resources/Prototypes/Entities/Stations/base.yml @@ -106,11 +106,11 @@ - type: SalvageMagnetData - type: entity - id: BaseStationSiliconNTDefault + id: BaseStationSiliconNTDefault #Corvax-NTDefault abstract: true components: - type: SiliconLawProvider - laws: NTDefault + laws: NTDefault #Corvax-NTDefault - type: entity id: BaseStationNews From c5f500e545a4a4229f51a2e39dfb8c8215f33b8c Mon Sep 17 00:00:00 2001 From: kerisargit <108146620+kerisargit@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:46:02 +0300 Subject: [PATCH 7/9] Update base_borg_chassis.yml --- .../Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 3ebf4f4e586..03cb3ef8a86 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -75,7 +75,7 @@ - type: EmagSiliconLaw stunTime: 5 - type: SiliconLawProvider - laws: Crewsimov + laws: NTDefault - type: IonStormTarget - type: Inventory templateId: borg From 2645a8b55afa61639f5c61b06dda9647e36e1a61 Mon Sep 17 00:00:00 2001 From: kerisargit <108146620+kerisargit@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:47:43 +0300 Subject: [PATCH 8/9] Update silicon-laws.yml --- Resources/Prototypes/silicon-laws.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 8e65a27158b..f2a4cccf96f 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -166,9 +166,9 @@ - type: weightedRandom id: IonStormLawsets weights: - # its crewsimov by default dont be lame - Crewsimov: 0.25 + Crewsimov: 1 #Corvax-not-base Corporate: 1 - NTDefault: 1 + # its Corvax base + NTDefault: 0.25 Drone: 0.5 Ninja: 0.25 From 466e6485f83a8c18583848e247e0293da1c1f812 Mon Sep 17 00:00:00 2001 From: kerisargit <108146620+kerisargit@users.noreply.github.com> Date: Sat, 6 Jul 2024 01:42:57 +0300 Subject: [PATCH 9/9] Update laws.ftl --- Resources/Locale/ru-RU/station-laws/laws.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/station-laws/laws.ftl b/Resources/Locale/ru-RU/station-laws/laws.ftl index f3844e6ca66..e9b8c869f9a 100644 --- a/Resources/Locale/ru-RU/station-laws/laws.ftl +++ b/Resources/Locale/ru-RU/station-laws/laws.ftl @@ -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 } превыше всего. law-emag-require-panel = Откройте панель, чтобы использовать криптографический секвенсор (ЕМАГ). law-emag-cannot-emag-self = Вы не можете использовать ЕМАГ на себе. laws-ui-menu-title = Законы