Commit Graph

13 Commits

Author SHA1 Message Date
firecage@hotmail.com
6bc651f9ab Added a new chef utensil named the Butcher's Cleaver. For now it functions like a kitchen knife, but it does slightly more damage and can only be gotten from a hacked/emagged kitchen vending machine.
A few new foods are added, namely the following. Brain Burger, Chocolate Egg, Mystery Soup, Sausage and Fish Fingers.

Service/butler cyborg has a new sprite to pick from, the Maximillion one.

Chaplain now has a Flash of Holy Water in his office using the new holy water reagent.

Chef also now has an alternative apron he can find in the kitchen vending machine.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1882 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-18 18:25:03 +00:00
uporotiy
f1759a4aec Uplink implant. 'nuff said.
The only problem with it is that it doesn't update its window because durp can't pass user arguments to Topic(), so it uses usr by default, which doesn't work in this case.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1757 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-03 20:10:06 +00:00
uporotiy
0685e1e564 Easier gib spawning.
Monkey cubes.
WIP bears.
Cleaned up some sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1740 316c924e-a436-60f5-8080-3fe189b3f50e
2011-06-29 16:33:21 +00:00
rastaf.zero@gmail.com
9b2e9c3420 Fixed bugs:
Players now cannot rejoin the game if their mobs were gibbed/burned while they were disconnected.
Cremating/gibbing for meat now counts as death with triggering log records, gamemode checks, sql reports, etc.
Fixed some bugs with enabling verb ghostize().
Fixed bug with DNA Machine popping out from the protolathe.
Fixed bug with tuning RSD.
Added juicer:
	berry -> berry juice
	banana -> banana juice
	tomato -> tomato juice
	carrot -> carrot juice
Bug your botanists for getting better potence for more juice.
Juicer can be pulled, chef can give it to barmen or botanists.
Blender changed a bit:
	tomato -> ketchup
	corn -> corn oil
	soy beans -> soy milk
	any food -> nutriments and contained reagents.
Sound for the juicer found at http://www.freesound.org/samplesViewSingle.php?id=98053, edited by Nikie.
You can eject ingredients from the microwave. However, you cannot get back your reagents, they will be lost and can make microwave dirty.
Essence of Banana was renamed to Banana Juice.
Added Carrot Juice. Heals eyes much slower than imidazoline.
Carrots now contain imidazoline (however, carrot cake contains more imidazoline).
Potency for peppers, tomatoes, carrots and druggy mushrooms should work now.
New cocktail "Bahama mama": 2 rum,  2 orangejuice, limejuice, ice.
Changed recipe for soy sauce: 4 soy milk + 1 acid.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1477 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-20 14:44:13 +00:00
noisomehollow@lycos.com
ca41b444f3 Map Changes:
Fixed AI Satellite. Turret controls are aligned properly now, several cameras re-added.
Switched Warden and HoS areas; they are now properly attached to their respective offices thanks to AtomicTroop.
Nuke Storage now has access to maintenance.
Air alarm map fixes thanks to Blade_.

Icon Updates:

Color adjustment on riveted walls.
Updated decal sprites acquired from a Russian SS13 build (with permission).
Alien meatspike sprite updated.
Fixed plague doctor gas mask in clothing code. Probably requires further revision.
Removed kobold.dmi from obj. Empty file.
Removed kobold.dmi from mob. Copy of sprites in mob, mob.dmi.
Removed techpriest.dmi as the actual sprite is contained in robots.dmi.
Removed sectoid.dmi from mob. Moved sprite to xcomalien.dmi.
Removed golems.dmi from mob. Moved sprites to misc, old_or_unused.dmi.
Removed junk.dmi. Moved sprite to misc, old_or_unused.dmi.
More updated female sprites.
Better female underwear sprites acquired from a Russian SS13 build (with permission). Modified to fit new female base models.

Icon Additions:

Added female AI Hologram and holopad (mob/mob.dmi and obj/stationobs.dmi).
Added elevator door (obj/doors/Doorele.dmi).
Added space ninja gear. 
Facepalm display acquired from a Russian SS13 build (with permission).
Awesomeface AI display added.
Rig mining sprites acquired from a Russian SS13 build (with permission). Added item holding sprites for the suit. Rig suit replaces space suit which spawns in Engineering.
Robocop sprites acquired from a Russian SS13 build (with permission).
ed209 sprites acquired from a Russian SS13 build (with permission). Unused at the moment.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@511 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-02 00:01:55 +00:00
morikou@gmail.com
a107e9cc7b More Hydroponics Stuff:
* New blender icons that don't suck!
* New Plant: Corn. Hmmm... corm.

Thanks to Guest XXX on the forums for the corn and blender icons (and the poppy ones I'm not using yet).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@506 316c924e-a436-60f5-8080-3fe189b3f50e
2010-11-30 18:26:54 +00:00
morikou@gmail.com
34360b919f The Over 9000 Food + Misc Update:
* Private meeting room attached to cafe!
* Starkist was somehow set to 0 in the vending machine. Fixed.
* Sleepy pen has been modified, it now puts people to sleep *near* instantly but only once. Cost increased slightly. Holds a signficantly lower amount of reagents. Might have to tone down the amount based on playtesting.
* Changed/removed some station radios that weren't loading properly (station radio frequencies cannot be set lower then 144.1 by default, FYI).
* Sodium now available from Chem Dispenser.
* New Condiment: Olive Oil (Graphic By Thedoorman). A bottle of it added to the kitchen (use wisely, there's only one).
* Minor food reagent tweaks. Now drinking too much soda will make you fat as well.
* New Device: Blender. It turns food items into reagents (Soybeans => Soy Milk, Berries => Berry Juice, Most grown items => Nutriment + Whatever, etc.) and acts as a container. Just stick the food items in, and select the "blend" option from the right-click menu.
* New Reagents: Universal Enzyme (Used in food production, a single bottle of it is in the kitchen), Soy Milk (Used in cooking, 

can be made from a blender or obtained from a carton in the food locker), Berry Juice (used to make wine and jelly donuts), Chloral Hydrate (a powerful sedative, treat it with anti-toxin. Won't always wake instantly but you up but you'll wake up faster)
* New food/drink items: Tofu
* New Reactions: Create Tofu (10 soy milk + 2 universal enzyme), Create Wine (5 Berry Juice + 2 Universal Enzyme), Create Moonshine (5 nutriment + 2 universal enzyme), Create Cheese Wheel (40 milk + 2 universal enzyme), Create Chloral Hydrate (3 chlorine + 1 water + 1 ethanol), Create Soysauce (1 soymilk + 1 sulfuric acid)
* Condiment containers now transfer 1 unit rather then 2. Beaker added to kitchen (to aid in mixing).
* Condiment bottles now work similarly to drinking glasses: They change based on their contents. A box of blank/empty ones can be found in the kitchen backroom and more can be ordered from the QM.
* Processor no longer produces hotsauce, coldsauce, or soysauce. Use a blender to make them instead. Because of this change, it now takes multiples of a particular item to fill a bottle. PROTIP: High potency chilis/icepeppers produce more condiment then low potency ones.
* ChemMaster added to kitchen backroom to "purify" blender mixtures, door to kitchen backroom from cafe room removed.
* New recipe: Tofu Bread (3 tofu + 3 flour + 3 cheese). Can be sliced just like meatbread.
* Microwave recipe changes: Instead adding entire containers full (or empty!) of reagents to the microwave, you instead just add a specific amount. For milk and sauces (berryjuice/ketchup/soy/hot/cold), it's 5 unit of the milk/sauce instead of 1 container. It's lenient with reagents so if you put in too much you'll be fine.
* Processor Change: No longer makes cheese wheels.
* Berry Jam replaced with berry juice in Jelly Donut recipes. Berry Jam removed entirely.

Note: Sorry if my new icons look like ass. Microwave/processor changes kind of half-assed. Intend to overhaul them next (more ROBUST!). Since a lot of kichen stuff is mess around, i'll update the wiki... soon.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@490 316c924e-a436-60f5-8080-3fe189b3f50e
2010-11-24 23:49:45 +00:00
polyxenitopalidou
2b165d7b40 •added cigarette directions east-west-north
•Bar now requires barman access in order to get behind the tap and in the freezer
•Preparing the ground for dat barman overhaul (SPRITE ME SOME GODDAMN BOTTLES)
•Piano sprite switch. It might just be me but the old one is goddamn horrible. Found it on the forums. If you think it sucks, feel free to revert.

Also, don't mind the change in kitchen.dmi and food.dmi, I took the glass sprites from one and placed them in the other.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@88 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-12 21:15:21 +00:00
polyxenitopalidou
2a1bae5390 SUCCESFUL MERGE IS A GO
•Added east+west sprites for the lit hardhat. They were missing.
•Removed silly extra lines of code in the new foodstuffs, also changed the muffins recipe a bit since it's conflicting for some reason, and is producing donuts.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@76 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 22:38:00 +00:00
Skiedrake
78fc52ef11 Merge to main from the hydroponics branch r57_skie_1.
Hydroponics update + bugfixes.
Consists of revisions: 
R58, R60, R67, R68, R73.


Combined changelog (from oldest rev to newest):

Put all hydroponics defines into one .dm file
Added functionality for nettles and made all currently growable plantlife work
Changed hydroponics layout
Added Hydroponics Supply crates and added weed/pest sprays into the current ones
at hydro
Fixed nettle hold graphics
Fixed vending machines showing hidden items.
Added Research Director hydroponics access and botanists tox access (already had
chem access, but no tox).
Hydroponics in great shape. Spank Numbers for final modifications before merging
to trunk. (weedkillers, pestkillers)
Added a seed vending machine.
Amanitas now poison, and the poison is nasty. Added a poison() proc to all
foods.
Added graphics for vertical and horizontal one-tile-wide tables. Put one inside
hydroponics.
New 'blur' texture when your vision goes blurry.
Fixed a typo in hydroponics code.
Added a disposal unit in hydroponics.
Added a how-to instructions paper in hydroponics.
Hydroponics in working order. Extra features still in developement.
Fixed weedspray and pestspray entries.
Removed chaplains random probability to have see_invisible 15 at start, because
it's reset to 0 right next world tick anyways.
Added burn() and drug() procs to foodstuffs.
Added drug effects to some mushrooms. Have a nice trip.
Made chilis heat you up and ice peppers freeze you down.
Fixed carrot's harvest icon (it didn't exist)


To-do: Mutagens and vitamins for hydroponics plants.
New mutations, recipes for cook, extracting stuff from plants.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@74 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 19:33:23 +00:00
polyxenitopalidou
fedd53e3b9 •Added kitchen stuff: Meatbread, Cheese wheel, Omelette Du fromage, Muffins. Kitchen knife now spawns in the chef's storage and can be used to slice the meatbread loaf or cheese wheel into wedges. Cheese wedges can be used in the microwave to make stuff. Cheese wheels made by using Milk (now spawns 8 bottles in the chef's fridge) on the food processor. Everything's got their respective icons.
•Cholesterol is out, for now. Shit doesn't work.
•Raised the YOU-ARE-FAT limit to src.nutrition > 600 instead of 400. Meatbread tends to make people fat, fast.
•Included a fix for the cleaner spraying when added to the backpack. Im such an uber haxxor

Files edited: 
code/defines/obj/weapon.dm
code/game/machinery/microwave.dm
code/game/machinery/processor.dm
code/game/objects/closets/kitchen.dm
code/game/objects/items/weapons/mops_cleaners.dm
code/WorkInProgress/Chemistry-Reagents.dm
code/WorkInProgress/Chemistry-Tools.dm
food.dmi
kitchen.dmi•Added kitchen stuff: Meatbread, Cheese wheel, Omelette Du fromage, Muffins. Kitchen knife now spawns in the chef's storage and can be used to slice the meatbread loaf or cheese wheel into wedges. Cheese wedges can be used in the microwave to make stuff. Cheese wheels made by using Milk (now spawns 8 bottles in the chef's fridge) on the food processor. Everything's got their respective icons.
Forkloads of food half-in, not yet working. Forks dont spawn but if someone gets his hands on one, he can hit the omelette with it and the fork will change its icon to a "loaded with omelette" fork. TO DO: Actually get the loaded fork to feed the user once he hits himself with it.
◘Recipes: Meatbread: 3 cheese 3 meat 3 flour Omelette: 2 eggs 2 cheese Muffin: 1 egg 1 flour
•Cholesterol is out, for now. Shit doesn't work.
•Raised the YOU-ARE-FAT limit to src.nutrition > 600 instead of 400. Meatbread tends to make people fat, fast.
•Included a fix for the cleaner spraying when added to the backpack. Im such an uber haxxor

Files edited: 
code/defines/obj/weapon.dm
code/game/machinery/microwave.dm
code/game/machinery/processor.dm
code/game/objects/closets/kitchen.dm
code/game/objects/items/weapons/mops_cleaners.dm
code/WorkInProgress/Chemistry-Reagents.dm
code/WorkInProgress/Chemistry-Tools.dm
food.dmi
kitchen.dmi


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@59 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-05 13:02:10 +00:00
Skiedrake
aa7598e682 Added carrot growth stages, seeds etc.
Updated graphics of many food related things. 
Added seed and nutrient vending machine graphics. 
Shuffled some items around so you can see many at a time. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@18 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-29 12:18:59 +00:00
only.lurking
662c08272a git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e 2010-08-23 14:29:20 +00:00