Vigers Ray
ee21d08199
Нерф и фикс баннихопа
2025-01-06 23:48:07 +03:00
Vigers Ray
502811b5c8
Много говна
2025-01-04 06:03:21 +03:00
haiwwkes
25b439a971
реверт чатстака на время фиксов ( #947 )
...
* Revert "a (#939 )"
This reverts commit 3239865364#935 )"
This reverts commit 79fd150bf0
2024-12-27 18:29:14 +03:00
haiwwkes
3239865364
a ( #939 )
2024-12-27 02:41:35 +03:00
haiwwkes
79fd150bf0
Chat Stack ( #935 )
2024-12-26 21:16:44 +03:00
haiwwkes
5192d120ea
Новая панель эмоутов. ( #891 )
...
* wacky
* work
* work
* work
* work
* eff
* a
2024-12-24 23:27:09 +03:00
Vigers Ray
6f1366814f
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
2024-12-14 21:22:31 +03:00
Southbridge
7eb714d38f
Monospace Support for Rich Text ( #33830 )
...
* Initial Commit
* Moved all this to SS14 on it's own
* Added prototype validation
2024-12-13 15:24:34 +01:00
Vigers Ray
46d1ed8cc6
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/labeler.yml
# Content.Client/Lobby/LobbyUIController.cs
# Resources/Locale/en-US/_strings/movement/pulling.ftl
2024-12-09 23:32:58 +03:00
deathride58
5ab8e467a5
Adds an introductory message to the user-facing ahelp chat window ( #33348 )
...
* Adds an introductory message to the user-facing ahelp chat window
* Update Resources/Locale/en-US/administration/bwoink.ftl
* Update Resources/Locale/en-US/administration/bwoink.ftl
---------
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
2024-12-09 09:54:23 +01:00
Errant
0c4dd9d1b9
Revert "Simplify separated screen top menu ( #33047 )" (Stable -> Master) ( #33785 )
2024-12-08 22:14:34 +01:00
Vasilis The Pikachu
8472603b76
Revert "Simplify separated screen top menu ( #33047 )"
...
This reverts commit f27fa1ed30
2024-12-08 21:36:48 +01:00
SpaceManiac
20be8298b7
Organize the Sandbox Panel window ( #33684 )
...
* Organize Sandbox Panel
* Map Editing -> Editing
* Unset ToggleMode on Suicide button. Can hardly un-suicide, no?
* Remove 'Link machines' button that has done nothing for 3 years
* Remember Sandbox window's position instead of forcing to center
* Shows Spawns -> Show Spawns
* Remove SandboxSystem.MachineLinking
2024-12-07 19:13:56 +01:00
Vigers Ray
e99ff5dc82
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Resources/Prototypes/Entities/Structures/Machines/nuke.yml
# Resources/migration.yml
2024-12-01 18:21:33 +03:00
Plykiya
450bf813b8
Fix for inspecting entities in hand ( #33642 )
...
Actually inspect entity in hands
2024-11-30 17:14:39 +01:00
Vigers Ray
dbfa90e956
Звуковое оповещение новых ролей для призраков и вынос правил в отдельную кнопку.
2024-11-29 04:35:28 +03:00
Vigers Ray
0c1e15e516
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Info/LinkBanner.cs
# Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl
# Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
2024-11-26 17:50:59 +03:00
Intoxicating-Innocence
d5225d1f46
Ghost role drop-down alignment ( #33397 )
...
* dropdown shares margin width with children
* removed dependency that rider added for some reason
* reduced vertical margin from 8 to 2
2024-11-26 09:28:31 +01:00
metalgearsloth
f27fa1ed30
Simplify separated screen top menu ( #33047 )
2024-11-26 01:59:34 +01:00
Nikolai Korolev
ea7f5433ac
Fix RA0003 warning for ChatBox ( #33531 )
2024-11-25 22:53:12 +11:00
Vigers Ray
1c05542382
Фикс гост ролей с требованиями
2024-11-20 19:30:45 +03:00
Vigers Ray
8d0ab85920
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Resources/Locale/en-US/_strings/clothing/components/magboots-component.ftl
# Resources/Locale/en-US/_strings/singularity/components/generator-component.ftl
# Resources/Prototypes/Datasets/Names/borer.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
# Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
# Resources/migration.yml
2024-11-20 17:50:33 +03:00
SlamBamActionman
89392e2424
Remove drag & drop dropping items from containers ( #32706 )
...
* Initial commit
* Update based on maintainer discussion
* Forgot to remove this woops
2024-11-20 12:00:38 +11:00
Vigers Ray
38889342ad
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Shared/Weapons/Ranged/Components/GunComponent.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
2024-11-13 04:35:52 +03:00
MilenVolf
cc3a19c212
Collapsible ghost roles menu ( #32717 )
...
* Make ghost roles collapsible
* Save `BodyVisible` state of each `Collapsible` box
* Make ghost role collapsible only when group has more than 1 role
* Make it a little prettier
* Make only ghost role buttons collapsible
* Apply requested changes
* Typo
* Small cleanup
* Store in list, instead of iterating
* Make unique ids more unique
* Move it out of the cycle
* Make _collapsibleBoxes into dictionary and use key instead of Collapsible boxes names
Added TODO. So after the problem will be fixed in `GhostRolesEui`, it should be mirrored and fixed here too.
* Put TODO in GhostRolesEui. I guess Issue must be made for this
* Use HashSet instead of Dictionary as suggested. Invert the HashSet, so being present means it uncollapsed
I decided to invert HashSet to _uncollapsedStates, because players surely will have more collapsed buttons than opened, so we optimise memory usage a little bit.
* Remove extra space from ghost roles window
* Add buttons stretching. Size 3:1
2024-11-04 01:49:42 +01:00
Vigers Ray
389ed704e1
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
# Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
# Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
# Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Resources/Audio/Ambience/Antag/attributions.yml
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
# Resources/Locale/en-US/_strings/shuttles/commands.ftl
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
# Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# RobustToolbox
2024-10-30 13:26:32 +03:00
metalgearsloth
94e686ca9c
Fix separated game screen bumping ( #33046 )
...
I don't really understand why RecordedSplitContainer exists but removing it looks identical and fixes the panel bumping occasionally.
2024-10-29 16:07:57 +11:00
VigersRay
839257dba8
Провиль и привязка через лобби.
2024-10-11 23:44:48 +03:00
VigersRay
b8633c71f3
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-10-03 17:25:09 +03:00
eoineoineoin
a8982b88af
Allow users to drag-reorder action bar ( #32552 )
...
* Avoid rebuilding all buttons on action state change
Allows for drag events to continue when actions change
* Remove excess action buttons
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-10-03 16:01:01 +02:00
VigersRay
73c323bd9a
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/LobbyGui.xaml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
2024-09-21 06:29:09 +03:00
Winkarst
0093fce5b4
Dialog windows now grab the keyboard focus ( #31294 )
...
* Dialog windows now grab the keyboard focus
* Comment
2024-09-20 00:01:54 +10:00
Rinary
64f1aed90c
Большие изменения ( #345 )
...
* 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
2024-09-16 19:05:38 +03:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
godisdeadLOL
a25132ed5d
Actions bar dynamic resizing ( #31759 )
...
* action bar dynamic resizing
* action bar dynamic resizing for separated style
* decreased indent for separated style
---------
Co-authored-by: YourUsername <you@example.com>
2024-09-02 15:12:11 -04:00
Winkarst
88dcc831c1
Remove calls to FormattedMessage obsolete methods ( #31706 )
...
* Remove FormattedMessage obsolete methods
* Oops
2024-09-01 13:00:53 +02:00
VigersRay
1f5e68029a
фиксы лобби
2024-08-31 01:52:48 +03:00
VigersRay
2cf61843ed
Фикс дебаг сборки
2024-08-28 21:31:46 +03:00
VigersRay
9328f4d9cb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/UserInterface/ActivatableUIComponent.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# SpaceStation14.sln
2024-08-28 19:12:01 +03:00
12rabbits
367cdfd439
Make guidebook remember where you left off ( #31375 )
...
* Guidebook tracks last read entry
* Persistent guidebook fixes
* Persistent guidebook requested changes
* Update Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2024-08-27 01:06:54 +02:00
metalgearsloth
2e1b486e8b
Add BUI ctor tests ( #31463 )
...
5 lines of eaten iocmanager.injectdependencies led to this.
2024-08-26 17:39:48 +10:00
metalgearsloth
2e029a7d5b
Action stuff ( #31305 )
...
* Action stuff
- Cleanup some event stuff
- Avoid dirtying entity unnecessarily
- Add ActionGrant as an easy way to apply / remove actions via compregistry.
* Fix merge
2024-08-25 22:43:31 +10:00
metalgearsloth
948bb726de
Run actions on press ( #31191 )
...
I know UI generallys want to do stuff on key-up not key-down. With that being said the delay on release for these is noticeable.
e.g.
ActivateInWorld / UseInHand / any in-world interactions are on-press. This is especially noticeable if you have the same event on action + verb.
2024-08-25 22:36:22 +10:00
SlamBamActionman
61a1e89339
Add codeword highlighting ( #30092 )
...
* Added codeword highlighting
* Updated to support more codeword roles, color is set serverside
* Review feedback
* Change to a Component-based system using SessionSpecific
* Tidied up CanGetState, set Access restrictions on component
* Clean-up
* Makes the injection ignore brackets, restore some codewords, remove "Taste/Touch" from adjectives
2024-08-23 11:14:38 +02:00
metalgearsloth
f7e08ec343
Station AI overlay ( #31335 )
...
Split
2024-08-22 23:13:47 -06:00
metalgearsloth
6553fd3d6e
Fix inventory GUI for non-inventory entities ( #31306 )
...
Default to invisible and only set visible if itemslots gets initialised.
2024-08-22 13:05:17 -04:00
Rinary
0cad3450c8
Фиксы ( #291 )
...
* init
* fix fax
2024-08-17 16:44:01 +03:00
VigersRay
afe7f25a2b
Фикс открытия ролей, повышение пенсионного возраста... Ой, требований возраста для командования.
2024-08-15 00:26:50 +03:00
Rinary
05aeb44b14
[RU] Полный перевод ( #236 )
...
* init
* fax translate
* translate
* translate cargo panel
* road map translate
* Fix cargo panel | fix bot craft translate
* fix, steal objectives translate
* do not break my not localized fax!
* fix
* radio guide translate
* Better DefaultRules
* Translate Criminal Records
* Space luw fully translate excluding CrimeList(need to rework)
* Some Guidebook translate
* Перевод глоссария, некоторые термины были переписанны под РУ комьюнити игры, некоторые к сожелению остались прежними
* Fix
* fix, translate
* Обновил структуру SpeakOnUIClosed, пофиксил перевод автоматов
* update and fix
* fully translate
* fix
* not fail but warn
* fix
* fix2
* фикс уже переведённого дерьма от корвахов
* Добавил термин подов в глоссарий
* roles translate fix
* Сикей в глоссарий
* Delete Resources/Locale/ru-RU/_sunrise/info/character-info.ftl
* remove cluster from pool
* new translation
* fully translate borgs
* some fixes
* Mr.Chang moment
* upd
* upd
* upd
* hotfix
* big fix
* fix some hardcode lang
* oh no shitcode language
* some translation
* some actions| admin commands translate start
* some new translation
* fully translate commands | figurines | chat-repo
* upd
* second upd
* upd
* start translating items
* some fixes
* translate wackpack
Из-за игры слов, я не смог нормально интерпритировать это дерьмо, так что пусть будет так, да теряется смысл и смешинка, но извините, я не смог как-то придумать игру слов
* translate
* debug translate
* upd
* Актуализация всего перевода
* fix
* fix
* upd
* some fixes | guns to his folders
* upd
* upd
* upd
* upd
* upd
* upd
* Перевод меток атмоса
* Последние коррективы
* fix
* some hardcode localization fix
* fix
* some fixes
* stats entry fully translate
* upd
* some fixes
* translate server side stats entry
* fix
* fix
* fix2
* fix
* upd
* upd
* fix
* holly shit
* fix
* totaly feed
* upd
* upd
* fix
* upd
* init
* upd
* upd
* access in prototypes
* Sunrise comments on code
* my bad
* я даун
2024-08-14 21:44:32 +03:00
VigersRay
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
# Resources/migration.yml
2024-08-14 19:55:44 +03:00
