Nadyr
|
1b4cc6b555
|
Merge pull request #4581 from CHOMPStation2/upstream-merge-13357
[MIRROR] [MIRROR] Nerfs allergic reactions (Again)
|
2022-07-20 20:50:48 -04:00 |
|
Casey
|
31471796a1
|
Merge pull request #13357 from VOREStation/upstream-merge-8668
[MIRROR] Nerfs allergic reactions (Again)
|
2022-07-20 17:23:10 +00:00 |
|
TheGreatKitsune
|
e294c54eab
|
Add comments to final file
|
2022-07-19 22:08:35 -05:00 |
|
TheGreatKitsune
|
9ca0accd77
|
Uncomment pill bottle styling code
|
2022-07-05 13:18:24 -05:00 |
|
TheGreatKitsune
|
454560d83f
|
Fix Nar'Sour's result amount
|
2022-07-03 21:12:39 -05:00 |
|
Razgriz
|
f46bacf1da
|
Merge pull request #4454 from CHOMPStation2/upstream-merge-13207
[MIRROR] Fixes some reagent dispenser fuckery
|
2022-07-03 17:03:14 -07:00 |
|
Nadyr
|
5033e705f2
|
powder that makes you say yes
|
2022-06-30 17:38:03 -04:00 |
|
Casey
|
2f426a74e8
|
Merge pull request #13207 from Heroman3003/dispenser-fckery
Fixes some reagent dispenser fuckery
|
2022-06-30 08:22:11 +00:00 |
|
Casey
|
b7a0a7fd5b
|
Merge pull request #13208 from liache/CargoCoffeeDispenserPatch
Cargo-Orderable-Coffee-Dispenser
|
2022-06-30 08:22:06 +00:00 |
|
Nadyr
|
a2d9c8b58a
|
Merge branch 'master' into upstream-merge-13122
|
2022-06-22 22:37:44 -04:00 |
|
Casey
|
b0802ce267
|
More TGUI Input Conversions
|
2022-06-19 11:09:42 +00:00 |
|
Casey
|
928a321b5f
|
TGUI Input Conversions
|
2022-06-19 03:59:14 +00:00 |
|
Casey
|
a5ed33a2e1
|
Merge pull request #12944 from Somememeguy/MakeCookingGreatAgain
Make Cooking Great Again [Tedium Update, Rebalance some cooking aspects]
|
2022-05-12 19:26:08 +00:00 |
|
Casey
|
16b58a8b18
|
Adds chemistry kits
|
2022-05-08 09:57:10 +00:00 |
|
Razgriz
|
0ce7af1fd9
|
Merge pull request #4145 from TheGreatKitsune/hypospray_size
Adjust hypospray size. (Fixes #4097)
|
2022-04-28 13:52:44 -07:00 |
|
Razgriz
|
7fc813a15f
|
Merge pull request #4146 from TheGreatKitsune/sorbitol
Add Sorbitol
|
2022-04-27 02:28:28 -07:00 |
|
Casey
|
8679260347
|
Merge pull request #12819 from GhostActual/powder_drugs
Pharma Fix
|
2022-04-24 07:17:44 +00:00 |
|
TheGreatKitsune
|
85b7fc2d58
|
Add Sorbitol
|
2022-04-23 21:26:28 -05:00 |
|
TheGreatKitsune
|
084dfb05c4
|
Adjust hypospray size.
|
2022-04-23 20:42:11 -05:00 |
|
Nadyr
|
c4dd51a17b
|
powder that makes you say yes
|
2022-04-23 17:44:38 -04:00 |
|
Casey
|
e18aef92e9
|
remove workaround chem
|
2022-04-22 22:43:19 +00:00 |
|
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 |
|