Commit Graph

12 Commits

Author SHA1 Message Date
n3ophyt3@gmail.com
81b0fdea10 More runtime errors squashed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@231 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-30 18:30:49 +00:00
musketstgstation@gmail.com
cf07db9502 Fixed the Screwdriver cocktail.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@230 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-30 17:41:53 +00:00
polyxenitopalidou
de8ca2e0f1 fFixed missing vodkamartini entity
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@229 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-29 23:16:19 +00:00
musketstgstation@gmail.com
e5931185fe Fixed a couple of broken drink iconstates.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@228 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-29 22:35:46 +00:00
polyxenitopalidou
756dc7dc06 •Barman update. See soon-to-be-created wiki article for cocktail and drink additions
•Various icon fixes and missing icon_state fixes
•Messed with shotgun sprite a bit. I mean, come on, it was hideous.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@218 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-29 13:12:45 +00:00
n3ophyt3@gmail.com
26bc2276f4 Fixed a bunch of the runtime errors cropping up in the server logs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@175 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-26 01:55:42 +00:00
polyxenitopalidou
5e9900a338 •tweaked cigarette, it was missing a frame
•Modified plague doctor mask a bit, it looks better without the ear marks
•Added the new alchoholic reagents and cocktail recipes in preparation for the barman update.
Im sorry guys But I really can't be arsed to re-write them if shit takes place and I lose them. Already lost chemsitry-tools.dm once.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@171 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-25 22:56:04 +00:00
Skiedrake
d98a8b57c0 Added:
Numbers' hydroponics syringe injections:
Now you can put chemical solutions into hydrotrays and plants will react accordingly.
Minihoe for uprooting weeds safely. Added to hydroponics trays.

Changed:
Advanced ProcCall proc, now actually somewhat useful.
Blob expands faster again.
Slight Plant-b-Gone buff against alien weeds.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@125 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-21 02:55:21 +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
456a9d6da6 Added hydroponics crates, graphics and crates themselves into the code.
Added Weed-B-Gone into crates at hydro, also Weed-B-Gone functionality. 
Changed map accordingly. 
Added weedbgone as a reagent and a recipe for it.
Added new spray sound effects and updated/changed those that were used before for fire extinguisher, refueling/refilling, using cleaner and using weed-b-gone.
Removed thumbs.db added by TLE as I saw it unnecessary.
Added buzzing sound to be used later with Fly Amanitas.
Changed some fertilizer graphics in chemical.dmi to be prettier.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@42 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-01 17:54:19 +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