shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,183 Commits 5 Branches 0 Tags
2a33dcd3338900cf72e07b8b7b6ef800982f401f
Commit Graph

129 Commits

Author SHA1 Message Date
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
XDTM
ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
Ordonis
ab81220eda Adds a French beret! HONH HONH HONH! (#37457) 
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.

Ready for merge.
 2018-05-09 16:03:28 -05:00
deathride58
c3a58dbc2a Merge branch 'master' into upstream-merge-37343 2018-05-02 14:28:53 +00:00
Jordan Brown
7415dcb352 Merge pull request #37343 from 81Denton/roundstart-tips 
Adds more roundstart tips
 2018-04-23 08:37:28 -05:00
Poojawa
f0743e3c1f encourage Travis to appeal my compile test. 2018-04-23 06:16:19 -05:00
RandomMarine
9479c757dd Adds/changes some tips. (#37037) 
tips changes
 2018-04-10 23:49:38 -05:00
CosmicScientist
5d1b06c2e3 Bird and Chasm phobias (#36430) 
CosmicScientist

add: Top Nanotrasen scientists have diagnosed two new phobias! Birds and chasms! Good luck Chief Engineers and Miners.


Modified fear of doctors to include plague doctor suit. Who isn't afraid of Medieval medicine?
 2018-04-08 16:24:34 -05:00
Jordan Brown
eb5936c48b Merge pull request #36927 from 81Denton/moff-name-variety 
Adds more moth names to prevent duplicate random names
 2018-04-03 22:02:47 -05:00
Tacolizard
8b1cf5bfce Fixes phobia word recognition (#36457) 
* fix

* Update phobia.json

* add plural detection
 2018-03-28 13:43:09 -05:00
81Denton
4bb191a327 Updates a bunch of tips and adds new ones (#36422) 
* so this is what being an archaeologist feels like

* just like in one of my chinese cartoons

* borg reset wire, thanks to davethewave

* even more tips

* fixes grab tip
 2018-03-17 08:18:59 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
CitadelStationBot
42fa43ee82 [MIRROR] Updates some old tips (#5747) 
* Updates some old tips (#36009)

* Corrects some out-of-date tips

* Update tips.txt

* Updates some old tips
 2018-03-02 18:35:05 -06:00
vuonojenmustaturska
afb1ab021b Removes SNPCs (#36016) 
* he's dead, jim

* a few stragglers

* Restores the populate world-verb
 2018-02-28 00:12:12 -06:00
MMMiracles
5493339c7d Adds Tinfoil Hats (#35665) 
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
 2018-02-25 18:11:48 -06:00
deathride58
cee4822b2a Merge pull request #5609 from Citadel-Station-13/upstream-merge-35436 
[MIRROR] Adds several new phobias
 2018-02-20 15:25:19 +00:00
Anonmare
b9f3dd587a Adds several new phobias (#35436) 
[Changelogs]: Adds four five several new phobias to the ones you might receive, careful, you don't want to be a cultist afraid of your own God now, do you?

cl
add: Nanotrasen psychologists have identified new phobias emerging amongst the workforce. Nanotrasen's surgeon general advises all personnel to just buck up and deal with it.
/cl

[why]: Because I think it would be fun and makes traumas more... Traumatising?
 2018-02-19 22:09:17 -06:00
oranges
91a404fca7 Merge pull request #35737 from coiax/better-italian 
Italian mustache respects capital letters more
 2018-02-19 22:08:17 -06:00
Chayse Ramsay
0b42003f53 Merge branch 'master' into QM-as-Head 2018-02-18 03:46:35 +00:00
Poojawa
1bc3908203 Fix missing brain damage picks 2018-02-16 13:33:06 -06:00
Chayse Ramsay
39f84767f1 Updates sillytips.txt to make sense 2018-02-16 17:55:25 +00:00