 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 |
|
|
Fermi
|
4cb697d2ec
|
Final changes before checks.
|
2019-05-26 17:37:20 +01:00 |
|
|
Fermi
|
91f10442cf
|
Merge branch 'pr/12'
|
2019-05-26 02:05:48 +01:00 |
|
|
deathride58
|
4fc31f6322
|
Merge branch 'master' into fuckatmos
|
2019-05-25 15:34:06 -04:00 |
|
|
kevinz000
|
d0819246bc
|
Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
|
2019-05-25 11:30:57 -07:00 |
|
|
Fermi
|
f932fadfc6
|
Blood commit.
|
2019-05-22 18:46:46 +01:00 |
|
|
Poojawa
|
971ddef989
|
reverts forensics components. If I can't figure it out, MURDER IT
|
2019-05-22 04:10:29 -05:00 |
|
|
Poojawa
|
f6f4c946e6
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-05-22 00:08:13 -05:00 |
|
|
Ghommie
|
20124c24ec
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-05-21 22:48:59 +02:00 |
|
|
Ghommie
|
5e4bbb0d02
|
Awaken, code.
|
2019-05-21 22:45:59 +02:00 |
|
|
nero1024
|
732bb6575b
|
tweak footstep frequency
|
2019-05-21 14:49:15 -05:00 |
|
|
kevinz000
|
a9cbcdf74e
|
Merge pull request #8179 from Trilbyspaceclone/BShonker
[Ready]Makes a blue space bike horn HONK
|
2019-05-20 23:40:17 -07:00 |
|
|
Fermi
|
a9bc75fc0e
|
why do I even bother
|
2019-05-21 02:53:17 +01:00 |
|
|
Fermi
|
bb4aecbd5f
|
Progressional fixes
|
2019-05-20 07:44:39 +01:00 |
|
|
Nero1024
|
cbdb98988c
|
fix footsteps for naga/tentacle
|
2019-05-17 20:42:54 -05:00 |
|
|
Nero1024
|
752f368ed2
|
Ports additional footsteps
And actually make it all compile.
|
2019-05-17 19:12:22 -05:00 |
|
|
Nero1024
|
2a4a656a4d
|
Port new footsteps from tg
|
2019-05-17 18:10:03 -05:00 |
|
|
Poojawa
|
f95da1aae5
|
Heart Attacks will murder you now
Also sanity check for cursed heart overlay
|
2019-05-17 05:59:28 -05:00 |
|