diff --git a/Content.Client/_Sunrise/Roadmap/Roadmap.xaml.cs b/Content.Client/_Sunrise/Roadmap/Roadmap.xaml.cs index 1a70d975c6b..b1b9f421efb 100644 --- a/Content.Client/_Sunrise/Roadmap/Roadmap.xaml.cs +++ b/Content.Client/_Sunrise/Roadmap/Roadmap.xaml.cs @@ -55,8 +55,8 @@ private void PopulateRoadmap(RoadmapVersionsPrototype roadmapVersions) { var roadmapItem = new RoadmapItem() { - HeaderText = Loc.TryGetString($"{roadmapVersions.ID}-name", out var name) ? name : goal.Value.Name, - Text = Loc.TryGetString($"{roadmapVersions.ID}-desc", out var desc) ? desc : goal.Value.Desc, + HeaderText = Loc.TryGetString($"{goal.Value.ID}-name", out var name) ? name : goal.Value.Name, + Text = Loc.TryGetString($"{goal.Value.ID}-desc", out var desc) ? desc : goal.Value.Desc, ItemState = goal.Value.State, }; diff --git a/Content.Shared/_Sunrise/Roadmap/RoadmapVersionsPrototype.cs b/Content.Shared/_Sunrise/Roadmap/RoadmapVersionsPrototype.cs index 000e739704d..6c4e93b9928 100644 --- a/Content.Shared/_Sunrise/Roadmap/RoadmapVersionsPrototype.cs +++ b/Content.Shared/_Sunrise/Roadmap/RoadmapVersionsPrototype.cs @@ -29,6 +29,9 @@ public sealed partial class RoadmapGroup [Serializable, NetSerializable] public sealed partial class RoadmapGoal { + [DataField] + public string ID { get; set; } = string.Empty; //Хуйня нужная для локализации, не трогать + [DataField] public string Name { get; set; } = string.Empty; diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers.ftl deleted file mode 100644 index 5d471981c8e..00000000000 --- a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers.ftl +++ /dev/null @@ -1,3 +0,0 @@ -ent-LockerHeadOfPrisonFilled = шкафчик начальника тюрьмы - .suffix = Filled - .desc = { ent-LockerHeadOfSecurity.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/bebeplinks.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/bebeplinks.ftl deleted file mode 100644 index 0c71bb96d62..00000000000 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/bebeplinks.ftl +++ /dev/null @@ -1,11 +0,0 @@ -ent-BaseSunriseUplink = { ent-BaseItem } - .desc = { ent-BaseItem.desc } -ent-SunriseUplink40 = портативный магазин Санрайз - .desc = Имеет широкий ассортимент товаров для всех вкусов и предпочтений - от удивительных ручных изделий и уникальных сувениров до современной техники и модных аксессуаров. - .suffix = 40 -ent-SunriseUplink80 = портативный магазин Санрайз - .desc = Имеет широкий ассортимент товаров для всех вкусов и предпочтений - от удивительных ручных изделий и уникальных сувениров до современной техники и модных аксессуаров. - .suffix = 80 -ent-SunriseUplink100 = портативный магазин Санрайз - .desc = Имеет широкий ассортимент товаров для всех вкусов и предпочтений - от удивительных ручных изделий и уникальных сувениров до современной техники и модных аксессуаров. - .suffix = 100 diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/fishplinks.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/fishplinks.ftl deleted file mode 100644 index 80a9234d433..00000000000 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/fishplinks.ftl +++ /dev/null @@ -1,9 +0,0 @@ -ent-FishStationUplink40 = Портативный магазин «Рыбаплинк» - .desc = Имеет широкий ассортимент товаров для всех вкусов и предпочтений - от удивительных ручных изделий и уникальных сувениров до современной техники и модных аксессуаров. - .suffix = 40 -ent-FishStationUplink80 = Портативный магазин «Рыбаплинк» - .desc = Имеет широкий ассортимент товаров для всех вкусов и предпочтений - от удивительных ручных изделий и уникальных сувениров до современной техники и модных аксессуаров. - .suffix = 80 -ent-FishStationUplink100 = Портативный магазин «Рыбаплинк» - .desc = Имеет широкий ассортимент товаров для всех вкусов и предпочтений - от удивительных ручных изделий и уникальных сувениров до современной техники и модных аксессуаров. - .suffix = 100 diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/identification_cards.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/identification_cards.ftl deleted file mode 100644 index d7320f0797f..00000000000 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/identification_cards.ftl +++ /dev/null @@ -1,28 +0,0 @@ -ent-BlueShieldIDCard = ID карта офицера «синий щит» - .desc = Карта, необходимая для доступа в различные области станции. -ent-RoboticistIDCard = ID карта робототехника - .desc = { ent-IDCardStandard.desc } -ent-SecurityPilotIDCard = ID карта пилота службы безопастности - .desc = { ent-IDCardStandard.desc } -ent-PrisonEngineeringIDCard = ID карта тюремного инженера - .desc = { ent-IDCardStandard.desc } -ent-IAAIDCard = internal affairs agent ID card - .desc = { ent-IDCardStandard.desc } -ent-MagistratIDCard = Magistrate ID Card - .desc = { ent-IDCardStandard.desc } -ent-BrigmedicIDCard = brigmedic ID card - .desc = { ent-IDCardStandard.desc } -ent-PrisonerIDCard = prisoner ID card - .desc = { ent-IDCardStandard.desc } -ent-GuardIDCard = guard ID card - .desc = { ent-IDCardStandard.desc } -ent-PrisonPilotIDCard = ID карта тюремного пилота - .desc = { ent-IDCardStandard.desc } -ent-HeadOfPrisonIDCard = ID карта начальника тюрьмы - .desc = { ent-IDCardStandard.desc } -ent-NanoTrasenRepresentativeIDCard = NanoTrasen Representative ID Card - .desc = { ent-IDCardStandard.desc } -ent-BarberIDCard = ID карта парикмахера - .desc = Карта, необходимая для доступа в различные области станции. -ent-AdjutantIDCard = adjutant ID card - .desc = Adjutant ID card. diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/reinforcement_teleporter.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/reinforcement_teleporter.ftl deleted file mode 100644 index c72c05e02dd..00000000000 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/reinforcement_teleporter.ftl +++ /dev/null @@ -1,15 +0,0 @@ -ent-ReinforcementRadioSyndicateCyborgMedical = syndicate medical cyborg reinforcement radio - .desc = Call in a well armed assault cyborg, instantly! - .suffix = NukeOps -ent-ReinforcementRadioSyndicateCyborgReaper = syndicate reaper cyborg reinforcement radio - .desc = Call in a well armed assault cyborg, instantly! - .suffix = NukeOps -ent-ReinforcementRadioSyndicateCyborgAssault = syndicate assault cyborg reinforcement radio - .desc = Call in a well armed assault cyborg, instantly! - .suffix = NukeOps -ent-ReinforcementRadioSyndicateCyborgHeavy = syndicate heavy cyborg reinforcement radio - .desc = Call in a well armed assault cyborg, instantly! - .suffix = NukeOps -ent-ReinforcementRadioSyndicateCyborgSpider = syndicate spider cyborg reinforcement radio - .desc = Call in a well armed assault cyborg, instantly! - .suffix = NukeOps diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/neweraplinks.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/neweraplinks.ftl deleted file mode 100644 index 5c066599407..00000000000 --- a/Resources/Locale/en-US/_prototypes/_sunrise/neweraplinks.ftl +++ /dev/null @@ -1,9 +0,0 @@ -ent-NeweraStationUplink40 = Портативный магазин «Котоплинк» - .desc = Имеет широкий ассортимент товаров для всех вкусов и предпочтений - от удивительных ручных изделий и уникальных сувениров до современной техники и модных аксессуаров. - .suffix = 40 -ent-NeweraStationUplink80 = Портативный магазин «Котоплинк» - .desc = Имеет широкий ассортимент товаров для всех вкусов и предпочтений - от удивительных ручных изделий и уникальных сувениров до современной техники и модных аксессуаров. - .suffix = 80 -ent-NeweraStationUplink100 = Портативный магазин «Котоплинк» - .desc = Имеет широкий ассортимент товаров для всех вкусов и предпочтений - от удивительных ручных изделий и уникальных сувениров до современной техники и модных аксессуаров. - .suffix = 100 diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/planetprison/objective.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/planetprison/objective.ftl deleted file mode 100644 index 903ac49174b..00000000000 --- a/Resources/Locale/en-US/_prototypes/_sunrise/planetprison/objective.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-BasePlanetPrisonerObjective = { ent-BaseObjective } - .desc = { ent-BaseObjective.desc } -ent-PlanetPrisonerEscapeObjective = Сбежать с планетарной тюрьмы. - .desc = Вам нужно выбраться из комплекса содержания и убежать как можно дальше, возможно вам удастся скрыться. diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/planetprison/roundstart.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/planetprison/roundstart.ftl deleted file mode 100644 index cb35b0ddd98..00000000000 --- a/Resources/Locale/en-US/_prototypes/_sunrise/planetprison/roundstart.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-PlanetPrison = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/roadmap/roadmap-goals.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/roadmap/roadmap-goals.ftl index 08346134ceb..6a0d051d19a 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/roadmap/roadmap-goals.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/roadmap/roadmap-goals.ftl @@ -69,19 +69,19 @@ borer-desc = Антагонист залазящий в мозги живых с lavalend-name = Лаваленд lavalend-desc = Отдельное измерение где шахтёры будут добывать ресурсы для станции. angels-name = Раса ангелов -angels-desc = Ну типа да. +angels-desc = Новая раса ангелов с своими способностями. impids-name = Раса импидов -impids-desc = Ну типа да. +impids-desc = Новая раса импидов выросшая в суровых и жарких условиях. skills-name = Система навыков skills-desc = Система не позволяющая сделать то или инное действие если у вас нет определённого навыка. space-fight-name = Режим космической битвы -space-fight-desc = Ну типа да. +space-fight-desc = Новый увлекатильный режим который погрузит вас в мир космических войн. spider-terror-name = Пауки ужаса -spider-terror-desc = Ну типа да. +spider-terror-desc = Результат экспериментов Синдиката по скрещиванию ДНК гигантского космического паука и Ксеноморфа. wizards-name = Режим магов -wizards-desc = Ну типа да. +wizards-desc = Игровой режим при которым спавнится маг и делает всякие пакости. morph-name = Морф -morph-desc = Ну типа да. +morph-desc = Маса зеленой плоти, которая имеет способность принимать облик любого человека. diseases-name = Болезни diseases-desc = Оживление вирусологии, вы сможете реально получить спид, как соник. plasmamens-name = Раса плазмаменов diff --git a/Resources/Prototypes/_Sunrise/roadmap.yml b/Resources/Prototypes/_Sunrise/roadmap.yml index c202f5cbb0a..6bfd6b0136b 100644 --- a/Resources/Prototypes/_Sunrise/roadmap.yml +++ b/Resources/Prototypes/_Sunrise/roadmap.yml @@ -5,102 +5,132 @@ name: 2024 goals: fugitive: + id: fugitive name: Fugitive desc: An escaped fugitive prisoner whose goal is to survive. state: Complete planet-prison: + id: planet-prison name: Planet Prison desc: A prison on a planet operating as a separate station. state: Complete cyborg-update: + id: cyborg-update name: Station Cyborgs Update desc: New cyborgs. state: Complete collective-mind: + id: collective-mind name: Collective Mind desc: A system that allows some creatures to communicate with each other if they have one. state: Complete syndicate-cyborgs: + id: syndicate-cyborgs name: New Syndie Cyborgs desc: More advanced and useful syndicate borg. state: Complete new-guns: + id: new-guns name: Firearms Expansion desc: Adding various firearms (what about the flamethrower?). state: Complete smart-viruse: + id: smart-viruse name: Smart Viruse desc: An antagonist whose goal is to infect the station with a disease. state: Complete cargo-rework: + id: cargo-rework name: Cargo Rework desc: Removal of the trading outpost and the cargo shuttle, realizing the buying and selling at the station. state: Complete new-maps: + id: new-maps name: Global Map Reworking desc: Significant refinements to the maps (delta, box). state: Complete fully-translating: + id: fully-translating name: Full Translation Of Everything desc: translation of all the items, menus. In order to simplify gameplay. state: Complete night-vision: + id: night-vision name: Night Vision desc: NVD, night vision in some animals/race. state: Complete + mechs: + id: mechs + name: Mechs + desc: Controlled mechanoids, created to work in difficult places, as well as in facilitating the transportation of goods and other tasks where man himself can not cope. + state: Partial ipc: + id: ipc name: IPC desc: A race of intelligent machines, in reworking. state: Partial blob: + id: blob name: Blob desc: An antagonist whose goal is to devour and thereby destroy the station. state: InProgress assault-ops: + id: assault-ops name: Assault Ops desc: A mercenary squad whose purpose is to stealthily sabotage the station, disrupting its operations. state: InProgress ert-call: + id: ert-call name: ERT Call Console desc: A console that can be used to call an ERT. state: InProgress USSP: + id: USSP name: USSP Station desc: A separate station of the USSP with its own shift tasks. state: InProgress vent-crawling: + id: vent-crawling name: Vent Crawling desc: Allowing small creatures and various antagonists to move through the ventilation system. state: InProgress flesh-cult: + id: flesh-cult name: The cult of flesh desc: A flesh cult intent on destroying the station. state: InProgress blood-cult: + id: blood-cult name: Blood Cult (Nar'Si) desc: A cult that follows the god Nar'Si, the cult's goal is to summon its patron, who will later destroy the station. state: InProgress economy: + id: economy name: Economy desc: Adding money, wages, the post office will give money and vendomats will take money for food. state: InProgress extend-med: + id: extend-med name: Medical Department Expansion desc: Adding new mechanics, roles. state: Planned pathologist: + id: pathologist name: Pathologist desc: A new role for the medical department. To keep an eye on the morgue. state: Planned arena: + id: arena name: Ghosts Arena desc: An arena where ghosts can occupy their time so they don't have to fly around the station waiting for the end of the round. state: Planned limbo: + id: limbo name: Limbo desc: A separate world for ghosts where there are no rules. state: Planned taipan: + id: taipan name: Taipan desc: A separate syndicate station with its own shift tasks. state: Planned @@ -108,62 +138,72 @@ name: 2025 goals: mail: + id: mail name: Mail desc: Sending parcels to different parts of the station for which the station will receive money. state: InProgress - mechs: - name: Mechs - desc: Controlled mechanoids, created to work in difficult places, as well as in facilitating the transportation of goods and other tasks where man himself can not cope. - state: Partial ai: + id: ai name: AI desc: A new artificial intelligence profession aimed at helping the station destroy itself? state: Partial borer: + id: borer name: Brainworm desc: An antagonist climbing into the brains of living beings and taking over their minds. state: Planned lavaland: + id: lavalend name: Lavalend desc: A separate dimension where miners will extract resources for the station. state: Planned angels: + id: angels name: A race of angels - desc: I kind of do. + desc: A new race of angels with their own abilities. state: Planned impids: + id: impids name: A race of impids - desc: I kind of do. + desc: A new race of imps raised in a harsh and hot environment. state: Planned skills: + id: skills name: Skill System desc: A system that prevents you from doing something if you don't have a certain skill. state: Planned space-fight: + id: space-fight name: Space Fight Mode - desc: I kind of do. + desc: New exciting mode that will immerse you in the world of space wars. state: Planned spider-terror: + id: spider-terror name: Spider Terror - desc: I kind of do. + desc: The result of the Syndicate's experiments to crossbreed the DNA of a giant space spider and a Xenomorph. state: Planned wizards: + id: wizards name: Wizard Mode - desc: I kind of do. + desc: Game mode when the mage spawns and does all sorts of mischief. state: Planned morph: + id: morph name: Morph - desc: I kind of do. + desc: A mass of green flesh that has the ability to take on the appearance of any person. state: Planned diseases: + id: diseases name: Diseases desc: Revitalising virology, you can actually get speed as a sonic. state: Planned plasmamens: + id: plasmamens name: A race of plasmamens desc: A race of cool plasma dudes. state: Planned centcomm-update: + id: centcomm-update name: Centcomm Update desc: Central Command map update and possible role update. state: Planned