Commit Graph

97 Commits

Author SHA1 Message Date
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
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
F-OS
bedfaffac9 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 18:31:49 -06:00
MoreRobustThanYou
5b5822c316 Adds useful sec officer tips (#34423)
* Adds a useful sec officer tip

* ok done

* Update tips.txt

* Update tips.txt
2018-01-18 16:49:50 -06:00
Ashe Higgs
6668782ed6 Adds some new tips for fighting the clockcult (#34406)
* Adds some new tips for fighting the clockcult

* Update tips.txt
2018-01-15 14:34:40 -06:00
oranges
93f00d4a0f Merge pull request #33958 from XDTM/Morpheus
Dreaming Improvements
2018-01-13 04:21:50 -06:00
Dax Dupont
fe7ccaa300 Retcons spacemen movement lore in sillytips.txt 2018-01-10 09:04:57 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Ashe Higgs
c3712f5be5 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 20:18:28 -06:00
deathride58
c4501563b1 tools sync, fixes minor regression in traumas.json. travis is broken too 2018-01-04 11:00:50 -05:00
deathride58
1e1f83d945 fixes compiling errors and string regressions 2018-01-04 10:24:57 -05:00
deathride58
d1cec46035 aND FINALLY THE REST OF THE CODEBASE HOLY FUCK ITS DONE 2018-01-04 02:03:42 -05:00
LetterJay
d4c218ec09 Update traumas.json 2017-12-17 15:55:04 -06:00
XDTM
962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
deathride58
b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
deathride58
81e855d819 Update brain_damage_lines.json 2017-12-11 11:23:53 -05:00
Jordan Brown
1628a89402 Adds terry to brain damage lines 2017-12-11 08:57:22 -06:00
deathride58
65cc4a2f16 Merge pull request #4102 from Citadel-Station-13/upstream-merge-33001
[MIRROR] Adds a python script to load jsons to prevent any syntax error on them
2017-12-11 01:18:08 +00:00
deathride58
11b7094dfa fUCK - fixes compiling errors for real i hope fuck 2017-12-10 20:08:33 -05:00
deathride58
cb6c0e190d fixes compiling error 2017-12-10 19:48:40 -05:00
deathride58
216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
Leo
0dc826735b 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 12:59:41 -06:00
deathride58
de9cfb2b7c Update brain_damage_lines.json 2017-11-23 19:14:21 -05:00
Leo
67d495c053 Fixes strings runtime 2017-11-23 05:48:44 -06:00
oranges
43113cd9b5 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 03:19:38 -06:00
The-clown-known-as-Pepe
212ef96a41 Minor ion law species update. (#32416)
* GET THIS MERGED

* Update ion_laws.json
2017-11-05 12:02:30 -06:00
ShizCalev
63d373729b removes old freon blob hint 2017-11-04 22:20:21 -05:00
oranges
f43c2b8db1 Updates the clockwork cult tips of the round 2017-11-01 21:37:35 -05:00