Commit Graph

811 Commits

Author SHA1 Message Date
Fermi
ad37ec08b2 Removing slimejelly req from feedback. 2019-07-04 23:24:18 +01:00
Fermi
27aad8f117 Quick in case. 2019-07-02 22:42:07 +01:00
Fermi
946fbff999 +Yamerol, tweaked PE, tweaked CM3000, tweaked medpH. 2019-07-02 22:15:32 +01:00
Fermi
d876b20a0b Quickfix for botany and removed message_admins that I thought I pushed. 2019-07-01 22:32:42 +01:00
Fermi
326bae2109 pH? More like Pretty HARGH. 2019-07-01 21:04:17 +01:00
Thalpy
48ce61580e Fixes viro oversight. 2019-07-01 12:36:24 +01:00
Thalpy
937d6467e6 Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_ 2019-06-30 19:16:27 +01:00
Thalpy
e09f189895 WELCOME TO PH'S HELL RIDE 2019-06-30 01:56:10 +01:00
Thalpy
696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Thalpy
7be7f05228 Reduced pent, tweaked pH, tweaked MK, added beaker tally. 2019-06-29 08:50:20 +01:00
Thalpy
f8a93a035f Tweaking pH based on user feedback. 2019-06-29 07:32:00 +01:00
kevinz000
c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
2019-06-28 20:32:15 -07:00
kevinz000
a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
2019-06-28 20:30:44 -07:00
Thalpy
b6309d5a31 Fixes explosion bug, tweaks hypo and fiddles pH. 2019-06-29 02:47:32 +01:00
Thalpy
a4edb0b69a Trying alternative fix for pH. 2019-06-28 18:50:28 +01:00
kevinz000
d4b9b52f10 Merge pull request #8728 from Sishen1542/JESUSFUCKFIXDISPENSERSALREADYGODDAMN
Dispensers now act like tg counterparts! Tweak to available chems in chem/soda/booze dispensers.
2019-06-28 10:16:25 -07:00
Thalpy
b8028242c0 Compile fixes 2019-06-28 17:16:21 +01:00
Thalpy
9ee17e4045 [TEST] redo pH on reaction. 2019-06-28 16:58:08 +01:00
Thalpy
4b7ac0be79 More fun ssblackbox tallies. 2019-06-28 16:50:48 +01:00
Sishen
92f530eed1 left the , for diethyl when i removed saltpetre whoops 2019-06-28 08:34:35 -04:00
Sishen
84e60b1cd2 Update chem_dispenser.dm 2019-06-28 08:32:56 -04:00
deathride58
8f168727c5 Merge pull request #8730 from Ghommie/Ghommie-cit80
Port in alt click to eject beaker and swapping beakers for chem machines, grinder radial menu.
2019-06-28 00:52:59 -04:00
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
Sishen
a74712eef2 Update toxins.dm 2019-06-23 15:33:16 -04: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
bfa212f43e Update toxin_reagents.dm 2019-06-23 04:38:58 -04:00
Sishen
13363ab16f Update drink_reagents.dm 2019-06-23 04:36:54 -04:00
Sishen
b63453a7f0 Update drink_reagents.dm 2019-06-23 04:36:12 -04:00
Sishen
a2a440a92c golem gang golem gang golem gang golem gang 2019-06-23 04:27:50 -04:00
Ghommie
c01499b5a0 Ports in radials for reagent grinders, alt click to eject beaker and beaker swapping. 2019-06-23 04:32:39 +02:00
Ghommie
38bc8a4efd Ports "Removes SSreligion" 2019-06-23 01:45:21 +02:00
Sishen
410c960f79 Update chem_dispenser.dm 2019-06-22 18:35:04 -04: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