Rinary
520aac8a6f
Опять Перевод/Фиксы ( #320 )
...
* init
* some upd
* upd
* upd
* fix
* Update southern.ftl
* fix
2024-08-28 18:15:49 +03:00
pacable
c71b0c37b6
Spray paint ( #321 )
...
* paints
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* review changes
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-08-28 18:15:38 +03:00
VigersRay
0441b8b814
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Launcher/LauncherConnecting.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/StationEvents/Events/RandomSentienceRule.cs
# Content.Shared/Interaction/Components/BlockMovementComponent.cs
# Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Objectives/stealTargetGroups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/Prototypes/Voice/speech_emotes.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/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/migration.yml
2024-08-22 06:50:04 +03:00
Nemanja
65c0b699f2
fix and buff the handheld mass scanner ( #31284 )
2024-08-21 12:33:01 -06:00
Pieter-Jan Briers
89c59398f1
Word wrap for vote titles ( #31248 )
2024-08-21 10:50:49 -04:00
Repo
93497e484f
Copy button for ban/disconnect reason ( #30760 )
...
* Copy button for connection messages on failed connections and ban hit attempts
* loc
* better sepperation layout
* consistent styling.
* Fix loc var name
* Reconnect button back.
* Move clipboard dependency out to the params.
* open buttons so they look a bit better.
2024-08-20 23:31:09 +02:00
Red Mushie
2742adb881
Add Communications Console button tooltips ( #31217 )
...
* Finally, people can learn what the Broadcast button does!
* Also add for Alert level
* Add alert level and shuttle button tooltips
* Fix dumdum, tweak Broadcast tooltip
2024-08-19 22:36:36 +02:00
tosatur
b2a24f50dd
Change text for ghost visibility button ( #30998 )
...
* add new text
* changed loc names
* fixes
2024-08-19 19:51:54 +02:00
Nemanja
476c7751c4
Recycler Overhaul ( #30802 )
...
* Recycler overhaul
* remove
2024-08-18 21:39:00 -06:00
VigersRay
a741ff4195
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-08-18 01:15:36 +03:00
Milon
a4b0bef12c
add confirmation to the delete button in objects tab ( #30946 )
...
ui shitcode
2024-08-17 12:05:17 -04:00
VigersRay
012be1afc2
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
# Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
2024-08-17 17:27:37 +03:00
Lgibb18
913b27a9de
абуз форматирования чата, емаг боргов итд ( #290 )
2024-08-17 16:48:02 +03:00
Rinary
0cad3450c8
Фиксы ( #291 )
...
* init
* fix fax
2024-08-17 16:44:01 +03:00
Nemanja
ada6455b17
Make printing from ore procecssors slightly more bearable ( #31074 )
...
* Make printing from ore procecssors slightly more bearable
* Update sheet.yml
2024-08-17 15:12:55 +10:00
Nemanja
8440fb6acb
anonymize salvage wrecks ( #31087 )
...
* anonymize salvage wrecks
* display wreck size
2024-08-17 15:09:21 +10:00
Mervill
4692c69ce1
Remove obsolete functions from RadiationDebugOverlay ( #31111 )
...
remove obsolete functions from radiation
2024-08-17 13:12:45 +10:00
to4no_fix
4ee9c00200
Localization hud layout ( #31013 )
2024-08-16 22:04:33 -04:00
Mervill
61a3562451
Replace obsolete map functions in IconSmoothSystem ( #30958 )
...
* first part
* second part
2024-08-16 00:55:20 -04:00
Nemanja
3cdd62b0dd
Mining Rebalance ( #30920 )
...
* first pass
* this shit too
* ok fix that shit
* buff
* actually fix that
2024-08-16 11:43:54 +10:00
VigersRay
84fd99fc85
фиксы говна за Rinary
2024-08-16 02:27:31 +03:00
VigersRay
ff29e78e72
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Client/Chat/Managers/ChatManager.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Shared/Administration/PlayerInfo.cs
2024-08-15 22:54:40 +03:00
Errant
40b9fd4ea3
Namespace cleanup around Mind Roles ( #30965 )
...
* namespaces
* Comment does not need a semicolon
---------
Co-authored-by: Vasilis <vascreeper@yahoo.com>
2024-08-15 20:26:57 +02:00
VigersRay
f07eec269d
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Machines/nuke.yml
2024-08-15 21:11:15 +03:00
VigersRay
e081aa66fd
Фикс открытия ролей спонсоркой
2024-08-15 21:08:28 +03:00
IgorAnt028
84f9dd0f0b
Fix false and true in player-panel.ftl ( #31043 )
...
Fix false and true in player-panel
Add a new True string
2024-08-15 18:00:56 +03:00
Mervill
2e3365793c
Greatly improve the usability of the Gas Analyzer. ( #30763 )
...
* greatly improve how the gas analyzer behaves
* don't close the analyzer when the object goes out of range
* cleanup
* always switch to the device tab when a new device is analyzed
* modern api part one
* modern api part 2
* modern api part three
* file scope namespace
2024-08-15 10:45:13 -04:00
VigersRay
7aed7719b3
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-08-15 16:59:39 +03:00
Plykiya
af01d8fbff
Correct relay mover entity ( #31040 )
...
* Relay entity
* Server
2024-08-15 22:30:53 +10:00
VigersRay
dcfa1e82e7
фикс хаба серверов
2024-08-15 05:07:17 +03:00
VigersRay
913fb7ab7a
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
2024-08-15 05:02:48 +03:00
VigersRay
ab8b08df14
фикс оверлея разумной болезни
2024-08-15 04:59:35 +03:00
to4no_fix
b48ac8439d
Localization of the slot ( #31008 )
...
localization of the slot
2024-08-14 20:06:32 -04:00
VigersRay
eeb1fa8725
Адекватное отключение AssignOverflowJobs чтобы игроки понимали почему остались в лобби и не было параметра в лобби.
2024-08-15 00:39:11 +03:00
VigersRay
afe7f25a2b
Фикс открытия ролей, повышение пенсионного возраста... Ой, требований возраста для командования.
2024-08-15 00:26:50 +03:00
Lgibb18
95da9625e8
Разумная болезнь опять ( #157 )
...
* disease
* eula
* disease 2
* why
* fix
* фикс рси и локализаций
* update
* Revert "update"
This reverts commit ac33a3a1124175a87b82a72ed49f228e8c6c8aa6.
* фикс работоспособности, опять
* никакого лигуба, только санрайз
* санрайзотизация прототипов, спавн болезни
* ещё всякая хрень
* фуу статистика в конце раунда
---------
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-08-14 22:17:14 +03:00
Vigers Ray
9f179a447d
Обновление говнокрада ( #283 )
...
* real?
* ok
* real 2
* one more thing that i forgot to port part 2
* i am dumb
* mofo og
* waaaagh
* some rework placeholders
* porting part 2
* bruh.
* bruh 2
* bruh 3.
* Update ChangelingRuleSystem.cs
* Update AdminVerbSystem.Antags.cs
* говнокрад это SubGamemode
* тяжело...
* пу-пу-пу
* mf og
* Update radio_channels.yml
---------
Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com>
2024-08-14 22:16:31 +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
pacable
0fbd734906
Фикс парикмахера ( #278 )
...
* fix
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* accessfix
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* locale fix
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* accessfix
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-08-14 20:36:11 +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
DrSmugleaf
1fb03e9074
Fix popups not working properly with an eye offset ( #30990 )
2024-08-14 09:38:36 -04:00
Ed
e659eb992f
Custom Taco & Kebabs - FoodSequence 2 ( #30905 )
...
* control layer ordering
* sprite update
* taco!
* taco naming gen
* fix separator naming
* some proto fixes
* default naming separation
* fix taco naming
* rat update
* hamsterburger
* organs taco
* remove from spawners
* fixes
* fix separators and lemons
* Update food-sequence.ftl
* randomization offset
* fix
* kebabs refactor
* fix
* skewer weapon
* Update food_single.yml
* Update migration.yml
* suppermatter
* hamlet centered
* hamsburger
* Update dead-0.png
* 20 -> 4 burger layers max
* Update burger.yml
* canReact: false
* capfruit update
* Update burger.yml
* Update burger.yml
* Update produce.yml
* some fixes
* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* chicken
* Update food-sequence.ftl
* documentation
* fixes
* Update meat.yml
* Update meat.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-08-14 15:04:00 +02:00
slarticodefast
6a462221ff
Add keybinds for rotating and flipping objects ( #30540 )
...
* add keybinds for rotating and flipping objects
* no popup for verbs
2024-08-13 23:36:41 +10:00
nikthechampiongr
dcc11873f9
Fix permission check for whitelists in player panel ( #30948 )
2024-08-12 18:25:31 -05:00
beck-thompson
ee922e37f6
Replaced some AddMarkups with AddMarkupOrThrow ( #30632 )
...
* First commit
* Silly me
* bruh
2024-08-11 13:06:33 +10:00
Mervill
c25c5ec666
Remove uses of Component.Owner from AmbientSoundSystem ( #30842 )
...
Remove Component.Owner from AmbientSoundSystem
2024-08-11 12:39:37 +10:00
Mervill
32e315c68f
Refactor LightBehaviorSystem to remove obsolete code ( #30890 )
2024-08-11 11:45:37 +10:00
Ed
4d75cb54c8
Custom burgers - FoodSequence system ( #30755 )
...
* setup foodsequence
* name generation and max layers limit
* move to nutrition
* move code to serverside
* move to appearance data
* marked fields as required
* Update foodsequence.yml
* b
* burgeers!
* Update produce.yml
* Update meat.yml
* Update burger.yml
* fix duplicate naming
* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* merge flavor profiles
* make food trash List<>
* merge trash
* Update FoodComponent.cs
* Update FoodComponent.cs
* organs and cannabis support
---------
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
2024-08-10 22:31:32 +03:00
Nemanja
fc1446e73a
Cursed Mask ( #29659 )
...
* Cursed Mask
* extra expressions
* block ingestion
* mind returning
* okay fix the removal shit
2024-08-10 11:14:58 -04:00
VigersRay
a9152c0a53
Revert "3 попытки конекта в случае дисконекта"
...
This reverts commit f0900740f1
2024-08-10 17:10:50 +03:00
