Commit Graph

802 Commits

Author SHA1 Message Date
Fermi
e58a94bcc7 Merge remote-tracking branch 'upstream/master' 2019-06-01 03:12:38 +01:00
Fermi
01c3f66f7c Great, merge conflicts. 2019-06-01 02:42:55 +01:00
Fermi
2eceb6f57b Added a cybernetic tongue and sprites. Fixed furranium. 2019-06-01 01:28:52 +01:00
Fermi
e1577111a0 TO BE TESTED: Added the ability for slimes to make MKUltra. 2019-05-31 05:09:07 +01:00
Fermi
1244b848bf Compile safe. 2019-05-31 04:29:35 +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
f8005dd625 Moved the secret cat to the respective fermi.dms. 2019-05-31 02:47:08 +01:00
Fermi
ee2d75ae22 Removed special screen obj, as I didn't like how they looked. 2019-05-30 20:05:06 +01:00
deathride58
9e35f91706 suggested changes from asky 2019-05-30 13:18:05 -04:00
Thalpy
4077ab1fe3 .5 2019-05-29 21:22:07 +01:00
Thalpy
a58766c885 Fixed explosions not occuring when temps were high enough. 2019-05-29 21:11:21 +01:00
Thalpy
621f973cac Fixed pH disappearing and changed how strongly reactions shifted the pH. 2019-05-29 20:25:32 +01:00
Thalpy
90949f406d Fixed the forceMove issue. 2019-05-29 20:17:22 +01:00
Fermi
1ce25acb0c Forgot to save this too. 2019-05-29 05:41:33 +01:00
Fermi
455ebc2a7c Edited Astrogen. 2019-05-29 04:50:21 +01:00
Fermi
42513fda9b Pre extra file culling. 2019-05-29 03:49:14 +01:00
Fermi
d4d955b138 Finished. 2019-05-29 03:29:17 +01:00
Fermi
01a38479fa Why did I fiddle with things I shouldn't have. 2019-05-29 03:16:11 +01:00
Fermi
91cfd8e052 Before say component remove. 2019-05-29 03:01:47 +01:00
Fermi
336ba8dbad Tidying code. 2019-05-29 02:33:15 +01:00
Fermi
c1544ffe46 Tweak. 2019-05-29 01:57:31 +01:00
Fermi
db3369ab43 Scrubbing messages and cleaning code. 2019-05-29 01:51:07 +01:00
Fermi
331c2887ea Small recipie changes. 2019-05-29 01:41:30 +01:00
Fermi
543dc9a399 Final fixes, finally fixed all problems. 2019-05-29 01:33:07 +01:00
deathride58
3feb11f12a Ports the zulie cloak and blackredgold coat donor items from RP 2019-05-28 19:38:08 -04:00
Fermi
12eb5e9b17 ARGH 2019-05-28 23:35:50 +01:00
Fermi
89665de8a7 Last round of test checks. 2019-05-28 22:33:04 +01:00
Fermi
48ae55d61d Sishen implementation 2019-05-28 19:25:31 +01:00
Thalpy
4f28dbd7fc Lil clarification. 2019-05-28 18:44:14 +01:00
Fermi
8282819c84 CHECK PLASMA THOUGH! 2019-05-28 05:03:58 +01:00
Fermi
df2a14880e Beginning comment purge. 2019-05-28 00:35:33 +01:00
Fermi
5771fd9442 Should be the last fix. 2019-05-27 20:52:05 +01:00
Fermi
79a7b6b45b Fixes. 2019-05-27 20:25:57 +01:00
Fermi
c531e6afa6 Okay, forgot to stage changes. Now compile safe. 2019-05-27 15:03:29 +01:00
Fermi
a1afeb880f Final testing. Added pH meter too. Compile safe. 2019-05-27 15:00:19 +01:00
Fermi
4607a2b6c3 Compile safe. Today's fixes. 2019-05-27 05:39:52 +01:00
Fermi
4cb697d2ec Final changes before checks. 2019-05-26 17:37:20 +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
87deaf07c5 Update breasts.dm
I do not like how git works sometimes.
2019-05-26 01:55:59 +01:00
Fermi
a0073295e1 Updating from Cit, pre PR. 2019-05-26 01:49:58 +01:00
kevinz000
0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118
[Ready] Cleaner looking autolathen organization
2019-05-25 11:51:17 -07:00
kevinz000
e434b9ceb5 Merge pull request #8397 from WhiteHusky/arousal-related-styling-fixes
Changed arousal message styling.
2019-05-25 11:30:18 -07:00
kevinz000
97609fb84e Merge pull request #8409 from Poojawa/why-is-arousal-code-is-bad
Fixes species getting genitals at all if NOGENITAL'd
2019-05-25 11:13:55 -07:00
Fermi
e3d3f30ea9 Could this be the final commit?! 2019-05-25 16:12:46 +01:00
Fermi
e2c1eb1d7c prebed fixes 2019-05-25 05:27:28 +01:00
Fermi
b4624c5537 I really hate genitals. 2019-05-25 03:15:15 +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