Vigers Ray 28484c893c Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Damage/modifier_sets.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml # Resources/migration.yml		2024-12-16 18:50:05 +03:00
..
hide.rsi	various material & ore inhands (#33342)	2024-11-24 17:24:13 +01:00
ingots.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
materials.rsi	various material & ore inhands (#33342)	2024-11-24 17:24:13 +01:00
Mob	add space carp and sharkminnow teeth (#31070)	2024-08-18 21:04:59 -06:00
ore.rsi	various material & ore inhands (#33342)	2024-11-24 17:24:13 +01:00
parts.rsi	various material & ore inhands (#33342)	2024-11-24 17:24:13 +01:00
Scrap	Add generator scrap (Plasma / uranium scrap) (#32198)	2024-12-16 13:33:34 +01:00
Shards	crystals drop shards and ore crab tweaks. (#20930)	2023-12-16 15:20:14 -07:00
Sheets	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
silk.rsi	various material & ore inhands (#33342)	2024-11-24 17:24:13 +01:00