VigersRay
16c4eef3ff
Фикс майншилда двойника
2024-08-15 01:22:30 +03:00
VigersRay
af8c356aac
фикс статуй
2024-08-15 01:13:25 +03:00
VigersRay
0d6ab66848
Фиксы линтера
2024-08-15 00:58:06 +03:00
VigersRay
f0c560306f
Вернул НТР
2024-08-15 00:57:29 +03:00
VigersRay
ecaaab58ac
Merge remote-tracking branch 'origin/master'
2024-08-15 00:39:32 +03:00
VigersRay
eeb1fa8725
Адекватное отключение AssignOverflowJobs чтобы игроки понимали почему остались в лобби и не было параметра в лобби.
2024-08-15 00:39:11 +03:00
VigersRay
cb325f709c
вупс
2024-08-15 00:38:39 +03:00
GayBot
5779ec319a
Automatic changelog update
2024-08-15 00:28:58 +03:00
Rinary
6cde1b3d61
Фикс фонарей боргов ( #279 )
...
* fix
* Update HandheldLightSystem.cs
2024-08-15 00:27:51 +03:00
Rinary
277df25b97
Катсцены ( #285 )
...
* init
* upd
* fix ss13
2024-08-15 00:27:32 +03:00
VigersRay
afe7f25a2b
Фикс открытия ролей, повышение пенсионного возраста... Ой, требований возраста для командования.
2024-08-15 00:26:50 +03:00
VigersRay
d74a6abb31
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-08-14 23:33:00 +03:00
VigersRay
3be7a103ba
Нет педали, вы не сможете себе любой скин на госта ставить.
2024-08-14 23:32:43 +03:00
VigersRay
2d9a05c7ab
Статуи из сс13
2024-08-14 23:30:22 +03:00
Brandon Hu
dc2c02cd6a
fix(origin): Make medbay exit button functional ( #31001 )
2024-08-14 13:48:34 -06:00
Pieter-Jan Briers
6c008be126
Fix creator prefix for Cog ( #30995 )
...
Now uses the same one as Atlas.
2024-08-14 13:48:16 -06:00
PJBot
84f229a149
Automatic changelog update
2024-08-14 19:48:11 +00:00
themias
cd8bd908da
Fix lizards being unable to eat custom burgers ( #31005 )
...
* Fix lizards being unable to eat custom burgers
* ensure tag comp
2024-08-14 13:47:03 -06:00
VigersRay
98f1022d07
update roadmap
2024-08-14 22:39:27 +03:00
VigersRay
6f3649d95a
Merge remote-tracking branch 'origin/master'
2024-08-14 22:38:21 +03:00
VigersRay
2f8b639ed3
мама почему я хочу умереть...
2024-08-14 22:38:07 +03:00
VigersRay
18f32e487d
фикс SickIcon
2024-08-14 22:33:01 +03:00
GayBot
246a3b2f33
Automatic changelog update
2024-08-14 22:30:24 +03:00
Rinary
79617dd973
[Maps] Delta Re-design ( #284 )
...
* Изменения
* Фикс
---------
Co-authored-by: meowstushka <meowstushka@gmail.com>
2024-08-14 22:29:19 +03:00
VigersRay
0cad2d9442
лигуб блядь рот твой на ласт стейшен я полоскал
2024-08-14 22:26:59 +03:00
GayBot
45be294984
Automatic changelog update
2024-08-14 22:18:20 +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
Rinary
77af3fcb24
перевод генокрада ( #282 )
2024-08-14 22:16:54 +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
VigersRay
141520c2a8
secret update
2024-08-14 22:05:06 +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
82fb55d40e
ой
2024-08-14 20:46:10 +03:00
GayBot
57b137502b
Automatic changelog update
2024-08-14 20:39:13 +03:00
ASR_A
c4f4a6d719
Тюремный инженер ( #277 )
...
* я решил вернуть тюремного инженера.
* PE
* Update prison_engineer.yml
* Update prison_engineer.yml
---------
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-08-14 20:38:08 +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
Rinary
fd4edf43f1
Мусор в прототипах ( #280 )
2024-08-14 20:35:24 +03:00
VigersRay
6f858567f2
фиксы апстрима
2024-08-14 20:30:52 +03:00
VigersRay
0e7ccd3b0d
Опять 25
2024-08-14 20:00:13 +03:00
lapatison
5aee328e10
Translate Upstream #2466 ( #2478 )
...
(cherry picked from commit 66591d52e0ae88792c646edc26b1bc045d309a6b)
2024-08-14 19:58:35 +03:00
Morb0
22d8d2c9ff
Update locale
...
(cherry picked from commit 84a13fb57d71f181ffaeaf9a09693bc9ea7c31df)
2024-08-14 19:58:30 +03:00
NotSoDamn
444dcc4cd5
Change translation for CutterMachine ( #2453 )
...
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
(cherry picked from commit bb2d5a9148239a16f0db1de6e8437a9e8fe2a785)
2024-08-14 19:56:42 +03:00
SonicHDC
af1aac5612
Crowbar sprite fix ( #2485 )
...
(cherry picked from commit a6f647a54b4772a0e771ef65a8e3cebd9ce235e4)
2024-08-14 19:56:12 +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
VigersRay
ecc5a580fb
Обнова дельты
2024-08-14 18:39:12 +03:00
VigersRay
a615fdadb5
1984
2024-08-14 18:34:30 +03:00
Velcroboy
890c0eeb99
Adds a random smokable spawner ( #30870 )
...
* Textures to make lamps mappable to East/West.
* Adds a random smokable spawner
* remove double derma
* Increase chance for just basic cig
* Update to enitity tables
* Tweak values
* Remove space
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-08-14 09:44:21 -04:00
DrSmugleaf
1fb03e9074
Fix popups not working properly with an eye offset ( #30990 )
2024-08-14 09:38:36 -04:00
PJBot
07451eb92b
Automatic changelog update
2024-08-14 13:05:08 +00: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
Pieter-Jan Briers
8ac0246998
Enable worldgen by default in non-wizden config ( #30996 )
...
Enable worldgen by default
If somebody can explain to me WHY this isn't enabled by default, that would be epic. Otherwise we're merging this
2024-08-14 21:56:45 +10:00
