cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-31 09:16:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,093 Commits 8 Branches 0 Tags
metropolis
Commit Graph
864 Commits
Author SHA1 Message Date
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot 17a01b6f2a revert stuff 2024-01-16 14:53:48 -03:00
SandPoot 0919b13d63 extra stuff 2024-01-07 03:47:09 -03:00
SandPoot 46384d2a67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-07 03:36:25 -03:00
SandPoot 003eec1850 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons 2024-01-07 02:09:58 -03:00
SandPoot 6d7321b0c4 okay so this is necessary 2024-01-05 22:09:21 -03:00
SandPoot 51c1c2abc9 huds! 2024-01-05 17:07:54 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 05e2cc0979 there 2024-01-05 00:18:21 -03:00
SandPoot a8be340925 fix constructs follow-up pr 2024-01-03 22:46:19 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot 65ed5c79f4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-30 02:07:21 -03:00
SandPoot 6733de69bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks 2023-12-29 23:16:11 -03:00
SandPoot 4e9ff44ee7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-29 15:49:14 -03:00
deathride58andGitHub ce1d757159 Merge pull request #16016 from SandPoot/throwing-update 
[TESTMERGE] Updates firemanning, throwing stuff
 2023-12-28 22:44:59 -05:00
SandPoot b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot f626df9d1d push 2023-12-13 00:08:58 -03: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
deathride58andGitHub e729badcd2 Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable) 
Maptext()s the maptexts
 2023-12-12 19:21:17 -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 42fdd30ba4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-05 17:47:58 -03:00
SandPoot b290efc434 push 2023-11-22 14:11:17 -03:00
SandPoot d4ea14c4ef push 2023-10-09 16:15:49 -03: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
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
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
SandPoot 7cc1ecfa1e (i'm being shot by those red arrows help) 2023-04-06 18:49:21 -03: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
SandPoot 04eb7226e6 general better handling of code + interaction screen tip 2023-02-15 23:26:59 -03:00
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -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 ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
SandPoot 03304ba2c8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-10 22:50:16 -03:00
Timothy TeakettleandGitHub c8fc27fc9c Merge pull request #15930 from SandPoot/reskinning 
Update to reskinning
 2023-01-11 01:00:35 +00:00
SandPoot 3b8d102fac puts pda in the system to remove shitcode 2023-01-10 20:02:12 -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
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
siliconsandGitHub a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou 
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
 2022-09-23 16:27:03 -07: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
SandPoot cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03:00