1868 Commits

Author SHA1 Message Date
ExabyteDiscord 2222f438ed Merge branch 'master' into BullvaleneAndAlizeneFixes 2019-11-21 12:04:22 -08:00
Nadyr 6891c26a1a Fixes spelling mistakes in the bullvalene and alizene recipes. 2019-11-06 23:22:01 -05:00
TheFurryFeline d3a48f8e40 Fix Roundstart Runtimes
Title: Casino had a few more reagents that weren't labelled correctly for carrotjuice, applejuice, tomatojuice. beepsky_smash refactored to beepskysmash as well as royrogers.
2019-09-24 11:38:57 -04:00
Razgriz d272a5a5a5 Merge pull request #797 from ExabyteDiscord/ErikTheDogEdits
Realistic Salt
2019-09-14 13:44:01 -07:00
Erik Darkpaws b0283e8440 damage fix 2019-09-13 23:21:06 -07:00
Erik Darkpaws c0e15a3f44 Normal OD But Oxy 2019-09-13 23:10:56 -07:00
Erik Darkpaws c0fd7290c7 Realistic Salt 2019-09-13 22:38:44 -07:00
JesusChristItsJasonBourne e0cf44509f functional gender changing chemicals that respect the users prefs cleanly. 2019-09-08 21:01:58 +10:00
Hiziaan 2d511dd76d Merge pull request #789 from Shadowfire117/master
Casino 2: The gambling boogaloo!
2019-08-31 09:42:44 -05:00
Shadowfire c716971fb4 Casino 2: The gambling boogaloo!
-	Added walls around casino in space, come on people youre not supposed to spacewalk and steal from it...
-	A new wall dispenser that gives space cleaner, perfect for janitors on luxury cruisers and casinos
-	Relay on casino, so finally folks can talk without event manager having to panic about lack of comms >>
-	Platinum chip can now be flipped like a coin!
-	Wallets can now hold casino chips and platinum coin, and theres also a casino wallet that can change between 3 designs
-	Theres now a casino chip exchanger, only accepts cash and doesnt give back change!
-	Casino now has curtains for some tables so not everyone screams into each others ears
-	redefined casino manual to include self betting, reduced sentient prize cost, taken out rules with usage of joker card, added group blackjack and Cards against the galaxy.
2019-08-31 12:59:14 +02:00
Sharkmare 1f3845c259 Update borghydro.dm 2019-08-21 11:29:22 +02:00
Sharkmare 3e31b5f97d Update borghydro.dm 2019-08-21 11:13:39 +02:00
Sharkmare 2dba28e23e Update borghydro.dm 2019-08-21 11:12:55 +02:00
Shadowfire 846f35bb70 Final commit for casino! 2019-08-10 19:51:32 +02:00
Shadowfire117 a5f0b88225 Heres the big one folks, the casino!
New space map with room to add more interesting event places! ((Will be revealed when event happens ;3))
Casino ship! It has waiting lounge, medbay, security wing, engineering closet, janitor closet, emergency eva storage, bar, stripper poles and lap dance rooms, large gambling area, exchange booth, several dorms, staff only area with staff R&R, restroom and showers, cockpit and the casino managers private quarters! ((As above))
Casino shuttle! That’s right, gamblers and casino staff can be brought back and forth easily enough in a comfortable casino shuttle! ((As above above))
Casino roulette table, its fully functional with rolling and even nice sound to fill the atmosphere with that rolling ball!
Casino card table, a three parts table for a dealer to work at with up to 3 or even 5 players to sit at!
Casino slot machine, it eats chips and sometimes spits out rewards when you get three of a kind! Also got a lovely little sound effect when you win!
Casino chips, they work like similarly to thalers but has can only be used for slot machine and gambling and rewards in casino, Theres chips for values of 1, 10, 20, 50, 100, 200, 500 and 1000!
A fancy casino platinum chip that looks pretty fancy!
The wheel of fortune, its interval for roll results can be adjusted on the fly to suit how many lottery entries there are or for other events!
Stripper pole, finally people can dance and grind on a pole, interacting with the pole makes the dancer swing around and move in front or behind the pole!
Three special  bluespace deluxe machines for drinking and dining!
-	The deluxe dispenser, this bad boy can hold up to 90 cartridges and can restock anything the soft drink, hard drink and coffe dispensers can do, and even more!
-	The deluxe dining distributor, holds a big variety of food and also tools and gear for a chef, nice and compact storage!
-	The deluxe drink distributor, this one holds a lot more drinks than the standard booze o mat, and there’s not much one can’t mix with this and the deluxe dispenser!
A fancy new jukebox! This one plays music specifically for the casino unlike the normal jukebox!
A looong manual on how to play casino games, get prizes, even got info for casino staff and also ooc info!
2019-07-22 01:59:43 +02:00
Nadyr 285a2ba2af Removes nonfunctional "remove_reagent" proc when making tencha, adds functional "del_reagent" proc to tencha on being cooked. Teamush will now be properly deleted when making matcha. 2019-06-18 18:02:14 -05:00
kcin2001 1c95fb840e adds slime reagant,implant and metaglas sprite 2019-06-12 22:39:20 -07:00
Erik Darkpaws 0087147492 gdi travis you picky motherfucker 2019-05-27 15:49:29 -07:00
Erik Darkpaws efcdf16049 Fixes spam chem messages in anti-depressants and spaceacillin with prometheans. 2019-05-27 01:44:48 -07:00
Erik Darkpaws d43bfdec28 Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into ErikTheDogEdits
# Conflicts:
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
2019-05-27 00:37:27 -07:00
Erik Darkpaws 9f54b4de22 Forgot to remove some things, which has been fixed 2019-05-26 21:46:59 -07:00
Erik Darkpaws 6cdeb1c2b4 Fixes and simplifies anti-depressant and spaceacillin + prommie message spam! 2019-05-26 21:40:26 -07:00
Nadyr f43c991bad -Adds a metamorphic pint glass
-Adds metamorphic pint glass to booze-o-mat
-Also fixes goldschlager to use the right icon in a metaglass (it used the vodka/gin sprite before)
2019-05-26 22:00:35 -05:00
Darlantanis 6c29a98e89 Merge pull request #688 from TheFurryFeline/TFF-Slime_Focus_Message_Spam_Fixy
Hotfix Message Spam
2019-05-26 19:27:20 -05:00
Nadyr 9e876fc4ab Adds a line to the metamorphic glass to use the mojito icon which has existed but never been used. 2019-05-26 02:40:03 -05:00
TheFurryFeline bc94020ec6 Hotfix Message Spam
Fixes spammage stuff for Spaceacillin and Prommies. Revert an edit involving Psychiatric medications and increases rate of dispersal when ingested.
2019-05-26 02:15:19 -04:00
Kazzc da3e3d82b5 Tamal Update
Added tamales on the code and its sprite art.
Increased nutriment values of "Garlic bread", "Tocino", "Pan de nata" and "Conchas"
Added more description flavors to "pan de nata" and "Tocino"
Changed the recipe of "Pan de nata" of egg reagent to egg item.
2019-05-21 02:06:42 -05:00
Hiziaan 462c08229d Merge pull request #633 from TheFurryFeline/TFF-TF_Fixes
Prommy Party Time
2019-04-14 16:49:27 -05:00
TheFurryFeline 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
AnonymousHybi 75b0037a00 Fixes compile error
Missing an " ^^
2019-04-04 23:47:50 +01:00
Shandriaa fa301acd78 Update metaglass.dm 2019-04-04 17:13:47 -05:00
Shandriaa f784b8c08e Update Chemistry-Reagents-Food-Drinks.dm 2019-04-04 16:59:20 -05:00
Shandriaa 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
TheFurryFeline 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
Sharkmare 84f5533f42 Update Chemistry-Reagents_chomp.dm 2019-03-06 08:32:37 +01:00
Sharkmare da1c4d079c Update Chemistry-Reagents_chomp.dm 2019-03-06 08:23:37 +01:00
Sharkmare 8a0098757f Update Chemistry-Reagents_chomp.dm 2019-03-06 08:09:35 +01:00
Sharkmare a574f9a855 Update Chemistry-Reagents_chomp.dm 2019-03-06 07:58:13 +01:00
Sharkmare 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
Vollybally e1e3e280f7 Merge pull request #461 from Sharkmare/patch-56
Recipe for new antitoxin
2019-03-01 09:19:35 -05:00
Sharkmare c19bf4dbbe Recipe for new antitoxin
as well as ethanol interaction
2019-03-01 14:06:09 +01:00
Sharkmare 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