Commit Graph

8362 Commits

Author SHA1 Message Date
Fermi
be36a8bb33 Cleanup 2019-06-15 18:04:06 +01:00
Fermi
79d176336c A few minor fixes. 2019-06-15 11:36:38 +01:00
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
aa1cb22edc Eigenstate fixes. 2019-06-14 16:26:08 +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
2365f7337c Adventures in bitflags! 2019-06-14 12:47:22 +01:00
Fermi
e95b371ea5 Changed to weakness 2019-06-14 11:56:28 +01:00
Fermi
d6edc8db1f Preweakeness 2019-06-14 11:43:01 +01:00
Fermi
ab35b018db Indents and eigenstate var reduction. 2019-06-14 11:24:21 +01:00
Fermi
ee458b102f bitflags 2019-06-14 10:45:36 +01:00
Fermi
2a76cfa285 Logging 2019-06-13 07:51:46 +01:00
Fermi
54985c05d9 Confused about bitgates. 2019-06-13 07:11:29 +01:00
Fermi
9fb7c9866d Splitting larger fermi_reagents. 2019-06-13 06:59:46 +01:00
Fermi
0f5d47c03f Velvet speech reconfig. 2019-06-13 06:51:11 +01:00
Fermi
c9a66544bc pH and temp immune bitflagging. 2019-06-13 06:45:29 +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
14aa7084a8 Breast rename. 2019-06-13 04:37:03 +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
Fermi
a6b211a4a3 Fixes for beakers. 2019-06-13 03:25:16 +01:00
Fermi
91e58d896e Spelling is hard. 2019-06-13 03:24:02 +01:00
Fermi
93973b630c Moonsugar edit. 2019-06-13 03:08:01 +01:00
Fermi
b07f3b37ff Saline edit 2019-06-13 03:07:25 +01:00
Fermi
eab52a51e6 Fixed compile errors. 2019-06-13 03:05:34 +01:00
Fermi
981c1644c9 Holder changes; removed ferminew. 2019-06-13 02:47:05 +01:00
Fermi
3368d3d98b Fixed taste.dm 2019-06-13 02:32:42 +01:00
Fermi
5e4ced1a60 Sorta changes to say.dm 2019-06-13 02:26:04 +01:00
Fermi
099afc3c8e Removed hypnoflash TC 2019-06-13 02:21:37 +01:00
Fermi
70734b705a Forgot to commit to blood. 2019-06-13 02:01:42 +01:00
Fermi
9effbb1e33 Removed increase/decrease blood var. 2019-06-13 01:58:26 +01:00
Fermi
c8bcca5964 Staged hypnoflash removal. 2019-06-13 01:45:48 +01:00
kevinz000
54b3568319 Merge pull request #8599 from Poojawa/pacifistic-vore
Pacifists can nom things now, but not feed to others
2019-06-11 11:13:01 -07:00
kevinz000
d2b40ea73d Merge pull request #8610 from Sishen1542/fingerlessinsuls
Changes assistant family heirloom to a pair of fingerless insulated gloves
2019-06-11 11:03:56 -07:00
kevinz000
6ead9bbe65 Merge pull request #8587 from SkullyRoberts/DickImplant
Added a single use penis autosurgeon as rare maint loot. Because why the hell not?
2019-06-11 10:56:44 -07:00
Sishen
9f80fbe68b Coloring gloves? Not on my watch! 2019-06-10 05:20:54 -04:00
Sishen
4eccc12205 Why are we here? Just to suffer? 2019-06-10 04:56:24 -04:00
Poojawa
3f1b7e4dd6 Pacifists can nom things now, but not feed to others 2019-06-09 02:23:53 -05:00
kevinz000
ec9ae5348f Merge remote-tracking branch 'origin/master' into kevinz000-patch-48 2019-06-08 19:10:59 -07:00
kevinz000
1a07f304c9 Update examine.dm 2019-06-08 17:32:36 -07:00
kevinz000
5cf0a9e67f Update carbon_defense.dm 2019-06-08 17:30:50 -07:00
Thalpy
628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01:00
SkullyRoberts
e83365daed Added a penis autosurgeon as rare maint loot 2019-06-08 17:12:51 -04:00
kevinz000
bd0e16461b Merge pull request #8522 from Useroth/changeling-hentai
Made the changeling tentacle disarm a bit more reliable.
2019-06-08 01:32:52 -07:00
kevinz000
d36b8068fa Merge pull request #8556 from Poojawa/ninja-speak
Gives Ninjas back their Weeb speech modification
2019-06-08 01:29:42 -07:00
kevinz000
d28754cb4d Merge pull request #8560 from Ghommie/Ghommie-cit37
Ports in the fix against hitting oneself with one's own thrown items.
2019-06-08 01:27:43 -07:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
2019-06-08 01:26:28 -07:00