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

55 commits

Author SHA1 Message Date
1Mentor5
ce3b153f63
Добавление боевых магбутсов для сб и для пиратов. ОБР и РХБЗЗ получили боевые магнитки вместо обычных. (#531) 
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-10-30 10:34:22 +03:00
Vigers Ray
ec4b32df59
пу-пу-пу (#563) 2024-10-30 10:28:57 +03:00
imskyhappy
47f72b81b5
Extended magazines (#509) 
* добавил расширенные магазины для оружия

* Добавил технологию

* Доработал (закомичу как доработаю)

* modified:   Resources/Prototypes/_Sunrise/Research/arsenal.yml
	modified:   Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl
	modified:   Resources/Prototypes/Research/arsenal.yml

* доработал

---------

Co-authored-by: ChappyChokolate-org <63551838+ChappyChokolate-org@users.noreply.github.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-10-30 10:08:48 +03:00
Rinary
612f8ca9aa
Фикс всей локализации (#496) 
* cargo product loc

* first cargo product translate

* second cargoproduct translate

* roadmap has optional localization

* upd

* 2024 roadmap translate

* full ru roadmap goals translate moved to russian loc

* translate some roadmap 2025

* roadmap fully translate

* holidays translate

* donation plinks rework

* translate categories

* translate planet prison objective

* translate evil twin objectives

* translate fugitive objectives

* fix planet prisoner dir

* upd

* no more planet prison dir

* partial toys translate

* fully translate toys

* lockbox loc fix

* fix Suntick loc

* fix tape loc

* borg modules translate

* translate borg tools and nanopaste

* upd

* boombox translate

* translate pda's and hand_teleporter

* reinforcement radio translate

* donation plinks translate

* barber items translate

* tape player translate

* ID cards translate

* computers translate

* translate corporate laws

* pepper spray translate

* flippo lighter translate

* magistrat's rubber stamp translate

* translate some ammunition

* clear no need desc

* translate SMGS

* fix

* Finaly guns translating

* translate clocks

* translate misc

* some cloaks translate

* fully cloaks translate

* belts translate

* translate all masks

* translate boots

* all backpacks translate

* glasses translate

* gloves translate

* bras translate

* fix rsi validator

* translate jumpskirt's

* jumpsuits translate

* security pilot's jumpsuit translate

* translate hardsuit helmets

* translate hood

* hats translate

* helmets translate

* men's underpants translate

* translate women's pants

* hardsuits translate

* fix pant desc

* translate armor

* translate coats

* translate captain's overcoat

* socks translate

* big boxes translate

* translate lockers

* power translate

* translate barber pole

* poster translate

* translate chairs

* translate vending_machines

* translate pacificator

* translate computers

* clowns ghost role translate

* translate eviltwin ghost role

* translate predator name

* another player species translate

* translate foliant

* translate borg chassis

* shuttle markers translate

* translate job spawners

* ghost roles spawners translate

* actions translate

* stacks translate

* some fixes

* uplink catalog fully translate

* return hypo on uplink

* sponsor uplink catalog translate start

* new sponsor uplink translation

* fully translate sponsor uplink catalog

* translate lockers

* translate kits

* translate syndicate boombox bundle

* predator organs translate

* body prototypes translate

* humanoid xeno organs translate

* predator body parts translate

* xenomorph body parts translate

* tajaran body parts translate

* translate disease

* species translate

* translate speech emotes

* upd

* translate frontier rules

* translate lust rules

* translate default rules

* crafting translate

* holy shit, last fixes

* no checks if you not changes prototypes

* fix

* fix linter

* fix sponsor uplink catalog

* second fix

* fix socks

* last fix

* xd

* fix

* upd locale, ALL En-US prototypes translated

* upd

* upd locale validator, checks for non lokalized strings in ru-RU

* some translations

* clear

* gaaaaaaaaaay pin

* upd

* upd

* fix

* fix linter

* translate toys

* translate

* upd

* fix

* upd

* fix

* fix linter

* upd

* fix

* better construction graph translation

* start reworking construction menu translation

* some new translations

* fix

* upd translations

* пу-пу-пу

* fix

* upd

* upd, sunrise strings in en-us

* upd

* translate voice-mask

* translate guns

* energy gun translate

* server info translate

* bar signs translate

* translate ui tabs

* translate reagent effect

* translate revenant-catalog

* translate categories

* general translate

* friends translate

* Sponsor uplink fixes|Translate

* some fixes

* translate Security, Hos, QM sponsor uplink
 2024-10-30 10:04:15 +03:00
SplikZerys
1282ae1c85
new voices (#550) 2024-10-27 17:43:51 +03:00
SplikZerys
92d4b4bef3
NEW TTS VOICES (#532) 
* new tts voices and roundStart false mtf1-2

* new tts voice - georgiy kain from pathologic 2

* deleted bad voice model

* Артемий Бурах

* warcraft

* asd

* Инквизитор

* ttttttttttttttsssssssssssss

* path

* tts

* changelog update
 2024-10-21 03:45:29 +03:00
iertis
8a6dd70bb4
station-goal-component.ftl fix 2024-10-17 03:28:18 +03:00
SplikZerys
42b16d1eee tts voices update 2024-10-15 03:22:48 +03:00
SplikZerys
e097cb78cd
Merge pull request #504 
* Зверолов Тавиш

* elisa

* mr chu

* sotis

* wtf

* mediv

* asd

* mtf1

* cleaning

* round stat false
 2024-10-14 22:35:37 +03:00
VigersRay
9df0369159 Фиксы и локализация профиля лобби 2024-10-12 17:43:21 +03:00
VigersRay
a0cfe2e3d4 чейнжлог 2024-10-11 23:46:14 +03:00
VigersRay
839257dba8 Провиль и привязка через лобби. 2024-10-11 23:44:48 +03:00
Rinary
d3094b7cb5
Исправления (#488) 
* init

* fix en us

* translate Labels

* last fix
 2024-10-11 17:11:41 +03:00
SplikZerys
f499223bbc Added new TTS voices 2024-10-11 16:55:35 +03:00
Rinary
3fae427a25
Фиксы (#484) 
* fix uplink

* upd

* upd and fix Locale

* AI CAN DIE

* AI BIGGER HEALTH
 2024-10-11 13:25:19 +03:00
haiwwkes
40568a243c
lay down + scope (#476) 
* remove old system

* new scope, new laying
 2024-10-11 11:52:39 +03:00
Rinary
b0ae6571da
Больше шлюзов (#474) 
* before yaml lintering

* linter fix

* rsi validator fixes (there is 1 more bug)

* fucking...

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

* hidroponics

* upd

* upd

* try fix

* fix

* try fix x2

* holy shit

* fix

* upd airlocks

* add standart hidroponics

* fix loc

* fix

* fix en us

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: pxc1984 <igor.mamaev1@gmail.com>
 2024-10-10 20:10:26 +03:00
pacable
641ce5c958
Судейский молоточек. (#481) 
* судейский молоточек и наковальня

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-10-10 20:07:45 +03:00
SplikZerys
b1f077f7cb tts list update 2024-10-09 17:26:41 +03:00
SplikZerys
c3ac683e8d
added new tts voices: announcer and warden (#478) 2024-10-09 12:28:02 +03:00
SplikZerys
45848f24c7 Added new TTS - Silencer from Dota 2. 2024-10-07 21:46:31 +03:00
SplikZerys
25e9a5cd2b New TTS voice - Abaddon from Dota 2 2024-10-07 14:35:17 +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
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
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
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
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
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
iertis
c2f4c7bf42
Улучшение пиратского акцента (#375) 2024-09-16 11:09:43 +03:00