Commit Graph

1378 Commits

Author SHA1 Message Date
kevinz000
c9d67ecd49 Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
2019-06-23 06:54:43 -07:00
kevinz000
294e1e48d2 Merge pull request #8659 from Ghommie/Ghommie-cit57
ports "Componentizes orbiting"
2019-06-23 06:50:32 -07:00
kevinz000
94d92f7b1b Merge pull request #8664 from BlackMajor/MeMapGood
Adds another space ruin
2019-06-23 06:49:37 -07:00
kevinz000
082d6c75a9 Merge pull request #8688 from Ghommie/Ghommie-cit67
Ports in bee plushes.
2019-06-23 06:45:49 -07:00
Ghommie
f963ca050b thanks, badcoder trilby 2019-06-18 23:49:20 +02:00
kevinz000
4f42d40681 Merge pull request #8507 from Thalpy/Wheelchairs
Adds Hoverchairs and the paraplegic trait.
2019-06-17 11:13:43 -07:00
Fermi
0457026c0f Missed another. 2019-06-17 12:15:54 +01:00
Fermi
dd7421f130 Missed one. 2019-06-17 12:05:21 +01:00
Ghommie
50dd512be7 Ports system for randomized semi-persistent chem reactions. 2019-06-17 10:50:40 +02:00
BlackMajor
1060bb05b4 Space hermit ruin 2019-06-17 17:41:46 +12:00
kevinz000
d9119d43f0 Merge pull request #8627 from BlackMajor/MeMapGood
Adds more space ruins.
2019-06-16 19:29:23 -07:00
Ghommie
b782226900 ports "Componentizes orbiting" 2019-06-17 00:19:57 +02:00
Thalpy
98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
kevinz000
1408a453de Merge pull request #8591 from Ghommie/Ghommie-cit43
You smell that? Napalm, son.
2019-06-16 01:16:12 -07:00
kevinz000
1c46bcef7e Merge pull request #8479 from Ghommie/Ghommie-cit21
Krav maga leg sweep tweak.
2019-06-16 01:13:08 -07:00
BlackMajor
9219a2c813 Adding more ruins 2019-06-15 21:17:34 +12:00
BlackMajor
4528384976 Fuck it lets add way more spiciest PR 2019-06-15 19:03:04 +12:00
BlackMajor
e2ad96f4c9 Made a shitty space ruin robotics lab 2019-06-12 01:21:16 +12: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
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
Trilbyspaceclone
0eb468e3a5 Update ert.dm 2019-05-30 11:33:38 -04:00
Ghommie
8fbc25ad77 Ports in combat gloves plus. 2019-05-29 16:35:56 +02:00