Commit graph

32400 commits

Author SHA1 Message Date
Vigers Ray
df2ea9dd7b ы 2025-02-10 06:32:38 +03:00
Vigers Ray
11dc942756 странности 2025-02-10 06:30:35 +03:00
Vigers Ray
33b2107cc4 заебал 2025-02-10 05:34:22 +03:00
Vigers Ray
8f3d01efdc ы 2025-02-10 05:27:02 +03:00
Vigers Ray
76d493549e Merge remote-tracking branch 'origin/master' 2025-02-10 05:10:18 +03:00
Vigers Ray
07857c5377 ы 2025-02-10 05:09:51 +03:00
Babaev
67316d6138
Фикс голосования о выборе карт (#1299) 2025-02-10 05:00:01 +03:00
Vigers Ray
42daef2255 Фикс апстрима 2025-02-10 04:53:54 +03:00
Vigers Ray
4c2742b365 Merge remote-tracking branch 'space-wizards/master' 2025-02-10 04:33:51 +03:00
Vigers Ray
163df9d5a9 Мехи говорят 2025-02-10 04:32:54 +03:00
PJBot
2f30bc3c0d Automatic changelog update 2025-02-10 01:25:18 +00:00
IProduceWidgets
fe064adaec
Allows pacifists to throw Items with DamageOnLand (#31060) 2025-02-09 20:24:10 -05:00
Deerstop
2e2a3a9cb1
Elkridge Tweaks 2 (#34757)
* bigger TEG, moved EVA, moved engi and med substations, maints loot, increased pop to 15-45

* tweaked some job numbers around for higher pop

* holy shit i forgot the o2 and n2 miners

* fixed unwired substation

* made the TEG worse >:)

* added southbridge's pride-o-mat cos i kept forgetting

* fixed evac timer display, resolves #34850

* removed pridevend for testing

* nvm it was the shuttle, not the pridevend, oops
2025-02-09 18:07:10 -07:00
Spessmann
eeb689261b
Convex update (#35023)
convex update
2025-02-09 18:06:32 -07:00
ArtisticRoomba
e1aff4dd98
Rebalance Relic station power + misc fixes (#35022)
Rebalance Relic station power
2025-02-09 17:51:29 -07:00
compilatron
21b3f23938
Plasma fixes 3 (#35021)
Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
2025-02-09 17:47:21 -07:00
ArtisticRoomba
27e54832d9
Misc Loop improvements (#34997)
* misc loop improvements

* fixgridatmos

* god help me
2025-02-09 16:41:13 -07:00
PJBot
d8db4a66fd Automatic changelog update 2025-02-09 23:25:20 +00:00
Vortebo
3ab1db99c1
Relic station (#34988)
* General structure mostly complete.

* I thiiiiiink I am done with air alarms. And pipes. Maybe.

* Decals, shuttle, rust.

* Small fixes.

* Shuttle more or less where I want it.

* Security is prettier, spawns are more fun.

* Shuttle done. Almost done with one checklist.

* Map renders now.

* Checklists done.

* Adjusted min player count.

* Should pass the Build & Test Debug check now.
2025-02-09 16:24:13 -07:00
Zachary Higgs
6cb30b3092
Make UnrevivableComponent shared, give the component reason messages and if it shows up on the analyzer (#35013)
* Make UnrevivableComponent shared

- Move UnrevivableComponent to shared

- add reason messages and if the status shows up in a health analyzer

* Update Content.Shared/Traits/Assorted/UnrevivableComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Make UnrevivableComponent networked

* Update Content.Shared/Traits/Assorted/UnrevivableComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-10 00:16:21 +01:00
Vigers Ray
8412970eb5 ту мач 2025-02-10 02:08:50 +03:00
PJBot
cb723b0cdb Automatic changelog update 2025-02-09 22:17:23 +00:00
Джексон Миссиссиппи
0024f3fa0d
Add loungewear to uniform printer (#35008)
* Update clothing.yml

* Update clothing.yml
2025-02-09 23:16:17 +01:00
Vigers Ray
1e617b9896 Фелинидам не место в мехах для больших дядь 2025-02-10 00:39:59 +03:00
Vigers Ray
733ec19150 звук какашка 2025-02-10 00:38:48 +03:00
PJBot
c1f64c591d Automatic changelog update 2025-02-09 21:02:38 +00:00
Spessmann
afede7d4d0
Removes Cog station (#34996)
freedom!!!
2025-02-09 14:01:31 -07:00
Vigers Ray
62a972a050 админвху для всех 2025-02-09 23:38:39 +03:00
Vigers Ray
7abc8efa2a фиксы апстрима 2025-02-09 23:35:01 +03:00
Pieter-Jan Briers
360794eb3a
Publishing workflow for Vulture Test server (#35009)
* Publishing workflow for Vulture Test server

* Remove dep install from workflow

Not necessary since changelogs don't happen
2025-02-09 20:48:10 +01:00
Vigers Ray
3355febe9b Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/StatusIcon/StatusIconSystem.cs
#	Content.Server/Implants/ImplantedSystem.cs
#	Resources/Audio/Effects/attributions.yml
#	Resources/Locale/en-US/markings/ears.ftl
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/Prototypes/Entities/Mobs/Player/observer.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/LootTables/suspicion_loot_table.yml
#	Resources/Prototypes/Research/arsenal.yml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
#	Resources/manifest.yml
#	Resources/migration.yml
#	RobustToolbox
2025-02-09 22:17:22 +03:00
Vigers Ray
ed4886b04a Нерф хила рады от алкашки. 2025-02-09 21:43:38 +03:00
Vigers Ray
d7ad3d8ffd
Update issue templates 2025-02-09 21:25:47 +03:00
GayBot
cb7fb34763 Automatic changelog update 2025-02-09 21:17:55 +03:00
Francus41
c561f5c001
фрейчик крутит мету как может (#1314) 2025-02-09 21:21:14 +03:00
Vigers Ray
dfe8d5f487 фиксы линтера 2025-02-09 21:16:52 +03:00
GayBot
8ae6639771 Automatic changelog update 2025-02-09 20:23:02 +03:00
Kendrick
94ce1a39e5
Снижение цены на имплант "Побег" (#1292) 2025-02-09 20:26:21 +03:00
temm1ie
46791dd40a
Добавление мешка с землей в биогенератор (#1313) 2025-02-09 20:26:00 +03:00
Perl404
7505a1709a
[LOCALE] Locale validator 09.02.2025 (#1312) 2025-02-09 20:25:30 +03:00
GayBot
50e687c2f7 Automatic changelog update 2025-02-09 20:14:49 +03:00
RaMbUt878
e5ffd7afd6
UZI gun (#1307)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-02-09 20:18:07 +03:00
temm1ie
fa23f7b264
Добавление нового растения и мутаций (#1304) 2025-02-09 20:13:40 +03:00
KaiserMaus
f6219c111a
Базовые Прототипы Экономики (#1303) 2025-02-09 20:13:15 +03:00
KaiserMaus
9e751eccc8
Шахте Победа Tweaks (#1302) 2025-02-09 20:12:48 +03:00
Nrd-K
df935de609
Спрайты для коробки с glock и игрушки Вех (#1301) 2025-02-09 20:12:30 +03:00
GayBot
58711e7a54 Automatic changelog update 2025-02-09 20:07:34 +03:00
KaiserMaus
02f0befd13
Балансировка Мехов и их вооружения в Аплинке (#1298)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-02-09 20:11:57 +03:00
banumbas
cf2b4421fb
Обновление дарвиниума, НЕ ФИКС(разве что чут чут). Плюс подкрепы и ребаланс некоторых вещей синдиката. (#1297) 2025-02-09 20:10:53 +03:00
KaiserMaus
ebd35e4cf6
Осанрайзил Карго заказы Вооружения (#1296) 2025-02-09 20:10:20 +03:00