 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 |
|
|
TrilbySpaseClone
|
771ac9724e
|
ports Fel connet
Shamelessly stealing content
|
2019-06-21 04:39:10 -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
|
d5279c8373
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-06-17 09:51:22 +02:00 |
|
|
Ghommie
|
1c93c43e20
|
Fixes roffle waffle, mushroom halluginogen and some invalid reagent.
|
2019-06-17 09:16:45 +02:00 |
|
|
Ghommie
|
1323ace579
|
Peanuts, peanut butter, and sandwiches.
|
2019-06-17 05:17:24 +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 |
|