Commit graph

30570 commits

Author SHA1 Message Date
Nrd-K
449112803a
сбалансирована цель по просьбе игроков, удален когнизин, что не вписывался в "сюжет" цели (#772) 2024-12-04 02:46:37 +03:00
EscontiX
9fa1a18762
Добавлена ручка ЦК во второй карман (#770) 2024-12-04 02:45:34 +03:00
KaiserMaus
d79a6b33dd
Визор оперативников для пилотов МЕХа (#769)
* Sunrise weapon: small rebalance

* NukeMechDiagnosticHUD

* meta

---------

Co-authored-by: Your Name <you@example.com>
2024-12-04 02:45:23 +03:00
iertis
02bab1efe9
Небольшие фиксы (#766) 2024-12-04 02:44:58 +03:00
Vigers Ray
3eeeaaa05c
Реворк огнестрела под хитскан. (#755)
* Реворк огнестрела под хитскан

* борги на хитскане

* Анимация трассировки пули
2024-12-04 02:44:24 +03:00
Vigers Ray
6d2680043d Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
2024-12-03 20:37:10 +03:00
Southbridge
2c2a435dbd
Amber Station Seasonal Update (#33698)
Made some modifications requested by reviewers prior to and after map merge, also added holiday decorations!
2024-12-02 21:58:02 -07:00
PJBot
bfd005a37f Automatic changelog update 2024-12-03 03:00:54 +00:00
CheddaCheez
e50c98c618
Add missing nacho recipes (#33637)
* Nacho recipes, nutrition, and trash

In meal_recipes.yml: Add recipes for Nachos, Cheesy Nachos, and Cuban Nachos.

In meals.yml: Add a solutions container to regular nachos so it lines up with the others, and add a small plate as trash to each one.

* Volumes, nutritional tweaks, and flavor

In meals.yml: Lowered maxVol on nachos to leave 5 units of space. Nachos nutriment and vitamin lowered for costing so little. A cheese wedge is 3.75 nutriment, so cheesy having 4 more total nutritional value lines up nicely to me.

Cuban nachos had too little volume to fit its reagents in the first place, so increased maxVol by 10. Chili peppers are 4 nutri / 4 vitamin and ketchup has a touch of tomato, so bumped to 8 and 5. Capsaicin lowered partly to make it an even 20u. Ketchup dilutes I guess. Also they don't have cheese so I changed the flavor profile to tomato instead.

In meal_recipes.yml: Cuban Nachos recipe tweaked to require one less pepper. Given above numbers, this fits the nutritional value imo.
2024-12-02 20:59:47 -06:00
Luiz Costa
029b0374e9
Juiceable slimeballs (#33660)
adds extractable component to slimeball prototype
2024-12-02 20:51:00 -06:00
Velcroboy
c1491e91b8
Adds a morgue locked maints airlock (#33693)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-12-02 20:46:55 -06:00
SpaceRox1244
2e31eb32cb
Makes kukri not use combat knife's storage sprite (#33661) 2024-12-02 20:41:42 -06:00
PJBot
f0829a6652 Automatic changelog update 2024-12-03 02:25:45 +00:00
Southbridge
e4e84aea74
New Low-Mid Pop Station - Amber Station (#33441)
* Initial Commit with two departments done

* Checkpointing work

* Added most of service and science

* Started work on medbay

* Modified TEG setup and set up atmos pipes for engineering

* Re-added medbay, added chapel and janitorial, started routing disposals and generally the final layout of the map is coming together

* Plenty of additions, too many to list in a commit message

* Major update

* Nearly done with the map, just have to do decals and emergency lights

* Added all decals, only thing missing is department signs

* Toned back the dirt decals a bunch, added hallway signs and other decorations

* Finishing touches on the map before testing.

* Fixed invalids

* Renamed the station to Amber, and made a couple adjustments

* Completely redid cargo, added maints around sec

* Added Amber to the map post init integration test

* Many small updates addressing issues.

* Ran a script to update all the camera names, also ran fixgridatmos, fixrotations, tilewalls, and variantize

* Started addressing some of the issues brough up by Emisse and others

* Addressed all issues mentioned by reviewers. Added mail system.

* Wrapped up meeting all the issues raised by reviewers, also did a bunch of testing and resolved issues found during those tests

* Addressed additional requested changes, and nabbed some ship designs from Frontier. Redesigned south east maints and surrounding meteor nets based off of those designs

* Making a couple more requested changes

* Reduced the amount of Nitrogen Closets, made several small adjustments. Ready for review again!

* Removed invalids!

* web edit lmao

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2024-12-02 19:24:37 -07:00
SpaceManiac
b800d98260
Fix lobby countdown not showing hours (#33685) 2024-12-02 13:29:44 -08:00
PJBot
cc804bf316 Automatic changelog update 2024-12-02 19:45:08 +00:00
JIPDawg
638a1dc489
Fixed ghost role rules for some syndicate familiars (#32457)
* fix ghost role rules for some syndicate familiars

* change from monkey rules to Team Antag rules.

* Resolve reviews + Fix rules for LoneOp and Xenos

* ghostrole rules

---------

Co-authored-by: JIPDawg <JIPDawg93@gmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
2024-12-02 20:43:59 +01:00
dylanstrategie
7f966ab9b1
Touching up Bagel Security Brig (#33680)
* Touching up Bagel Security Brig

* Added a few missing door names

* Last door name I promise

* Address feedback

* Forgot to delete old shutter button

---------

Co-authored-by: dylanstrategie <188926747+dylanstrategie@users.noreply.github.com~>
2024-12-02 04:29:45 -07:00
Vigers Ray
5be9a62344 - планета дельты 2024-12-02 11:24:08 +03:00
GayBot
6478780a8c Automatic changelog update 2024-12-02 11:18:40 +03:00
iertis
871696037f
Добавил слоты агостам (#763) 2024-12-02 11:18:45 +03:00
iertis
4b2dadd371
Ручка магистрата (#762) 2024-12-02 11:18:34 +03:00
Vigers Ray
4541daf2bf чейнжлог 2024-12-02 11:17:16 +03:00
Vigers Ray
3735f36731 фикс DragonComponent 2024-12-02 11:16:18 +03:00
Vigers Ray
2866de91de Фиксы 2024-12-02 11:16:05 +03:00
Vigers Ray
81fd05c517 хмм 2024-12-02 09:32:22 +03:00
Vigers Ray
89cf50ba6c хммм 2024-12-02 09:18:57 +03:00
Vigers Ray
51903affc2 упс 2024-12-02 08:58:05 +03:00
Vigers Ray
bbd5fc5f7c Фикс следов для рас 2024-12-02 08:40:07 +03:00
Vigers Ray
1025e3b2a0 фикс настройки удаления следов 2024-12-02 08:25:07 +03:00
GayBot
ec51b16f98 Automatic changelog update 2024-12-02 08:05:00 +03:00
pacable
903b4f1401
Портативная консоль атмосферных угроз всем инженерам и атмосам. (#754)
* base prototype

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>

* лоадаут для этого

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

* role loadouts

* locale

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-12-02 08:04:52 +03:00
Vigers Ray
0e3038eb59 фикс дубля 2024-12-02 08:00:02 +03:00
Vigers Ray
b83de68c91 чейнжлог 2024-12-02 07:40:09 +03:00
Vigers Ray
7c8a5ae4c2 Фикс энерго мечей. Фикс смены цвета работы каргой агента. карту агента, эсворды, пИИ синдиката и одежду хамелеона больше не могут использовать не синдикаты. 2024-12-02 07:31:30 +03:00
Vigers Ray
d3dc1659b6 Сделал звук ионного шторма тише 2024-12-02 07:27:33 +03:00
Vigers Ray
d16c5264d3 Добавил скидки для вещей санрайза в аплинке 2024-12-02 03:27:11 +03:00
Vigers Ray
7b7f3a10ca У предателей 40тк. 2024-12-02 03:26:46 +03:00
Vigers Ray
08d15d459c Фикс возможность узнать геймрул через хаб и вебхук. Добавил 3 выбора попимо секрета в геймрул 2024-12-02 03:26:33 +03:00
Vigers Ray
be9fea93ab Вернул бесплатный растворитель для агентов 2024-12-02 03:24:35 +03:00
Vigers Ray
16b166e915 Убрал вампиров как раундстарт геймрул 2024-12-02 03:24:16 +03:00
Vigers Ray
c7fb9ea04b Беглец получил фракцию синдиката 2024-12-02 03:09:57 +03:00
Vigers Ray
22fde339f5 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-02 02:25:52 +03:00
GayBot
d2db74bcfd Automatic changelog update 2024-12-02 02:23:30 +03:00
pacable
4031029f15
Мапа для ивентов от рыбьей станции (#752) 2024-12-02 02:23:45 +03:00
pacable
18143644f5
исправление (#753)
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-12-02 02:23:21 +03:00
Vigers Ray
4c090a3d03 Бафф и возвращение резины для СБ. 2024-12-02 02:05:07 +03:00
Vigers Ray
5303ca2622 Бафф чайны 2024-12-02 01:49:11 +03:00
Vigers Ray
189583f536 Авторазядка оружия киборгов синдиката 2024-12-02 01:35:14 +03:00
PJBot
560fd8dd77 Automatic changelog update 2024-12-01 22:10:41 +00:00