Artur 5b7d9a9008 Merge conflict fix

2020-05-13 12:37:18 +03:00

..

flavor_objectives

Removed some bad flavor objectives.

2020-03-04 11:23:53 -08:00

names

remove bad words

2020-04-14 17:54:07 -05:00

abductee_objectives.txt

…

admin_nicknames.txt

…

canadian_replacement.json

give'r or leave'r, buddy.

2019-06-09 06:54:26 +02:00

cas_black.txt

thatwasreallyannoying

2019-06-24 20:21:27 -04:00

cas_white.txt

thatwasreallyannoying

2019-06-24 20:21:27 -04:00

clockwork_cult_changelog.txt

Moves some clockie paper info to the right file.

2019-11-20 01:19:05 +01:00

dreamstrings.txt

…

dwarf_replacement.json

Halloween lava dwarves

2019-10-14 10:27:09 -04:00

french_replacement.json

…

greek_letters.txt

…

hallucination.json

…

insult.json

Merge pull request #11881 from Ghommie/Ghommie-cit684

2020-04-16 08:29:10 -07:00

ion_laws.json

remove bad words

2020-04-14 17:54:07 -05:00

italian_replacement.json

…

numbers_as_words.txt

…

phobia.json

Update phobia.json

2020-04-16 17:18:11 +02:00

phonetic_alphabet.txt

…

pirates.json

…

redpill.json

Ports the Chem Master choose your pill PR plus post-improvements

2019-07-12 07:39:17 +02:00

revenant_names.json

…

round_start_sounds.txt

Adds new title music!

2019-08-08 17:25:40 +01:00

sillytips.txt

Update sillytips.txt

2019-02-27 19:35:58 -05:00

spurdo_replacement.json

More stuff.

2020-02-07 08:04:07 +01:00

station_names.txt

…

station_prefixes.txt

…

station_suffixes.txt

…

tips.txt

it just complies

2020-04-25 23:23:42 -04:00

traumas.json

Makes G gluid calcs only happen when it's required (#12095)

2020-05-04 05:08:01 +02:00

wanted_message.json

Fixing more stuff

2020-04-23 20:09:42 +03:00