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-01-26 00:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,712 Commits 55 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

163 Commits

Author SHA1 Message Date
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Ghommie
7362b89aeb More stuff. 2020-02-07 08:04:07 +01:00
Putnam
37777c4cc7 Removed the wirecutting one 2020-01-25 13:37:40 -08:00
Putnam
847b3c0a09 Fixed flavor objectives and added more. 2020-01-24 10:46:07 -08:00
Trilbyspaceclone
bc1e24cb7b Update tips.txt 2020-01-14 08:40:58 -05:00
Trilbyspaceclone
c320143d53 Update tips.txt 2020-01-14 08:39:24 -05:00
TrilbySpaceClone
29e7c49627 Pss got any of the good stuf Hydro? 2020-01-11 13:07:02 -05:00
Ghommie
13f65c028f Moves some clockie paper info to the right file. 2019-11-20 01:19:05 +01:00
kevinz000
45e91e7943 Merge pull request #9544 from MrJWhit/brain-damage-change 
Changes brain damage lines
 2019-11-14 15:49:59 -07:00
MrJWhit
412aa0feeb Update traumas.json 2019-10-21 20:33:28 -04:00
MrJWhit
142144ebad Update traumas.json 2019-10-20 23:31:35 -04:00
MrJWhit
6fb205c17b Update traumas.json 2019-10-20 22:17:50 -04:00
MrJWhit
7e8101abc3 Changes brain damage lines 
Adds the noise emotes, as well as makes the brain damage not lean towards OOC in IC language.
 2019-10-20 03:30:18 -04:00
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