kevinz000
|
89e204b980
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 23:12:17 -07:00 |
|
kevinz000
|
593e626233
|
Merge pull request #10346 from deathride58/limbstamlossnerf
Nerfs limb stamcrit by doubling the base limb stam regen rate and making disabled limbs double the regen rate further
|
2020-01-19 23:11:02 -07:00 |
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
kevinz000
|
9ef4cbfa76
|
refactor tags
|
2020-01-16 20:58:00 -07:00 |
|
kevinz000
|
1d184b8cad
|
s
|
2020-01-16 00:21:21 -07:00 |
|
kevinz000
|
eca7eeace3
|
aa
|
2020-01-15 19:11:49 -07:00 |
|
kevinz000
|
45c92bcb6f
|
s
|
2020-01-15 19:07:47 -07:00 |
|
kevinz000
|
ded4d1bed6
|
compile
|
2020-01-15 18:58:26 -07:00 |
|
Putnam
|
d29603ad77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-15 15:57:32 -08:00 |
|
kevinz000
|
b341818f04
|
mobility flags
|
2020-01-12 11:00:12 -08:00 |
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
kevinz000
|
fe720dbb9c
|
Merge pull request #10500 from rossark/robo
ports fast augmentation surgery pr from /tg/
|
2020-01-12 00:41:30 -08:00 |
|
Putnam
|
48fadffbfb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-10 17:57:03 -08:00 |
|
kevinz000
|
830054c106
|
sigh
|
2020-01-10 13:25:47 -08:00 |
|
rosko
|
e1f524fc03
|
ports fast augmentation pr from /tg/
https://github.com/tgstation/tgstation/pull/47721
|
2020-01-10 03:53:27 +02:00 |
|
Lin
|
e5e2e4f012
|
Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
|
2020-01-10 01:34:39 +00:00 |
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
Ghom
|
dd6e85ddac
|
Merge pull request #10483 from Putnam3145/fix_limbs
Fix limb damage
|
2020-01-09 03:04:44 +01:00 |
|
Putnam
|
244d46ee41
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-08 17:08:01 -08:00 |
|
Putnam
|
df572996b3
|
fix limb damage
|
2020-01-08 15:40:35 -08:00 |
|
Putnam
|
cd35e516ac
|
back by popular demand: maso/nympho
|
2020-01-07 17:01:14 -08:00 |
|
kevinz000
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -08:00 |
|
Putnam
|
d75a525b3c
|
let's fix arousal huh
|
2020-01-05 19:10:48 -08:00 |
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +01:00 |
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
Ghommie
|
80e716eeaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-30 18:14:47 +01:00 |
|
Ghommie
|
49f1176170
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-30 16:06:16 +01:00 |
|
kevinz000
|
74edd7b13f
|
Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
|
2019-12-30 00:09:18 -08:00 |
|
kevinz000
|
310d343242
|
Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
|
2019-12-30 00:03:21 -08:00 |
|
deathride58
|
9ea99d4c81
|
nerfs limb stamcrit by doubling the base limb stam regen, making limbs regen stam at double the rate when disabled, and adding stam multiplier mechanics to limb stamloss
|
2019-12-29 20:01:21 -05:00 |
|
Ghommie
|
b4c0433d6d
|
more work.
|
2019-12-27 17:45:19 +01:00 |
|
Ghommie
|
53d142b4c0
|
more work.
|
2019-12-25 01:34:33 +01:00 |
|
Ghommie
|
864b768c67
|
Fixes digitigrades.
|
2019-12-23 19:36:47 +01:00 |
|
Ghommie
|
d88f50ac15
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-23 05:02:31 +01:00 |
|
Ghommie
|
b75349bebf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-23 04:32:09 +01:00 |
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
Ghom
|
aea2b8865e
|
Merge pull request #10120 from Citadel-Station-13/night_vision
Night vision trait but it just boosts barely-lit visibility
|
2019-12-21 15:30:32 +01:00 |
|
Ghommie
|
9db79ff958
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-20 23:40:21 +01:00 |
|
Putnam
|
f2b46f0951
|
ROBUST OPTING MECHANICS
|
2019-12-19 11:14:02 -08:00 |
|
Linzolle
|
70e50e57cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-17 20:21:49 -06:00 |
|
kevinz000
|
e496b7c397
|
Update eyes.dm
|
2019-12-15 17:02:43 -07:00 |
|
kevinz000
|
762cd00a5f
|
Update eyes.dm
|
2019-12-15 16:55:56 -07:00 |
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
Artur
|
d0493ac471
|
Reviewer and linter fixes, and veil tweak
|
2019-12-14 17:09:39 +02:00 |
|
Ghommie
|
7d7bcc7c34
|
Fixes and ready up.
|
2019-12-13 02:30:21 +01:00 |
|
Ghommie
|
8ec4bdaef5
|
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2019-12-13 02:30:11 +01:00 |
|