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
496 Commits
Author SHA1 Message Date
Putnam 833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
qweq12yt 584dce4a80 updating comments 2021-06-11 01:34:19 -03:00
SandPoot 91fd04c552 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-10 23:41:21 -03:00
qweq12yt 0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
keronshb 25fe97e8fe Lets Disposal pipes work on the cargo shuttle again 
Silly removal.
 2021-05-29 13:21:23 -04:00
silicons 47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
SandPootandGitHub ee72b01707 Smooth sailing (#157) 
* upload files

* upload shuttle_upgrades.dm

* upload files

* upload shuttle_upgrades.dm

* upload files
 2021-04-21 21:13:14 -03:00
SandPoot bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
qweq12yt b97a38f125 todo comment 
hopefully i will be able to do it in the future, or someone else will implement it
 2021-03-31 00:55:14 -03:00
qweq12yt 04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -03:00
SandPoot afae5c3247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-23 19:49:58 -03:00
LetterN 86b8bbf727 no more free shipping 2021-03-21 21:44:04 +08:00
Putnam cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08:00
SandPoot 20509121b8 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-08 14:07:57 -03:00
Letter N e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
Letter N a43309a097 shuttle pog 2021-03-05 22:26:55 +08:00
SandPoot af6a8bdd5c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-03 12:05:27 -03:00
Putnam f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
Letter N 5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
SandPoot 98e11d88a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 23:29:09 -03:00
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Putnam 51100c9bf9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-20 18:38:52 -08:00
SandPoot 8582f93800 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-20 19:14:59 -03:00
Letter N 125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
Letter N 021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
SandPoot 0d1a6c73fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-19 23:31:15 -03:00
Putnam 158dd11d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-19 17:52:40 -08:00
Putnam f05df1c7de Huge optimizations+some fixes 2021-01-19 17:48:20 -08:00
silicons ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
SandPoot 168799038d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-04 02:05:26 -03:00
Letter N cd5d558fad safety? what's that? 
* maybe table-breaking change
 2021-01-04 11:57:12 +08:00
Letter N 6e060b13f5 all done 2021-01-02 20:17:19 +08:00
shellspeed1 45ce0a72a1 Ports bluespace navigation gigabeaconon 
port of https://github.com/tgstation/tgstation/pull/44807
 2020-12-31 01:49:38 -08:00
Letter N 98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
SandPoot c585095ba5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-04 12:29:55 -03:00
The0bserver 4559a153c3 Map Tweak 2020-11-27 16:51:55 -05:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
silicons 5b03f5b0ec more 2020-11-12 23:36:18 -07:00
SandPoot 273ad286d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-10 14:43:38 -03:00
siliconsGitHubLetter NPutnam3145
 		19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Enric Gabriel 4de9baf690 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-21 14:10:28 -03:00
Artur debc300563 https://github.com/tgstation/tgstation/pull/53236/ 2020-09-02 18:39:00 +03:00
Artur d59748ceaa https://github.com/tgstation/tgstation/pull/53168/ 2020-09-02 18:38:47 +03:00
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
Letter N afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Enric Gabriel b0cf18fc5a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-20 13:29:24 -03:00