Commit Graph

94 Commits

Author SHA1 Message Date
Denton fa53461877 adds more roundstart tips 2018-04-21 23:08:45 +02:00
RandomMarine 23836fb64d Adds/changes some tips. (#37037)
tips changes
2018-04-11 16:48:50 +12:00
CosmicScientist 3b3a2b1255 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 09:24:27 +12:00
Denton 1253053cdc adds moth surnames + more names in general 2018-03-31 22:49:36 +02:00
Tacolizard 2d985dc390 Fixes phobia word recognition (#36457)
* fix

* Update phobia.json

* add plural detection
2018-03-28 21:43:07 +03:00
81Denton 9b2bdde688 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 15:17:50 +02: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
oranges ac8864b6e3 Merge pull request #31947 from AnturK/yarr
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 22:18:37 +13:00
The-clown-known-as-Pepe e7a2a08dae Minor ion law species update. (#32416)
* GET THIS MERGED

* Update ion_laws.json
2017-11-05 13:01:55 -05:00
ShizCalev 872a062966 removes old freon blob hint 2017-11-04 22:20:00 -05:00
AnturK cd1c4f9df9 Pirate Event 2017-11-04 17:33:45 +01:00
Xhuis eb89f62f15 Updates the clockcult tips 2017-10-30 12:38:29 -04:00
francinum 84c47a1022 Removes outdated tips 2017-10-25 23:42:36 -05:00
francinum 04fe505043 Removed an outdated tip referring to construction permits 2017-10-16 12:49:23 -05:00
Armhulen 15241d90c5 Mega Carp Re-Carpening: Carpatastrophe! (#31365)
* healing, thank you kor!

* why isn't this working

* balance sucks

* fixed, whoops

* cuts-the-fat

* yay

* fixes

* cool beans
2017-10-12 11:07:53 +13:00
Armhulen d75eb9cd1c Gives nightmares a random shadowling name (#31188)
* fuck you ruined my !ONE COMMIT PR!

* !ONE COMMIT PR!
2017-10-04 12:40:53 +13:00
Dax Dupont 805c1a8116 Removes references to gangs from tips 2017-09-29 00:33:58 +02:00
ShizCalev d71efa0859 Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)
* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references
2017-09-14 12:14:52 -04:00
Cyberboss 9e55bef5a3 Merge pull request #30339 2017-09-02 23:13:13 -04:00
FrozenGuy5 660683723b Station flavour names replaced with strings lists! (#30341)
* station_prefixes

* station_names.txt

* station_suffixes.txt

* greek_letters

* Rename greek_letters to greek_letters.txt

* phoenetic_alphabet.txt

* numbers_as_words.txt

* adds the strings lists

* + ""

* removes newline

* removes newline

* removed omega and delta from station_names.txt
2017-09-02 23:11:40 -04:00