cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-22 12:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
2004 Commits
Author SHA1 Message Date
silicons a4688557d7 Cryo 2020-12-13 02:29:31 -07:00
LinandGitHub 0d95172bef Merge pull request #13749 from Citadel-Station-13/silicons-patch-7 
fixes nonsensical verb
 2020-12-12 20:00:41 +00:00
silicons 07d8e72125 fix 2020-12-12 11:19:45 -07:00
SandPoot ab4c4efee3 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-12 13:03:46 -03:00
silicons 45a7c68da1 wow 2020-12-11 15:05:00 -07:00
siliconsandGitHub 8af8063e73 Update input.dm 2020-12-10 13:39:22 -07:00
Putnam d1277ad7b2 Updated auxmos (see desc) 
1. All callbacks are now auxmos-side, using new auxcallbacks.
2. Heat processing is now paused for and has been optimized by making it have fewer callbacks.
 2020-12-10 12:03:28 -08:00
Timothy Teakettle 132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
Timothy Teakettle ac9e383638 WOOPS ONE MORE DEBUG MESSAGE 2020-12-07 21:28:17 +00:00
timothyteakettle 61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-12-06 17:26:04 +00:00
timothyteakettle 0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
timothyteakettle 5566c00a69 fixes 2020-12-06 17:24:12 +00:00
timothyteakettle a478da678e bugfixes 2020-12-06 15:50:33 +00:00
timothyteakettle fa26f4c402 b 2020-12-06 00:02:14 +00:00
Timothy Teakettle afdbac31fa test 2020-12-05 22:35:27 +00:00
silicons 8d7f3aebc4 sigh 2020-12-02 09:20:23 -07:00
SandPoot 1c61b39093 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-29 14:21:19 -03:00
silicons a6d73e0344 fix 2020-11-27 04:25:22 -07:00
silicons 9f4e0ac4df woops 2020-11-26 23:38:39 -07:00
silicons 5e965d099f COME ON 2020-11-26 23:37:27 -07:00
Timothy TeakettleandGitHub 285208ece3 Merge branch 'master' into communication-hotkeys 2020-11-22 21:30:43 +00:00
Putnam 65920283f5 Always remember to commit, lord. 2020-11-21 22:33:52 -08:00
SandPootandGitHub 01dc62502a Roundstart pings (#106) 2020-11-21 16:17:17 -03:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
Putnam 91ed35cc8a A lot of testing and fiddling. Not ready for primetime. 2020-11-18 04:58:31 -08:00
Putnam bfaaecde49 whoops more sanity checking 2020-11-17 02:42:49 -08:00
Putnam 30fb673670 Superconductivity is gone. Only rustmos now. 2020-11-17 02:35:10 -08:00
timothyteakettle 60077f028e port 2020-11-17 01:41:19 +00:00
SandPoot c66ae014ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-13 14:49:27 -03:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
Putnam 43d4ad8c12 More testing and such. It's super slow now! 2020-11-10 20:04:32 -08:00
Putnam ff1a1aa8ae Updated to latest attempts. Oy. 2020-11-09 18:56:02 -08:00
Artur 503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
SandPoot 529cea6698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-08 18:10:47 -03:00
SandPoot b77a18d6c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-07 13:03:03 -03:00
Timothy Teakettle 1993364ce0 Revert "deletes one word" 
This reverts commit 8b7fd151af.
 2020-11-06 21:45:52 +00:00
Timothy Teakettle fdd7cc9843 Revert "fix" 
This reverts commit 58e884d18e.
 2020-11-06 21:45:47 +00:00
Timothy Teakettle 58e884d18e fix 2020-11-05 21:49:46 +00:00
Timothy Teakettle 8b7fd151af deletes one word 2020-11-05 16:59:49 +00:00
Putnam 8f7c821f3a Made turf processing stop if overtime. 2020-11-01 04:07:28 -08:00
Putnam 90e3be2a12 auxtools atmos works now 2020-10-31 02:55:31 -07:00
Putnam 3c4eff605d broken but compiles and runs sans panics 2020-10-28 23:07:59 -07:00
SandPoot b28fce9ebb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-10-28 13:36:59 -03:00
siliconsandGitHub 2d842270f5 Merge pull request #13625 from LetterN/revert-12994-patch-37 
Reverts this circuit frame removal
 2020-10-28 07:53:15 -07:00
siliconsandGitHub e672ee847e Merge pull request #13592 from Putnam3145/stat-voting-tweaks 
Adds ranked choice ballots to stat voting
 2020-10-28 07:41:43 -07:00
siliconsandGitHub a3228b3366 Merge pull request #13593 from Putnam3145/add-all-vote-types-to-maps 
Stringified the vote #defines for easier config stuff
 2020-10-28 07:41:35 -07:00
timothyteakettle b1379dd49e still not working 2020-10-27 21:11:42 +00:00
timothyteakettle e35b3e4a33 color editing 2020-10-26 00:47:40 +00:00
Timothy Teakettle 0c2e1997ce more loadout 2 2020-10-25 22:49:39 +00:00
Letter NandGitHub 3d2bd4a98e Revert "removes dildo" 2020-10-25 12:55:04 +08:00