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-25 05:36:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
494 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
 2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot 8cdb82a23f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-12 22:06:13 -03:00
deathride58andGitHub 3e45c18ab4 Merge pull request #16038 from SandPoot/fix-lava+borgs 
Deals with lava plus a lot of borg stuff
 2023-12-12 19:25:13 -05:00
SandPoot e457f40328 maptext 2023-12-11 17:43:24 -03:00
SandPoot c1ec13b1bf maybe final 2023-12-07 23:55:44 -03:00
SandPoot d4ea14c4ef push 2023-10-09 16:15:49 -03:00
BongaTheProtoandGitHub a33dd4d5b5 Merge branch 'Sandstorm-Station:master' into master 2023-08-18 16:11:50 -05:00
SandPoot 41ece8c6ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-08-16 16:55:53 -03:00
SandPoot 21f2735db9 yeah baby that's what i've been waiting for 2023-08-16 13:55:58 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto 2b718295d3 Merge remote-tracking branch 'upstream/master' 2023-07-23 13:41:11 -05:00
SandPoot 8b66a57665 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-21 00:23:16 -03:00
LinandGitHub 77df8655e0 Merge pull request #15990 from SandPoot/lobby-collapse 
Collapsible lobby buttons
 2023-07-20 11:55:29 -05:00
SandPoot 6ab934f6a1 pushies 2023-07-19 15:06:23 -03:00
BongaTheProto 5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
 2023-05-01 00:16:20 -05:00
BongaTheProto acf6b87535 Merge remote-tracking branch 'upstream/master' 2023-02-24 01:39:26 -05:00
SandPoot f0dcf824a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-24 01:59:45 -03:00
SandPoot b2f7fc5a9e over action buttons also very cool you guy that hates my fancy hints, hope you know how to do everything 2023-02-24 01:07:27 -03:00
BongaTheProto 972df3f711 Merge remote-tracking branch 'upstream/master' 2023-02-16 16:30:59 -05:00
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
BongaTheProto 3f376c1bb3 Merge remote-tracking branch 'upstream/master' 2023-02-13 19:36:05 -05: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 ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
SandPoot d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
PeriodicChaosandJerry Wester 183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
BongaTheProto e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
siliconsandGitHub a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition 
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
 2022-09-23 16:16:03 -07:00
BongaTheProtoandGitHub 9025f54d7a Merge pull request #464 from ItsSelis/tgui-input-framework 
TGUI Input Framework
 2022-09-20 10:27:32 -05:00
BongaTheProto 9cdaffc417 Merge remote-tracking branch 'upstream/master' 2022-09-18 23:40:20 -05:00
BongaTheProtoandGitHub 0d5f2ab542 Merge pull request #492 from Zirok-BYOND/miscfixes 
Miscfixes
 2022-09-18 14:59:01 -05:00
SandPoot cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03:00
HatterhatGitHubHatterhat
 		1f0ad3e68c its a lil janky but we take those (#15834) 
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2022-09-17 13:47:24 -07:00
shellspeed1 11ec2b89e0 borg pda 2022-09-17 02:40:37 -07:00
Zirok b295e02087 Various harddel fixes from https://github.com/tgstation/tgstation/pull/60228/ 2022-09-16 18:51:08 +02:00
Zirok 3efd9fbf68 Various fixes, make things compile 2022-09-02 18:24:34 +02:00
KyleraceandZirok 5d2d68edc4 Cherry-pick the merge commit for tgstation PR 58991, implementing underlay Lighting 
Implements underlay lighting, turning lightin objects into a datum, for details see the tgstation PR.
 2022-09-02 18:22:15 +02:00
ItsSelis cb7e71a7b9 Added Prefs 2022-08-31 16:51:51 +02: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
BongaTheProto ec12aeaabf Merge remote-tracking branch 'upstream/master' 2022-06-05 02:00:30 -05:00
SandPoot 6bff4b4165 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-05 01:38:42 -03:00
deathride58 1a918ed8db animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game 2022-05-31 19:22:30 -04:00
deathride58 ee92230176 Moves newplayer button population to a dedicated proc, significantly reducing the hackiness involved for getting the agegate working proper 2022-05-30 22:08:49 -04:00