Commit graph

9171 commits

Author SHA1 Message Date
AverageNotDoingAnythingEnjoyer
d760ec7df0
"ИИ видит" постер (#533)
* weh

weh

* Локализация вроде

Наверное

* weh

weh

* NN не видит

* weh

weh

* Названия файлов

Изменены названия по стандартам

* лишний текст

удалена лишняя локализация во избежание конфликтов

* ы

---------

Co-authored-by: Vigers Ray <vigersray@gmail.com>
2024-10-30 10:38:41 +03:00
1Mentor5
ce3b153f63
Добавление боевых магбутсов для сб и для пиратов. ОБР и РХБЗЗ получили боевые магнитки вместо обычных. (#531)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-30 10:34:22 +03:00
darvin7531
9f52910558
Darvin7531 (#529)
* HatWithPaces&Tallit

* stoles -> neck

* ftl
2024-10-30 10:33:07 +03:00
iertis
6751fea526
Сумка для материалов (#526) 2024-10-30 10:30:59 +03:00
pacable
51ecaf35a6
5 новых плюшек (#525) 2024-10-30 10:30:32 +03:00
Vigers Ray
ec4b32df59
пу-пу-пу (#563) 2024-10-30 10:28:57 +03:00
Vigers Ray
fe5c0db463 Merge remote-tracking branch 'origin/master' 2024-10-30 10:22:51 +03:00
Vigers Ray
98af1bd815 сантики теперь имеют отрицательную цену 2024-10-30 10:21:58 +03:00
Rinary
591a3c4a50
Новые предметы, фикс супер материи, правки (#515)
* permission changes

* super matter changes

* NT backpack energy dome

* energy dome is contraband

* fix singularity

* upd

* upd supermatter

* reflector

* upd

* upd

* add meta.json

* fix announcement

* upd

* fix rsi

* fix ids

* return checking for double actions

* fix hydro assembly

* fix x2 hydroponics and chemistry airlock

* upd

* У всех хардсьютов временно забран пнв(переработка хардсьютов под пнв момент)

* peace parts

* clown parts

* upd parts meta

* akms bigger price

* fix

* fix x2

* add clown, peace parts

---------

Co-authored-by: darkrell <rc-alh@outlook.com>
2024-10-30 10:19:36 +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
imskyhappy
c6cc07d0b7
Добавлен переделанный шатл ОБРовцов (#495)
* Добавлен переделанный шатл ОБРовцов

* Доработал

---------

Co-authored-by: ChappyChokolate-org <63551838+ChappyChokolate-org@users.noreply.github.com>
2024-10-30 10:03:53 +03:00
AverageNotDoingAnythingEnjoyer
88efc9a810
Ребаланс требования карт к количеству игроков (#445)
* weh

Первый набросок лимитов

* Update bagel.yml

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-30 10:02:57 +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
b121deb412
Adjutant minor fix 2024-10-17 03:26:12 +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
iertis
9cbe6dc3b0
Увеличил лимит символов в книге (#500) 2024-10-12 19:59:55 +03:00
VigersRay
06a10c9f99 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-12 17:43:47 +03:00
VigersRay
fc05b743ba Фикс абуза нанопасты 2024-10-12 17:00:17 +03:00
eoineoineoin
70b7747fdd
Make APC UI work correctly with multiple users (#32465)
* Make APC UI work correctly with multiple users

* Check access only on client, when constructing UI

* Do TODO (Thanks, Robust 236.1)

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-10-12 19:21:43 +11:00
VigersRay
6423086773 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-12 00:26:07 +03:00
AverageNotDoingAnythingEnjoyer
4ad1ffa9c4
Fix (#493)
M16A4 magazine
SunriseMeta Ai fix
2024-10-11 23:27:45 +03:00
lulpiopio
73d44d4657
add mirotvorec, fixed some stuff (#490)
* add mirotvorec, fixed some stuff

добавил миротворца (попросили меня)
добавил себя и кента в бебеплинк
добавил кенту еще один звук
дал кд на звуки 20 секунд

* Update sponsor_uplink_catalog.yml

* Update toys.yml

* Update meta.json

* asdasd

asdasd
2024-10-11 19:38:00 +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
pacable
ce89f48535
добавил админ абуз телепортер (#459)
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-10-11 11:52:58 +03:00
haiwwkes
40568a243c
lay down + scope (#476)
* remove old system

* new scope, new laying
2024-10-11 11:52:39 +03:00
lulpiopio
faea6bced4
added na-ra toy (#486)
добавил звук орущего папича
добавил себя в игру
добавил сексуальности в игру
2024-10-11 11:52:10 +03:00
scrivoy
e98af125dc
Fixed capitalization in Interface description (#32739) 2024-10-10 21:40:41 +02:00
Rinary
42f9ac0dbd
Ребаланс Мехов (#482)
* Initial commit

* mechs has reflect

* all mechs has powercagehigh

* mechs can only powered by power cages

* powercages on protolathes

* magboots on mechs

* fire cost upped x2

* battery on guns has 200 energy by basic, adds ion gun

* mecha x-ray gun add

* mecha vindictor here

* added amlg 90

* added uvm31

* localization

* burst fire on Ultra

* fix vindictor no desc

* mech has prying

* add scale 1.08

* add scale 1.08 to combat mechs

* Mechs has collision

* buff chain sword

* upd

* some fixes

* fix weapon charging

* Fix UVM-31 "Drake" Sound and Proto particle

* Fix Mech collision, mechs can't stop peoples any more(some thing issues creates if collision is on)

* AMLG90 Has bigger damage

* Stunner uses hos stun spread

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2024-10-10 20:11:43 +03:00
Rinary
18640aef4f
upd bagel (#473)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-10 20:11:01 +03:00
Rinary
b045dfaf66
Балансные правки (#480)
* rebalance

* toolbox bigger price

* upd

* no syndie gas mask but welding goggles

* nvd has battery

* disable night vision on felenids
2024-10-10 20:10:47 +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
AverageNotDoingAnythingEnjoyer
ba64c822ae
Meta Station (#433)
* Weh

Сейфы в оружейке
Шлюзы
Спавны магистрата, ПНТ, адъютанта
Хохохонкерсвенд
Шкаф бригмеда
Карта добавлена в пул, добавлены роли и слоты

* Цели

Добавлены цели

* мгм..

ну и где эта ошибка спряталась

* Begone merge conflict!

weh

* weh 2

electric boogaloo

* SMES

SMES

* Юр

Юр. канала ключ

* weh 3

* weh 4

electric wehoogaloo

* Пока ОСЩ

* Суперматерия

вех

* Fixgridatmos

Fixgridatmos

- Fixgridatmos

* Revert "Суперматерия"

This reverts commit 4fdd3c60008611f898dc578efc2261aabde1dd8f.
2024-10-10 20:08:52 +03:00
pacable
5c906f4649
Плюшевый Себастиан Хейз (#470)
* спавн в техах

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

* плюшевый Себастиан

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

* linter fix

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

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-10-10 20:08:32 +03:00
Rinary
92e5bf48e8
Несколько новых предметов (#479)
* ussp hardsuits

* upd loc

* Fix coats in suits

* upd

* Molot Add

* fix _

* locale fix

* fix flexing texture

* reflect

* power cage

* upd

* remove

* rem

* Brigmed hardsuit fix
2024-10-10 20:07:58 +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
Rinary
e172fdd5d6
БИОКОД на энерго щитах (#472)
* init

* fix loc

* fix catalog
2024-10-10 20:07:28 +03:00
pacable
6a89a06250
Изменил звук плюшке (#468)
* added meow to cfb

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>
2024-10-10 20:06:59 +03:00
imskyhappy
ad87d435b7
Постер Арирал (#477)
* хуй

* Доработал

---------

Co-authored-by: ChappyChokolate-org <63551838+ChappyChokolate-org@users.noreply.github.com>
2024-10-10 19:31:13 +03:00
imskyhappy
5f883c5b43
Добавил лобби арт (#483)
* Добавил лобби арт

* Доработал

* Доработал

---------

Co-authored-by: ChappyChokolate-org <63551838+ChappyChokolate-org@users.noreply.github.com>
2024-10-10 19:30:56 +03:00
VigersRay
918213bee5 Фиксы апстрима 2024-10-10 19:27:49 +03:00
VigersRay
c8e9b7bbf4 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Roles/RoleSystem.cs
#	Content.Server/Silicons/Laws/SiliconLawSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Objects/Fun/pai.yml
#	Resources/Prototypes/GameRules/midround.yml
#	RobustToolbox
2024-10-10 19:09:17 +03:00
VigersRay
2ae18ca4d6 фиксы ПНВ 2024-10-10 19:04:20 +03:00
Errant
93c7bdc134
Mind Role Entities (#31318)
* Mind Role Entities wip

* headrev count fix

* silicon stuff, cleanup

* exclusive antag config, cleanup

* jobroleadd overwerite

* logging stuff

* MindHasRole cleanup, admin log stuff

* last second cleanup

* ocd

* minor cleanup

* remove createdTime datafield

* now actually using the event replacement I made for role time tracking

* weh
2024-10-10 10:48:56 +02:00
beck-thompson
327466a6e2
Plushies can now have pAIs stuffed into them (v2)! (#30805)
* First commit

* I forgot silly me

* Actually added comments

* spellin

* fixes

* more blacklists

* Minor fixes

* Speech Verb also changes now

* Simple name stuff

* Other fixes

* remove one line of whitespace

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-09 20:01:32 +02:00
chavonadelal
6d99597349
Job title localization (#32338)
* Job title localization

* Correcting fields
2024-10-09 17:05:36 +02:00
SplikZerys
b1f077f7cb tts list update 2024-10-09 17:26:41 +03:00