Vigers Ray 389ed704e1 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Client/IoC/ClientContentIoC.cs # Content.Server/Administration/Managers/BanManager.cs # Content.Server/Chat/Managers/ChatSanitizationManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Traitor/Uplink/UplinkSystem.cs # Content.Shared/Interaction/SharedInteractionSystem.cs # Content.Shared/Localizations/ContentLocalizationManager.cs # Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs # Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs # Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs # Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs # Resources/Audio/Ambience/Antag/attributions.yml # Resources/Audio/Weapons/Guns/Gunshots/attributions.yml # Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl # Resources/Locale/en-US/_strings/shuttles/commands.ftl # Resources/Prototypes/Datasets/Names/last.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Roles/Jobs/Science/borg.yml # Resources/Prototypes/Shuttles/shuttle_incoming_event.yml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json # Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # RobustToolbox		2024-10-30 13:26:32 +03:00
..
Atmos/gasanalyzer.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
Chapel	The Honored Quran (Sprite addition) (#27400)	2024-04-28 02:36:04 +10:00
Chemistry	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-30 13:26:32 +03:00
Detective/evidence_marker.rsi	Added Evidence Markers for the Detective! (#25255)	2024-02-17 15:49:16 -05:00
Hydroponics	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
Janitorial	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-21 05:04:06 +03:00
Kitchen/food_carts.rsi	Add food carts (#19177)	2023-08-15 15:26:49 -07:00
Library/Equipment/books_bag.rsi	Change my copyright (#31599)	2024-08-28 21:12:09 +02:00
Mech	Рефактор мехов, правки в системе медицины (#507)	2024-10-30 10:53:00 +03:00
Medical	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-30 13:26:32 +03:00
Mining	upstream	2024-09-16 12:40:23 +03:00
Research	Wide anomaly locator (#20581)	2023-10-01 12:41:32 -04:00
Robotics	Новые предметы, фикс супер материи, правки (#515)	2024-10-30 10:19:36 +03:00
Security	LockVisualizer (#25224)	2024-02-16 16:52:31 -07:00
Service/vending_machine_restock.rsi	Adds vending restocks for ChefVend and Condiment Stations (#19305)	2023-10-01 16:49:10 -04:00
Syndicate/telecrystal.rsi	add saturation to TC inhand sprites (#22870)	2023-12-22 20:26:01 -07:00
Xenoarchaeology	node scanner resprite (#17609)	2023-06-24 14:20:26 +10:00