 Thalpy
|
cf8db59649
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-01 08:20:16 +01:00 |
|
|
Fermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
|
Poojawa
|
117e5a409d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 00:05:44 -05:00 |
|
|
Thalpy
|
1bdb66d5de
|
Okay a few things I just saw
|
2019-09-27 07:28:02 +01:00 |
|
|
Fermi
|
cc87682c25
|
Fix and eigen tweak.
|
2019-09-26 09:04:06 +01:00 |
|
|
Fermi
|
60adaa9f1b
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-09-26 08:44:21 +01:00 |
|
|
Fermi
|
8dcf74d5f0
|
Makes buffers not react with stab agent
|
2019-09-22 12:02:20 +01:00 |
|
|
Poojawa
|
5876a235c2
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-22 00:22:18 -05:00 |
|
|
Fermi
|
97fa05f446
|
Merge branch 'master' into tg-Organ-port
|
2019-09-21 14:01:52 +01:00 |
|
|
Fermi
|
f8dfb1e3aa
|
Okay.
|
2019-09-21 12:45:10 +01:00 |
|
|
Fermi
|
a3ae942c1d
|
Okay.. I think this fixes it all.
|
2019-09-21 11:13:20 +01:00 |
|
|
kevinz000
|
313956002b
|
Merge pull request #9269 from Thalpy/FermiGrenades
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
|
2019-09-21 01:46:22 -07:00 |
|
|
Fermi
|
15d36cbaa1
|
I need to stop leaving .dm files open in dreammaker.
|
2019-09-21 09:37:54 +01:00 |
|
|
Fermi
|
a08c1229d6
|
OKAY now I'm done I think.
|
2019-09-21 09:31:53 +01:00 |
|
|
Fermi
|
4b44b31aa3
|
Okay, feature done
|
2019-09-21 08:24:46 +01:00 |
|
|
Fermi
|
a8747449c2
|
All good
|
2019-09-20 21:50:04 +01:00 |
|
|
Fermi
|
d12fd72ebf
|
Updates a buncha stuff.
|
2019-09-20 21:11:20 +01:00 |
|
|
Fermi
|
9b2f67d67d
|
reagent_flags is used elsewhere, renamed to chemical_flags
|
2019-09-20 19:43:37 +01:00 |
|
|
Fermi
|
3f2933adbf
|
Ghommies' requests.
|
2019-09-19 23:31:36 +01:00 |
|
|
Thalpy
|
79011190c1
|
Merge branch 'master' into tg-Organ-port
|
2019-09-19 21:26:42 +01:00 |
|
|
Fermi
|
b8190552f1
|
Update defines, and vars, and created new procs
|
2019-09-19 21:24:50 +01:00 |
|
|
Fermi
|
70098f8bc8
|
Merge branch 'master' into Reagents_bitflats
|
2019-09-19 20:04:10 +01:00 |
|
|
Thalpy
|
641196b9dd
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-09-19 19:57:57 +01:00 |
|
|
Fermi
|
7ef5ab0332
|
TO TEST - also needs #9099 merging.
|
2019-09-19 17:52:45 +01:00 |
|
|
Fermi
|
a398f64b66
|
Okay
|
2019-09-19 15:33:40 +01:00 |
|
|
Fermi
|
08eeda97f5
|
Heck
|
2019-09-19 01:45:21 +01:00 |
|
|
Fermi
|
587568bf88
|
Merge branch 'master' into tg-Organ-port
|
2019-09-19 01:33:15 +01:00 |
|
|
Fermi
|
107dd67cbe
|
Well it compiles; just synthtissue and TongueLoss now.
|
2019-09-19 01:14:12 +01:00 |
|
|
Fermi
|
dfa40a4b22
|
tg Code complete, now to bugtest and clear compile errors.
|
2019-09-18 23:57:21 +01:00 |
|
|
Fermi
|
c23d6f0113
|
I missed an earlier port.
|
2019-09-17 01:08:37 +01:00 |
|
|
Poojawa
|
53895106dc
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-13 12:58:02 -05:00 |
|
|
kevinz000
|
63d2273a75
|
Merge pull request #9220 from Thalpy/Catnip-Furranium
Allows Furranium grown from organic sources.
|
2019-09-13 10:41:07 -07:00 |
|
|
Poojawa
|
2bf4d00d29
|
Double checking my work
|
2019-09-12 00:46:18 -05:00 |
|
|
Thalpy
|
f50e84a20c
|
Merge branch 'master' into NeuroFix
|
2019-09-11 16:24:00 +01:00 |
|
|
Fermi
|
b22994e546
|
Removes MK stuffs
|
2019-09-10 21:59:24 +01:00 |
|
|
Fermi
|
4f0afb6e45
|
50 to 100
|
2019-09-10 21:36:49 +01:00 |
|
|
Fermi
|
0a4090d83c
|
Fixes weird message
|
2019-09-10 21:12:43 +01: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
|
f03c9c236d
|
Compile fixes and tweaks.
|
2019-09-10 18:54:47 +01:00 |
|
|
Fermi
|
8b20df838d
|
Just testing now.
|
2019-09-10 18:15:04 +01:00 |
|
|
Fermi
|
033057d380
|
OOPS
|
2019-09-08 02:55:40 +01:00 |
|
|
Fermi
|
d883192cf9
|
Forgot to save
|
2019-09-08 02:53:11 +01:00 |
|
|
Fermi
|
2a98f94b24
|
Rewrite
|
2019-09-08 02:52:22 +01:00 |
|
|
Fermi
|
018ebc32ae
|
All that remains is MK testing.
|
2019-09-08 02:46:43 +01:00 |
|
|
Fermi
|
d90b4769f1
|
MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes.
|
2019-09-05 22:30:53 +01:00 |
|
|
Fermi
|
f1f762ef48
|
Darnit bobby
|
2019-09-04 21:45:55 +01:00 |
|
|
Fermi
|
91cace6812
|
Merge remote-tracking branch 'upstream/master' into FERMICHEMCurTweaks
|
2019-09-03 20:33:33 +01:00 |
|
|
Fermi
|
7890ad08d5
|
what is this
|
2019-09-03 20:30:21 +01:00 |
|