Commit Graph

781 Commits

Author SHA1 Message Date
Fermi
3928e027b4 Fixes (see dev discussion) 2019-06-25 23:06:55 +01:00
Fermi
8605d3a246 Found a pH overflow. 2019-06-24 15:06:18 +01:00
Fermi
10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
kevinz000
f7dcedce5f Merge pull request #8715 from Sishen1542/toxinmanbad
Pentetic Jelly, the chem we all needed. Anatomic panacea not deadly for slimes! Also, medbeam buff?
2019-06-23 06:57:09 -07:00
kevinz000
c9d67ecd49 Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
2019-06-23 06:54:43 -07:00
kevinz000
2b50f355d7 Merge pull request #8666 from Ghommie/Ghommie-cit60
Fixes roffle waffle, mushroom hallucinogen and some invalid reagents.
2019-06-23 06:54:05 -07:00
kevinz000
dcab96d9d5 Merge pull request #8721 from Ghommie/Ghommie-cit77
Ports in "Liver removal/failure now also stops passive reagent effects"
2019-06-23 06:53:30 -07:00
Sishen
2276f65c02 holy shit it actually works 2019-06-22 14:27:08 -04:00
Ghommie
d50afb9275 frickkkkeroni pepperoni garlic. 2019-06-22 17:58:42 +02:00
Ghommie
45109776e1 Ports in "Liver removal/failure now also stops passive reagent effects" 2019-06-22 17:05:08 +02:00
Sishen
94b8b33efa Update medicine_reagents.dm 2019-06-22 00:41:52 -04:00
Sishen
0a43036eae hugboxing slimepeople one thing at a time 2019-06-21 20:01:19 -04:00
Fermi
35cc690f91 One more sneaky multiplier! 2019-06-20 02:16:53 +01:00
Fermi
b51f902c14 I can't spell 2019-06-20 02:13:36 +01:00
Fermi
1cefd6fca7 Added a few more comments for reviewers as I was reviewing myself. 2019-06-19 23:04:08 +01:00
Fermi
fec1df2098 Rephrasal for understanding. 2019-06-19 00:52:45 +01:00
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
Thalpy
1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
Ghommie
50dd512be7 Ports system for randomized semi-persistent chem reactions. 2019-06-17 10:50:40 +02:00
Ghommie
1c93c43e20 Fixes roffle waffle, mushroom halluginogen and some invalid reagent. 2019-06-17 09:16:45 +02:00
kevinz000
67a00c9141 Merge pull request #8614 from Ghommie/Ghommie-cit44
Portin "Fix chem dispensers starting with an extra power cell"
2019-06-16 19:31:08 -07:00
Fermi
2df7e208b5 Spellchecking. 2019-06-16 12:34:37 +01:00
Fermi
3caadb2009 pH calc redo, too confusing. 2019-06-16 12:22:13 +01:00
Fermi
8fb3022624 Classic me. 2019-06-16 10:25:43 +01:00
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
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
14aa7084a8 Breast rename. 2019-06-13 04:37:03 +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
17403bd059 Non-functioning EMP code for review (revert before merging.) 2019-06-13 00:58:54 +01:00
Ghommie
a7bbfe46ac Fix chem dispensers starting with an extra power cell 2019-06-10 14:55:17 +02:00