cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-18 01:26:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,431 Commits 66 Branches 25 Tags
9c62bb5f55c0f2fefaf4e5ea2a8dfce8fa32d3a3
Commit Graph
1841 Commits
Author SHA1 Message Date
HiziaanandGitHub 462c08229d Merge pull request #633 from TheFurryFeline/TFF-TF_Fixes 
Prommy Party Time
 2019-04-14 16:49:27 -05:00
TheFurryFelineandGitHub ff8cba55fd TF Fixes 
Ports VoreStation fix of Transformation.
 2019-04-14 16:37:49 -04:00
Nadyr 3b7630259c Introducing matcha! 
-Adds matcha, matcha powder, and matcha latte reagents
-Adds recipe to microwave a steamed tea leaf to get tencha then use a knife to devein and obtain matcha
-Adds matcha latte to the coffee dispenser, also makes the new cartridge available in the coffee dispenser refill crate
-Fixes grammatical issues with tea
-Removes teamush added when steaming tea leaves
-Adds matcha ice cream
-Adds icons for new objects
 2019-04-12 05:59:48 -05:00
AnonymousHybiandGitHub 75b0037a00 Fixes compile error 
Missing an " ^^
 2019-04-04 23:47:50 +01:00
ShandriaaandGitHub fa301acd78 Update metaglass.dm 2019-04-04 17:13:47 -05:00
ShandriaaandGitHub f784b8c08e Update Chemistry-Reagents-Food-Drinks.dm 2019-04-04 16:59:20 -05:00
ShandriaaandGitHub 075766d674 Update Chemistry-Recipes.dm 2019-04-04 16:38:23 -05:00
Nadyr 8da02fa33a Fixes the item path on the metamorphic glass to display the proper sprite for B52. 2019-03-22 02:44:53 -05:00
Shadowfire117 90aa9a9ff5 This time we got 4 new plants and 2 new chemicals! 
We got voltato which is a potato mutant that produces 200 V for all, then we have the solarflower which is a sunflower mutant that glows and can be planted anywhere, perfect for mood lights and blackout! Then we have two lavender mutants, milk dew that produces milk and sweet breeze that produces Serazine!
The two new chems are Serazine that is a mild anti toxin that can be used to enhance drugs, which at the current time is bicaridine with some tungsten added in to produce the other new chem called Alizine that is double as effective as bicaridine, though it sadly cant cure internal bleeding when overdosing patients :c
 2019-03-17 20:34:34 +01:00
TheFurryFelineandGitHub 68f6491638 Higher Capacity ChemMaster 
Ports Polaris' edit for the ChemMaster so that they never lose the last 180 units of a bluespace beaker's contents.
 2019-03-16 11:43:42 -04:00
Nadyr 92e9488ddb -Tea seed did not show up in seed vendor so also added to the vr version. It's unclear which one is used. 
-Removed tea mush from the rolled tea leaf as this shouldn't be in the final product.
-Fixed flavor text on new tea beverages in glasses.
 2019-03-10 11:46:43 -05:00
Nadyr 884771866d Added several tea reagents and recipes. 
-green tea, the desired end product
-green tea leaves, to make green tea
-green tea mush, a 'failed' product to make instant tea
-instant green tea powder to make use of tea mush
-instant green tea, heathen
-recipes for most of these reagents
-steamed tea leaf, rolled steam tea leaf, and green tea leaf (all food items in snacks_vr.dm for making green tea)
-recipes for the above mentioned food items
 2019-03-10 10:58:02 -05:00
Nadyr 354441bd21 Removed adj_temp from hotwater. This variable wasn't defined yet and it's not important to keep. 2019-03-07 02:39:02 -06:00
Nadyr a348aa26e9 Adds a reagent bottle of hot water. 2019-03-07 02:17:59 -06:00
Nadyr 1f34ddacac Added a 'hot water' reagent. This shares the rapid metabolism rate of water. adj_temp is set to 2 to offset the metabolism rate (as opposed to 20 for tea). 
Purpose of hot water is for use as a reagent in preparing hot drinks.
 2019-03-07 01:55:18 -06:00
SharkmareandGitHub 84f5533f42 Update Chemistry-Reagents_chomp.dm 2019-03-06 08:32:37 +01:00
SharkmareandGitHub da1c4d079c Update Chemistry-Reagents_chomp.dm 2019-03-06 08:23:37 +01:00
SharkmareandGitHub 8a0098757f Update Chemistry-Reagents_chomp.dm 2019-03-06 08:09:35 +01:00
SharkmareandGitHub a574f9a855 Update Chemistry-Reagents_chomp.dm 2019-03-06 07:58:13 +01:00
SharkmareandGitHub a7824363f9 Liquid spidereggs 
Liquid spidereggs to inject.
Unlike the nurse this first incubates the eggs in your bloodstream before they hatch,

Process should work similiar to affect_blood
 2019-03-06 07:49:24 +01:00
VollyballyandGitHub e1e3e280f7 Merge pull request #461 from Sharkmare/patch-56 
Recipe for new antitoxin
 2019-03-01 09:19:35 -05:00
SharkmareandGitHub c19bf4dbbe Recipe for new antitoxin 
as well as ethanol interaction
 2019-03-01 14:06:09 +01:00
SharkmareandGitHub 82b0941094 Adding a new anti toxin 
A new phoron based anti toxin with special properties.

Mixing it with ethanol is a bad idea.
 2019-03-01 14:04:58 +01:00
VollyballyandGitHub fc80a0229c Merge pull request #427 from Shadowfire117/master 
Feeder
 2019-02-21 14:42:38 -05:00
Shadowfire117 7453cb8dce Adding in a feeding pump! With this you can feed someone liquids automatic while you snuggle and bully them! 2019-02-21 13:47:57 +01:00
VollyballyandGitHub 6bce5d8f41 Merge pull request #417 from Shadowfire117/master 
heck, damn irish cream gave a buggy recipe, now fixed.
 2019-02-19 20:36:56 -05:00
Shadowfire117 7d1b52f19e heck, damn irish cream gave a buggy recipe, now fixed. 2019-02-19 13:10:38 +01:00
VollyballyandGitHub 2be1f9d722 Merge pull request #410 from Shadowfire117/master 
Sit on my face and nutbutter!
 2019-02-18 21:19:51 -05:00
Shadowfire117 cec81ea1fb Sit on my face! No wait! Thats the name of the new drink I was asked to make! Also we now have peanut extract from peanuts, giving the nuts more purpose in life and allowing new kinds of recipes to be made! 2019-02-18 11:22:47 +01:00
VollyballyandGitHub 5c86719642 Merge pull request #401 from Sharkmare/patch-20 
Changing mutagen touch effect
 2019-02-17 00:03:38 -05:00
SharkmareandGitHub 1e8caf014f Update Chemistry-Reagents-Toxins.dm 2019-02-17 02:29:53 +01:00
SharkmareandGitHub a31c87d20c Update Chemistry-Reagents-Medicine.dm 2019-02-16 18:15:29 +01:00
SharkmareandGitHub b11d5cb3b9 Basically turning Hyperzine into skooma 
Giving hyperzine druggy effects if taken by tajarans.

Khajit is innocent!
 2019-02-16 18:14:54 +01:00
SharkmareandGitHub 2de4b63ecf Changing mutagen touch effect 
Changing the random chance to inject itself when splashed to a chance to cause DNA regression.
 2019-02-16 17:48:54 +01:00
VollyballyandGitHub d6cfa4a510 Merge pull request #392 from Shadowfire117/master 
Buffing to the 'side effects' from The high power.
 2019-02-14 18:26:12 -05:00
Shadowfire117 bda75dfff7 Buffing to the 'side effects' from The high power. 2019-02-15 00:00:05 +01:00
VollyballyandGitHub 3a4b01360f Merge pull request #391 from Shadowfire117/master 
Added three new drinks, The high power, Oil slide and Flapper!
 2019-02-14 17:17:48 -05:00
Shadowfire117 1b64ba6d41 Added three new drinks, The high power, Oil slide and Flapper! 2019-02-14 22:55:21 +01:00
SharkmareandGitHub 207f727198 Update Chemistry-Reagents_chomp.dm 2019-02-14 19:06:56 +01:00
SharkmareandGitHub 65fdd06fe8 Adding bloodburn to the reagent list. 
A semi volatile chemical which reacts if ingested anihilating anything else the subject ingested.
If you need to ask why you should not inject this into the bloodstream then you probably should not be medical.

Needless to say FOR ORAL delivery only.

To be implemented #soon
 2019-02-14 18:49:39 +01:00
VollyballyandGitHub a4f3af2322 Merge pull request #384 from Sharkmare/patch-11 
Tea + Dylovene = Anti Alcoholic Anti Toxin.
 2019-02-13 16:14:14 -05:00
VollyballyandGitHub 2c201c98a2 Merge pull request #386 from Shadowfire117/master 
Love potion sprite and three new drinks!
 2019-02-13 14:53:15 -05:00
Shadowfire117 9d9865a065 This time its an metamorphic sprite for the love potion! And we also got three new drinks! The low power, Bookwyrm's bite and Jack's brew! 2019-02-13 17:27:45 +01:00
SharkmareandGitHub d77d4e9cf8 Update Chemistry-Reagents_chomp.dm 2019-02-13 15:05:11 +01:00
SharkmareandGitHub af3b91671c Recipeeeeeeee 2019-02-13 14:24:42 +01:00
SharkmareandGitHub 347f90f3b1 Tea + Dylovene = Anti Alcoholic Anti Toxin. 
You could put this into an IV Drip and then get as shitfaced as you want, probably
 2019-02-13 14:19:47 +01:00
SharkmareandGitHub fbba79c3b9 amonia, what is amonia 2019-02-12 08:55:42 +01:00
Shadowfire117 266c959f82 Merge branch 'master' of https://github.com/Shadowfire117/CHOMPstation 2019-02-10 23:34:53 +01:00
Shadowfire117 ad8269d8dc . 2019-02-10 23:30:53 +01:00
VollyballyandGitHub 7ddcbc0e01 Merge pull request #366 from Sharkmare/patch-2 
Balancing Claridyl 2
 2019-02-10 12:39:18 -05:00