Commit Graph

59 Commits

Author SHA1 Message Date
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
Robustin
b409a52d42 Blood Cult Nerf: Restricted Nar-Sie summoning locations (#28137)
* Restricted Blood Cult Summoning

* fixed warning
2017-06-08 07:28:40 -04:00
oranges
00241d3fe0 Adds stungloves to tgstation
As a mutation braindead people can ask for
2017-06-07 01:12:44 +00:00
Joan Lung
5884071627 Renames Clockwork Proselytizers to Replica Fabricators (#28062) 2017-06-05 14:52:31 -03:00
Food
81e1ce621c Abductee objectives refactor 2017-05-11 19:13:38 -04:00
Cyberboss
ad080c43f1 Cleans up librarian stuff (#26862) 2017-05-03 21:06:12 -05:00
Cyberboss
abf59e153f Moves tips from config to strings tree (#26722)
* Moves tips and deadmin names from config to strings tree

* Just the tip
2017-05-01 10:51:10 -06:00
Cyberboss
bb697a81db Moves config/names to strings/names (#26687) 2017-04-29 21:49:10 -03:00
bgobandit
bbab8f5062 Fixes oversight resulting in ALLCAPS traitor codewords; expands corpus (#25300) 2017-03-22 07:50:23 -03:00
bgobandit
0708bee69d Traitor codewords and responses now pull from the ion storm wordlists. (#24538)
* Traitor codewords and responses now pull from the ion storm wordlists.

* more words for codewords/ion laws

* oops honk
2017-03-02 19:29:40 +13:00
Xhuis
5509157601 Roundstart sound refactor (#23880)
* Roundstart sound refactor and four new sounds!

* Removes the new lobby music
2017-02-17 14:23:17 +13:00
coiax
331763d0c4 Revert "Soapstones now have a fixed vocabulary (and rating system!)" (#23909) 2017-02-10 10:06:14 -06:00
Xhuis
9662b53334 Soapstones now have a fixed vocabulary (and rating system!) (#23717)
* Soapstone message vocabulary, refactors, and more

* Changes message sprite and deletion, adds suffixes

* Removes sounds and sprites for a new PR

* Removes self-rating

* Now with compiling!

* Compiling in 2017 LUL

* Re-adds message removal functionality

Through shoddy editor code, of course

* Fixes a message not appearing
2017-02-08 18:22:53 +13:00
Cyberboss
e36a89b4f0 Adds a brain damage line (#21641)
* This was long overdue

* Those are spaces, not tabs
2016-11-22 11:48:39 +13:00
Iamgoofball
5fc6bda3a7 this isn't funny i'm locked in the least fun room in the fucking map 2016-11-18 18:41:49 -08:00
oranges
8235a6b6aa Adds a brain damage line (#21605) 2016-11-18 19:32:51 -06:00
bobdobbington
6e500814b6 snatches erry motherfucker birthday 2016-06-24 20:01:38 -07:00
bobdobbington
504cd18988 Makes retards slightly more retarded
Adds the lines "I'VE GOT BALLS OF STEEL" and "NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE." 
<hornygranny> ILL KILL YOU OLD STYLE YOU FUCKIN PRICK
<hornygranny> classic mem
<NikNak> I'll classic mem u
<bob_dobbington> that is a classic meme
<bob_dobbington> actually fuckin' someone should add that to the list of things retarded people yell
<Shadowmobile> Bob_dobbington code it yourself? It's one of the easiest changes to make
2016-06-23 23:57:49 -07:00