shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,644 Commits 5 Branches 0 Tags
d38475f06d67cd92af8a95c2ee563449cf84df98
Commit Graph

77 Commits

Author SHA1 Message Date
Ghommie
fa270c8a79 leftovers. 2019-12-03 06:48:25 +01:00
Ghommie
6e318bfb09 Fixes traitor codewords highlight and some other hear signal hoonks. 2019-12-03 06:31:35 +01:00
GrayRachnid
a69b4b4916 removes creep 2019-11-23 02:28:31 -05:00
GrayRachnid
61299fee42 ready for review/testing 2019-11-22 15:32:09 -05:00
GrayRachnid
3544885b73 reverts fermis changes, woops. 2019-11-22 15:26:20 -05:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
GrayRachnid
9f8ad74bf9 New traumas and some other things. 2019-10-08 03:53:01 -04:00
Ghommie
5d1cac62da Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-08-24 13:50:22 +02:00
Ghommie
4df4cbd721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-15 17:23:01 +02:00
Fermi
8d12d0f017 I am very smart 2019-07-13 20:02:53 +01:00
Thalpy
4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Thalpy
8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
Ghommie
a3ab5f6d23 Moving the snowflake mob var to the component and finalizing. 2019-07-04 02:03:51 +02:00
Ghommie
c58efa64c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-03 02:36:23 +02:00
Ghommie
06ce8c6245 I thought I commited these already. turns out I were wrong. 2019-06-28 23:30:19 +02:00
Ghommie
d93e63af53 we just want the trauma to be niche, not unachievable. 2019-06-28 23:21:10 +02:00
Ghommie
3291b9c47a Porting in donut fixes, beepsky smash and Neurotoxin reworks. 2019-06-28 23:17:12 +02:00
Fermi
4145b0f256 Hotfix for egregious oversights. 2019-06-25 07:22:20 +01:00
Fermi
8992dbfa4d Commented out hypnoquirk and edited it so that it functions differently 2019-06-23 18:59:15 +01:00
Fermi
21c17813b8 Guess who should've compile tested! 2019-06-23 01:20:11 +01:00
Fermi
713d849c03 Merge remote-tracking branch 'upstream/master' 2019-06-19 21:02:30 +01:00
Fermi
4526832e7d I'm spending too much time trying to fix something rejected. 2019-06-17 15:16:45 +01:00
Fermi
59469fae2e Oops. 2019-06-17 12:40:30 +01:00
Fermi
49c76986ca Whoops 2019-06-17 12:31:45 +01:00
Fermi
0457026c0f Missed another. 2019-06-17 12:15:54 +01:00
Thalpy
fb70b97d5b Tweaks hypnoquirk as the discord seems to really want it. 2019-06-16 20:24:36 +01:00
Thalpy
98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
Fermi
7a66039f0c Fixing merge errors. 
Testmerge ready.
 2019-06-14 21:55:17 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Ghommie
3cbe9cf6b0 componentization part 1: "The flawed theorical code" 2019-06-10 22:37:38 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Fermi
bebaf8e7a8 Wheelchairs are apparently banned, we now have HOVERCHAIRS! 2019-06-01 18:17:49 +01:00
Fermi
7990a20ea6 We don't have wheelchairs? Heresy. Plus fixes to work on citcode. Csafe 2019-06-01 17:20:04 +01:00
Fermi
7fe18b5a37 Parapalegic trait. 2019-06-01 16:55:31 +01:00
Fermi
44d13818f0 Inital paralysis. (https://github.com/tgstation/tgstation/pull/41140) 2019-06-01 16:52:58 +01:00
Fermi
4cb697d2ec Final changes before checks. 2019-05-26 17:37:20 +01:00
Fermi
a9bc75fc0e why do I even bother 2019-05-21 02:53:17 +01:00
Fermi
f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
Poojawa
b6430559e9 datums 2018-09-11 02:49:41 -05:00
LetterJay
1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
XDTM
ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
deathride58
35cc70dd04 Merge pull request #6494 from Citadel-Station-13/upstream-merge-37263 
[MIRROR] 's is no longer a dirty reminder of snake lisps for the traumatized (phobia regex fix)
 2018-04-27 09:27:29 +00:00
Noka
881331e232 test (#37263) 2018-04-23 09:06:42 -05:00
Poojawa
e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
Jordan Brown
20f7370ea3 Removes @ (#36928) 2018-04-03 22:02:55 -05:00
Tacolizard
8b1cf5bfce Fixes phobia word recognition (#36457) 
* fix

* Update phobia.json

* add plural detection
 2018-03-28 13:43:09 -05:00