NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/.github
History
Exact
Morb0 611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Packaging/ContentPackaging.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Resources/Audio/Weapons/Guns/Gunshots/license.txt
#	Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
2023-11-08 03:00:51 +03:00
..
ISSUE_TEMPLATE Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-24 22:01:46 +03:00
workflows Merge remote-tracking branch 'upstream/master' into update-sposnors 2023-11-08 03:00:51 +03:00
CODEOWNERS Refactoring body system to use containers and general body cleanup (#20202) 2023-09-21 17:23:02 +10:00
config.yml Create config.yml 2020-02-04 20:42:36 +01:00
labeler.yml Fix labeler localization path 2022-06-21 01:24:26 +03:00
PULL_REQUEST_TEMPLATE.md Update pull request template (#18900) 2023-08-18 09:22:00 -08:00
rsi-schema.json Adds support for CC-BY-NC licenses (#6648) 2022-02-10 20:27:48 -07:00