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 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,341 Commits 55 Branches 0 Tags
bf562de84ec84c7accc0cd1e428c7b51aee2c06c
Commit Graph

149 Commits

Author SHA1 Message Date
JTGSZ
9cac961ba3 Halloween lava dwarves 2019-10-14 10:27:09 -04:00
Fermi
5764041835 Adds new title music! 2019-08-08 17:25:40 +01:00
kevinz000
e7eda42260 Merge pull request #8876 from Poojawa/patch-1 
So I was trying to talk to someone with brain damage today
 2019-07-14 03:34:05 -07:00
Poojawa
2e0053aa86 Update traumas.json 2019-07-12 03:06:35 -05:00
Ghommie
d36bae06a7 Ports the Chem Master choose your pill PR plus post-improvements 2019-07-12 07:39:17 +02:00
kevinz000
41c93ee793 Update traumas.json 2019-07-06 03:24:24 -07:00
Sishen
935080e7a1 thatwasreallyannoying 2019-06-24 20:21:27 -04:00
Ghommie
cb255b8719 give'r or leave'r, buddy. 2019-06-09 06:54:26 +02:00
kevinz000
a949295022 Merge pull request #8370 from Trilbyspaceclone/patch-130 
Adds a few more mime names
 2019-05-20 23:36:56 -07:00
deathride58
aa1fdd9fb7 Merge pull request #8311 from Trilbyspaceclone/patch-114 
Adds new phobias and tweaks others - syndicate, eye phobia
 2019-05-17 00:33:12 -04:00
Trilbyspaceclone
f6ce2b25bb Update mime.txt 2019-05-16 20:37:53 -04:00
BurgerLua
8463163faa NEWLINE 2019-05-10 19:22:09 -07:00
BurgerLua
4aba11739b Finishing touches. 2019-05-10 19:15:42 -07:00
BurgerLua
d97bf47b95 Added 2019-05-10 18:12:36 -07:00
deathride58
3333a7eac1 Update strings/phobia.json 
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-05-06 23:55:24 -04:00
deathride58
7e853a620c Update strings/phobia.json 
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-05-06 23:55:03 -04:00
deathride58
f897144a66 Update strings/phobia.json 
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-05-06 23:54:57 -04:00
Trilbyspaceclone
44b4c5f916 Update phobia.json 2019-05-02 18:36:21 -04:00
Trilbyspaceclone
05c800aab3 Update phobia.json 2019-05-02 17:46:54 -04:00
BurgerLua
6da47ef05f Adds additional brain damage text 2019-05-02 01:35:34 -07:00
Trilbyspaceclone
9312ca8c43 Update sillytips.txt 2019-02-27 19:35:58 -05:00
Trilbyspaceclone
32e0d08c1d Adds a ton of new clown names (#7970) 2019-02-05 18:13:54 -08:00
Trilbyspaceclone
7b0f9de138 [Ready] More useful tips. (#7957) 
* Usefull tips

* Update tips.txt

* Update tips.txt

* distance

* Apply suggestions from code review

Rags helpings

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Half way with rag
 2019-02-05 18:10:53 -08:00
deathride58
007646d55e Merge pull request #7917 from Trilbyspaceclone/Ailurophobia 
[Ready] Adds new Ailurophobia phobia!
 2019-01-21 19:46:06 -05:00
Ragolution
f1c53549c4 New Lobby Song 
I really love this song, because all it is about is a bunch of crew on a ship praying that their ship doesn't blow the fuck up.

And it's perfect for space station.
 2019-01-14 02:25:38 -05:00
Trilbyspaceclone
c77f25b982 cats 2019-01-10 23:18:21 -05:00
Trilbyspaceclone
c7353c84ff Update phobia.json 2019-01-10 22:05:34 -05:00
Trilbyspaceclone
f80da7ae3c Update phobia.json 2019-01-10 22:02:27 -05:00
nik707
82f03774c5 Merge pull request #7684 from Trilbyspaceclone/master 
[Ready]Silly Tips
 2018-11-20 18:31:16 -06:00
Trilbyspaceclone
c411c6671a truns 2018-11-20 16:35:33 -05:00
cebutris
e816402914 Grammar 
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2018-11-10 00:39:22 -05:00
cebutris
37591ba18c Grammar 
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2018-11-10 00:39:03 -05:00
Trilbyspaceclone
56a5f252e9 ^_^ Bhijn grammar fix 2018-10-30 18:48:09 -04:00
Trilbyspaceclone
dea6050a97 Witha bug fix this is fixed 2018-10-29 00:04:41 -04:00
Trilbyspaceclone
4b68af2b46 Silly Tips 2018-10-28 23:20:56 -04:00
Tupinambis
2e0cb266de Makes all ion references to "humans" reference to "crew" instead. 2018-10-27 21:01:03 -05:00
deathride58
81495ff036 Merge pull request #7657 from Trilbyspaceclone/patch-1 
Rewords a misleading tip of the round
 2018-10-17 09:12:56 -04:00
Trilbyspaceclone
c6dc1efb7a Poojawas Amazing! 2018-10-15 01:32:15 -04:00
Trilbyspaceclone
9c8e026aac Removes a lie of a tip that is Fake news and wrong 2018-10-14 00:13:51 -04:00
Poojawa
c03627033b feh 2018-10-12 06:15:59 -05:00
Poojawa
e8f1258060 runtime unit test fix 2018-10-12 06:10:50 -05:00
Trilbyspaceclone
0419301ab0 Adds in Phobia quirk and Mime Phobia! Good grammar and no conflicts (Maybe) (#7602) 
* Phobia quirk.

* Adds in the words

* Should be good now

SHOULD

* Should work now that I added the missing comma!

It will propy fail anyways
 2018-10-03 20:36:45 -07:00
Trilbyspaceclone
0496c64459 Fixes lack of door stuck (#7574) 2018-09-26 12:15:46 -07:00
Poojawa
42092f37c6 readds braindamage memes 2018-09-18 23:46:47 -05:00
Poojawa
c22d1cacb8 Adds *insult 2018-08-29 03:25:27 -05:00
deathride58
db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
Jordan Brown
4a233caf74 Merge pull request #38558 from erwgd/permanentchemnames 
Replaces names in plasmaman.txt
 2018-06-18 13:12:21 -05:00
yorii
68236af542 Adds one brain damage statement (#38244) 
* this one is kinda funny tbqh

* fix comma

* fix
 2018-06-03 12:58:15 -05:00
LetterJay
8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
81Denton
d6b945e2b7 Adds wizard randomname (#37801) 2018-05-12 17:54:45 -05:00