311 Commits
Author SHA1 Message Date
Seris02 ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
kevinz000andGitHub 275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
Ghommie 8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
kevinz000 9827b15466 Unused variables wasting my memory 2020-01-24 23:05:59 -07:00
kevinz000 d86af199f5 initialize 2020-01-24 21:22:59 -07:00
kevinz000 78b901f66f spacing is a pet peeve 2020-01-24 21:18:51 -07:00
Seris02 9761d68f4b more merge conflict fixes 2020-01-24 10:14:31 +08:00
kevinz000 89e204b980 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 23:12:17 -07:00
kevinz000andGitHub 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
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07: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
Seris02 ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-11 13:55:29 +08:00
kevinz000 830054c106 sigh 2020-01-10 13:25:47 -08:00
LinandGitHub 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
GhomandGitHub dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs
Fix limb damage
2020-01-09 03:04:44 +01:00
Putnam df572996b3 fix limb damage 2020-01-08 15:40:35 -08:00
Ghommie dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01: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
Seris02 862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Ghommie 864b768c67 Fixes digitigrades. 2019-12-23 19:36:47 +01: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
Ghommie 542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie 792f1947a7 Fixes limbs' set_disabled. 2019-11-27 19:45:27 +01:00
BlackMajorandGitHub c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
kevinz000andGitHub 8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
Ghommie dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie 6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
kevinz000andGitHub 318c03cc28 Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
2019-11-14 15:52:11 -07:00
Ghommie 358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
Ghommie 09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie ae9ff92d33 Fixes free real estate paraplegic trait and bolas. 2019-11-05 18:03:50 +01:00
Ghommie 543df8822e .len 2019-11-03 18:17:34 +01:00
Ghommie efbcce023a Oh yea it won't work otherwise. 2019-11-03 18:16:19 +01:00
Ghommie 4b667743b9 Regenerating limbs won't no longer gib dullahans. 2019-11-03 17:50:03 +01:00
Ghommie 7bd905e6b2 Mistakes were made. 2019-11-03 15:13:18 +01:00
Ghommie 02935c062d Fixing more issues. 2019-11-03 05:37:10 +01:00
Ghommie 401f21d746 Fixing broken fixes. Testing. 2019-11-03 01:19:45 +01:00
Ghommie a204fddc4b Fixing some issues with dullahans. 2019-11-01 18:51:06 +01:00
kevinz000andGitHub e6046d62d6 Merge pull request #9528 from Ghommie/Ghommie-cit244
Fixes some peculiarities with hands layer overlapping stuff
2019-10-29 21:38:24 -07:00
Ghommie 5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie 13e06cdef3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit244 2019-10-28 01:37:10 +01:00
Ghommie 9f0e534a55 only add once. 2019-10-28 01:26:41 +01:00
Ghommie cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Ghommie 20d9adaccd Floaty floating. 2019-10-23 20:43:05 +02:00
Ghommie a57911b88a null lists type mismatch 2019-10-18 11:19:24 +02:00