 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 |
|
|
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 |
|
|
kevinz000
|
5c6100dfc6
|
Update food_reagents.dm
|
2019-06-08 15:52:55 -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 |
|
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
|
Thalpy
|
84c3c104cd
|
Pointed out that a message could be misinterpreted as lewd.
|
2019-06-08 06:32:12 +01:00 |
|
|
deathride58
|
8bf5777844
|
Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
|
2019-06-08 01:07:56 -04:00 |
|
|
Fermi
|
42d0ab4825
|
Comment cleanup.
|
2019-06-08 01:31:21 +01:00 |
|
|
Fermi
|
c6c98b539d
|
Minor bug fix.
|
2019-06-08 01:22:43 +01:00 |
|
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
|
Ghommie
|
44358e054a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29
|
2019-06-06 15:24:31 +02:00 |
|
|
Ghommie
|
0e630680ba
|
forgot to pull from upstream. One second.
|
2019-06-06 15:20:27 +02:00 |
|
|
Ghommie
|
af2598035a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-06-05 19:32:17 +02:00 |
|
|
Ghommie
|
0513f3464a
|
one
|
2019-06-05 19:20:25 +02:00 |
|
|
Poojawa
|
1f1f951924
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-06-03 05:35:52 -05:00 |
|
|
Fermi
|
fd22dbfc0d
|
More fixes. Need to check over merging math.
|
2019-06-02 03:59:52 +01:00 |
|
|
Fermi
|
0fa445c153
|
Fixes and test.
|
2019-06-02 03:24:01 +01:00 |
|
|
Fermi
|
3cf3268c76
|
New non-harmful medicinal darts.
|
2019-06-01 22:52:03 +01:00 |
|
|
Fermi
|
e58a94bcc7
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-01 03:12:38 +01:00 |
|