Commit Graph

2206 Commits

Author SHA1 Message Date
Ghommie bed431defc wrong indention. 2019-06-11 00:00:18 +02:00
Ghommie 3cbe9cf6b0 componentization part 1: "The flawed theorical code" 2019-06-10 22:37:38 +02:00
Sishen 13853ac6bf removes family gavel, readds briefcase 2019-06-10 10:16:32 -04:00
Sishen 400ad0b03b added family gavel 2019-06-10 09:55:23 -04:00
Sishen 9f80fbe68b Coloring gloves? Not on my watch! 2019-06-10 05:20:54 -04:00
Sishen 4eccc12205 Why are we here? Just to suffer? 2019-06-10 04:56:24 -04:00
Ghommie cb255b8719 give'r or leave'r, buddy. 2019-06-09 06:54:26 +02:00
Ghommie c3fa360270 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43 2019-06-09 04:50:10 +02:00
Ghommie 7706ec6329 I LOVE THE SMELL OF NAPALM IN THE MORNING! 2019-06-09 02:45:14 +02:00
Thalpy 628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01:00
Ghommie e1c94ef8af named arguments. 2019-06-08 15:06:07 +02:00
Ghommie ec2da508b8 Gonna go with 25 since it won't be usable on lying people. 2019-06-08 15:05:26 +02:00
kevinz000 aca85123be Merge pull request #8555 from Ghommie/Ghommie-cit32
Updates radials, makes RCD and RCL use em.
2019-06-08 01:25:37 -07:00
kevinz000 ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
kevinz000 3b24e05dd6 Merge pull request #8483 from Ghommie/Ghommie-cit23
Ports in combat gloves plus.
2019-06-08 01:07:18 -07:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie 5a69499927 Hol up, unrelated PR time, atomization. 2019-06-07 01:32:15 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie 44358e054a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29 2019-06-06 15:24:31 +02:00
Ghommie 0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
kevinz000 102d68a243 Merge pull request #8518 from Ghommie/Ghommie-cit27
Fixes and updates pod's emergency suits storage.
2019-06-05 01:41:23 -07:00
BurgerLua ed7d0575b2 Ass Blast USA 2019-06-03 14:40:57 -07:00
Poojawa 1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -05:00
Fermi 0eec1ed3f3 Pooj changes. 2019-06-02 22:49:04 +01:00
Fermi a3e60843bc Renamed blood trait and spelt minutes right. 2019-06-02 22:35:16 +01:00
Fermi 4513dd9815 MINUTE define changes. 2019-06-02 22:26:53 +01:00
Fermi e607cd3c7d Fixes para's abilities to use other vehicles. 2019-06-02 19:11:34 +01:00
Fermi 59e5372abd Made it so prosthetics can't replace legs. Compiled and tested. 2019-06-02 18:40:56 +01:00
Ghommie 472d7ef8cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27 2019-06-02 19:03:34 +02:00
Ghommie d6e54bf237 Fixes and updates pod's emergency suits storage. 2019-06-02 18:28:30 +02:00
Fermi 5918b026aa Fixes, PLEASE CHECK HEADPATS IN MOODULAR. 2019-06-01 20:02:51 +01:00
Fermi f8586c9699 Adds Friendly and empahty quirk from tg. 2019-06-01 18:51:25 +01: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 e58a94bcc7 Merge remote-tracking branch 'upstream/master' 2019-06-01 03:12:38 +01:00
Fermi ee2d75ae22 Removed special screen obj, as I didn't like how they looked. 2019-05-30 20:05:06 +01:00
Trilbyspaceclone 0eb468e3a5 Update ert.dm 2019-05-30 11:33:38 -04:00
Thalpy 71eb285472 Few tweaks and fixes to last commits. 2019-05-29 20:04:52 +01:00
Thalpy 6117e3a6aa Fixes to the hypnoflash, 2019-05-29 19:09:40 +01:00
Thalpy af80bf3204 MINUTE defines. 2019-05-29 18:41:51 +01:00
Ghommie 8fbc25ad77 Ports in combat gloves plus. 2019-05-29 16:35:56 +02:00
Ghommie 5309eafb59 Fine and be it, man. 2019-05-29 11:24:27 +02:00
Ghommie 12648720dc tweakin. 2019-05-29 10:41:43 +02:00
Ghommie fe5ac5e6e9 On the other hand, vehicle memes. 2019-05-29 09:24:12 +02:00
Ghommie 894b0d28e2 Krav maga leg sweep buff. 2019-05-29 08:45:45 +02:00
Fermi ae35366e97 Some fixes before bed. 2019-05-29 05:41:12 +01:00
Fermi 336ba8dbad Tidying code. 2019-05-29 02:33:15 +01:00
Fermi 4607a2b6c3 Compile safe. Today's fixes. 2019-05-27 05:39:52 +01:00