89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
117e5a409d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 00:05:44 -05:00
e0b8d28386
donator item
2019-09-30 22:16:27 -05:00
1bdb66d5de
Okay a few things I just saw
2019-09-27 07:28:02 +01:00
cc87682c25
Fix and eigen tweak.
2019-09-26 09:04:06 +01:00
60adaa9f1b
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-26 08:44:21 +01:00
8dcf74d5f0
Makes buffers not react with stab agent
2019-09-22 12:02:20 +01:00
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01:00
f8dfb1e3aa
Okay.
2019-09-21 12:45:10 +01:00
a3ae942c1d
Okay.. I think this fixes it all.
2019-09-21 11:13:20 +01:00
af157e85fb
Update living.dm
2019-09-21 01:48:58 -07:00
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
3e899e59f9
Merge pull request #9283 from Trilbyspaceclone/removal
...
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
f259d98d7a
Merge pull request #9282 from Ghommie/Ghommie-cit193
...
Fixed a few dozen suits' body coverage inconsistencies.
2019-09-21 01:43:52 -07:00
15d36cbaa1
I need to stop leaving .dm files open in dreammaker.
2019-09-21 09:37:54 +01:00
a08c1229d6
OKAY now I'm done I think.
2019-09-21 09:31:53 +01:00
4b44b31aa3
Okay, feature done
2019-09-21 08:24:46 +01:00
a8747449c2
All good
2019-09-20 21:50:04 +01:00
d12fd72ebf
Updates a buncha stuff.
2019-09-20 21:11:20 +01:00
9b2f67d67d
reagent_flags is used elsewhere, renamed to chemical_flags
2019-09-20 19:43:37 +01:00
3f2933adbf
Ghommies' requests.
2019-09-19 23:31:36 +01:00
79011190c1
Merge branch 'master' into tg-Organ-port
2019-09-19 21:26:42 +01:00
b8190552f1
Update defines, and vars, and created new procs
2019-09-19 21:24:50 +01:00
70098f8bc8
Merge branch 'master' into Reagents_bitflats
2019-09-19 20:04:10 +01:00
641196b9dd
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-19 19:57:57 +01:00
7ef5ab0332
TO TEST - also needs #9099 merging.
2019-09-19 17:52:45 +01:00
a398f64b66
Okay
2019-09-19 15:33:40 +01:00
08eeda97f5
Heck
2019-09-19 01:45:21 +01:00
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
c813555697
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-09-15 04:05:14 +02:00
344ccaf20d
cleans up some other species related stuff, unmodularizes some code
2019-09-13 22:18:53 -05:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
9376bfb44d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
2019-09-13 12:56:57 -05:00
63d2273a75
Merge pull request #9220 from Thalpy/Catnip-Furranium
...
Allows Furranium grown from organic sources.
2019-09-13 10:41:07 -07:00
9561819fb7
Fixes Horn coloration issues, allows mammals to choose their meat type
...
Because reasons I guess.
2019-09-13 10:58:04 -05:00
ef4b5c1b34
gone_reduced_to_atoms
2019-09-12 23:06:46 -04:00
2226bd3b69
More adjustments.
2019-09-13 00:25:52 +02:00
2bf4d00d29
Double checking my work
2019-09-12 00:46:18 -05:00
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
f50e84a20c
Merge branch 'master' into NeuroFix
2019-09-11 16:24:00 +01:00
b22994e546
Removes MK stuffs
2019-09-10 21:59:24 +01:00
4f0afb6e45
50 to 100
2019-09-10 21:36:49 +01:00
0a4090d83c
Fixes weird message
2019-09-10 21:12:43 +01:00
ce5095321c
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-10 20:52:31 +01:00
12626c8db2
Okay I dunno why it does what it do but it do.
2019-09-10 20:51:22 +01:00
Fermi