389ed704e1
# 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 |
||
|---|---|---|
| .. | ||
| Marker | ||
| Melee | ||
| Misc | ||
| Ranged | ||
| Reflect | ||