 Putnam3145
|
1d91e1acf4
|
Merge pull request #10016 from deathride58/mousedropfixes
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
|
2019-11-30 22:51:42 -08:00 |
|
|
deathride58
|
b1fca2b74b
|
Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it
|
2019-11-29 22:59:37 -05:00 |
|
|
Fermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
|
Fermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +00:00 |
|
|
Fermi
|
c8b206a4cf
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 03:04:04 +00:00 |
|
|
Fermi
|
4c1c257035
|
Revert "Revert "pls""
This reverts commit b23f2a4460.
|
2019-11-24 03:02:21 +00:00 |
|
|
Fermi
|
9eaed4ea8e
|
Revert "pls2"
This reverts commit 0eb635b908.
|
2019-11-24 03:02:04 +00:00 |
|
|
Fermi
|
0eb635b908
|
pls2
ugh
|
2019-11-24 02:52:17 +00:00 |
|
|
Fermi
|
b23f2a4460
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 02:49:20 +00:00 |
|
|
Fermi
|
8c97511871
|
pls
ugh
|
2019-11-24 02:47:52 +00:00 |
|
|
Fermi
|
00601a0c87
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 02:44:00 +00:00 |
|
|
Fermi
|
8af225e6e3
|
PLASE
|
2019-11-24 02:41:21 +00:00 |
|
|
Fermi
|
b404e18b15
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-11-23 00:10:33 +00:00 |
|
|
Ghommie
|
bf92aa2ffb
|
Unmodularize MkII hyposprays and other reagent items sprites.
|
2019-10-26 19:14:28 +02:00 |
|
|
Fermi
|
12626c8db2
|
Okay I dunno why it does what it do but it do.
|
2019-09-10 20:51:22 +01:00 |
|
|
Fermi
|
621851790e
|
Damnit hat, don't get too excited now, y'all.
|
2019-09-10 20:46:38 +01:00 |
|
|
Fermi
|
443f9e433d
|
Final tweaks
|
2019-09-10 20:18:45 +01:00 |
|
|
Fermi
|
018ebc32ae
|
All that remains is MK testing.
|
2019-09-08 02:46:43 +01:00 |
|
|
Fermi
|
7890ad08d5
|
what is this
|
2019-09-03 20:30:21 +01:00 |
|
|
Fermi
|
9d3aa1f3b0
|
Removing a comment block I missed.
|
2019-08-08 18:28:47 +01:00 |
|
|
Fermi
|
a8e2311caf
|
Bloomin' indents!
|
2019-08-07 14:53:20 +01:00 |
|
|
Fermi
|
7391581a26
|
2 small fixes.
|
2019-08-07 11:33:53 +01:00 |
|
|
Fermi
|
8d12d0f017
|
I am very smart
|
2019-07-13 20:02:53 +01:00 |
|
|
Fermi
|
6c9f37790b
|
Fixing bugs from merge conflicts.
|
2019-07-13 20:02:27 +01:00 |
|
|
Fermi
|
0f2978d7fd
|
Updated Analysis meter's Analysis.
|
2019-07-01 14:47:32 +01:00 |
|
|
Thalpy
|
937d6467e6
|
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
|
2019-06-30 19:16:27 +01:00 |
|
|
Fermi
|
0954f0f50c
|
This is why you always compile test before merging.
|
2019-06-26 12:07:21 +01:00 |
|
|
Fermi
|
fbf54cd560
|
Ninja fix.
|
2019-06-26 12:01:26 +01:00 |
|
|
Fermi
|
4526832e7d
|
I'm spending too much time trying to fix something rejected.
|
2019-06-17 15:16:45 +01:00 |
|
|
Fermi
|
d092dd1da0
|
Testing hypnoquirk
|
2019-06-17 12:47:23 +01:00 |
|
|
Fermi
|
c2b9c0321d
|
Catfix
|
2019-06-16 13:33:41 +01:00 |
|
|
Fermi
|
3caadb2009
|
pH calc redo, too confusing.
|
2019-06-16 12:22:13 +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
|
eab52a51e6
|
Fixed compile errors.
|
2019-06-13 03:05:34 +01:00 |
|
|
Fermi
|
8edecb64a6
|
pHMeter fix
|
2019-06-13 01:20:36 +01:00 |
|
|
Fermi
|
b51a9e70e5
|
Fix for pHbooklet.
|
2019-06-13 01:13:47 +01:00 |
|
|
Fermi
|
91cfd8e052
|
Before say component remove.
|
2019-05-29 03:01:47 +01:00 |
|
|
Fermi
|
89665de8a7
|
Last round of test checks.
|
2019-05-28 22:33:04 +01:00 |
|
|
Fermi
|
79a7b6b45b
|
Fixes.
|
2019-05-27 20:25:57 +01:00 |
|
|
Fermi
|
c531e6afa6
|
Okay, forgot to stage changes. Now compile safe.
|
2019-05-27 15:03:29 +01:00 |
|
|
Fermi
|
a1afeb880f
|
Final testing. Added pH meter too. Compile safe.
|
2019-05-27 15:00:19 +01:00 |
|
|
Fermi
|
a0073295e1
|
Updating from Cit, pre PR.
|
2019-05-26 01:49:58 +01:00 |
|
|
Fermi
|
645dfca14a
|
Compile ready.
|
2019-05-23 23:17:17 +01:00 |
|
|
Fermi
|
2f7a4082ab
|
woooah.
|
2019-05-23 23:09:32 +01:00 |
|
|
Fermi
|
9da13f231c
|
OOPS BROKE LUNGS
|
2019-05-22 20:23:45 +01:00 |
|
|
Fermi
|
a9bc75fc0e
|
why do I even bother
|
2019-05-21 02:53:17 +01:00 |
|
|
Fermi
|
a6ede9fecc
|
Endless fixes
|
2019-05-19 23:32:30 +01:00 |
|
|
Fermi
|
072a4ce6a6
|
Sleepy fixes
|
2019-05-19 04:20:34 +01:00 |
|
|
Fermi
|
791d021d50
|
Even more fixes.
|
2019-05-19 01:37:20 +01:00 |
|