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

163 commits

Author SHA1 Message Date
Rinary
9236906937
Апстрим локализации (#398) 
* fix all handhelds

* fix pai portable camera monitor

* fix hohohonkersVend access

* init

* anomaly translate

* upd

* КровоМат here

* upd

* fix

* linter moment
 2024-09-26 21:41:00 +03:00
VigersRay
47cdabdaed Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/StatusEffect/StatusEffectsSystem.cs
#	Resources/Audio/Effects/attributions.yml
#	Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
 2024-09-19 16:09:00 +03:00
Pieter-Jan Briers
b55366cf9b
chmod +x publish_multi_request.py (#32274) 
Fuck.
 2024-09-18 16:09:25 +02:00
Pieter-Jan Briers
8322b1c2d1
New publish workflow for Robust.Cdn (#32222) 
This uses multiple API requests to directly send the publish to the CDN server, no more GitHub artifacts.

Faster, less moving parts.

Needs Robust.Cdn 2.2.0
 2024-09-18 15:28:09 +02:00
Ed
675a9197f2
Easy IconSmooth spriting (#32210) 
* фыр

* Update IconSmoothingTemplate README.txt
 2024-09-18 11:41:24 +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
pacable
5d4d8c0039
большой респрайт всего (#368) 
Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-09-16 11:06:09 +03:00
Myra
0df531970b
Make the pr link more visible in the changelog bot (#32047) 2024-09-12 00:15:06 +02:00
Kara
7a6efeaba4
Properly credit contributors who were truncated by GitHub API (#31739) 
* Properly credit contributors who were truncated by GitHub's 500 email limit

* update list oops forgot my origin was so out of date

* another
 2024-09-09 13:31:27 -06:00
Rinary
74e733ef4f
Рефактор Локализации + Фиксы (#339) 
* init

* fix

* upd scripts

* trying to rework syntax finder

* upd

* upd

* upd

* transate AI

* upd

* upd

* upd

* fix

* translate

* upd

* ай бля

* fix

* upd

* upd

* fix
 2024-08-30 20:11:33 +03:00
Rinary
066eba13a0
Апстрим перевода (#327) 
* перевод гайдбука воришки

* Ура, меня роняли в детстве

* ЯО dudes

* Бедность

* Злодей Британец

* Безмозглики

* Какие-то агенты

* Viva la revolución!!

* кто эти ваши антагонисты?

* он уже не слаймируется

* Капитан судна тут

* upd

* upd

* upd

* upd
 2024-08-28 22:28:37 +03:00
Rinary
520aac8a6f
Опять Перевод/Фиксы (#320) 
* init

* some upd

* upd

* upd

* fix

* Update southern.ftl

* fix
 2024-08-28 18:15:49 +03:00
VigersRay
33c17836bb Merge remote-tracking branch 'origin/master' 2024-08-22 06:29:57 +03:00
Rinary
0850bc3f91
Фиксы, Перевод, Изменения (#299) 
* init

* upd

* upd

* upd big thruster

* fix

* upd locale

* fix

* upd

* fix

* upd catscenes
 2024-08-22 06:29:34 +03:00
VigersRay
09bb4a2c51 UPD CDN URL 2024-08-22 06:18:53 +03:00
Rinary
3fc5d92b2d
Фиксы/Перевод (#296) 
* upd

* upd

* upd

* add localization tools

* upd

* upd

* upd

* upd

* upd

* Update book-salvage.ftl

* Update book-authorbooks.ftl

* Update implant.ftl

* fix

* fix

* fix
 2024-08-18 00:28:18 +03:00
VigersRay
7cb0a232f7 фикс actions_changelogs_since_last_run.py 2024-07-22 07:01:07 +03:00
VigersRay
fe44e6e65c йой 2024-07-22 05:58:58 +03:00
VigersRay
d4887bc961 Update CDN 2024-07-22 04:18:30 +03:00
VigersRay
a3e61685c8 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-15 18:04:05 +03:00
Pieter-Jan Briers
eb3b2ae01a
Update host key for changelog RSS (#30068) 2024-07-15 16:32:12 +02:00
VigersRay
9b6a3b293c Ну типа 2024-07-14 13:25:30 +03:00
VigersRay
5aaf638614 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Tools/gen_build_info.py
 2024-07-14 12:24:06 +03:00
Pieter-Jan Briers
85fba9809a
Update changelog RSS configuration (#30024) 
New server
 2024-07-14 01:18:12 +02:00
Pieter-Jan Briers
5e800e0ece
New CDN publish workflow (#30009) 
* LET'S SEE IF THIS WORKS

* I forgot the chmod +x

* I forgot the shebang
 2024-07-13 19:34:17 +02:00
VigersRay
bb47363382 oooops 2024-06-18 07:43:05 +03:00
VigersRay
a3e61bc7d8 Небольшие правки actions_changelogs_since_last_run.py 2024-06-18 04:54:50 +03:00
VigersRay
c8d942c34e Небольшой фикс actions_changelogs_since_last_run.py 2024-06-18 00:22:00 +03:00
VigersRay
388ef61c3e фикс actions_changelogs_since_last_run.py 2024-06-16 02:10:54 +03:00
VigersRay
ecca786582 Небольшой апдейт actions_changelogs_since_last_run.py 2024-06-16 01:32:29 +03:00
VigersRay
18482e0856 фикс actions_changelogs_since_last_run.py 2024-06-15 23:40:37 +03:00
VigersRay
dee924d570 Да здраствует GayBot 2024-06-15 07:09:09 +03:00
Rinary
3450799bc2
Фикс Ошибок Yaml linter, CRLF Check проекта (#109) 
* Added Sound in Lobby

* Loadout Groups Locale Fix

* Может сначала укажем спрайт а потом указываем стейты с этого спрайта?

* Sprite in Icon

* Убрал лишнее из Audio

* SS13 Lobby Sound

* кто-то додумался запихнуть русские символы в название файла) Теперь git grep умирает от кодировки

* Прикольный вендомат(покупаешь за 1200, продаешь за 1290)

* backslash in file names fix

* No Cirilic in File Names
 2024-06-13 16:35:57 +03:00
VigersRay
ae20372a25 а если так 2024-06-13 11:06:52 +03:00
VigersRay
2fa7ff57ad Экранирование тела PR в авточейнжлоге 2024-06-13 10:51:41 +03:00
VigersRay
cf03e488c7 сук 2024-06-13 03:37:37 +03:00
VigersRay
0c8379ccc2 ой 2024-06-13 03:29:32 +03:00
VigersRay
36165c8cfc Может так 2024-06-13 03:23:57 +03:00
VigersRay
5630797def попробуем так 2024-06-13 03:09:56 +03:00
VigersRay
344a12070b вот же блядь 2024-06-13 02:55:06 +03:00
VigersRay
57562787ea Обновил под наш формат 2024-06-13 02:43:36 +03:00
VigersRay
9ca7bb4996 поставил наш чейнжлог 2024-06-13 02:36:55 +03:00
VigersRay
f97f4ea228 update actions_changelogs_since_last_run.py 2024-06-13 00:17:29 +03:00
VigersRay
c1a0b1e766 Убирать проблелы с начала и конца 2024-06-13 00:03:23 +03:00
VigersRay
137495f480 пу-пу-пу 2024-06-12 23:54:47 +03:00
VigersRay
36b39f786f Поддержка пробелов в 🆑 2024-06-12 23:42:24 +03:00
VigersRay
7cda417d41 Дапустим 2024-06-12 23:36:27 +03:00
VigersRay
143d4ecce9 йобани юникод 2024-06-12 23:05:43 +03:00
VigersRay
a45c1ab392 попробуем так 2024-06-12 22:52:19 +03:00