rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Shared/Roles
History
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
..
JobRequirement Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-30 13:26:32 +03:00
Jobs Add role prototype validation tests (#32801) 2024-10-14 14:05:25 +11:00
RoleCodeword Add codeword highlighting (#30092) 2024-08-23 11:14:38 +02:00
AntagPrototype.cs Add JobRequirementOverride prototypes (#28607) 2024-06-07 09:43:02 -07:00
DepartmentPrototype.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-08-05 17:22:05 +03:00
JobPrototype.cs upstream 2024-09-16 12:40:23 +03:00
JobRequirementOverridePrototype.cs Add JobRequirementOverride prototypes (#28607) 2024-06-07 09:43:02 -07:00
JobRequirements.cs Фикс открытия ролей спонсоркой 2024-08-15 21:08:28 +03:00
JobSpecial.cs Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
MindGetAllRoleInfoEvent.cs Mind Role Entities (#31318) 2024-10-10 10:48:56 +02:00
MindIsAntagonistEvent.cs Refactor antag rule code (#23445) 2024-02-29 17:25:10 +11:00
MindRoleAddedEvent.cs Move minds, roles, jobs and objectives to shared (#19679) 2023-08-30 21:46:11 -07:00
MindRoleComponent.cs Hide role entities in the spawn menu (#32798) 2024-10-14 14:05:49 +11:00
RoleAddedEvent.cs Move minds, roles, jobs and objectives to shared (#19679) 2023-08-30 21:46:11 -07:00
RoleEvent.cs Move minds, roles, jobs and objectives to shared (#19679) 2023-08-30 21:46:11 -07:00
RoleRemovedEvent.cs Move minds, roles, jobs and objectives to shared (#19679) 2023-08-30 21:46:11 -07:00
SharedRoleSystem.cs Add role prototype validation tests (#32801) 2024-10-14 14:05:25 +11:00
StartingGearEquippedEvent.cs Space Ninjas auto-toggle internals after spawning (#25083) 2024-05-03 11:24:21 +10:00
StartingGearPrototype.cs De-duplicate loadout gear (#30341) 2024-08-05 00:42:25 -04:00