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-26 14:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
5155 Commits
Author SHA1 Message Date
Pin-alternative 2fb97598f9 Merge remote-tracking branch 'upstream/master' into cursed 2022-07-10 19:49:01 +10:00
BongaTheProto 08db67f10a Merge remote-tracking branch 'upstream/master' 2022-07-09 10:53:45 -05:00
SandPoot 1b42f5f99f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-08 20:20:44 -03:00
Aphast 90c7222460 Mosley forced me down and tried to seggs me for this 2022-07-06 05:09:16 -04:00
SandPoot 33bfcf67b5 solves missing keyword args 2022-07-03 01:37:26 -03:00
SandPoot 09e351277a this 2022-07-03 01:28:39 -03:00
Pin-alternative 2a8a23dd30 Merge remote-tracking branch 'upstream/master' into cursed 2022-06-24 20:10:06 +10:00
BongaTheProtoandGitHub 34c6184cd4 Merge pull request #378 from WoolyAypa/dumb4cum 2022-06-21 08:49:30 -07:00
BongaTheProto 0b89d8c778 Merge remote-tracking branch 'upstream/master' 2022-06-20 01:08:17 -05:00
SandPoot 25deceb75f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-19 23:02:20 -03:00
WoolyAypa 9c94cad910 modularization and removed the is_dumb4cum proc 2022-06-17 14:03:48 -03:00
WoolyAypa af3df23c49 dumb4cum that is 2022-06-17 02:46:28 -03:00
BongaTheProto 375c0f2634 Merge branch 'master' into pr/359 2022-06-16 16:43:41 -05:00
TripleShades ca57269f66 WHY DID THIS NOT GET TESTED EVER 2022-06-15 17:29:17 -04:00
Pin-alternative 407989f08b Merge remote-tracking branch 'upstream/master' into cursed 2022-06-14 19:43:07 +10: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
siliconsandGitHub 9a17ef3bf2 Merge pull request #15663 from deathride58/blockquotes 
Blockquotes for chat; Prettier examine text and more!
 2022-06-10 22:09:12 -07:00
Pin-alternative 79ab402216 Merge remote-tracking branch 'upstream/master' into cursed 2022-06-10 07:45:46 +10:00
Bangus 74d0fc1d93 healthscanner refuckery zombie edition 2022-06-09 12:32:25 -04:00
AshTheDergandGitHub 6be1fa5b2b Modular PC Vendor 
Item was already there, I just removed the comment that disabled it.
 2022-06-09 07:47:52 -04:00
AshTheDergandGitHub 5d855b2797 Debug omnitool 
Might as well add it to the debug box.
 2022-06-09 07:43:25 -04:00
AshTheDergandGitHub cda7f74257 Reviving Debug Omnitool 
Why am I doing this? Because it works. Good soldiers follow orders.
 2022-06-09 07:42:20 -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
Pin-alternative 64cbd81e9c Merge remote-tracking branch 'upstream/master' into cursed 2022-06-07 17:10:33 +10:00
BongaTheProto 04d9c7d167 Merge remote-tracking branch 'upstream/master' 2022-06-04 13:25:54 -05:00
SandPootandGitHub 229b618dee CRISPR for Base Gene editing (#258) 
* push the content

* tiny update
 2022-06-03 21:29:19 -03:00
deathride58 04a0a3b869 chat blockquotes; prettier examine text and more! 2022-06-03 18:55:18 -04: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
Pin-alternative b3b70bb319 Merge remote-tracking branch 'upstream/master' into cursed 2022-05-30 20:09:20 +10:00
Pin-alternative c0f224efff some more crap 2022-05-28 20:18:09 +10:00
BongaTheProto be74edefd0 Merge branch 'master' into prefs-update 2022-05-28 02:06:44 -05:00
BongaTheProto 4735651dd4 Merge remote-tracking branch 'upstream/master' 2022-05-24 09:35:48 -05:00
SandPootandGitHub fac92f66ca You can now make shuttle seats with titanium (#255) 
* Update mineral.dm

* consistency
 2022-05-23 23:04:24 -03:00
BongaTheProto d151f761e7 some adds 2022-05-18 19:18:08 -05:00
Putnam3145 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
BongaTheProto 90a52494cd Merge remote-tracking branch 'upstream/master' 2022-04-30 16:35:30 -05:00
SandPoot 41949a8be1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-29 13:24:42 -03:00
siliconsandGitHub ce7d7a5124 Merge pull request #15594 from SandPoot/stasis-beds-update 
Makes stasis beds *slightly* less hated
 2022-04-27 16:11:34 -07:00
BongaTheProto 479b497b00 ok 2022-04-19 01:30:44 -05:00
AManWithAToolbox dda0869f82 Merge branch 'pr/1' into its-wasnt-gonna-happen 2022-04-18 23:19:18 -05:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
TemptStationandnullfag 9b63431a50 Merge pull request #5 from NullFag/kill_me 
smexi fix
 2022-04-15 00:40:12 +02:00
SandPoot 5d4bae4482 Update files 2022-04-10 23:27:12 -03:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00