rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
27999 commits 1 branch 0 tags 1.2 GiB
Commit graph

273 commits

Author SHA1 Message Date
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
ShadowCommander
1df84515c7
Add EntityWorldTargetAction (#29819) 
* Add EntityWorldTargetAction initial implementation

* Update obsolete methods

* Partially working EntityWorldTargetAction

* Fix entity selection

* Move and clean up AfterInteract

* Fix building new walls

* Readd no entity or coordinates error

* Consolidate action validation code

* Add summaries to component

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-08-08 12:47:08 +03:00
VigersRay
a33b949c98 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Prototypes/Maps/train.yml
 2024-08-07 22:57:31 +03:00
Plykiya
a87efd7d01
Replace xform.WorldPosition with xformSystem method for Setting/Getting (#30029) 
* GET WORLD POSITON, ROTATION

* Missing parentheses

* ui system depndency

* the issue

* Unused

* Let the function do the transform

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-08-06 21:02:01 +10:00
VigersRay
c0ee7e3cc9 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Lobby/LobbyUIController.cs
#	Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
#	Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
#	Content.Shared/Roles/JobRequirements.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
#	Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
#	Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
#	Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
#	Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
#	Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
#	Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
#	Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
#	Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
#	Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
#	Resources/Prototypes/Recipes/Lathes/medical.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Command/captain.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
#	Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
#	Resources/Textures/Structures/Power/apc.rsi/base.png
#	Resources/Textures/Structures/Power/apc.rsi/broken.png
#	Resources/Textures/Structures/Power/apc.rsi/display-charging.png
#	Resources/Textures/Structures/Power/apc.rsi/display-full.png
#	Resources/Textures/Structures/Power/apc.rsi/display-lack.png
#	Resources/Textures/Structures/Power/apc.rsi/display-remote.png
#	Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
#	Resources/Textures/Structures/Power/apc.rsi/frame.png
#	Resources/Textures/Structures/Power/apc.rsi/static.png
 2024-08-05 17:22:05 +03:00
Ed
a95d2257c3
JobRequirement refactor (#30347) 
* refactor JobRequirements

* add profile support

* fix

* Update quartermaster.yml

* sloth fixes

* inport 30208

* Update DepartmentPrototype.cs

* species restriction

* left tweak stick

* stringbuilder is cool!
 2024-08-05 14:25:49 +10:00
DrSmugleaf
54d5bd266c
Add mapping editor (#23427) 
* Add mapping editor (#757)

* Remove mapping actions, never again

* Cleanup actions system

* Jarvis, remove all references to CM14

* Fix InventoryUIController crashing when an InventoryGui is not found

* Rename mapping1 to mapping

* Clean up context calls

* Add doc comments

* Add delegate for hiding decals in the mapping screen

* Jarvis mission failed

* a

* Add test

* Fix not flushing save stream in mapping manager

* change

* Fix verbs

* fixes

* localise

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2024-08-04 13:31:45 +10:00
Vigers Ray
bb2e9f677e
Коллективный разум (#248) 
* Коллективный разум

* Колективный разум гуманоидному ксеносу
 2024-07-27 12:09:05 +03:00
VigersRay
d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
#	Resources/Textures/Structures/Walls/mining.rsi/meta.json
 2024-07-22 04:16:05 +03:00
metalgearsloth
b41c6a28fe
Reset ghost role menu scroll upon search (#30159) 
Quality of life so it doesn't sit on your old spot anymore.
 2024-07-21 02:38:45 -04:00
metalgearsloth
edb05e36bb
Reapply "Remove some BUI boilerplate" (#30214) (#30219) 
* Reapply "Remove some BUI boilerplate" (#30214)

This reverts commit cb0ba66be3.

* Fix gas tank

* Fix PA

* Fix microwave

* Comms console underwrap

* Fix rcd

* log wehs
 2024-07-21 14:48:13 +10:00
Nemanja
cb0ba66be3
Revert "Remove some BUI boilerplate" (#30214) 
Revert "Remove some BUI boilerplate (#28399)"

This reverts commit cbf329a82d.
 2024-07-20 20:42:27 -04:00
metalgearsloth
cbf329a82d
Remove some BUI boilerplate (#28399) 
* Remove some BUI boilerplate

- The disposals overrides got removed due to the helper method handling it.
- Replace window creation with CreateWindow helper.
- Fixed some stinky code which would cause exceptions.

* More

* moar

* weh

* done

* More BUIs

* More updates

* weh

* moar

* look who it is

* weh

* merge

* weh

* fixes
 2024-07-20 15:40:16 +10:00
VigersRay
a8e5e66277 Апстрим 2024-07-18 17:07:25 +03:00
Ed
d8ab4982ad
Character menu issuer localization (#29840) 
* Update CharacterUIController.cs

* TODO Burn this shit

* huh?

* huh!

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2024-07-17 08:47:50 +03:00
VigersRay
5fed5ad979 Куча разного говна которое давно должно было в билде. 2024-07-15 01:22:56 +03:00
Vigers Ray
1d7a75070c
Roadmap (#188) 
* Копипаст смуглефа

* Дорожная карта санрайза

* Мелкие фиксы

* Небольшие фиксы

---------

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2024-07-12 04:13:29 +03:00
VigersRay
bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Resources/Locale/en-US/chemistry/components/mixing-component.ftl
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Recipes/Crafting/crates.yml
#	Resources/ServerInfo/Guidebook/Mobs/Diona.xml
#	Resources/ServerInfo/Guidebook/Mobs/Species.xml
#	Resources/ServerInfo/Guidebook/Science/Science.xml
#	Resources/ServerInfo/Guidebook/Science/Technologies.xml
#	Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/migration.yml
 2024-07-11 14:05:37 +03:00
Chief-Engineer
6371a04621
Fix baby jail (#29896) 
* Revert "Revert Baby Jail (#29891)"

This reverts commit 24a2866747.

* the fix
 2024-07-11 15:14:01 +10:00
Vasilis
24a2866747
Revert Baby Jail (#29891) 
* Revert "SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)"

This reverts commit 3ceb92a0c4.

* Revert configs

* Oops
 2024-07-11 10:33:47 +10:00
chavonadelal
04cb2657bf
Action menu localization (#29839) 2024-07-09 23:37:00 +10:00
VigersRay
1a9950886a Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-05 20:02:52 +03:00
DrSmugleaf
11034a0986
Fix showing the inventory button on entities without any inventory slots (#29728) 2024-07-06 00:25:23 +10:00
Vigers Ray
ff592a6963
Обнова лобби (#171) 
* Обнова лобби

* Небольшой фикс

* Убрал YouTubeWindow
 2024-07-04 09:44:28 +03:00
VigersRay
465ccb630e фикс открытия призрак ролей для спонсоров 2024-07-01 22:40:00 +03:00
VigersRay
06dcab6a05 Фиксы спонсорки 2024-07-01 17:24:00 +03:00
VigersRay
ff394987f4 Обнова спонсорки 2024-07-01 17:03:24 +03:00
VigersRay
60cbcb2e9d Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Resources/migration.yml
 2024-06-28 07:56:45 +03:00
Repo
4a728fa3c6
Fix Admin Object tab sorting and search - Part 2 (#28681) 
* admin Object tab sorting and searchable

* Fix for showing disconnected players on player admin tab

* Fix namespace and search bar location.

* Change linq to loop.

* No more Linq to sort

* Fix item click vv menu

* Added refresh button and refresh on opening tab.

* Clear spaces.

* Move tab magic numbers to enums

* Get rid of old unused xaml

* Fix code style issues and button event type.

* Merge in baby jail

* More style cleanup and move cast around.

* Make the localization a little more easy to read, same loc var names.

* Missed Loc for label

* Fix class field order

* Over zelous delete.

* Small updates.

* Min syntax issues fix
 2024-06-28 13:32:57 +10:00
VigersRay
a8876c7549 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/lobbyscreens.yml
#	Resources/Textures/LobbyScreens/attributions.yml
#	Resources/Textures/LobbyScreens/blueprint.webp.yml
#	Resources/Textures/LobbyScreens/justaweekaway.webp.yml
 2024-06-25 23:31:06 +03:00
DrSmugleaf
a4d93362c3
Attempt to fix random test fail by undeleted AlertControl._spriteViewEntity (#29424) 2024-06-25 11:31:38 +10:00
VigersRay
24c8d682f9 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-16 01:36:33 +03:00
DrSmugleaf
2ddebba0e9
Fix speech bubble occlusion being checked from the player's position instead of the eye's (#29012) 2024-06-15 17:35:05 -04:00
VigersRay
aa156c2c86 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
 2024-06-15 21:05:02 +03:00
AJCM-git
c339773b5f
Fixes the ShowRulesCommand and the client not syncing rules correctly (#28752) 2024-06-15 00:41:25 -04:00
Vigers Ray
19ff7831b6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
#	Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/ServerInfo/Guidebook/SpaceStation14.xml
 2024-06-09 22:32:37 +03:00
Hannah Giovanna Dawson
3ceb92a0c4
SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763) 2024-06-09 14:58:10 -04:00
AJCM-git
346ac44a28
Open the guidebook when people with less than an hour playing join the round (#28774) 
* Open the guidebook when people with less than an hour playing join the round

* Filter for gameplayState

* Fix tests

* tweaks

* saltern update (#28773)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Fix admin menu objects list (#28787)

* Make `MakeAntag()` log errors instead of throwing exceptions (#28771)

Make `MakeAntag()` log errors instead of throw

* add default page support for the guidebook (#28772)

* Probably a better way to handle this

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-06-09 12:26:48 -04:00
Vigers Ray
d7b054c032 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
 2024-06-09 00:50:47 +03:00
DrSmugleaf
0762f9da17
Fix action icons when dragging an active action to another slot (#28692) 2024-06-07 22:34:48 -07:00
AJCM-git
63e0ee08cb
Fixes client having authority over rules popup cvars (#28655) 
* Fixes client having authority over rules popup cvars

* Delete duplicate migration

* Pre-update

* Post-update
 2024-06-07 21:53:20 +02:00
VigersRay
f5911d8eac Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-07 16:37:58 +03:00
AJCM-git
accf8adf97
Fixed the guidebook listing every single rule (#28680) 
* Well i tried this way

* New approach (start)

* Did it

* makes spacelaw available, put it under sec
 2024-06-07 06:28:55 -05:00
VigersRay
7d0476aab0 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Roles/Antags/nukeops.yml
#	Resources/Prototypes/Roles/Antags/revolutionary.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Antags/zombie.yml
 2024-06-07 11:28:58 +03:00
Leon Friedrich
e7f2ae52ab
Give jobs & antags prototypes a guide field (#28614) 
* Give jobs & antags prototypes a guide field

* A

* space

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Add todo

* Fix merge errors

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-06-06 05:05:58 -07:00
Nemanja
1333b48747
Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
Repo
039fd932b2
Fix Admin Object tab sorting and search (#28609) 2024-06-06 02:41:11 -04:00
Vigers Ray
e0566ffa3e
Хаб серверов (#13) 
* Хаб серверов внутри игры

* чейнжлог
 2024-06-04 10:03:48 +03:00