VigersRay 7d0476aab0 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/Roles/JobPrototype.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Roles/Antags/nukeops.yml # Resources/Prototypes/Roles/Antags/revolutionary.yml # Resources/Prototypes/Roles/Antags/traitor.yml # Resources/Prototypes/Roles/Antags/zombie.yml		2024-06-07 11:28:58 +03:00
..
_Sunrise	Шаттлы для ОБР (#27)	2024-06-07 11:13:40 +03:00
Dungeon	SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)	2024-04-21 12:09:26 -04:00
Misc	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
Nonstations	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Ruins	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
Salvage	Fix godmode serialization (#27427)	2024-04-28 14:30:39 +10:00
Shuttles	Респрайты стен, шлюзов, окон и плиток. (#33)	2024-06-07 11:06:08 +03:00
Test	You can bless more containers with a bible (#26526)	2024-04-20 16:16:55 +10:00
atlas.yml	atlas update (#28442)	2024-05-31 02:39:08 -06:00
bagel.yml	bagel update (#28080)	2024-05-17 00:15:52 -06:00
box.yml	Респрайты стен, шлюзов, окон и плиток. (#33)	2024-06-07 11:06:08 +03:00
centcomm.yml	Респрайты стен, шлюзов, окон и плиток. (#33)	2024-06-07 11:06:08 +03:00
cluster.yml	Cluster Update (#28627)	2024-06-05 11:50:37 -06:00
core.yml	Update Core (#28689)	2024-06-06 23:00:02 -06:00
europa.yml	Component of planet initialization on the map (#26510)	2024-04-18 21:27:54 +10:00
fland.yml	fix fland kitchen freezer (#27532)	2024-05-10 09:57:21 -06:00
marathon.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
meta.yml	No More Bartender Incendiaries on Meta (#27142)	2024-04-20 11:06:21 +10:00
oasis.yml	Update Oasis -- robo control comp, other minor changes. (#27990)	2024-05-29 13:20:29 -06:00
omega.yml	Fix unlocked locker on Omega (#28247)	2024-05-28 01:52:59 -06:00
origin.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
packed.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
reach.yml	Fix dirt decals in reach not being cleanable (#26636)	2024-04-01 13:14:28 +11:00
saltern.yml	saltern update (#28443)	2024-05-31 02:39:14 -06:00
train.yml	Replace Train syndicate Jaws (#27734)	2024-05-08 10:30:53 +03:00