Commit Graph

399 Commits

Author SHA1 Message Date
Fermi 7a66039f0c Fixing merge errors.
Testmerge ready.
2019-06-14 21:55:17 +01:00
Fermi 6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi b4beb006f9 More fixes. 2019-06-14 15:43:48 +01:00
Fermi d7cffadc13 Fixes 2019-06-14 13:43:57 +01:00
Fermi 54985c05d9 Confused about bitgates. 2019-06-13 07:11:29 +01:00
Fermi 0f5d47c03f Velvet speech reconfig. 2019-06-13 06:51:11 +01:00
Fermi aa7805eaa4 Fixes. 2019-06-13 06:35:12 +01:00
Fermi 378af882d3 Ramping up to logging and a few more fixes. 2019-06-13 05:51:28 +01:00
Fermi 026f29ba46 Comments and logs. 2019-06-13 04:31:15 +01:00
Fermi a3aa0408a3 Tongue 2019-06-13 03:37:15 +01:00
Fermi c3892db433 Liver and lungs. 2019-06-13 03:34:33 +01:00
SkullyRoberts e83365daed Added a penis autosurgeon as rare maint loot 2019-06-08 17:12:51 -04:00
kevinz000 ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Fermi 05067463c5 Missed a comment. 2019-06-06 23:02:14 +01:00
Fermi 83666abfea Small text edits and tightening up of self MKU OD. 2019-06-06 22:56:59 +01:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa 27ef3ce281 Without this, everyone is broken 2019-06-05 08:10:20 -05:00
Poojawa a2b4f4261c Fixes missing hands and marking overlap
cleans up the code a bit too. Improves female chest sprites.
2019-06-05 02:33:25 -05:00
Poojawa b053fe3c86 Probably fixes synth hand issues 2019-06-04 23:36:58 -05:00
Fermi 228ab5b7c9 +Acute hepatic pharmacokinesis. (untested, will test with alterations)CC 2019-06-05 00:23:42 +01:00
kevinz000 fc1611d86a Merge pull request #8426 from Sishen1542/sloom-hnngh
Slimespeak!
2019-06-03 00:51:36 -07:00
Fermi 40aa231b64 Made MKUltra's OD on self turn the player into a narcissist. 2019-06-01 04:31:34 +01:00
Fermi 2eceb6f57b Added a cybernetic tongue and sprites. Fixed furranium. 2019-06-01 01:28:52 +01:00
Fermi d0811e5be6 Adjusted lung health. 2019-05-31 04:26:41 +01:00
Fermi adeffe0c47 Fixed lungs. 2019-05-31 04:16:18 +01:00
Fermi 08e72ba05e Why does adjustLungLoss not workkkkkkkkkkkkkkkkk 2019-05-31 03:49:25 +01:00
Fermi 543dc9a399 Final fixes, finally fixed all problems. 2019-05-29 01:33:07 +01:00
Fermi 48ae55d61d Sishen implementation 2019-05-28 19:25:31 +01:00
Fermi 4607a2b6c3 Compile safe. Today's fixes. 2019-05-27 05:39:52 +01:00
Fermi bd85095590 Prebed tweaks 2019-05-26 05:34:28 +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
Fermi e2c1eb1d7c prebed fixes 2019-05-25 05:27:28 +01:00
Fermi 5e8a20b171 More bugs, to be fixed. 2019-05-25 03:00:31 +01:00
Fermi faf6585b69 Winding down to the final commits. 2019-05-25 01:04:00 +01:00
Sishen d082479ccb Slimespeak! 2019-05-24 08:48:03 -04:00
Fermi 05aaeb4d70 Current state 2019-05-24 06:06:25 +01:00
Fermi 2f7a4082ab woooah. 2019-05-23 23:09:32 +01:00
Fermi a480ccb9fa Changes 2019-05-23 05:26:38 +01:00
Fermi 9da13f231c OOPS BROKE LUNGS 2019-05-22 20:23:45 +01:00
Fermi 41d991e81c Pre blood commit 2019-05-22 18:13:12 +01:00
Fermi 7cb7f5de73 Update of master required. 2019-05-22 16:50:53 +01:00
Poojawa ae939c4344 Female Gendered markings 2019-05-21 22:51:00 -05:00
Fermi e86585935f MidFix - compile unsafe. 2019-05-22 02:25:05 +01:00
Fermi 485def8d28 More fixed upon the last! 2019-05-21 22:06:55 +01:00
Fermi ac3f0c790e Fixed compling errors from last time. 2019-05-21 20:28:40 +01:00
Fermi be4f188589 FermiChem? More like, FermiFixes! 2019-05-21 20:08:46 +01:00
kevinz000 999bb87b4a Merge pull request #8378 from Useroth/nutcracker
Nutcracker. Yes, it's big enough to crush heads.
2019-05-20 23:35:33 -07:00
Fermi 71088eace9 More fixes 2019-05-21 05:05:32 +01:00