cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-31 08:37:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
53,550 Commits 55 Branches 0 Tags
d9d617bf8d5b5602456f53995f636ca5fd85ca21
Commit Graph
896 Commits
Author SHA1 Message Date
BongaTheProtoandGitHub d9d617bf8d Merge branch 'Sandstorm-Station:master' into master 2023-02-10 16:53:13 -05: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
BongaTheProto ebbb0ad08c Merge remote-tracking branch 'upstream/master' 2023-01-10 16:51:46 -05: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
BongaTheProto ab9d691f1a Merge remote-tracking branch 'upstream/master' 2023-01-09 16:59:38 -05: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
BongaTheProto a04476b38d Merge remote-tracking branch 'upstream/master' 2022-12-16 20:39:53 -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
BongaTheProtoandGitHub a1c93d4767 Merge branch 'Sandstorm-Station:master' into master 2022-11-09 19:12:06 -05: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
BongaTheProto a949e5d08c Merge remote-tracking branch 'upstream/master' 2022-10-28 16:43:28 -05: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
BongaTheProto b287251261 Merge remote-tracking branch 'upstream/master' 2022-08-31 19:46:05 -05: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
SandPoot 32535e69b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-23 18:31:23 -03:00
siliconsandGitHub f2b8061d4b Update observer.dm (#15802) 2022-08-21 20:39:17 -07:00
BongaTheProtoandGitHub e061ac9fbf Merge pull request #433 from WoolyAypa/esthetic-help 
More sprites for the sprite gods
 2022-08-16 18:06:31 -05:00
Yawet330 648ad713b0 Wings^2, mental illness edition. 2022-08-16 11:23:28 +01:00
Aypa e837ea991e Merge branch 'master' into esthetic-help 2022-08-14 16:54:21 -03:00
WoolyAypa df7fae30c1 fuck it, colorful angel wings! >:) 2022-08-13 23:12:58 -03:00
timothyteakettle 2313a24918 Merge branch 'master' into dullahan-2-electric-boogaloo 2022-08-11 14:43:48 +01:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05: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
BongaTheProto 375c0f2634 Merge branch 'master' into pr/359 2022-06-16 16:43:41 -05:00
BongaTheProto 03f4c65fc4 Merge remote-tracking branch 'upstream/master' 2022-06-11 23:25:29 -05: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
BongaTheProto 6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -05:00
SandPoot be1357bdb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:29:38 -03:00
LinandGitHub 6f97ec2b1d Merge pull request #15656 from deathride58/animfix 
Animation refresh - Fully restores animations broken by BYOND updates, some light animation-related tweaks, and more
 2022-06-07 18:05:07 +00:00
deathride58 dac4e9b974 fixes ghost pixel z not resetting on orbit stop 2022-06-05 18:01:15 -04:00