Commit graph

30603 commits

Author SHA1 Message Date
KaiserMaus
c5624b7fc7
Spawner for NT Gygax (ОБР) (#779)
* Sunrise weapon: small rebalance

* Особый гигакс получил спавнер

* Fix name and locale

* Перепутал Ру и US локаль...

* Короб ПКМ/MG42 250>200

---------

Co-authored-by: Your Name <you@example.com>
2024-12-05 15:13:28 +03:00
GayBot
ea76e2a280 Automatic changelog update 2024-12-05 15:07:42 +03:00
AverageNotDoingAnythingEnjoyer
1c53d61cca
"Это было в СС13" (#724)
* Пока адвокат

(и привет будушие конфликты)

* Бум, и ты АВД

* Бум, и ты больше не армянин

* Не

* Надо бы Кайзер, надо бы

* бум
2024-12-05 15:11:30 +03:00
GayBot
4cd246f10b Automatic changelog update 2024-12-05 15:00:53 +03:00
pacable
ddeada2693
Уборочный борг корректно убирает следы. (#781) 2024-12-05 15:05:04 +03:00
pacable
2400e50f72
Исправление бага с пда магистрата (#780) 2024-12-05 15:04:39 +03:00
Vigers Ray
dcc9c47c67 фикс WeaponLightMachineGunL6C 2024-12-05 15:04:00 +03:00
Vigers Ray
8a06ab5f14 Фиксы рефлекта 2024-12-05 14:59:30 +03:00
Vigers Ray
52c8a839bc Упс, забыл добавить ячейку и пустой аплик с прошлых комитов 2024-12-05 14:54:50 +03:00
Vigers Ray
01a01cce62 Увеличил лимиты чейнжлога 2024-12-05 14:54:21 +03:00
Vigers Ray
27d04c106f Доработки хитскана 2024-12-05 14:54:08 +03:00
Vigers Ray
dfd097ba38 чейнжлог 2024-12-05 14:49:02 +03:00
Vigers Ray
2f34309ebf беглецу скидки 2024-12-05 14:46:15 +03:00
Vigers Ray
c16708feee Большой апдейт ЯО. 2024-12-05 14:45:19 +03:00
Vigers Ray
12aa68be8c Рева в голосованиях 2024-12-04 23:57:00 +03:00
Vigers Ray
3b085d53df Фикс отражения пуль 2024-12-04 23:28:00 +03:00
Vigers Ray
afebbddff1 Уменьшил частоту ЯО в голосованиях 2024-12-04 23:24:24 +03:00
Vigers Ray
0579434582 упс 2024-12-04 08:11:04 +03:00
Vigers Ray
33e5f568d0 Пии может говорить в общий канал 2024-12-04 07:54:04 +03:00
Vigers Ray
da303de374 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-04 07:34:54 +03:00
Vigers Ray
879ba3b692 Возвращение тюрьмы. 2024-12-04 07:34:19 +03:00
PJBot
7ffd8012f6 Automatic changelog update 2024-12-04 02:43:25 +00:00
Partmedia
cf202e805d
Fix sinks and toilets not draining (#33691)
* Fix AutoDrain

Per the system comments, AutoDrain is designed to automatically move
puddles into the drain (like a floor drain). Drains without AutoDrain
are still supposed to gradually empty the buffer, but not remove puddles
(like sinks and toilets).

However, a logic error in the original implementation causes drains with
AutoDrain set to false to simply not work. Hence sinks never emptied.

* Update documentation
2024-12-04 03:42:16 +01:00
Vigers Ray
3a33d1c2c1 нерфы рдм предметов 2024-12-04 03:33:54 +03:00
Southbridge
87182635b6
Amber Improvements (#33707)
* Various changes (see PR)

* variantized, fixedgridatmos, tiledwalls
2024-12-03 16:59:16 -07:00
Vigers Ray
6abb3e9f93 Merge remote-tracking branch 'origin/master' 2024-12-04 02:51:01 +03:00
Vigers Ray
bfd528aecb Merge remote-tracking branch 'origin/master' 2024-12-04 02:48:38 +03:00
GayBot
d5ef75f4ba Automatic changelog update 2024-12-04 02:47:52 +03:00
pacable
08cf7e0883
Когти вульпам по просьбам трудящихся. (#774)
* дал вульпам когти. Как же они просили этого...

* легкая балансная правка
2024-12-04 02:47:44 +03:00
KaiserMaus
16a394893b
Замена Оружия в Сейфе (#775)
* Sunrise weapon: small rebalance

* NewGunSafe

---------

Co-authored-by: Your Name <you@example.com>
2024-12-04 02:47:05 +03:00
Vigers Ray
9a2e1c9e4c фикс 2024-12-04 02:46:31 +03:00
GayBot
691cdb555a Automatic changelog update 2024-12-04 02:45:51 +03:00
KaiserMaus
518971475f
Фиксы описания магазинов и оружия (#773)
* Sunrise weapon: small rebalance

* Описание Оружие и Магазинов

---------

Co-authored-by: Your Name <you@example.com>
2024-12-04 02:46:46 +03:00
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