Nadyr
925ddb8f0e
powder that makes you say yes
2022-09-04 18:09:38 -04:00
Casey
cfe8e710d2
Fixes a bunch runtimes
2022-09-04 21:47:57 +00:00
Nadyr
ffaa190835
Merge pull request #4788 from CHOMPStation2/upstream-merge-13583
...
[MIRROR] [MIRROR] Makes topical OD do damage.
2022-08-28 20:42:45 -04:00
Nadyr
408bf4de39
Merge pull request #4767 from Holdelta/BarUpdate
...
Refactoring existing CHOMPStation drinks into the modular folder, visual update to some drinks, and adding new drinks from other servers.
2022-08-28 19:06:15 -04:00
C.L
eae96d9ed0
Merge pull request #13583 from VOREStation/upstream-merge-8687
...
[MIRROR] Makes topical OD do damage.
2022-08-26 22:35:23 +00:00
Test Turtle
5f314473ba
Refactoring existing CHOMPStation drinks and adding new ones.
2022-08-23 02:12:28 -07:00
Casey
660e9df072
Merge pull request #13490 from Screemonster/pickupthatcan
...
Makes brainzsnax actually snacks
2022-08-14 20:38:24 +00:00
Nadyr
604c37f716
Merge pull request #4663 from CHOMPStation2/upstream-merge-13443
...
[MIRROR] Allows un-obligate bloodsucker to just drink blood normally
2022-08-07 19:37:19 -04:00
xnqm8h
3d7b3e40bf
Fixed some leftover typos preventing the alizene reaction from happening. 🧪
...
Fixed some leftover typos preventing the reaction from happening.
2022-08-07 16:13:07 -04:00
Casey
fc8890bd7c
Allows un-obligate bloodsucker to just drink blood normally
2022-08-07 19:37:24 +00:00
xnqm8h
3dbb49378f
Fixes mutation chains for chomp seeds and some reaction formulas 🪴 💊
...
Fixes missing mutation chains for most of the plant types in seed_datums_ch along with fixing some typos in some chemical reactions. Lastly added a simple description for Bullvalene since it had a placeholder one.
2022-08-05 16:53:02 -04:00
Nadyr
c5a0f8fb24
Merge pull request #4584 from CHOMPStation2/upstream-merge-13371
...
[MIRROR] Fixes in-chat icons being broken in oldchat
2022-07-20 21:12:22 -04:00
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
48f835f41f
Fixes in-chat icons being broken in oldchat
2022-07-20 17:24:27 +00: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
