cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,260 Commits 5 Branches 0 Tags
d740295aabb1d008fe91a9c28c235d44b5110f4d
Commit Graph

2474 Commits

Author SHA1 Message Date
Casey
cea57f35ad Merge pull request #12799 from lm40/master 
Fixes bar dispenser lemon juice
 2022-04-20 09:03:09 +00:00
Nadyr
2ce2880fe6 Merge pull request #4112 from CHOMPStation2/upstream-merge-12604 
[MIRROR] [MIRROR] Allergen CE Conversion
 2022-04-18 00:33:22 -04:00
Nadyr
d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Nadyr
db0ddb1cd6 Merge pull request #4104 from CHOMPStation2/upstream-merge-12768 
[MIRROR] Pocky Fix
 2022-04-17 23:32:04 -04:00
Casey
ec4b9bc914 Merge pull request #12604 from VOREStation/upstream-merge-8431 
[MIRROR] Allergen CE Conversion
 2022-04-17 22:41:03 +00:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
80cbe24947 Merge pull request #12768 from GhostActual/pocky_stick_fix 
Pocky Fix
 2022-04-17 21:17:00 +00:00
Casey
abea22deec Merge pull request #12765 from GhostActual/Lettuce-Eat 
Lettuce Eat
 2022-04-17 17:55:59 +00:00
Casey
a6e052cc9b Hypospray Revamp 2022-04-04 18:29:52 -04:00
Razgriz
6eb551306e Merge pull request #3944 from CHOMPStation2/upstream-merge-12552 
[MIRROR] Makes Xenobio Great Again
 2022-03-31 00:36:25 -07:00
Razgriz
743e6bfae4 powder that makes you say yes 2022-03-30 23:27:57 -07:00
Razgriz
861646f4b4 no 2022-03-27 15:20:12 -07:00
Casey
61c0ddf399 Makes engraving no-longer cause rage when trying to cut wires, amongst other things. 2022-03-27 19:00:28 +00:00
Casey
9609511e87 Makes Xenobio Great Again 2022-03-27 18:59:22 +00:00
Casey
973135795d Merge pull request #12461 from Heroman3003/protean-food 
Adjustments to synthetic food processing
 2022-03-20 03:13:33 +00:00
Razgriz
2302b9c597 Merge pull request #3803 from CHOMPStation2/upstream-merge-12388 
[MIRROR] Recipe Fixes
 2022-03-07 17:01:41 -07:00
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