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

240 commits

Author SHA1 Message Date
VigersRay
a2c382d5ba Доработка ПНВ 2024-10-07 08:44:38 +03:00
Rinary
dc40c1404b
Доработка ночного зрения (#455) 
* texture upd

* upd and fix color system

* fix

* handcrafted_nvd texture

* add handcraft nvd

* upd color

* add nvd to uplink

* fix loc

* recipe and research

* fix delay system

* fix

* пу-пу-пу

* add recipe to protolathe

* fully fix nvds

* fix layer set visible

* fix

* upd roadmap

* felinids has night vision

* engineering hardsuits has yellow night vision

* upd icon
 2024-10-07 01:18:10 +03:00
Rinary
18abfd962a
Апстрим локализации (#460) 
* init

* upd

* fix

* fix
 2024-10-07 01:17:51 +03:00
pacable
9a37e68869
Мешок с землей (#461) 
* Добавил мешок с землей

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* fix тавтологии

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* fix stamina

Signed-off-by: pacable <igor.mamaev1@gmail.com>

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-10-07 01:17:24 +03:00
pacable
e1f0818c06
фикс описания способности генокрада (#462) 
Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-10-07 01:16:38 +03:00
Rinary
08a055a7c2
Обновление энергетических щитов (#425) 
* init

* energy dome no more block melee attacks

* return HOS shield

* belt nanotrasen energy shield generator

* fix

* localise

* Revert "return HOS shield"

This reverts commit 3821d1ae51b0a442cc9a551481fe5742e5782bb1.
 2024-10-04 21:34:00 +03:00
Rinary
f47ba89a2f
Фиксы (#448) 
* shuttles fix

* localise

* nanopaste fix

* fix adidas

* fix
 2024-10-03 21:59:58 +03:00
SplikZerys
d90d22f2f8
Added new TTS-voice - Soldier from TF2 (#450) 
* Added new TTS-voice - Soldier from TF2

* yes
 2024-10-03 16:54:51 +03:00
Alan Wake
94a6fff32c
good for start, not enough to finish (#417) 2024-10-03 03:11:13 +03:00
VigersRay
082df3213c Merge remote-tracking branch 'origin/master' 2024-10-03 03:06:33 +03:00
VigersRay
d867313415 Фикс следования 2024-10-03 03:06:21 +03:00
SplikZerys
dffc8a9e1d
Added new TTS-voice - Pudge from Dota 2 (#443) 2024-10-03 02:24:08 +03:00
SplikZerys
27ee3abaa8 Revert "Proton (#420)" 
This reverts commit 939249a3
 2024-10-02 09:05:30 +03:00
SplikZerys
cb8e240bc3
Added new TTS-voice - Riki from Dota 2 (#434) 2024-10-02 08:04:07 +03:00
Rinary
e39dfe9e64
Мехи (#415) 
* initial commit

* some sprites

* mech weapons

* syndi mechs to nuke ops uplink

* some loadouts to Nanotrasen mechs

* spawn mark filled mechs

* construction graphs

* researchable mechs

* i forgor

* locale changes

* aaa

* minor translate(big, later)

* fix items in hands

* fix

* upd translate

* translate electronics

* translate mech weapons

* translate

* translate const

* fix rsi

* fix

* fix

---------

Co-authored-by: NULL882 <gost6865@yandex.ru>
Co-authored-by: VigersRay <vigersray@gmail.com>
 2024-10-02 06:39:12 +03:00
VigersRay
2a523b73d3 Ну а чо я? Я ничо 2024-10-02 06:33:00 +03:00
VigersRay
7b5d899388 фиксы линтера 2024-10-02 05:31:55 +03:00
SplikZerys
01766a461b
Добавил свой ТТС-голос (#430) 2024-10-01 13:05:32 +03:00
SplikZerys
0fdbab5f8e
New tts voice - Kendrick (#429) 2024-10-01 12:39:56 +03:00
Rinary
e343c8f2f8
Ночное видение (#413) 
* init

* minor changes

* action container fix

* cap night vision fix

* translate
 2024-09-30 16:20:42 +03:00
Matveyuchik
f39126c723
Настой ромашки (#411) 
* Добавлена настойка ромашки (пока что идентична квасу)

* Теперь настойка ромашки имеет пользу

* Ну и по мелочи

* Бывает

* Опять мелочимся

* Удаляем ненужное

* Бранчи

* Ромашку теперь можно получить в кофемашине

* Поправочки от санрайза + удалил психоделический пол (не знаю зачем его сделал)
 2024-09-30 16:19:15 +03:00
pacable
939249a38b
Proton (#420) 
* Proton-1 finished!

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* fix

Signed-off-by: pacable <igor.mamaev1@gmail.com>

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-09-30 16:15:53 +03:00
Focstor
ce81c1a7a2
Добавление в меню покупок карго новой хуйни и ещё хуйня какая то (#405) 
* dobavlenievsego

* ispravil

* travmattepernegovno
 2024-09-30 16:15:10 +03:00
SplikZerys
4aa930b708
added new tts voice - thrud from heartstone (#419) 2024-09-30 16:13:41 +03:00
Rinary
813a87897d
Апстрим локализации (#406) 
* init

* yaml extractor
 2024-09-30 16:13:29 +03:00
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
Rinary
0690d5c781
Генератор Супер материи (#399) 
* init

* Stupid shit code here

* upd locale

* upd loc

* fix announcements

* fix traitor loc
 2024-09-26 20:09:27 +03:00
Rinary
c826b076bb
Энергетические щиты (#404) 
* setup codebase

* add content

* cococontent!

* i try to understand git, and fix merge conflict.

* clean up

* fix attribution

* wtf?

* reuse PowerCellDraw

* reuse UseDelay

* minor clean up

* fix ugly hack

* change bad sound license

* integrate devicenetwork system, some fixes

* add medium-size circle barrier

* deltanedas 3/4 fix

* check fixes

* check fix 2

* remove HoS barrier, add CE barrier. sorted some function

* increase craft cost turtle, remove CE barrier, add Maxim barrier, move syndie barrier to Nuke uplink only

* Shitcode update! Add support to wire network energy shield

* some clean up + BIG dome sprite

* just checking slowdown field

* translate

* refactoring to current ver

* Я даун

* buff energy shields

* fix linter

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-09-26 20:09:00 +03:00
SplikZerys
b96ec59f04
New tts voices (#402) 
* new tts models

* tts ready
 2024-09-26 20:08:04 +03:00
Rinary
2e2f0f02d9
Фиксы (#397) 
* fix all handhelds

* fix pai portable camera monitor

* fix hohohonkersVend access

* upd loc

* move criminal records monitor to devices

* portable camera viewer resprite

* upd config

* fix

* fix rsi

* HandHeld Camera AI Vision

* Hand Held Criminal Records Monitor has no active sprite

* NT Bots has AI Vision

* fix

* balance
 2024-09-26 20:06:23 +03:00
smeraldo
25c97361a3
Добавлены новые ручки для глав отделов. (#392) 
Co-authored-by: Diana <florencd@student.21-school.ru>
 2024-09-19 15:47:20 +03: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
RaMbUtAn1337
0df7229ff1
Desoantizyne/Дезоантизин - наркота. (#342) 
* Новый реагент - Обдолбоссий, даёт 1.5х к ускорению и глюки на экране, передоз - 10 юнитов!

* Дезоантизин - новый наркотик.

* Дезоантизин - новый наркотик.

* Дезоантизин - 3.0

---------

Co-authored-by: unknown <RaMbUtAn1337>
 2024-09-16 12:13:46 +03:00
pacable
9bb4fc4921
исправлены цели станции (#386) 
Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-09-16 11:13:29 +03:00
iertis
ad0cbd2c92
Новая роль, Адъютант (#379) 
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-09-16 11:11:46 +03:00
pacable
f3245be21c
Роза от Makao (#377) 
* makao sprite security

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* added potted rose

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* Revert "makao sprite security"

This reverts commit aa9d52447a415142003c75c81151cc720d6c4414.

* resize

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-09-16 11:10:08 +03:00
iertis
c2f4c7bf42
Улучшение пиратского акцента (#375) 2024-09-16 11:09:43 +03:00
pacable
3f5c93f1d1
исправил неправильный перевод от ринари (#374) 
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-09-16 11:09:24 +03:00
pacable
321beed81c
Reed Industries (#367) 
* reed industries pin

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* стартгир

Signed-off-by: pacable <igor.mamaev1@gmail.com>

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-09-16 11:07:11 +03:00
lzk
9440318f3b
fix locale (#360) 
* фикс капитализации и ё

* парикмахер и ещё капитализации

* точка в конце описания

* фикс капитализации в описанияхх

* обнова немецкого акцента

wat в англе было потому что на нецемком что - was
а в англ was - был, в ру такого нет, так что ставим канон
тот это не das
лучше уж сделать оба варианта мой и моя
 2024-09-16 09:23:33 +03:00
SplikZerys
3a5e74f703
new tts voices (#357) 2024-09-16 09:21:20 +03:00
SplikZerys
8afcada159
added new 20 tts-voices\ (#346) 
* new 20 tts-voices

* tts fix
 2024-08-31 21:18:45 +03:00
pacable
76b872956e
Перцовка (#319) 
* pepper_spray.yml

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* linterfix

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* revert https://github.com/space-sunrise/space-station-14/pull/326

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* перцовка сбшникам

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* wizards

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* amend

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* linterfix

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* только для сб

Signed-off-by: pacable <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-08-30 21:26:01 +03: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
VigersRay
47235ba5b6 вобля 2024-08-29 16:14:49 +03:00
VigersRay
ee59ac5bb1 Фикс issuer в BaseTerminatorObjective 2024-08-29 16:12:17 +03:00
pacable
556d234b0a
Терминатор (#333) 
* Revert Revert Exterminator pending newmed/redesign (#26978)

This reverts commit f544c912

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* Revert "remove GenericAntag completely (#28218)"

This reverts commit 489efeb717.

* Revert "remove TerminatorRoleComponent (#30733)"

This reverts commit 0a4b220854.

* fix broken tag

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* delete invisible symbol

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* ru locale

Signed-off-by: pacable <igor.mamaev1@gmail.com>

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-08-29 16:07:25 +03:00
pacable
8441f9b95e
Новые цели (#330) 
* new station goals

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* добавил цели станции станциям

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* почему оно не работает

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* я заставил это сука работать

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* злобный гений древности..

Signed-off-by: pacable <igor.mamaev1@gmail.com>

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-08-29 15:55:58 +03:00
Rinary
066eba13a0
Апстрим перевода (#327) 
* перевод гайдбука воришки

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

* ЯО dudes

* Бедность

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

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

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

* Viva la revolución!!

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

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

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

* upd

* upd

* upd

* upd
 2024-08-28 22:28:37 +03:00
VigersRay
6b134a0888 Фиксы апстрима 2024-08-28 20:17:03 +03:00