shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,133 Commits 5 Branches 0 Tags
fb58f7066552ba9a992f2192bbbeb11ba753f208
Commit Graph
101 Commits
Author SHA1 Message Date
LetterJayandGitHub 8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
81Dentonandletterjay d6b945e2b7 Adds wizard randomname (#37801) 2018-05-12 17:54:45 -05:00
XDTMandletterjay ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
Ordonisandletterjay ab81220eda 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 16:03:28 -05:00
deathride58andGitHub c3a58dbc2a Merge branch 'master' into upstream-merge-37343 2018-05-02 14:28:53 +00:00
Jordan BrownandCitadelStationBot 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
RandomMarineandCitadelStationBot 9479c757dd Adds/changes some tips. (#37037) 
tips changes
 2018-04-10 23:49:38 -05:00
CosmicScientistandCitadelStationBot 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 BrownandCitadelStationBot 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
TacolizardandCitadelStationBot 8b1cf5bfce Fixes phobia word recognition (#36457) 
* fix

* Update phobia.json

* add plural detection
 2018-03-28 13:43:09 -05:00
81DentonandCitadelStationBot 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
PoojawaandGitHub 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
CitadelStationBotandPoojawa 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
vuonojenmustaturskaandCitadelStationBot afb1ab021b Removes SNPCs (#36016) 
* he's dead, jim

* a few stragglers

* Restores the populate world-verb
 2018-02-28 00:12:12 -06:00
MMMiraclesandCitadelStationBot 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
deathride58andGitHub 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
AnonmareandCitadelStationBot 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
orangesandCitadelStationBot 91a404fca7 Merge pull request #35737 from coiax/better-italian 
Italian mustache respects capital letters more
 2018-02-19 22:08:17 -06:00
Chayse RamsayandGitHub 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 RamsayandGitHub 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
PoojawaandGitHub 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-OSandCitadelStationBot 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
MoreRobustThanYouandCitadelStationBot 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 HiggsandCitadelStationBot 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
orangesandCitadelStationBot 93f00d4a0f Merge pull request #33958 from XDTM/Morpheus 
Dreaming Improvements
 2018-01-13 04:21:50 -06:00
Dax DupontandCitadelStationBot fe7ccaa300 Retcons spacemen movement lore in sillytips.txt 2018-01-10 09:04:57 -06:00
deathride58andGitHub e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Ashe HiggsandCitadelStationBot 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
LetterJayandGitHub d4c218ec09 Update traumas.json 2017-12-17 15:55:04 -06:00
XDTMandCitadelStationBot 962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
deathride58andkevinz000 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
deathride58andGitHub 81e855d819 Update brain_damage_lines.json 2017-12-11 11:23:53 -05:00
Jordan BrownandCitadelStationBot 1628a89402 Adds terry to brain damage lines 2017-12-11 08:57:22 -06:00
deathride58andGitHub 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
deathride58andGitHub 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 HiggsandCitadelStationBot 0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
XDTMandCitadelStationBot 988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
LeoandCitadelStationBot 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
deathride58andGitHub de9cfb2b7c Update brain_damage_lines.json 2017-11-23 19:14:21 -05:00
LeoandCitadelStationBot 67d495c053 Fixes strings runtime 2017-11-23 05:48:44 -06:00