Commit graph

6728 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
iertis
6751fea526
Сумка для материалов (#526) 2024-10-30 10:30:59 +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
imskyhappy
c6cc07d0b7
Добавлен переделанный шатл ОБРовцов (#495)
* Добавлен переделанный шатл ОБРовцов

* Доработал

---------

Co-authored-by: ChappyChokolate-org <63551838+ChappyChokolate-org@users.noreply.github.com>
2024-10-30 10:03:53 +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
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
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
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
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
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
imskyhappy
ad87d435b7
Постер Арирал (#477)
* хуй

* Доработал

---------

Co-authored-by: ChappyChokolate-org <63551838+ChappyChokolate-org@users.noreply.github.com>
2024-10-10 19:31:13 +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
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
lzk
d450b613d6
fix typo (#32712) 2024-10-09 14:41:07 +02:00
beck-thompson
384ff7e8f6
Add pumpkin pie! (#32623)
* first commit

* Licence fix

* rosysyntax licence change (permission granted!)

* simplify

* Better wording
2024-10-09 10:29:41 +11:00
K-Dynamic
6f9b4f4226
CHIMP and APE particle speed increase (#32690)
* swap omega and delta particle colours

* remove upgrade doafter

* explicit syndicate chip description

* Syndicate CHIMP stealth

* fast projectile speed

* 10 to 12 shots

* buff heat dmg

* upgrade chip mentions omega particle

* Revert "remove upgrade doafter"

This reverts commit 8a321980b7a384daca06215656494e0c116e7333.

* Revert "explicit syndicate chip description"

This reverts commit c803c773739a61fc5b3a6cb90810622a6d5846c9.

* Revert "Syndicate CHIMP stealth"

This reverts commit 698a108580892addabf8d51494a72e1ee651b8e6.

* Revert "10 to 12 shots"

This reverts commit 858ac0392be0549eb0a288648413d1020cabae1a.

* Revert "swap omega and delta particle colours"

This reverts commit 4c000b2f110a5d35f317cb61cb5b03ea32841ad5.

* Revert "buff heat dmg"

This reverts commit 02a8690dafbd41631b098e51ef9afba5b6ee6ac4.
2024-10-08 20:29:37 +02:00
shamp
922dd0bce6
Fix cloth dupe (#32685)
Update curtains.yml
2024-10-08 11:51:23 +02:00
VigersRay
8207cfc8dd Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-08 10:32:08 +03:00
Saphire Lattice
f22f9e39c5
Change minibomb to be explosion resistant and start timer on damage (#32429)
* Make minibomb explosion resistant and trigger timer on damage

* Tune damage behaviour and threshold for minibomb
2024-10-08 00:42:42 +02:00
VigersRay
a2c382d5ba Доработка ПНВ 2024-10-07 08:44:38 +03:00
VigersRay
9a5aceab90 фикс StandardNanotrasenStation 2024-10-07 01:58:01 +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
VigersRay
461a4d84a2 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/workflows/publish.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/migration.yml
2024-10-07 01:09:20 +03:00
VigersRay
0419589c8c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Resources/Changelog/ChangelogSunrise.yml
2024-10-07 01:07:42 +03:00
VigersRay
a3f3c539a1 Удаление шаттла СБ и отключение пилота пока не появится под СБ 2024-10-07 01:06:51 +03:00
Golinth
46a2eb545e
Fully Revert Clown Waddling (#32652)
Fully revert Clown Waddling (revival of #29161)

A sad day, see #29156 for discussion
2024-10-06 15:33:02 +02:00
SplikZerys
437e736150
conveyors were deleted from the game (#466) 2024-10-06 16:08:01 +03:00
Арт
867efe8b5b
Add flowers to loadout (#32097)
* Add_Poppy&Lily

* Add_FlowerWreath

* Add_Headflowers

Sprites, meta, prototype

* Id_Changes

* Changes

* Update_Sprite

* Desc_Change

* Scale_Change

* Sprite_Scaling
2024-10-06 14:48:49 +02:00
slarticodefast
eb4e422cb0
fix light bulbs not fitting into the trash bag (#32452)
fix trash
2024-10-05 12:44:47 -06: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
Saphire Lattice
94c8018ff3
Change the syndicate charge to start a timer on signal (#32423)
* Change the syndicate charge to start a timer on signal

* Actually add the component in question

* Add default link for TimerStart signal
2024-10-04 11:34:48 +02:00
SplikZerys
a6bbc44225 added AI tts voice glados 2024-10-04 12:05:21 +03:00
SoulFN
9e054c1f9d
Give dragon pull ability (#32568) 2024-10-04 15:39:50 +10:00
Rinary
2fe0f92886
Оптимизация и обновление ночного виденья (#431)
* optimize night vision shader

* upd

* nvd restyle

* upd

* я не знаю почему эта хуйня не работает, я уже здался

* fix

* upd

* fix
2024-10-03 22:01:47 +03:00
Rinary
f47ba89a2f
Фиксы (#448)
* shuttles fix

* localise

* nanopaste fix

* fix adidas

* fix
2024-10-03 21:59:58 +03:00
VigersRay
b8633c71f3 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-03 17:25:09 +03:00
Vasilis
bc76cd876f
Remove sentience from clean and medi bot (#32383)
There is no point in these silicon being sentient, they have basically zero role play potential and are not meant to be controlled by players. The janibot can be played somewhat but at that point we have janitor borgs which are way better at this. You can only clean floors and even then it does a terrible job at doing that and only that. A player playing as a janibot will get bored quickly. No amount of RP will save you.

A player taking over a mediborg just makes it useless as you cant inject anymore. And again, medical borg. There's no point in adding the feature. It's too much work then its worth when we have borgs.

They don't have ghost role info for a reason. They are not meant to be played.
2024-10-03 03:32:10 -07:00
ArtisticRoomba
c68e5a667c
Various item contraband fixes (#32614)
* fixes current contraband issues: xray cannon, hos's trench coats, stinger grenades

* yet another contraband addition
2024-10-03 12:01:58 +02:00
Pieter-Jan Briers
2d644095e3
Fix borg hands showing up in stripping menu (#32606)
* Fix borg hands showing up in stripping menu

Borgs can't drop their items anyways, and the amount of hands borgs have causes the UI to just bug out.

* Add more checks
2024-10-03 02:11:56 +02:00
VigersRay
940710da9e Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-02 15:50:00 +03:00
lzk
c55e311c7e
Cleanup pins.yml (#32593)
* Cleanup pins.yml

* oh my

* forgor
2024-10-02 13:23:32 +02:00
lzk
edc83b2fab
cleanup and fix dinky star (#32594)
* cleanup dinky star

* fix

* oh
2024-10-02 12:53:19 +02:00