Commit Graph

107 Commits

Author SHA1 Message Date
bgobandit
43255f34bd Fix more spelling/grammar (#39450)
self explanatory
2018-07-30 00:19:01 +01:00
Nich
6c879778b6 spellchecks tg whatever 2018-06-28 21:26:38 +02:00
Jordan Brown
b0708ed956 Merge pull request #38558 from erwgd/permanentchemnames
Replaces names in plasmaman.txt
2018-06-18 19:13:42 +01:00
yorii
853f4a5c76 Adds one brain damage statement (#38244)
* this one is kinda funny tbqh

* fix comma

* fix
2018-06-03 18:58:33 +01:00
Nich
74c26bbc2f thanks cute 2018-06-01 19:46:28 +02:00
Nich
8a00cdd821 adds our old ion laws 2018-05-31 19:06:15 +02:00
Ling
c04ee39bcd Merge pull request #873 from Moja10/master
Adds more default clown names
2018-05-20 17:37:38 +02:00
Moja10
dc6fb1161d Adds more default clown names 2018-05-17 17:44:23 -05:00
81Denton
961d6aca44 Adds wizard randomname (#37801) 2018-05-12 23:54:25 +01:00
Nich
aa2964c1df Merge pull request #764 from yogstation13/upstream-merge-37423
[MIRROR] [s] Hallucinations 4.0
2018-05-10 16:30:22 +02:00
XDTM
a64f7deac3 [s] Hallucinations 4.0 (#37423)
No ingame changelog cause these are supposed to fool people.

Changes:

    Hallucinations now pick from a single weighted list, instead of being separated in tiers. The more obvious a hallucinations, the less likely it is to appear.
    Hallucination is now a contantly ticking down variable. 1 hallucination = 2 seconds duration. Hallucinating effects have been rebalanced to fit this.
    Hallucinations have a random cooldown ranging from 10 to 60 seconds. The status will still tick down in the meantime.
    The Sounds hallucinations has been split in three: realistic sounds (likely), weird sounds (rare), and station messages (i.e. the shuttle arrived, blob warning, etc.)(also rare).
    The Bolts hallucination now stops you from bumping doors open. You can still click them to open them.
    Removed the singulo hallucination. It's pretty much impossible to make it realistic enough, and it's too widely known to scare someone. It's an annoyance and a definite tell that you're hallucinating.
    Removed the xeno attack for the same reasons. It was kept in the code to serve as a pseudotemplate for hallucination mobs.
    Removed the fake attacker hallucination. Trying to replicate full attack and defense code as well as managing icon generation with blacklists and all is just not worth it. It would never be realistic enough.
    RDS hallucinations have been either rolled into normal ones or removed (the OOC ones). No reason to keep them separate, aside from throwing off the hallucination odds (which has resulted in complaints about the cult victory warning being too common).
    Added/edited a lot of strings for the text-based hallucinations. I could definitely use a few more for the message hallucination, i got writer's block there.
2018-05-09 22:15:56 +01:00
Ordonis
91e2dc4371 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 22:02:31 +01:00
Nich
d9c94a5b35 bigotry rule 2: bigotry strikes back 2018-05-06 17:56:36 +02:00
Jordan Brown
0d1bfd5dea Merge pull request #37343 from 81Denton/roundstart-tips
Adds more roundstart tips
2018-04-23 17:52:16 +01:00
RandomMarine
3a6d72bfa1 Adds/changes some tips. (#37037)
tips changes
2018-04-11 10:18:09 +01:00
CosmicScientist
4f91f4ffbd 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-09 00:07:46 +02:00
Jordan Brown
8fde7eb0d0 Merge pull request #36927 from 81Denton/moff-name-variety
Adds more moth names to prevent duplicate random names
2018-04-03 18:38:01 +01:00
Tacolizard
b23639f201 Fixes phobia word recognition (#36457)
* fix

* Update phobia.json

* add plural detection
2018-03-28 19:43:52 +01:00
81Denton
84bbb6b451 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 14:18:16 +01:00
XDTM
757f9df742 Revenants have random names (#36113)
* Revenants have random names

* salt

* adds grief and laughter
2018-03-06 15:04:09 +02:00
YPOQ
6480a4b4e2 Updates some old tips (#36009)
* Corrects some out-of-date tips

* Update tips.txt
2018-03-02 13:57:20 +13:00
vuonojenmustaturska
8da498119d Removes SNPCs (#36016)
* he's dead, jim

* a few stragglers

* Restores the populate world-verb
2018-02-28 19:11:34 +13:00
MMMiracles
3108118b36 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 19:10:55 -05:00
oranges
b3f2a00b0f Merge pull request #35737 from coiax/better-italian
Italian mustache respects capital letters more
2018-02-20 09:56:45 +13:00
Anonmare
09614fd426 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-20 09:39:59 +13:00
Jack Edge
8c865f6b0b Italian mustache respects capital letters more
Fixes #35627.

Uses a new system of "word_replacement" for replacing words, trying for
capitalized, upper case and just the regular key. Supports multiple
possible "replacements" for a given key.
2018-02-16 21:58:53 +00:00
Ashe Higgs
54f5be614a brief CC power patch (#34880) 2018-01-29 21:32:46 +01:00
F-OS
7fb49b6c9d The long dark blue line continues. (Adds academy to random station names.) (#35029)
* Update station_names.txt

* oh

* Update station_names.txt
2018-01-28 19:30:42 -05:00
Armhulen
a1bc182b5e hahahahahahaha 2018-01-28 15:51:29 -06:00
Togopal
458c68143f [READY] SNAKES! (#34724)
* actual phobia created

* (LAST ATTEMPT) Adds Snakes

🆑 Togopal
add: Snakes! They hunt vermin on the station!
add: They can be purchased in cargo.
/🆑

Mice can be a problem in late round random events, and I figured releasing a bunch of snakes in maintenance would be a more long-term solution than constantly running around with a crowbar when you hear them.

Now with updated sprites!

(I apologize heavily for uploading this three times. I was unaware I was using an older fork, as this was my first attempt at modifying the code.)

* curator gets trauma! and fixes to snek trauma

* fixes the travis error

silly frog

* Reduces the cost of a normal snake crate in Cargo. Adds retaliation to snakes upon being attacked, removes venom from regular snakes.

I A

* quick fix

* quick fix 2

* fixes the cargo contains = list

* go away TRAVIS

* changes the name of the snake cargo crate of regular snakes to avoid confusion

* Updates how some snake mechanics works

Makes them actually retaliate, code is still sort of buggy though

* Some orange fixes

* Fix snakes on this motherfucking plane

* The thing oranges said
2018-01-25 09:11:37 -06:00
Joan Lung
b30e2934e7 Moths, except I have stolen them and they no longer conflict (#34498)
* Moths, except with less conflicts

* if I remove your wings, will you die?

* it would be extremely painful
2018-01-19 10:32:22 -05:00
MoreRobustThanYou
b88dbd301a Adds useful sec officer tips (#34423)
* Adds a useful sec officer tip

* ok done

* Update tips.txt

* Update tips.txt
2018-01-18 17:48:49 -05:00
Ashe Higgs
b89370c050 Adds some new tips for fighting the clockcult (#34406)
* Adds some new tips for fighting the clockcult

* Update tips.txt
2018-01-15 15:34:08 -05:00
oranges
618f4dceab Merge pull request #33958 from XDTM/Morpheus
Dreaming Improvements
2018-01-13 23:21:08 +13:00
Dax Dupont
233601e27c Retcons spacemen movement lore in sillytips.txt 2018-01-10 09:04:25 -06:00
Ashe Higgs
f42d5a43ca Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645)
* Objects touched by servants now warp to the Ark

* Check by servant

* Replaces with a baselock

* Updates the 'log
2018-01-07 21:18:14 -05:00
Jordan Brown
ea22051595 Merge pull request #33956 from XDTM/CustomMadeHallucinations
Text hallucinations use the victim's name more often
2017-12-31 10:57:56 -05:00
XDTM
b7bcfee6f8 Dreaming Improvements 2017-12-30 19:04:08 +01:00
XDTM
a409750f9e Text hallucinations use the victim's name more often 2017-12-30 17:34:39 +01:00
Cyberboss
5e961e23e7 Revert "[READY] Easy hosting of roundend sounds (#33618)"
This reverts commit 03e3dee35c.
2017-12-28 14:24:48 -05:00
MoreRobustThanYou
03e3dee35c [READY] Easy hosting of roundend sounds (#33618)
* [READY] Easy hosting of roundend sounds

* Hopefully fix this.
2017-12-28 11:32:44 +13:00
XDTM
b5d9845edf [Ready]Brain Trauma additions (#33405)
* Brain Trauma additions

* Adds Aphasia

* Adds the aphasia language

* Short window

* nuke exploits GONE

* fixes draggable portals

* psychobrawl won't just kill you if you use it too much, but stuns longer

* Adds anosognosia, and lowers thresholds

* .

* RANDOM GODWOKEN

* Default brain damage is now 0

* antur

* fix 1

* forcemove and afk friend adjustments

* okay it's ready now

* dead people can hear imaginary friends
2017-12-17 18:10:25 +01:00
MoreRobustThanYou
63471ca6fc Revert "Easy hosting of roundend sounds" (#33617)
* Revert "Db schema version check by simplification (#33582)"

This reverts commit 56e5a62033.

* Revert "Automatic changelog generation for PR #33576 [ci skip]"

This reverts commit 437170c1df.

* Revert "Easy hosting of roundend sounds (#33576)"

This reverts commit add61f049b.
2017-12-16 23:27:00 -05:00
MoreRobustThanYou
add61f049b Easy hosting of roundend sounds (#33576)
* i'm too lazy to make my own branch so i'll let github do it for me

* Refactors roundend sounds and lobby music

* Does away with round_start_sounds.txt
2017-12-16 23:21:42 -05:00
MoreRobustThanYou
205921ffbb Spacing 2017-12-10 10:51:45 -05:00
MoreRobustThanYou
72adeb484d Adds terry to brain damage lines 2017-12-10 10:51:14 -05:00
Ashe Higgs
32c68a60bf Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more (#32935)
* Adds the Eminence

* New abilities and a command system

* More stuff

* I did something in this commit but I dunno what

* Beginning work on trap setups

* This is good for now until arm gets his sprites

* I did something here!

* Manacle sprites

* R.I.P. R&D

* Maintainer review

* QoL, slabbin' it up

* Conflicts

* Conflicts

* <

* Now it compiles!

* TGUI

* TGUI, again

* 🥝

* that should be all, but I'll do some quick testing...

* aha!
2017-12-07 11:36:26 +13:00
XDTM
550d71167e Brain Traumas (#31727)
* Reworks Brain Damage

* mechanics

* rebalancing

* hulks in wheelchairs

* yup

* bugsquash

* Adds narcolepsy, phobias and agnosia. Not guaranteed 100% bug-free yet, testmerge at your own risk.

* lizard phobia

* Did you know there's a skeleton inside of you RIGHT NOW?

* Fixes for the new stuff

* The issue with those is that in most rounds you won't see them

I'll keep them available so they can be added manually, for example by events and such

* Goof reviews

* Brainloss is based off brain organ integrity

removes brainloss var

* Replaces some getorganslot with defines

* eyes

* put the traumas in the brainnnn

* text

* args

* Adds godwoken, puts split personality in severe, adds brainwashing

* Bluespace prophet special trauma (untested)

* Some minor stuff

* Monophobia, and tweaks

* More fixes

* fix

* a

* new tail

* Discoordination and Muscle Weakness

* thanks for the review!

* [B]oneless

* agnosia fix

* .

* go away agnosia

* pretend it didn't happen

* Shitcode-free-er

* bitwisdom

* psychotic brawling

* i guess this might be important

* latest reviews

* .

* conflict-free

* addresses it

* surgery fix

* a masterpiece

* fix

* fix again

* config

* damage formula reworked

* who needs to test anyway

* fixes some bugs

* fix 2

* proper spookin

* bluespace prophet fixes and improvements

* no bible healing

* .

* normalizes monophobia chances
2017-12-06 13:04:17 -05:00
Leo
e9b3d422d0 Adds a python script to load jsons to prevent any syntax error on them (#33001)
* Adds a python script to load jsons to prevent any syntax error on them

* Corrects identation on hallucination.json
2017-11-24 06:00:16 -05:00
ShizCalev
91a72f5f76 Fixes strings runtime 2017-11-22 04:28:00 -05:00