From 64f1aed90cc48820bed0dcfd76273f2f52efc37c Mon Sep 17 00:00:00 2001 From: Rinary <72972221+Rinary1@users.noreply.github.com> Date: Mon, 16 Sep 2024 19:05:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BE=D0=BB=D1=8C=D1=88=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20(#345)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * init * мать масштаба тарабанил * fix * upd * upd * upd * upd * upd * console spam fix * hohohohohohohooooonkeeeeeeeeeeeeeerrrrrrrrrrrsssssssss........ * fix * fix * upd * upd * some fixes * fix * upd * upd translation for steal obj * teg translate * upd * fix locale + add advertisements * translate configurator * Fully translate * upd * Я манал это переводить, позже переведу * upd en-US * fix Linter * upd * fix * upd * fix * fix * fix * Возврат ПНТ * remove agent non silent equipment * add acid to uplink * carrySystem new popups * fix * fix * fix disease locale * add Disease Guide * upd locale * upd * Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc" This reverts commit 4130d241fc47fb80924c0dd3b9c9a2db85af8a25, reversing changes made to 30abf7341ecce404f61f64e2000ad327964fcb00. * Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc" This reverts commit 4e5a50d21c29be8482f31e49db253b1ed17a0ae4, reversing changes made to 449cd7bfd50f29eb653e68ba60e3f0b9310f0443. * Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc" This reverts commit a4679665ef441d4b63a92dc3c4e217e2cdedbc16, reversing changes made to a80ef96cfbbc3cc737045e41a2f063a0910bf1ce. * Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc" This reverts commit 94f585756bb27d10a1be7fab1f340d79b7c0a213, reversing changes made to 906d18a3f66eaed73f3a894d70971872904fad4e. * Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc" This reverts commit d0a7c6436ba5c175b0e00d69f495ba51f9aac645, reversing changes made to e7933332274b336af1fc2a960264bc546c95d208. # Conflicts: # Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml # Resources/Prototypes/Roles/Jobs/departments.yml * fix * upd * upd * Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc" This reverts commit 042a3f112bbc32a622108475ac28081eb0bbbf9f. # Conflicts: # Content.Server/Dragon/DragonRiftSystem.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs # Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs # Resources/Changelog/Changelog.yml # Resources/Locale/en-US/_strings/store/uplink-catalog.ftl # Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Clothing/Head/helmets.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml # Resources/Prototypes/Loadouts/loadout_groups.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Maps/packed.yml # Resources/Prototypes/Roles/Jobs/departments.yml # Resources/Prototypes/Store/categories.yml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Security/Defusal.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/migration.yml * Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc" This reverts commit 2860e1d217a71be0c29684e020b2278c3f08685f. # Conflicts: # Resources/Changelog/Changelog.yml * Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc" This reverts commit 0dc7ea17e23d844ce93118db7812b844e36dda4f. # Conflicts: # Resources/Changelog/Changelog.yml # Resources/Prototypes/Hydroponics/randomMutations.yml * Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc" This reverts commit 439926b3c60e95cc2e701d84a032b17471a7c18e. * Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc" This reverts commit 14160ab99909bf6b6f996f415d9dcfd5d4addbba. # Conflicts: # Resources/Changelog/Changelog.yml * fix * upd * upd uplink * upd * fix linter --- .../EditSolutionsWindow.xaml.cs | 6 +- .../NetworkConfiguratorConfigurationMenu.xaml | 10 +- .../Ghost/Controls/GhostTargetWindow.xaml.cs | 4 - .../Shuttles/Systems/ArrivalsSystem.cs | 2 + .../Store/Systems/StoreSystem.Ui.cs | 6 +- .../_Sunrise/Carrying/CarryingSystem.cs | 12 +- .../_Sunrise/Fugitive/FugitiveSpawner.cs | 9 +- Content.Shared/Bed/Sleep/SleepingSystem.cs | 36 +- .../ArbitraryInsertConstructionGraphStep.cs | 12 +- .../_sunrise/entities/mobs/aliens/clowns.ftl | 4 + .../_sunrise/entities/objects/fun/prunks.ftl | 16 + .../entities/objects/misc/pepper_spray.ftl | 10 + .../objects/specific/chemistry-bottles.ftl | 3 + .../structures/machines/telecomms.ftl | 3 + .../structures/machines/vending_machines.ftl | 2 + .../structures/shuttles/thrusters.ftl | 2 + .../_prototypes/_sunrise/reagents/fun.ftl | 3 + .../_prototypes/_sunrise/store/presets.ftl | 2 + .../en-US/_prototypes/actions/station_ai.ftl | 8 + .../catalog/fills/backpacks/duffelbag.ftl | 3 - .../catalog/fills/boxes/service.ftl | 2 + .../_prototypes/catalog/fills/items/misc.ftl | 6 + .../catalog/fills/paper/manuals.ftl | 4 + .../entities/clothing/ears/headsets_alt.ftl | 3 - .../clothing/hands/base_clothinghands.ftl | 4 + .../entities/clothing/hands/colored.ftl | 2 + .../clothing/head/base_clothinghead.ftl | 2 - .../entities/clothing/head/hats.ftl | 2 + .../entities/clothing/head/helmets.ftl | 9 + .../entities/clothing/head/hoods.ftl | 2 + .../entities/clothing/shoes/magboots.ftl | 8 +- .../entities/clothing/uniforms/jumpsuits.ftl | 2 + .../entities/markers/spawners/mobs.ftl | 3 + .../spawners/random/salvage/spawners.ftl | 2 + .../entities/mobs/npcs/asteroid.ftl | 8 + .../_prototypes/entities/mobs/npcs/pets.ftl | 2 + .../_prototypes/entities/mobs/npcs/space.ftl | 10 + .../entities/mobs/player/humanoid.ftl | 26 - .../mobs/player/shuttleroles/roles.ftl | 128 +++++ .../mobs/player/shuttleroles/spawners.ftl | 139 +++++ .../entities/mobs/player/silicon.ftl | 32 +- .../entities/objects/base_contraband.ftl | 22 +- .../entities/objects/consumable/food/meat.ftl | 4 + .../objects/consumable/food/produce.ftl | 10 + .../entities/objects/consumable/food/soup.ftl | 2 + .../entities/objects/consumable/food/taco.ftl | 16 + .../devices/circuitboards/computer.ftl | 8 +- .../circuitboards/machine/production.ftl | 4 + .../devices/electronics/power_electronics.ftl | 2 +- .../entities/objects/devices/pda.ftl | 23 +- .../objects/devices/station_beacon.ftl | 3 + .../_prototypes/entities/objects/fun/toys.ftl | 2 +- .../entities/objects/misc/books.ftl | 3 + .../objects/misc/identification_cards.ftl | 17 +- .../objects/specific/chemical-containers.ftl | 48 +- .../objects/specific/chemistry-bottles.ftl | 64 ++- .../objects/specific/chemistry-vials.ftl | 9 +- .../entities/objects/specific/chemistry.ftl | 5 +- .../objects/specific/hydroponics/seeds.ftl | 8 + .../objects/specific/medical/healing.ftl | 42 +- .../objects/specific/salvage/scanner.ftl | 18 + .../entities/objects/specific/syndicate.ftl | 8 +- .../guns/ammunition/magazines/pistol.ftl | 2 +- .../weapons/guns/projectiles/projectiles.ftl | 4 +- .../entities/objects/weapons/melee/sword.ftl | 2 +- .../structures/doors/airlocks/access.ftl | 4 +- .../structures/doors/windoors/windoor.ftl | 110 ++-- .../machines/computers/computers.ftl | 6 +- .../entities/structures/machines/lathe.ftl | 2 + .../structures/shuttles/station_anchor.ftl | 11 + .../structures/specific/anomaly/anomalies.ftl | 5 + .../structures/specific/anomaly/cores.ftl | 6 + .../structures/storage/filing_cabinets.ftl | 24 +- .../structures/wallmounts/intercom.ftl | 8 +- .../structures/wallmounts/signs/signs.ftl | 4 +- .../entities/structures/walls/meteor.ftl | 29 + .../entities/structures/walls/railing.ftl | 16 +- .../structures/windows/reinforced.ftl | 2 - .../entities/structures/windows/window.ftl | 2 + .../en-US/_prototypes/gamerules/events.ftl | 8 +- .../en-US/_prototypes/gamerules/pests.ftl | 10 + .../gamerules/unknown_shuttles.ftl | 26 +- .../en-US/_prototypes/objectives/thief.ftl | 2 - .../procedural/themes/vgroidinterior.ftl | 2 + .../_sunrise/aphrodesiac/aphrodesiac.ftl | 3 - .../Locale/en-US/_strings/markings/cat.ftl | 2 - .../Locale/en-US/_strings/markings/ears.ftl | 1 - .../mind/commands/rename-command.ftl | 0 .../Locale/en-US/_strings/paint/paint.ftl | 8 - .../entities/clothing/ears/headsets.ftl | 1 - .../entities/clothing/head/helmets.ftl | 2 + .../entities/clothing/neck/mantles.ftl | 1 - .../entities/clothing/outerclothing/coats.ftl | 4 + .../entities/clothing/outerclothing/suits.ftl | 4 - .../entities/markers/spawners/jobs.ftl | 4 +- .../_sunrise/entities/mobs/aliens/clowns.ftl | 4 + .../objects/devices/identification_cards.ftl | 2 + .../_sunrise/entities/objects/devices/pda.ftl | 2 + .../_sunrise/entities/objects/fun/prunks.ftl | 16 + .../_sunrise/entities/objects/fun/toys.ftl | 12 + .../entities/objects/misc/pepper_spray.ftl | 10 + .../objects/specific/chemistry-bottles.ftl | 3 + .../guns/ammunition/cartridges/rifle.ftl | 4 + .../guns/ammunition/magazines/light_rifle.ftl | 26 +- .../guns/ammunition/magazines/magnum.ftl | 2 + .../guns/ammunition/magazines/pistol.ftl | 8 + .../guns/ammunition/magazines/rifle.ftl | 12 + .../guns/ammunition/projectiles/rifle.ftl | 2 + .../weapons/guns/battery/battery_guns.ftl | 5 +- .../objects/weapons/guns/biocode/biocode.ftl | 4 +- .../weapons/guns/launchers/launchers.ftl | 2 + .../objects/weapons/guns/pistols/pistols.ftl | 6 +- .../objects/weapons/guns/rifles/rifles.ftl | 6 +- .../weapons/guns/shotguns/shotguns.ftl | 6 +- .../structures/machines/telecomms.ftl | 3 + .../structures/machines/vending_machines.ftl | 6 +- .../structures/shuttles/thrusters.ftl | 4 + .../storage/closets/lockers/lockers.ftl | 6 + .../_prototypes/_sunrise/reagents/fun.ftl | 7 + .../_sunrise/reagents/narcotics.ftl | 2 + .../_sunrise/roles/antags/exterminator.ftl | 2 - .../_prototypes/_sunrise/store/presets.ftl | 2 + .../storage/closets/lockers/lockers.ftl | 6 - .../ru-RU/_prototypes/actions/station_ai.ftl | 8 + .../catalog/fills/boxes/emergency.ftl | 6 + .../catalog/fills/boxes/service.ftl | 2 + .../catalog/fills/boxes/syndicate.ftl | 2 + .../_prototypes/catalog/fills/items/misc.ftl | 6 + .../catalog/fills/paper/manuals.ftl | 4 + .../entities/clothing/back/backpacks.ftl | 3 + .../entities/clothing/eyes/glasses.ftl | 2 + .../entities/clothing/eyes/hud.ftl | 2 + .../clothing/hands/base_clothinghands.ftl | 6 + .../entities/clothing/hands/colored.ftl | 2 + .../entities/clothing/hands/rings.ftl | 12 +- .../clothing/head/hardsuit-helmets.ftl | 3 + .../entities/clothing/head/hats.ftl | 2 + .../entities/clothing/head/helmets.ftl | 12 + .../entities/clothing/head/hoods.ftl | 2 + .../entities/clothing/neck/mantles.ftl | 2 + .../entities/clothing/outerclothing/armor.ftl | 3 + .../clothing/outerclothing/hardsuits.ftl | 3 + .../entities/clothing/shoes/magboots.ftl | 2 + .../entities/clothing/uniforms/jumpskirts.ftl | 2 + .../entities/clothing/uniforms/jumpsuits.ftl | 2 + .../entities/markers/atmos_blocker.ftl | 3 + .../entities/markers/spawners/ghost_roles.ftl | 2 + .../entities/markers/spawners/mobs.ftl | 3 + .../spawners/random/salvage/spawners.ftl | 4 +- .../ru-RU/_prototypes/entities/mobs/base.ftl | 2 + .../entities/mobs/npcs/asteroid.ftl | 8 + .../_prototypes/entities/mobs/npcs/pets.ftl | 2 + .../_prototypes/entities/mobs/npcs/space.ftl | 10 + .../entities/mobs/player/humanoid.ftl | 2 - .../entities/mobs/player/observer.ftl | 2 + .../mobs/player/shuttleroles/roles.ftl | 128 +++++ .../mobs/player/shuttleroles/spawners.ftl | 139 +++++ .../entities/mobs/player/silicon.ftl | 51 +- .../entities/objects/base_contraband.ftl | 16 + .../consumable/drinks/drinks_flasks.ftl | 2 + .../objects/consumable/food/baked/bread.ftl | 4 + .../objects/consumable/food/baked/donut.ftl | 4 + .../objects/consumable/food/baked/misc.ftl | 2 + .../objects/consumable/food/baked/pizza.ftl | 4 + .../objects/consumable/food/ingredients.ftl | 6 + .../entities/objects/consumable/food/meat.ftl | 4 + .../objects/consumable/food/produce.ftl | 21 + .../entities/objects/consumable/food/soup.ftl | 2 + .../devices/circuitboards/computer.ftl | 2 + .../circuitboards/machine/production.ftl | 4 + .../entities/objects/devices/pda.ftl | 20 + .../objects/devices/station_beacon.ftl | 3 + .../entities/objects/materials/materials.ftl | 18 + .../objects/materials/sheets/other.ftl | 3 + .../entities/objects/misc/books.ftl | 3 + .../objects/misc/identification_cards.ftl | 2 + .../entities/objects/misc/paper.ftl | 2 + .../_prototypes/entities/objects/misc/pen.ftl | 2 + .../entities/objects/misc/rubber_stamp.ftl | 2 + .../entities/objects/shields/shields.ftl | 3 + .../objects/specific/chemistry-bottles.ftl | 28 + .../objects/specific/chemistry-vials.ftl | 7 + .../entities/objects/specific/chemistry.ftl | 1 + .../objects/specific/hydroponics/leaves.ftl | 4 + .../objects/specific/hydroponics/seeds.ftl | 19 + .../objects/specific/medical/healing.ftl | 14 + .../objects/specific/salvage/scanner.ftl | 18 + .../weapons/guns/battery/battery_guns.ftl | 2 +- .../weapons/guns/projectiles/projectiles.ftl | 12 +- .../objects/weapons/melee/e_sword.ftl | 2 + .../weapons/throwable/throwing_stars.ftl | 2 + .../structures/doors/windoors/windoor.ftl | 36 ++ .../entities/structures/furniture/toilet.ftl | 8 + .../_prototypes/entities/structures/gates.ftl | 4 + .../machines/computers/computers.ftl | 2 + .../entities/structures/machines/lathe.ftl | 2 + .../structures/shuttles/station_anchor.ftl | 11 + .../structures/specific/anomaly/anomalies.ftl | 5 + .../structures/specific/anomaly/cores.ftl | 6 + .../entities/structures/specific/xeno.ftl | 6 + .../structures/storage/filing_cabinets.ftl | 4 + .../structures/wallmounts/intercom.ftl | 2 + .../structures/wallmounts/signs/signs.ftl | 6 + .../entities/structures/walls/meteor.ftl | 29 + .../entities/structures/walls/railing.ftl | 2 + .../entities/structures/walls/walls.ftl | 3 + .../structures/windows/plastitanium.ftl | 17 +- .../structures/windows/reinforced.ftl | 2 - .../entities/structures/windows/window.ftl | 2 + .../ru-RU/_prototypes/gamerules/events.ftl | 12 +- .../_prototypes/gamerules/meteorswarms.ftl | 8 + .../ru-RU/_prototypes/gamerules/midround.ftl | 4 + .../ru-RU/_prototypes/gamerules/pests.ftl | 10 + .../gamerules/random_sentience.ftl | 2 + .../_prototypes/gamerules/roundstart.ftl | 4 + .../gamerules/unknown_shuttles.ftl | 24 + .../ru-RU/_prototypes/objectives/thief.ftl | 2 + .../ru-RU/_prototypes/objectives/traitor.ftl | 2 + .../procedural/themes/vgroidinterior.ftl | 2 + .../_sunrise/advertisements/honkers.ftl | 10 + .../_sunrise/aphrodesiac/aphrodesiac.ftl | 3 - .../_strings/_sunrise/carrying/carry.ftl | 3 + .../ru-RU/_strings/_sunrise/disease/shop.ftl | 28 + .../_strings/_sunrise/guidebook/guides.ftl | 1 + .../Locale/ru-RU/_strings/_sunrise/guns.ftl | 52 +- .../_strings/_sunrise/job/department-desc.ftl | 1 - .../_strings/_sunrise/job/department.ftl | 1 - .../ru-RU/_strings/_sunrise/job/job-desc.ftl | 2 +- .../_sunrise/objectives/terminate.ftl | 1 - .../station-goal/station-goal-component.ftl | 2 +- .../_sunrise/store/uplink-silent-catalog.ftl | 4 + .../Locale/ru-RU/_strings/accent/accents.ftl | 6 + .../Locale/ru-RU/_strings/accent/skeleton.ftl | 24 + .../ru-RU/_strings/accessories/human-hair.ftl | 2 + .../commands/add-uplink-command.ftl | 1 + .../commands/custom-vote-command.ftl | 4 + .../administration/commands/erase.ftl | 6 + .../administration/commands/respawn.ftl | 7 + .../advertisements/vending/bruiseomat.ftl | 43 ++ .../Locale/ru-RU/_strings/alerts/alerts.ftl | 2 + .../_strings/atmos/atmos-alerts-console.ftl | 29 + .../communications-console-component.ftl | 1 + .../components/station-anchor-component.ftl | 2 + .../_strings/devices/network-configurator.ftl | 6 + .../_strings/flavors/flavor-profiles.ftl | 9 +- .../ru-RU/_strings/forensics/fibers.ftl | 2 + .../_strings/game-ticking/game-ticker.ftl | 4 + .../ghost/roles/ghost-role-component.ftl | 64 +++ .../ru-RU/_strings/guardian/guardian.ftl | 1 + .../guidebook/chemistry/statuseffects.ftl | 1 + .../ru-RU/_strings/job/department-desc.ftl | 1 + .../Locale/ru-RU/_strings/job/department.ftl | 1 + .../Locale/ru-RU/_strings/job/job-names.ftl | 2 + .../lathe/components/lathe-component.ftl | 1 + .../ru-RU/_strings/lathe/lathe-categories.ftl | 3 + .../Locale/ru-RU/_strings/markings/gauze.ftl | 2 + .../Locale/ru-RU/_strings/markings/moth.ftl | 2 + .../ru-RU/_strings/mass-media/news-ui.ftl | 1 + Resources/Locale/ru-RU/_strings/mech/mech.ftl | 1 + .../components/health-analyzer-component.ftl | 2 +- .../_strings/mind/commands/rename-command.ftl | 5 + .../navmap-beacons/station-beacons.ftl | 1 + .../ru-RU/_strings/nuke/nuke-component.ftl | 1 + .../nutrition/components/food-sequence.ftl | 7 + .../objectives/commands/addobjectives.ftl | 10 + .../conditions/steal-target-groups.ftl | 62 +++ .../_strings/objectives/conditions/steal.ftl | 15 +- .../objectives/conditions/terminate.ftl | 1 + .../ru-RU/_strings/paper/paper-misc.ftl | 44 ++ .../components/power-charging-component.ftl | 24 + .../_strings/preferences/loadout-groups.ftl | 1 + .../_strings/prototypes/roles/antags.ftl | 2 + .../_strings/reagents/meta/chemicals.ftl | 2 + .../reagents/meta/consumable/drink/juice.ftl | 2 + .../Locale/ru-RU/_strings/replays/replays.ftl | 1 + .../Locale/ru-RU/_strings/seeds/seeds.ftl | 10 + .../ru-RU/_strings/shuttles/emergency.ftl | 1 + .../Locale/ru-RU/_strings/species/species.ftl | 1 + .../station-events/events/ion-storm.ftl | 1 + .../ru-RU/_strings/station-laws/laws.ftl | 45 ++ .../ru-RU/_strings/store/categories.ftl | 1 + .../Locale/ru-RU/_strings/store/store.ftl | 2 + .../ru-RU/_strings/store/uplink-catalog.ftl | 2 + .../Locale/ru-RU/_strings/traits/traits.ftl | 4 + .../ru-RU/_strings/wires/wire-names.ftl | 1 + .../xenoarchaeology/artifact-hints.ftl | 1 + .../_prototypes/reagents/narcotics.ftl | 2 - .../Entities/Objects/Devices/pda.yml | 2 +- .../Objects/Misc/subdermal_implants.yml | 2 +- .../Objects/Specific/Robotics/mmi.yml | 11 +- .../Entities/Objects/Specific/syndicate.yml | 21 +- .../Entities/Structures/Machines/jukebox.yml | 10 +- .../Prototypes/GameRules/unknown_shuttles.yml | 2 +- Resources/Prototypes/Guidebook/antagonist.yml | 1 + .../Prototypes/Recipes/Reactions/medicine.yml | 26 +- .../_Sunrise/Body/Prototypes/clowns.yml | 28 + .../Body/{ => Prototypes}/felinid.yml | 0 .../Body/{ => Prototypes}/humanoid_xeno.yml | 0 .../Body/{ => Prototypes}/predator.yml | 0 .../Body/{ => Prototypes}/silicons.yml | 0 .../_Sunrise/Body/{ => Prototypes}/swine.yml | 0 .../Body/{ => Prototypes}/tajaran.yml | 0 .../Body/{ => Prototypes}/vulpkanin.yml | 0 .../Inventories/hohohonkers.yml | 10 + .../VendingMachines/advertisements.yml | 6 + .../Catalog/uplink_silent_catalog.yml | 524 ++++++++++++++++++ .../_Sunrise/Entities/Mobs/Aliens/clowns.yml | 242 ++++++++ .../Entities/Mobs/Player/ghost_themes.yml | 24 + .../_Sunrise/Entities/Objects/Fun/prunks.yml | 303 ++++++++++ .../Objects/Specific/chemistry-bottles.yml | 15 + .../Structures/Machines/vending_machines.yml | 32 ++ .../Structures/Shuttles/thrusters.yml | 44 +- .../_Sunrise/Guidebook/antagonist.yml | 4 + .../clowns_inventory_template.yml | 76 +++ Resources/Prototypes/_Sunrise/Maps/bagel.yml | 2 +- Resources/Prototypes/_Sunrise/Maps/box.yml | 2 +- Resources/Prototypes/_Sunrise/Maps/delta.yml | 2 +- Resources/Prototypes/_Sunrise/Maps/fland.yml | 2 +- .../Prototypes/_Sunrise/Maps/marathon.yml | 2 +- .../_Sunrise/Objectives/stealTargetGroups.yml | 4 +- .../_Sunrise/Polymorphs/polymorph.yml | 13 + .../Prototypes/_Sunrise/Reagents/fun.yml | 20 + .../_Sunrise/Reagents/narcotics.yml | 2 +- .../_Sunrise/SoundCollections/misc.yml | 4 + .../Prototypes/_Sunrise/Store/categories.yml | 27 + .../Prototypes/_Sunrise/Store/presets.yml | 23 + .../_Sunrise/Voice/speech_emote_sounds.yml | 8 + .../_Sunrise/Voice/speech_sounds.yml | 9 + Resources/Prototypes/_Sunrise/roadmap.yml | 10 +- .../Guidebook/Antagonist/Disease.xml | 87 +++ .../Guidebook/Antagonist/MinorAntagonists.xml | 12 + .../ServerInfo/Guidebook/Engineering/TEG.xml | 22 +- Resources/ServerInfo/Guidebook/Jobs.xml | 2 +- Resources/Textures/Logo/icon/icon-16x16.png | Bin 924 -> 508 bytes Resources/Textures/Logo/logo-ru.png | Bin 17757 -> 55786 bytes .../Objects/Storage/boxes.rsi/meta.json | 2 +- .../Structures/Wallmounts/signs.rsi/meta.json | 2 +- .../Mobs/Aliens/clown_goblin.rsi/goblin.png | Bin 0 -> 1565 bytes .../Mobs/Aliens/clown_goblin.rsi/icon.png | Bin 0 -> 812 bytes .../Mobs/Aliens/clown_goblin.rsi/meta.json | 18 + .../hohohonkers.rsi/broken.png | Bin 0 -> 795 bytes .../hohohonkers.rsi/deny-unshaded.png | Bin 0 -> 486 bytes .../hohohonkers.rsi/eject-unshaded.png | Bin 0 -> 436 bytes .../VendingMachines/hohohonkers.rsi/meta.json | 53 ++ .../hohohonkers.rsi/normal-unshaded.png | Bin 0 -> 303 bytes .../VendingMachines/hohohonkers.rsi/off.png | Bin 0 -> 495 bytes .../VendingMachines/hohohonkers.rsi/panel.png | Bin 0 -> 153 bytes .../Shuttles/big_thruster.rsi/red_thrust.png | Bin 4827 -> 4703 bytes .../Shuttles/huge_thruster.rsi/meta.json | 148 ++++- .../Shuttles/huge_thruster.rsi/red_thrust.png | Bin 0 -> 6384 bytes .../red_thrust_burn_unshaded.png | Bin 0 -> 8389 bytes .../Shuttles/huge_thruster.rsi/thrust.png | Bin 0 -> 6537 bytes .../thrust_burn_unshaded.png | Bin 0 -> 8463 bytes Tools/_sunrise/en_syntax_finder.py | 10 +- 354 files changed, 4229 insertions(+), 478 deletions(-) create mode 100644 Resources/Locale/en-US/_prototypes/_sunrise/entities/mobs/aliens/clowns.ftl create mode 100644 Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/prunks.ftl create mode 100644 Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/pepper_spray.ftl create mode 100644 Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/telecomms.ftl create mode 100644 Resources/Locale/en-US/_prototypes/_sunrise/reagents/fun.ftl create mode 100644 Resources/Locale/en-US/_prototypes/_sunrise/store/presets.ftl create mode 100644 Resources/Locale/en-US/_prototypes/actions/station_ai.ftl create mode 100644 Resources/Locale/en-US/_prototypes/entities/mobs/player/shuttleroles/roles.ftl create mode 100644 Resources/Locale/en-US/_prototypes/entities/mobs/player/shuttleroles/spawners.ftl create mode 100644 Resources/Locale/en-US/_prototypes/entities/objects/specific/salvage/scanner.ftl create mode 100644 Resources/Locale/en-US/_prototypes/entities/structures/shuttles/station_anchor.ftl create mode 100644 Resources/Locale/en-US/_prototypes/entities/structures/walls/meteor.ftl create mode 100644 Resources/Locale/en-US/_prototypes/gamerules/pests.ftl create mode 100644 Resources/Locale/en-US/_prototypes/procedural/themes/vgroidinterior.ftl delete mode 100644 Resources/Locale/en-US/_strings/markings/cat.ftl delete mode 100644 Resources/Locale/en-US/_strings/markings/ears.ftl rename Resources/Locale/en-US/{ => _strings}/mind/commands/rename-command.ftl (100%) delete mode 100644 Resources/Locale/en-US/_strings/paint/paint.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/entities/mobs/aliens/clowns.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/prunks.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/pepper_spray.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/telecomms.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/fun.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/narcotics.ftl delete mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/roles/antags/exterminator.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/store/presets.ftl delete mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/structures/storage/closets/lockers/lockers.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/actions/station_ai.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/entities/mobs/player/shuttleroles/roles.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/entities/mobs/player/shuttleroles/spawners.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/entities/objects/specific/salvage/scanner.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/entities/structures/shuttles/station_anchor.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/entities/structures/walls/meteor.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/gamerules/pests.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/gamerules/random_sentience.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/procedural/themes/vgroidinterior.ftl create mode 100644 Resources/Locale/ru-RU/_strings/_sunrise/advertisements/honkers.ftl create mode 100644 Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl delete mode 100644 Resources/Locale/ru-RU/_strings/_sunrise/objectives/terminate.ftl create mode 100644 Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-silent-catalog.ftl create mode 100644 Resources/Locale/ru-RU/_strings/accent/skeleton.ftl create mode 100644 Resources/Locale/ru-RU/_strings/administration/commands/erase.ftl create mode 100644 Resources/Locale/ru-RU/_strings/administration/commands/respawn.ftl create mode 100644 Resources/Locale/ru-RU/_strings/advertisements/vending/bruiseomat.ftl create mode 100644 Resources/Locale/ru-RU/_strings/atmos/atmos-alerts-console.ftl create mode 100644 Resources/Locale/ru-RU/_strings/components/station-anchor-component.ftl create mode 100644 Resources/Locale/ru-RU/_strings/mind/commands/rename-command.ftl create mode 100644 Resources/Locale/ru-RU/_strings/objectives/commands/addobjectives.ftl create mode 100644 Resources/Locale/ru-RU/_strings/objectives/conditions/steal-target-groups.ftl create mode 100644 Resources/Locale/ru-RU/_strings/objectives/conditions/terminate.ftl create mode 100644 Resources/Locale/ru-RU/_strings/power/components/power-charging-component.ftl delete mode 100644 Resources/Locale/ru-RU/_sunrise/_prototypes/reagents/narcotics.ftl create mode 100644 Resources/Prototypes/_Sunrise/Body/Prototypes/clowns.yml rename Resources/Prototypes/_Sunrise/Body/{ => Prototypes}/felinid.yml (100%) rename Resources/Prototypes/_Sunrise/Body/{ => Prototypes}/humanoid_xeno.yml (100%) rename Resources/Prototypes/_Sunrise/Body/{ => Prototypes}/predator.yml (100%) rename Resources/Prototypes/_Sunrise/Body/{ => Prototypes}/silicons.yml (100%) rename Resources/Prototypes/_Sunrise/Body/{ => Prototypes}/swine.yml (100%) rename Resources/Prototypes/_Sunrise/Body/{ => Prototypes}/tajaran.yml (100%) rename Resources/Prototypes/_Sunrise/Body/{ => Prototypes}/vulpkanin.yml (100%) create mode 100644 Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/hohohonkers.yml create mode 100644 Resources/Prototypes/_Sunrise/Catalog/uplink_silent_catalog.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Mobs/Aliens/clowns.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Fun/prunks.yml create mode 100644 Resources/Prototypes/_Sunrise/Guidebook/antagonist.yml create mode 100644 Resources/Prototypes/_Sunrise/InventoryTemplates/clowns_inventory_template.yml create mode 100644 Resources/Prototypes/_Sunrise/SoundCollections/misc.yml create mode 100644 Resources/Prototypes/_Sunrise/Store/presets.yml create mode 100644 Resources/ServerInfo/Guidebook/Antagonist/Disease.xml create mode 100644 Resources/Textures/_Sunrise/Mobs/Aliens/clown_goblin.rsi/goblin.png create mode 100644 Resources/Textures/_Sunrise/Mobs/Aliens/clown_goblin.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Mobs/Aliens/clown_goblin.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Structures/Machines/VendingMachines/hohohonkers.rsi/broken.png create mode 100644 Resources/Textures/_Sunrise/Structures/Machines/VendingMachines/hohohonkers.rsi/deny-unshaded.png create mode 100644 Resources/Textures/_Sunrise/Structures/Machines/VendingMachines/hohohonkers.rsi/eject-unshaded.png create mode 100644 Resources/Textures/_Sunrise/Structures/Machines/VendingMachines/hohohonkers.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Structures/Machines/VendingMachines/hohohonkers.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_Sunrise/Structures/Machines/VendingMachines/hohohonkers.rsi/off.png create mode 100644 Resources/Textures/_Sunrise/Structures/Machines/VendingMachines/hohohonkers.rsi/panel.png create mode 100644 Resources/Textures/_Sunrise/Structures/Shuttles/huge_thruster.rsi/red_thrust.png create mode 100644 Resources/Textures/_Sunrise/Structures/Shuttles/huge_thruster.rsi/red_thrust_burn_unshaded.png create mode 100644 Resources/Textures/_Sunrise/Structures/Shuttles/huge_thruster.rsi/thrust.png create mode 100644 Resources/Textures/_Sunrise/Structures/Shuttles/huge_thruster.rsi/thrust_burn_unshaded.png diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs index 812f2de3a0..2dd7ec3c19 100644 --- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs +++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs @@ -8,6 +8,7 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Timing; +using Robust.Shared.Prototypes; namespace Content.Client.Administration.UI.ManageSolutions { @@ -189,12 +190,15 @@ namespace Content.Client.Administration.UI.ManageSolutions { var box = new BoxContainer(); var spin = new FloatSpinBox(1, 2); + + var prototypeManager = IoCManager.Resolve(); + var reagentPrototype = prototypeManager.Index(reagentQuantity.Reagent.Prototype); spin.Value = reagentQuantity.Quantity.Float(); spin.OnValueChanged += (args) => SetReagent(args, reagentQuantity.Reagent.Prototype); spin.HorizontalExpand = true; - box.AddChild(new Label() { Text = reagentQuantity.Reagent.Prototype , HorizontalExpand = true}); + box.AddChild(new Label() { Text = reagentPrototype.LocalizedName , HorizontalExpand = true}); box.AddChild(spin); ReagentList.AddChild(box); diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml index 469faf209d..dd3ffd3607 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml @@ -5,15 +5,15 @@ -