564c1fde9f
Merge branch 'master' into Reagents_bitflats
2019-10-08 07:31:03 +01:00
27c2c89766
Merge branch 'master' into Reagents_bitflats
2019-10-05 23:43:19 +01:00
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
41fbb759b2
Merge branch 'master' into more_cooking2
2019-09-25 14:56:11 -04:00
9b2f67d67d
reagent_flags is used elsewhere, renamed to chemical_flags
2019-09-20 19:43:37 +01:00
79011190c1
Merge branch 'master' into tg-Organ-port
2019-09-19 21:26:42 +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
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
0faafe8deb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
2019-09-13 23:26:27 -05:00
5b2dba354a
Merge branch 'master' into fruit
2019-09-13 14:00:11 -04: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
4494f42155
Merge pull request #9270 from Linzolle/reallyguys
...
fixes donuts being uncraftable
2019-09-13 10:40:21 -07: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
ff0c3ee844
Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
...
The art of drunken captaining
2019-09-10 22:06:36 -07:00
6cc92da914
bruh
2019-09-09 18:02:23 -05:00
7476f117da
pie
2019-09-03 10:45:33 -04:00
8394f2f1c7
grammer
2019-09-03 10:44:59 -04:00
1256d9382e
complie
2019-08-29 21:07:57 -04:00
d3852ebd56
even more
2019-08-29 19:39:10 -04:00
a5b8a56f9a
Realised it was impossible.
2019-08-29 00:32:05 +01:00
124d8503dc
Tests and fixes.
2019-08-29 00:12:16 +01:00
4878510c2b
Fixes that make this complie
2019-08-24 19:46:51 -04:00
db317b65af
Grand!
2019-08-24 19:39:15 -04:00
044ef51dfa
Relies on a PR
2019-08-20 18:32:39 -04:00
d6c9daa4eb
Update drinks_recipes.dm
...
Fixed more errors, spelling and id errors to be exact with the help of Papa Pax :D.
2019-08-19 16:04:16 -04:00
e7d08d1fed
Update drinks_recipes.dm
...
Fixed error at line 803, allies_cocktail to alliescocktail. Am bone-head :(.
2019-08-19 15:53:13 -04:00
6c6391b4c4
Merge branch 'master' into fruit
2019-08-19 07:37:12 -04:00
566a4e65a1
right crafting
2019-08-18 01:31:38 -04:00
4b6b2cf195
Adds new drink to drink recipes
...
It's a drink for Captains
2019-08-17 01:37:28 -04:00
e30f72067e
Merge branch 'master' into NeuroFix
2019-08-12 00:00:28 +01:00
821463f59c
Nya
2019-08-11 11:47:56 -04:00
5dcd419d8a
Merge pull request #8356 from Thalpy/master
...
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
2019-08-11 16:09:23 +12:00
251ac24e02
[NEED TO TEST] {Preview} Fixes Neurotoxin and adjusts it's reaction.
2019-08-11 00:35:36 +01:00
ab13b62bdd
fruits of labor
2019-08-08 16:14:04 -04:00
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
9ec56077b6
Merge pull request #8908 from Ghommie/Ghommie-cit142
...
Fixes Zelus flasks a bit.
2019-08-05 00:54:43 -07:00
2654a5388e
Merge pull request #9024 from Ghommie/Ghommie-cit176
...
Ports "Lizardwine drink crafting fix"
2019-08-04 19:22:52 -07:00
7a3d895997
Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes
...
Tweaks cakes, adds in more of them as well as a few more tarts - All hidden
2019-08-04 19:15:18 -07:00
e04547b838
Merge pull request #9015 from Trilbyspaceclone/patch-203
...
fixes a few snowcones being bad grammared
2019-08-04 19:13:44 -07:00
3a85f9473c
amazing
2019-08-02 14:37:52 -04:00
a9b16701a1
Ports "Lizardwine drink crafting fix"
2019-08-01 00:31:14 +02:00
c68fb90955
Update snacks_cake.dm
2019-07-31 12:03:56 -04:00
ef6be90435
Update recipes_frozen.dm
2019-07-31 11:42:20 -04:00
3dca4dd379
Update snacks_frozen.dm
2019-07-31 11:35:19 -04:00
57d5ddb80f
removed extra broken bottle strength.
2019-07-21 12:20:10 +02:00
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
66ddaf3ae8
Merge pull request #8903 from Trilbyspaceclone/patch-192
...
Re-words brass flasks to not be wrong
2019-07-20 11:59:30 -07:00
Thalpy