cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-22 04:38:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
596 Commits
Author SHA1 Message Date
SandPoot 2d87780147 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-13 18:06:56 -03:00
SandPoot 56d972eb0b all sorts of fixes and updates, may break stuff 2025-02-09 02:09:28 -03:00
SandPoot 1d6008397a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-11-19 23:22:26 -03:00
Metis f6af059a06 job titles 2024-11-02 03:16:16 -04:00
SandPoot 95a30412ad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-05-25 15:46:29 -03:00
SandPoot ad0f659226 push 2024-05-23 21:53:15 -03:00
SandPoot 2e2528ee56 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-13 00:36:29 -03:00
SandPoot 91045350e5 overlay stuff 2024-04-12 22:01:03 -03:00
SandPoot c2df4281b9 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-05 23:31:50 -03:00
SandPoot 68fa21d602 content 2024-04-05 17:57:54 -03:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 45a94856c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-18 18:24:11 -03:00
SandPoot 297ee64977 push 2023-10-12 15:45:35 -03:00
SandPoot ee163aae68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-12 02:40:12 -03:00
SandPoot d4ea14c4ef push 2023-10-09 16:15:49 -03:00
SandPoot b945e7a5ed push 2023-10-07 20:48:02 -03:00
SandPoot 8b66a57665 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-21 00:23:16 -03:00
SandPoot 6ab934f6a1 pushies 2023-07-19 15:06:23 -03:00
SandPootandGitHub 4a01b9f5e2 Re-UI-ing (just steals old skyrat) (#302) 
* send it

* redefining counts as error, so goodbye
 2023-02-13 00:22:01 -03:00
SandPoot 65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
DariusandGitHub 7fdaa58689 Fix latejoin panel slot displays (#281) 
Fixes a redundant display of job slots on the latejoin panel, caused by non-modular edits.
 2023-01-10 08:23:38 -03:00
SandPoot 42d4abc164 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-07 16:44:44 -03:00
Darius 3adcab1756 Display job slots out of total during late-join 
Changes late join text from "Job (current)" to "Job (current/limit)" to prevent confusion. Infinite-slot jobs display an infinity symbol.
 2023-01-04 19:15:09 -05:00
SandPoot 011dd2e817 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-16 16:47:19 -03:00
LinandGitHub 7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo 
dullahans 2: electric boogaloo
 2022-12-14 19:07:59 -07:00
SandPoot ba6d614e6a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-11-09 20:50:44 -03:00
siliconsandGitHub 268184347a Merge pull request #15875 from JerryWester/revert-15869-feat/drider-webs 
Revert "Grant Arachnid Abilities to Driders"
 2022-11-03 22:52:38 -07:00
SandPoot 02e4551a27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-25 22:52:45 -03:00
LinandGitHub 03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast 
Fixes deadchat_broadcast
 2022-10-25 04:36:00 +00:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
Jerry WesterandGitHub aace737989 Revert "Grant Arachnid Abilities to Driders" 2022-10-19 17:20:52 -06:00
siliconsandGitHub afed04d2fa Merge pull request #15873 from zeroisthebiggay/tallears 
tall ears from virgo
 2022-10-19 16:15:11 -07:00
zerothebigboy 1f8f5dc071 cocka 2022-10-19 03:49:33 -04:00
zerothebigboy 2fd981a05a penis 2022-10-18 23:57:02 -04:00
zerothebigboy 30bf2312f3 seizure 2022-10-18 23:37:40 -04:00
Jerry Wester 1015987d12 driderman, driderman, does whatever a spider can 2022-10-06 23:38:16 -06:00
SandPoot d9b51fa748 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-31 19:39:24 -03:00
zerothebigboy 434d7e0d10 don't lick a pai worst mistake i have ever made please fuck do not do it 2022-08-27 06:29:16 -04:00
timothyteakettle 2313a24918 Merge branch 'master' into dullahan-2-electric-boogaloo 2022-08-11 14:43:48 +01:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Timothy Teakettle 671e5dd872 oh shit oh fuck 2022-08-07 23:53:08 +01:00
Timothy Teakettle 7df374a1f5 IPC PLEASE 2022-08-07 23:51:02 +01:00
Timothy Teakettle 783d22b2d2 some more additions 2022-08-07 23:38:38 +01:00
Timothy Teakettle 7ed2ee82bf core changes 2022-08-04 14:11:42 +01:00
SandPoot 07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
deathride58 512a8c783c basic code cleanup and limits 2022-06-09 23:37:49 -04:00
deathride58 f30c9406cc randomization! 2022-06-09 15:29:48 -04:00