Ghommie
|
d43d996c38
|
ouch
|
2019-11-27 06:19:17 +01:00 |
|
Ghommie
|
c67f138d23
|
patching some combat mode edge cases and issues.
|
2019-11-27 06:10:08 +01:00 |
|
BlackMajor
|
c81d1fe7a3
|
Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
|
2019-11-25 11:31:03 +13:00 |
|
Ghommie
|
911a33bfd6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387
|
2019-11-21 06:36:59 +01:00 |
|
Ghommie
|
dccb3c2e22
|
part 3
|
2019-11-21 06:36:22 +01:00 |
|
kevinz000
|
8df8acb1b7
|
Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
|
2019-11-20 21:49:58 -07:00 |
|
Ghommie
|
21f15e411d
|
Part 3
|
2019-11-19 19:34:42 +01:00 |
|
Ghommie
|
358db4f390
|
Dreamchecker compatibility changes, part 2.
|
2019-11-14 14:54:12 +01:00 |
|
BlackMajor
|
ce94da9ed3
|
Merge branch 'master' into Yote
|
2019-11-14 17:37:57 +13:00 |
|
BlackMajor
|
b9a7685830
|
Adds dogborg catch for doggos and some
|
2019-11-14 17:14:14 +13:00 |
|
BlackMajor
|
4cd741310b
|
Borg changes and module compression
|
2019-11-11 16:35:20 +13:00 |
|
Ghommie
|
d575bb5442
|
I should have just run a replace text to start with..
|
2019-11-07 00:59:24 +01:00 |
|
Ghommie
|
3a9e4c1f13
|
Unmodularizing 2/3 of the sounds folder.
|
2019-11-06 23:11:15 +01:00 |
|
kevinz000
|
b172c5f691
|
Merge pull request #9501 from deathride58/stronksecborgs
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
|
2019-10-29 21:29:12 -07:00 |
|
Ghommie
|
c0130467db
|
Unmodularize space kiwis and banana spiders.
|
2019-10-26 18:15:02 +02:00 |
|
deathride58
|
be4d694080
|
Merge pull request #9329 from Citadel-Station-13/kevinz000-patch-87
makes sprinting take more stamina when buffer is empty to compensate for added regen
|
2019-10-25 23:15:11 -04:00 |
|
kevinz000
|
4eca1ca5ad
|
Merge pull request #9605 from Ghommie/Ghommie-cit269
Unmodularize vox sounds
|
2019-10-25 20:09:52 -07:00 |
|
kevinz000
|
02a1aaea34
|
Merge pull request #9548 from Ghommie/Ghommie-cit251
Fixing radio emotes conflict with drunk memes.
|
2019-10-24 18:48:33 -07:00 |
|
Ghommie
|
0da6ae549f
|
Unmodularize vox sounds
|
2019-10-24 23:02:21 +02:00 |
|
Ghommie
|
a50606bb67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
|
2019-10-24 10:10:07 +02:00 |
|
deathride58
|
f85f110baa
|
Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
|
2019-10-23 20:54:55 -04:00 |
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
Poojawa
|
6fc750dca0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-21 19:13:19 -05:00 |
|
kevinz000
|
1d649c27de
|
Update robot_movement.dm
|
2019-10-21 14:38:38 -07:00 |
|
kevinz000
|
9e63413911
|
Merge pull request #9466 from deathride58/yawnborgs
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
|
2019-10-21 01:04:34 -07:00 |
|
kevinz000
|
838575da50
|
Merge pull request #9503 from deathride58/tasernerf
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
|
2019-10-21 00:59:58 -07:00 |
|
Ghommie
|
7e9298d5ac
|
Fixing radio emotes conflict with drunk memes.
|
2019-10-20 12:21:21 +02:00 |
|
Poojawa
|
ffeae20daa
|
Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods
|
2019-10-18 06:01:52 -05:00 |
|
kevinz000
|
a7a238eafd
|
Merge pull request #9504 from Poojawa/vore-UI-improvements
Vore fixes and optimizations
|
2019-10-17 12:48:01 -07:00 |
|
Poojawa
|
66c8c17bbd
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-17 05:45:06 -05:00 |
|
izzyinbox
|
7a91bb4cd3
|
Adds *bark emote
|
2019-10-15 10:24:08 -05:00 |
|
Poojawa
|
d5d878e93e
|
moved the values up
|
2019-10-15 04:09:46 -05:00 |
|
deathride58
|
50c27df28f
|
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
|
2019-10-15 03:48:44 -04:00 |
|
deathride58
|
b3a81dce01
|
Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs
|
2019-10-14 18:18:32 -04:00 |
|
Poojawa
|
394c947d14
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-11 23:10:45 -05:00 |
|
deathride58
|
60749f8b07
|
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
|
2019-10-11 14:33:32 -04:00 |
|
Ghommie
|
735755019e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-09 01:18:30 +02:00 |
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
Ghommie
|
cac4157894
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-05 22:03:37 +02:00 |
|
GrayRachnid
|
7d579e6a0f
|
Removed cell charge on bite.
|
2019-10-03 23:33:38 -04:00 |
|
GrayRachnid
|
211e7a2c60
|
removes charge from small jaws. Reduces big jaws charge to 250. Adds a thingy so they don't run out. removes misleading comments.
|
2019-10-03 23:05:38 -04:00 |
|
GrayRachnid
|
ad9ddcb6da
|
Reduces cell charge to 750, spoolup time to 1 and reduces self-stun if missed.
|
2019-10-02 19:30:23 -04:00 |
|
GrayRachnid
|
e24c2ac249
|
Rebalances dogborg pounce/bite around the secborg's harmbaton.
|
2019-10-02 14:56:32 -04:00 |
|
Poojawa
|
5876a235c2
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-22 00:22:18 -05:00 |
|
kevinz000
|
af157e85fb
|
Update living.dm
|
2019-09-21 01:48:58 -07:00 |
|
kevinz000
|
3e899e59f9
|
Merge pull request #9283 from Trilbyspaceclone/removal
Removes a lot of unused files
|
2019-09-21 01:45:11 -07:00 |
|
Poojawa
|
fa7bf43ce7
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-16 17:44:10 -05:00 |
|
Ghommie
|
c813555697
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-09-15 04:05:14 +02:00 |
|
Poojawa
|
344ccaf20d
|
cleans up some other species related stuff, unmodularizes some code
|
2019-09-13 22:18:53 -05:00 |
|
Poojawa
|
53895106dc
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-13 12:58:02 -05:00 |
|