Commit graph

31590 commits

Author SHA1 Message Date
GayBot
f034dba5a8 Automatic changelog update 2025-01-10 21:34:21 +03:00
iertis
45ea2b6732
announce and maintance accesses (#1080)
* announce and maintance accesses

* some fixes

* Uwы

* Delay

* i think that this is final
2025-01-10 21:37:50 +03:00
GayBot
bdd3a89d58 Automatic changelog update 2025-01-10 21:32:45 +03:00
Babaev
f1e22f6b8c
Революция теперь заканчивается сразу после убийства всех глав (#1068)
* Update RevolutionaryRuleSystem.cs

* автоматический эпсилон при смерти глав
2025-01-10 21:36:17 +03:00
GayBot
7c1e8dc50c Automatic changelog update 2025-01-10 20:06:07 +03:00
Babaev
ea8d7c9c7e
дельта и эвак после икаруса (#1083) 2025-01-10 20:09:40 +03:00
GayBot
b8667f64ad Automatic changelog update 2025-01-10 19:47:57 +03:00
KaiserMaus
4218afd208
Аварийные баллоны увеличены в 2 раза (#1075)
* Sec QOF

* Buff all tanks
2025-01-10 19:51:30 +03:00
Vigers Ray
0dc68c5f4e Убрал кронерку 2025-01-10 04:51:33 +03:00
Vigers Ray
9211bebe21 чейнжлог 2025-01-10 03:56:51 +03:00
Vigers Ray
75af9a7dcc Борги не скользят на магбутсах 2025-01-10 03:53:06 +03:00
Vigers Ray
9366ca374a Борги могут опять садить на себя людей 2025-01-10 03:52:48 +03:00
Vigers Ray
85ee9ebbc6 Борги боевые лошади 2025-01-10 03:52:27 +03:00
Vigers Ray
ad194520bc упс 2025-01-10 02:35:36 +03:00
Vigers Ray
afdf42c433 Фикс возможности боргов садить на себя людей и нерф их прочности 2025-01-10 02:34:27 +03:00
Vigers Ray
e6900d919b фикс количества ТК у ЯО и ДО 2025-01-10 02:17:12 +03:00
Vigers Ray
74271a9dde вобля 2025-01-10 01:47:36 +03:00
Vigers Ray
19626808ec Merge remote-tracking branch 'origin/master' 2025-01-10 01:23:27 +03:00
Vigers Ray
e8ae38e85b Merge remote-tracking branch 'origin/master' 2025-01-10 01:22:44 +03:00
Vigers Ray
d16a238061 Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-10 01:22:33 +03:00
KaiserMaus
def2206f08
Шприцемёты: Крио/Блюспейс Мини-Шприцы (#1074)
* Syringe Gun

* Fix Linter?

* Now fix?

* Syringe Gun Tweaks

* Brigmed
2025-01-10 01:22:03 +03:00
GayBot
06170cdee9 Automatic changelog update 2025-01-10 01:18:30 +03:00
Vigers Ray
bee4a1492e Счетчик антагов для метрики 2025-01-10 01:18:16 +03:00
Vigers Ray
49c2165703 Иконки культу плоти и до (без до) 2025-01-10 01:18:00 +03:00
GayBot
249b3d7e22 Automatic changelog update 2025-01-10 01:17:12 +03:00
Babaev
17a90e0ef6
обычные госты больше не видят иконки фракций (#1072) 2025-01-10 01:21:18 +03:00
Perl404
674676a32f
Исправление локализации от 09.01.2025(fix1) (#1071)
* Резиновый магазин Glock-22 переведён

* Резиновый магазин Glock-22 переведён

* Полностью переведены игральные карты

* Полностью переведены классические игральные карты

* Fixes

* Fixes
2025-01-10 01:20:44 +03:00
ThereDrD
106293a4ad
Игра теперь со звуком (#1061)
* add: add pickup/drop sound to all guns and lasers

* add: add insert and remove sound to holsters and sabre sheaths

* add: add yummy hit sounds

* add: add pick up/drop sound to hundreds of items

* add: add new nvd sounds
2025-01-10 01:20:24 +03:00
Rinary
b93c6f4e0e
Locale update (#1060)
* init

* some fixes

* fix validator

* translate implanters
2025-01-10 01:20:11 +03:00
banumbas
21ede66dfe
Sosal? (#1064)
Co-authored-by: Seven2280 <semvalentin123@gmail.com>
2025-01-10 01:19:48 +03:00
PJBot
abf7f62e6f Automatic changelog update 2025-01-09 20:25:38 +00:00
Alpaccalypse
36cbd07c07
Drink titles and soda vendor consistency (#34178)
* Made capitalisation of proper names consistent.

* Roy Rogers is presumably a proper name.

* Second pass at distinguishing proper names only.

* Two nitpicking/minor changes

* Fixed some overlooked can brand names. Matched case with descriptions.

* Switched generic sodas with brands for SodaInventory

* Removed commonly available branded cans

* Matched case consistency used elsewhere. Minor SPAG corrections.

* Added "nothing" and some missing alcohol bottles to RandomSpawner

* Added distinct ad and bye chatter to Dr. Gibb machines.

* Revert "Added distinct ad and bye chatter to Dr. Gibb machines."

This reverts commit f90b8a470556de05aca81255db8b6b03596ae944.

* Revert "Removed commonly available branded cans"

This reverts commit 43b82168dac1f73b187b7677f34ecdd33b6bb81a.

* Revert "Switched generic sodas with brands for SodaInventory"

This reverts commit f1790f0ce61ef135c79068de6a741e8bb50d85d3.

* Lowercased DrinkGlass suffix. Moved alcoholic drinks from drinks to alcohol.

* Renamed energy drink to Red Bool. Corrected and added some jug descriptions.

* Added reagent names for all bottles except poison-wine

* Revision of title case for cocktails

* SPAG and fixed the only brand reagen with unbranded name.

* Possibly controversial, shortened some bran names to better fit the UI.

* Fixed some inconsistencies in naming

* Matched brand localisation change

* Two name style edits

* Fixed Smite bottle name

* Minor, punctuation

* Blank line to end of file

* Upgraded descriptive names to title case

* Banana Mama

* reverts change, moved to another PR to avoid conflict.

* Removed caffeine reference.

* Minor, corrected some more inconsistencies

* Removed Bottle of Nothing from random spawner.
2025-01-09 21:24:31 +01:00
PJBot
66810ef257 Automatic changelog update 2025-01-09 11:24:44 +00:00
deltanedas
04984984fe
change locking to use ComplexInteraction (#34326)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-01-09 12:23:37 +01:00
PJBot
fdbb3c8f39 Automatic changelog update 2025-01-09 08:55:16 +00:00
Southbridge
e0b2d000ef
Amber Station - Fixes and Warm Lights (#34324)
* Added warm lights, placed them around the map, also fixed an issue with the MV wire in the cafeteria

* Fixed lv wiring in caf, and adjusted a couple things

* Empty commit to force checks to rerun
2025-01-09 09:54:04 +01:00
flymo5678
ba9eed7670
Added missing cameras to Loop Station (#34308)
* Added missing cameras

* Added missing cameras
2025-01-08 16:38:13 -07:00
PJBot
60e1c6f515 Automatic changelog update 2025-01-08 15:24:42 +00:00
c4llv07e
904d75c8a9
Fix empty lines in adminwho with stealthmins. (#34122)
Don't print newline if admin is hidden.
2025-01-08 10:23:33 -05:00
GayBot
22a5170aec Automatic changelog update 2025-01-08 16:49:29 +03:00
Perl404
22d24feec7
Апстрим локализации 08.01.2025 (#1059)
* Локализация ирландского слэммера

* Исправление локализации

* Локализация verb-instrument-openui

* Локализация

* Локализация станционный маяк

* Локализация

* Локализация козы

* Добавлен gibb.ftl в русскую локализацию, переведён gibb.ftl

* Локализация голопады

* Переведён КПК патологоанатома

* Locale validator fix

* Исправлена локализация козы

* Переведён chameleon-projector
2025-01-08 16:53:01 +03:00
Babaev
0a5bb7f9ed
init (#1058) 2025-01-08 16:52:49 +03:00
Vigers Ray
951993c253 Убрал цель на убийство антагов 2025-01-08 16:50:26 +03:00
Vigers Ray
3f69870108 фикс запуска режима культа плоти 2025-01-08 16:43:27 +03:00
flymo5678
c1aaf64521
Fixed Loop Station's southern solar array unlinked airlocks (#34296)
Fixed Southern solar external airlock door bolts
2025-01-08 04:10:50 -07:00
Southbridge
8945ac3560
Amber Station - Balance Improvements (#34294)
changed the center area in med bay to a garden, weakened meteor shielding in some areas, also general touch ups around the station
2025-01-08 02:13:39 -07:00
Vigers Ray
a1c800c5ab Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	LICENSE.TXT
2025-01-08 09:03:30 +03:00
Vigers Ray
9c8d8f2ff8 упс 2025-01-08 09:01:31 +03:00
Vigers Ray
c97b3e9ab6 перевод наручников в аплинке 2025-01-08 08:52:01 +03:00
Vigers Ray
e196a1c838 Разные фиксы ДО и плоти. 2025-01-08 08:51:46 +03:00