Commit Graph

366 Commits

Author SHA1 Message Date
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
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
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
Fermi
a9bc75fc0e why do I even bother 2019-05-21 02:53:17 +01:00
Fermi
bb4aecbd5f Progressional fixes 2019-05-20 07:44:39 +01:00
Useroth
2ec5bc2db6 Because Travis is being a bitch right now. 2019-05-19 21:29:09 +02:00
Useroth
a92abcbb96 It's always the more extreme stuff you don't notice. Moved the damage check AFTER the check whether the head exists to begin with. 2019-05-18 21:40:43 +02:00
Fermi
4ef1355933 Made "heyo" a phase 2 2019-05-18 03:32:58 +01:00
Fermi
2f75f861ce Explode proc set up 2019-05-18 01:19:04 +01:00
Fermi
cabf490134 Fixed compiling errors for Neko. 2019-05-17 16:57:42 +01:00
Fermi
fa5531285a Push for Neko, probably doesn't compile atm. 2019-05-17 16:23:34 +01:00
Useroth
d2f7b961d9 Touch-up 2019-05-17 17:16:43 +02:00
Useroth
0f54bf7471 Might as well format it a little more. 2019-05-17 17:09:10 +02:00
Useroth
73c3e94946 A fixed oopsie. 2019-05-17 17:07:45 +02:00
Useroth
4d75eca582 Well, that was surely an interesting thing to code. 2019-05-17 16:22:17 +02:00
Poojawa
f95da1aae5 Heart Attacks will murder you now
Also sanity check for cursed heart overlay
2019-05-17 05:59:28 -05:00
Useroth
06681790cd ... 2019-05-17 04:24:38 +02:00
Fermi
246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) 2019-05-16 00:58:30 +01:00
Fermi
ec2f33ceb5 Added Hatmium and a few slight fixes. 2019-05-12 03:42:23 +01:00
Fermi
f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
Thalpy
926bd65392 Merge branch 'master' into FermiChem 2019-05-11 14:14:20 +01:00
Fermi
6a17d66323 Should be most compiling errors fixed outside of outdated merge problems 2019-05-11 14:04:43 +01:00
Fermi
6466ef562c 100 down, 66 to go. 2019-05-11 02:05:25 +01:00
Fermi
29d4a2fdde Finished MCchem, now to fix compling errors. 2019-05-11 00:14:04 +01:00
Fermi
7d567fee63 MC chem 5.5/6 2019-05-10 02:00:17 +01:00
Poojawa
28eb23d474 Fixes prosthetics and missing markings 2019-05-09 16:15:03 -05:00
Fermi
854c0097d4 MC 5/6th done, probably. 2019-05-08 23:13:51 +01:00
Fermi
1385e12fe3 MC 4/6th done 2019-05-07 23:38:50 +01:00
Fermi
f31a46e029 Fixed a few things, 1/2 way through MC chem. 2019-05-05 20:32:07 +01:00
Fermi
b71bc7d9dc Added happiness, psicodine, neurine and 2/6th of MC chem 2019-05-04 17:50:43 +01:00
Fermi
bca578ab2c About 1/6th done of MC base code 2019-05-03 03:02:37 +01:00
Fermi
e70eac8f53 Futher fixes and for some reason something broke arrrghhh. 2019-05-02 08:44:06 +01:00
Fermi
5ade1a27f0 Everything fixed.
BE largement (probably) fully functional
PE I think has issues ripping clothes?
2019-04-30 05:43:49 +01:00