Commit Graph

76 Commits

Author SHA1 Message Date
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
Ashe Higgs
c1455e2ad0 Update brain_damage_lines.json 2017-09-01 13:44:36 -04:00
Ashe Higgs
9fcc77cee1 Update brain_damage_lines.json 2017-09-01 13:44:18 -04:00
Ashe Higgs
1bd6c8c2cc Adds a new brain damage line 2017-09-01 13:43:49 -04:00
oranges
9d7ff2a785 Add a brain damage line from a backstory 2017-08-21 02:54:31 +00:00
Tacolizard
e115faeb24 Updates brain damage lines (#29758)
* wtf is this a bug

* Update brain_damage_lines.json

* semicolon bonanza

* add .h

* Update brain_damage_lines.json

* Update brain_damage_lines.json

* Update brain_damage_lines.json

* Update brain_damage_lines.json

* BUG!!
2017-08-08 23:35:30 -04:00
shizcalev
22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
XDTM
97fc07898c Merge branch 'master' into Hallucinations3.0 2017-07-29 12:43:18 +02:00
XDTM
59fdce8e66 Lotsa stuff 2017-07-29 12:36:48 +02:00
Joan Lung
eda1a04b7f Clockcult combat changes (#29326)
* Clockcult combat changes

* boom

* nah, less

* text changes

* compile

* more compile
2017-07-28 20:45:36 -03:00
bgobandit
603da8da86 Adds more CAS cards. Removes a couple shit ones. (#29302)
* Adds more CAS cards. Removes a couple shit ones.

* fixes

* ironic changes
2017-07-25 14:14:05 +12:00
shizcalev
f31cbb3ac5 Nanotrasen 2017-07-23 04:08:57 -04:00
XDTM
ae045dab62 Further code improvement 2017-07-18 23:21:15 +02:00
Joan Lung
8962ae5498 Unwrenching clockwork structures no longer damages them 2017-07-15 17:49:09 -04:00
Joan Lung
977e72c148 Removes Soul Vessel, Cogscarab, and Anima Fragment Scriptures 2017-07-13 10:58:17 -04:00
Joan Lung
bbdfed3c2a Dreams while sleeping are now slightly longer on average and will contain more possibilities (#29104)
* Dreams while sleeping are now slightly longer on average and will contain more possibilities

* I don't think this is worth it at all but sure whatever

* are you dreaming too

* dream
2017-07-07 22:17:57 -04:00
Jordan Brown
58194c3b8e Removes title4.ogg (#28882) 2017-06-28 19:37:37 -03:00
NikNakFlak
15c5b7205d Removes i did not grief them (#28879) 2017-06-28 19:18:36 -03:00
bgobandit
f8bae5d773 Adds "nyaaaaaaa" to brain damage lines (#28387)
* Adds a new brain damage line.

* makes it extra kawaii
2017-06-13 18:41:39 -05:00