614a462176
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
...
This reverts commit 1509d9d183
2019-11-24 03:33:02 +00:00
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
1509d9d183
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit 135608551fce7e9ac452
2019-11-24 03:04:13 +00:00
c8b206a4cf
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 03:04:04 +00:00
4c1c257035
Revert "Revert "pls""
...
This reverts commit b23f2a4460
2019-11-24 03:02:21 +00:00
b23f2a4460
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 02:49:20 +00:00
8c97511871
pls
...
ugh
2019-11-24 02:47:52 +00:00
13f65c028f
Moves some clockie paper info to the right file.
2019-11-20 01:19:05 +01:00
45e91e7943
Merge pull request #9544 from MrJWhit/brain-damage-change
...
Changes brain damage lines
2019-11-14 15:49:59 -07:00
412aa0feeb
Update traumas.json
2019-10-21 20:33:28 -04:00
142144ebad
Update traumas.json
2019-10-20 23:31:35 -04:00
6fb205c17b
Update traumas.json
2019-10-20 22:17:50 -04:00
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
9cac961ba3
Halloween lava dwarves
2019-10-14 10:27:09 -04:00
5764041835
Adds new title music!
2019-08-08 17:25:40 +01:00
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
2e0053aa86
Update traumas.json
2019-07-12 03:06:35 -05:00
d36bae06a7
Ports the Chem Master choose your pill PR plus post-improvements
2019-07-12 07:39:17 +02:00
41c93ee793
Update traumas.json
2019-07-06 03:24:24 -07:00
935080e7a1
thatwasreallyannoying
2019-06-24 20:21:27 -04:00
cb255b8719
give'r or leave'r, buddy.
2019-06-09 06:54:26 +02:00
a949295022
Merge pull request #8370 from Trilbyspaceclone/patch-130
...
Adds a few more mime names
2019-05-20 23:36:56 -07:00
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
f6ce2b25bb
Update mime.txt
2019-05-16 20:37:53 -04:00
8463163faa
NEWLINE
2019-05-10 19:22:09 -07:00
4aba11739b
Finishing touches.
2019-05-10 19:15:42 -07:00
d97bf47b95
Added
2019-05-10 18:12:36 -07:00
3333a7eac1
Update strings/phobia.json
...
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
2019-05-06 23:55:24 -04:00
7e853a620c
Update strings/phobia.json
...
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
2019-05-06 23:55:03 -04:00
f897144a66
Update strings/phobia.json
...
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
2019-05-06 23:54:57 -04:00
44b4c5f916
Update phobia.json
2019-05-02 18:36:21 -04:00
05c800aab3
Update phobia.json
2019-05-02 17:46:54 -04:00
6da47ef05f
Adds additional brain damage text
2019-05-02 01:35:34 -07:00
9312ca8c43
Update sillytips.txt
2019-02-27 19:35:58 -05:00
32e0d08c1d
Adds a ton of new clown names ( #7970 )
2019-02-05 18:13:54 -08:00
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
007646d55e
Merge pull request #7917 from Trilbyspaceclone/Ailurophobia
...
[Ready] Adds new Ailurophobia phobia!
2019-01-21 19:46:06 -05:00
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
c77f25b982
cats
2019-01-10 23:18:21 -05:00
c7353c84ff
Update phobia.json
2019-01-10 22:05:34 -05:00
f80da7ae3c
Update phobia.json
2019-01-10 22:02:27 -05:00
82f03774c5
Merge pull request #7684 from Trilbyspaceclone/master
...
[Ready]Silly Tips
2018-11-20 18:31:16 -06:00
c411c6671a
truns
2018-11-20 16:35:33 -05:00
e816402914
Grammar
...
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
2018-11-10 00:39:22 -05:00
37591ba18c
Grammar
...
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
2018-11-10 00:39:03 -05:00
56a5f252e9
^_^ Bhijn grammar fix
2018-10-30 18:48:09 -04:00
dea6050a97
Witha bug fix this is fixed
2018-10-29 00:04:41 -04:00
4b68af2b46
Silly Tips
2018-10-28 23:20:56 -04:00
2e0cb266de
Makes all ion references to "humans" reference to "crew" instead.
2018-10-27 21:01:03 -05:00
Fermi