Skip to content
Navigation Menu
Sign in
Appearance settings
Platform
AI CODE CREATION
GitHub Copilot
Write better code with AI
GitHub Copilot app
Direct agents from issue to merge
MCP Registry
Integrate external tools
DEVELOPER WORKFLOWS
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Code Quality
Enforce quality at merge
APPLICATION SECURITY
GitHub Advanced Security
Find and fix vulnerabilities
Code security
Secure your code as you build
Secret protection
Stop leaks before they start
EXPLORE
Why GitHub
Documentation
Blog
Changelog
Marketplace
View all features
Solutions
BY COMPANY SIZE
Enterprises
Small and medium teams
Startups
Nonprofits
BY USE CASE
App Modernization
DevSecOps
DevOps
CI/CD
View all use cases
BY INDUSTRY
Healthcare
Financial services
Manufacturing
Government
View all industries
View all solutions
Resources
EXPLORE BY TOPIC
AI
Software Development
DevOps
Security
View all topics
EXPLORE BY TYPE
Customer stories
Events & webinars
Ebooks & reports
Business insights
GitHub Skills
SUPPORT & SERVICES
Documentation
Customer support
Community forum
Trust center
Partners
View all resources
Open Source
COMMUNITY
GitHub Sponsors
Fund open source developers
PROGRAMS
Security Lab
Maintainer Community
Accelerator
GitHub Stars
Archive Program
REPOSITORIES
Topics
Trending
Collections
Enterprise
ENTERPRISE SOLUTIONS
Enterprise platform
AI-powered developer platform
AVAILABLE ADD-ONS
GitHub Advanced Security
Enterprise-grade security features
Copilot for Business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Type
/
to search
Sign in
Sign up
Appearance settings
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
Uh oh!
There was an error while loading.
Please reload this page
.
citadel-station
/
citadel-main
Public
Uh oh!
There was an error while loading.
Please reload this page
.
Notifications
You must be signed in to change notification settings
Fork
382
Star
78
Code
Issues
281
Pull requests
16
Actions
Projects
Wiki
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Projects
Wiki
Security and quality
Insights
Manual Hardsync
- #15598
#15598
Open
SandPoot
wants to merge 24 commits into
citadel-station:master
citadel-station/citadel-main:master
from
SandPoot:hardsync-maybe
SandPoot/Citadel-Station-13:hardsync-maybe
Copy head branch name to clipboard
Conversation
Commits
24
(24)
Checks
Files changed
Open
Manual Hardsync
#15598
SandPoot
wants to merge 24 commits into
citadel-station:master
citadel-station/citadel-main:master
from
SandPoot:hardsync-maybe
SandPoot/Citadel-Station-13:hardsync-maybe
Copy head branch name to clipboard
Commits
Commits on Apr 13, 2022
Upload files
SandPoot
committed
f6a19e3
View commit details
Copy full SHA for f6a19e3
Browse repository at this point
Commits on Apr 24, 2022
alright so, handling layers/planes, fov and stuff i'll forget to mention.
SandPoot
committed
15a8d55
View commit details
Copy full SHA for 15a8d55
Browse repository at this point
fuck bring em back
SandPoot
committed
ad7e40f
View commit details
Copy full SHA for ad7e40f
Browse repository at this point
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hardsync-maybe
SandPoot
committed
8a51a4c
View commit details
Copy full SHA for 8a51a4c
Browse repository at this point
fixes
SandPoot
committed
654ee39
View commit details
Copy full SHA for 654ee39
Browse repository at this point
Update shuttle.dm
SandPoot
committed
b9419ec
View commit details
Copy full SHA for b9419ec
Browse repository at this point
map fixes
SandPoot
committed
bbc883c
View commit details
Copy full SHA for bbc883c
Browse repository at this point
okay /general/visible
SandPoot
committed
5702553
View commit details
Copy full SHA for 5702553
Browse repository at this point
safety
SandPoot
committed
632620c
View commit details
Copy full SHA for 632620c
Browse repository at this point
Commits on May 17, 2022
Fixes glass floor icons by converting them to cutter smoothing
deathride58
committed
16acca1
View commit details
Copy full SHA for 16acca1
Browse repository at this point
Merge branch 'master' into hardsync-maybe
deathride58
authored
19f6edd
View commit details
Copy full SHA for 19f6edd
Browse repository at this point
Commits on May 24, 2022
Merge branch 'master' into hardsync-maybe
SandPoot
authored
db07094
View commit details
Copy full SHA for db07094
Browse repository at this point
Commits on May 25, 2022
Fixes runtimes from statclick effects lacking blocks_emissive
deathride58
committed
2f93401
View commit details
Copy full SHA for 2f93401
Browse repository at this point
Fixes being unable to place cables on plating
deathride58
committed
eab6300
View commit details
Copy full SHA for eab6300
Browse repository at this point
Commits on May 26, 2022
fixes plastic flaps and bot paths
SandPoot
committed
1ac8f32
View commit details
Copy full SHA for 1ac8f32
Browse repository at this point
Commits on Jun 6, 2022
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hardsync-maybe
SandPoot
committed
8b23fa8
View commit details
Copy full SHA for 8b23fa8
Browse repository at this point
LetterN will have to scream at me why this is necessary otherwise merge!!
SandPoot
committed
496a078
View commit details
Copy full SHA for 496a078
Browse repository at this point
Commits on Jun 15, 2022
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hardsync-maybe
SandPoot
committed
bc94644
View commit details
Copy full SHA for bc94644
Browse repository at this point
Closes Hitscans are broken, new testmerge probably #15685
SandPoot
committed
c1e6fea
View commit details
Copy full SHA for c1e6fea
Browse repository at this point
Commits on Oct 5, 2022
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hardsync-maybe
SandPoot
committed
6f8dcf9
View commit details
Copy full SHA for 6f8dcf9
Browse repository at this point
bad layer
SandPoot
committed
e2d3608
View commit details
Copy full SHA for e2d3608
Browse repository at this point
yeah
SandPoot
committed
328e8c0
View commit details
Copy full SHA for 328e8c0
Browse repository at this point
Commits on Feb 24, 2023
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hardsync-maybe
SandPoot
committed
25a3fb8
View commit details
Copy full SHA for 25a3fb8
Browse repository at this point
Commits on Mar 21, 2023
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hardsync-maybe
SandPoot
committed
999f12c
View commit details
Copy full SHA for 999f12c
Browse repository at this point
You can’t perform that action at this time.