a5b37b658b
Purging a lot of space indention in favor of tabs.
2019-10-29 15:46:31 +01:00
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
4eca1ca5ad
Merge pull request #9605 from Ghommie/Ghommie-cit269
...
Unmodularize vox sounds
2019-10-25 20:09:52 -07:00
02a1aaea34
Merge pull request #9548 from Ghommie/Ghommie-cit251
...
Fixing radio emotes conflict with drunk memes.
2019-10-24 18:48:33 -07:00
0da6ae549f
Unmodularize vox sounds
2019-10-24 23:02:21 +02:00
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
f85f110baa
Merge pull request #9047 from Poojawa/syntheticbloods
...
RGB Blood Reworks + Blood generator
2019-10-23 20:54:55 -04:00
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
6fc750dca0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-21 19:13:19 -05:00
1d649c27de
Update robot_movement.dm
2019-10-21 14:38:38 -07:00
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
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
7e9298d5ac
Fixing radio emotes conflict with drunk memes.
2019-10-20 12:21:21 +02:00
ffeae20daa
Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods
2019-10-18 06:01:52 -05:00
a7a238eafd
Merge pull request #9504 from Poojawa/vore-UI-improvements
...
Vore fixes and optimizations
2019-10-17 12:48:01 -07:00
66c8c17bbd
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-17 05:45:06 -05:00
7a91bb4cd3
Adds *bark emote
2019-10-15 10:24:08 -05:00
d5d878e93e
moved the values up
2019-10-15 04:09:46 -05:00
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
394c947d14
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-11 23:10:45 -05:00
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
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
3113074bfb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-08 02:55:32 -05:00
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
7d579e6a0f
Removed cell charge on bite.
2019-10-03 23:33:38 -04:00
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
ad9ddcb6da
Reduces cell charge to 750, spoolup time to 1 and reduces self-stun if missed.
2019-10-02 19:30:23 -04:00
e24c2ac249
Rebalances dogborg pounce/bite around the secborg's harmbaton.
2019-10-02 14:56:32 -04:00
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
af157e85fb
Update living.dm
2019-09-21 01:48:58 -07:00
3e899e59f9
Merge pull request #9283 from Trilbyspaceclone/removal
...
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
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
344ccaf20d
cleans up some other species related stuff, unmodularizes some code
2019-09-13 22:18:53 -05:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
9561819fb7
Fixes Horn coloration issues, allows mammals to choose their meat type
...
Because reasons I guess.
2019-09-13 10:58:04 -05:00
ef4b5c1b34
gone_reduced_to_atoms
2019-09-12 23:06:46 -04:00
2bf4d00d29
Double checking my work
2019-09-12 00:46:18 -05:00
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
fbc2d3c8fe
Ports dogborg sprites from RP to main
...
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
2019-09-06 01:23:53 +12:00
dd7907c3d7
Merge pull request #9057 from EgoSumStultus/male-AI-vox
...
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
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
bda3ac8745
blood dna is fixed, your ERP code is too
2019-08-20 07:41:50 -05:00
569e33fdbc
Update human.dm
2019-08-17 05:55:47 -05:00
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -05:00
5dddb11773
Fixes handcuffs being impossible to actually resist out of
2019-08-11 08:37:00 -04:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
98cecb2cc7
Merge pull request #8923 from Citadel-Station-13/kevinz000-patch-53
...
Removes damage from *dab
2019-08-06 21:47:52 +12:00
55b39a9cc6
male AI vox
2019-08-05 05:01:43 -07:00
Ghommie