Verkister
7a0d30171a
fixes puke coating stealing nutriment reagent's id
...
How do you even miss this and how in the world is the code itself able to miss it too until something messes up a bunch of buns?
2022-03-07 20:43:46 +02:00
Casey
778a42866e
Merge pull request #12388 from GhostActual/Recipe-fix
...
Recipe Fixes
2022-03-07 08:18:44 +00:00
Razgriz
61ad397978
Merge pull request #3770 from CHOMPStation2/upstream-merge-12350
...
[MIRROR] More Allergen Tweaks
2022-03-01 01:36:55 -07:00
Razgriz
7cdaea188a
Merge pull request #3749 from CHOMPStation2/upstream-merge-12322
...
[MIRROR] Carpet Craftin'
2022-03-01 01:20:06 -07:00
Razgriz
5d19f01fc2
powder that makes you say yes
2022-03-01 01:16:44 -07:00
Razgriz
388021e417
powder that makes you say yes
2022-03-01 00:57:51 -07:00
Razgriz
f90e935687
Merge pull request #3722 from CHOMPStation2/upstream-merge-12292
...
[MIRROR] 8316 fix
2022-03-01 00:29:44 -07:00
Casey
0941220ad7
More Allergen Tweaks
2022-03-01 02:18:39 +00:00
Casey
d07469a44c
Carpet Craftin'
2022-02-25 23:37:02 +00:00
Nadyr
59090266bd
Merge pull request #3717 from CHOMPStation2/upstream-merge-12286
...
[MIRROR] Merge Fixes for 8222
2022-02-19 20:51:16 -05:00
Nadyr
4f53ebd9c9
powder that makes you say yes
2022-02-19 20:31:40 -05:00
Nadyr
fa1fea2c56
Merge pull request #3715 from CHOMPStation2/upstream-merge-12285
...
[MIRROR] 7914 branch fix
2022-02-19 19:58:40 -05:00
Nadyr
96769bf048
powder that makes you say yes
2022-02-19 17:56:28 -05:00
Casey
02acd7cba0
8316 fix
2022-02-19 22:33:29 +00:00
Casey
592777ba9b
Merge Fixes for 8222
2022-02-19 22:04:54 +00:00
Casey
e73d113da0
7914 branch fix
2022-02-19 21:25:16 +00:00
Casey
e669aaeb62
Doom Barrels
2022-02-18 18:55:35 +00:00
Razgriz
9c4fcb067d
Merge pull request #3682 from CHOMPStation2/upstream-merge-12235
...
[MIRROR] Adds vendor refill cartridges to cargo
2022-02-17 17:33:53 -07:00
Razgriz
de4cc762f1
powder that makes you say yes
2022-02-16 14:40:09 -07:00
Razgriz
21597607bc
Merge pull request #3666 from Holdelta/bestdrink
...
Pilk
2022-02-16 14:10:02 -07:00
Casey
fdfa958555
Adds vendor refill cartridges to cargo
2022-02-14 21:36:39 +00:00
Test Turtle
270f307b7c
Pilk
...
What it says on the tin.
2022-02-13 00:42:21 -08:00
Casey
a13794c60f
Merge pull request #12187 from Heroman3003/fishochimera
...
Makes xenochimera able to eat raw fish
2022-02-09 15:05:26 +00:00
Casey
b83034829f
Merge pull request #12173 from KillianKirilenko/kk-test
...
Allergen Reaction Tuning
2022-02-07 23:17:12 +00:00
Nadyr
1932d42388
Merge pull request #3606 from CHOMPStation2/upstream-merge-12142
...
[MIRROR] Minor food tweaks
2022-02-03 22:51:11 -05:00
Casey
de56611efc
Merge pull request #12142 from Heroman3003/foodtweak
...
Minor food tweaks
2022-02-03 06:31:10 +00:00
Casey
4763264965
Merge pull request #12128 from TheObserver-sys/XenoBotanyPass1
...
Xenobotany Pass 1 (Of who knows how many)
2022-02-03 06:29:57 +00:00
Casey
cd80228460
Merge pull request #11944 from Heroman3003/nifnerf
...
Makes NIFs not get automatically lost (hopefully)
2022-01-09 01:50:59 +00:00
Nadyr
3b2ef9f7dd
Merge pull request #3481 from CHOMPStation2/upstream-merge-11994
...
[MIRROR] Makes Universal Enzyme inhibit choccy milk reaction
2021-12-12 06:39:25 -05:00
Nadyr
8d2e260f17
Merge pull request #3421 from CHOMPStation2/upstream-merge-11807
...
[MIRROR] Adds general-purpose cooking oil, replaces usages of corn oil
2021-12-12 03:23:06 -05:00
Casey
4bed6db581
Merge pull request #11994 from Heroman3003/chocc
...
Makes Universal Enzyme inhibit choccy milk reaction
2021-12-11 03:43:46 +00:00
Razgriz
cfe0107753
powder that makes you say yes
2021-12-10 01:03:48 -07:00
Casey
cb16101fb6
Merge pull request #11883 from Heroman3003/negroni
...
Makes Bitters inhibit Martini Classic reaction
2021-12-10 06:22:07 +00:00
Casey
c2441330b6
Adds general-purpose cooking oil, replaces usages of corn oil
2021-12-10 00:20:40 +00:00
Nadyr
db3ef9440e
Merge pull request #3217 from CHOMPStation2/upstream-merge-11921
...
[MIRROR] Snakes are Sweet
2021-12-05 13:28:39 -05:00
Nadyr
898a751401
powder that makes you say yes
2021-12-05 11:04:21 -05:00
Casey
a1fabbfaa1
Snakes are Sweet
2021-12-03 07:15:09 +00:00
Nadyr
e75b980dfe
Merge pull request #3186 from Shadowfire117/master
...
Arachnid Slammer
2021-11-13 19:57:04 -05:00
Shadow
fc2597de2a
Arachnid Slammer
...
Made a new drink derived from stimulants, energy drink and hearty ale! Good to warm the heart and soul when mining and slaying spiders!
Also made a recipe for making some absolute loko energy drinks!
2021-11-10 17:25:18 +01:00
Aronai Sieyes
12d8d8f592
Merge pull request #11681 from VOREStation/upstream-merge-8326
...
[MIRROR] You can't feed drinks to borgs
2021-10-28 01:25:13 +00:00
Nadyr
2e77d7b617
Merge pull request #3154 from CHOMPStationBot/upstream-merge-11665
...
[MIRROR] the part printing buff nobody asked for
2021-10-27 21:18:25 -04:00
Chompstation Bot
3caad465fa
the part printing buff nobody asked for
2021-10-27 21:05:26 -04:00
Aronai Sieyes
3aad9d6f36
Merge pull request #11669 from VOREStation/upstream-merge-8331
...
[MIRROR] Rum and Cola fix
2021-10-28 00:59:26 +00:00
Nadyr
e60a3245bc
powder that makes you say yes
2021-10-27 19:24:43 -04:00
Chompstation Bot
4a5b2182c1
Brainfood
2021-10-27 16:07:14 +00:00
Nadyr
3995a66fca
Merge branch 'master' into upstream-merge-11579
2021-10-22 20:03:36 -04:00
Nadyr
ed6e2d7eb6
powder that makes you say yes
2021-10-22 19:48:49 -04:00
Chompstation Bot
ffadbf101f
[MIRROR] Stimulant allergen for Tajaran
2021-10-22 18:57:48 +00:00
Chompstation Bot
deae206b41
[MIRROR] A Hint Of Lime
2021-10-22 18:12:11 +00:00
Nadyr
565b19066f
Merge pull request #3017 from CHOMPStationBot/upstream-merge-11582
...
[MIRROR] Adds large autoinjectors to autolathes
2021-09-24 17:12:18 -04:00
