CatStation/Resources/Prototypes/Roles
Morb0 0eba25c0eb Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	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/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
#	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/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2024-10-15 17:04:40 +03:00
..
Antags Add playtime requirement for thief (#2617) 2024-09-24 16:15:31 +02:00
Ghostroles Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098) 2024-09-10 00:40:00 -06:00
Jobs Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-15 17:04:40 +03:00
MindRoles Fix some rounds failing to end due to mind roles (#32792) 2024-10-13 22:55:15 +02:00
play_time_trackers.yml Fix some contraband issues (#31606) 2024-09-09 13:36:25 -06:00
requirement_overrides.yml Add JobRequirementOverride prototypes (#28607) 2024-06-07 09:43:02 -07:00