Commit Graph

1211 Commits

Author SHA1 Message Date
Skiedrake
54ce9c57c2 Made nettles less lethal. Now death nettles don't stun always, but on 20% chance, as it was supposed to be.
Improved plant analyzer, now you can also analyze harvested plants with it.
Modified hydroponics layout: added a blue toolkit, anti-toxins kit and changed floor textures some.
Added more drug effects to max potency drugs. This required a minor hud modification. (overlay effect scaling)
Made foods heal less, as eating almost anything instahealed you before.
Fixed minor hydroponics issue with plant-b-gone and adjusted some mutation/growth rates.
Mushrooms will now yield minimum one mushroom always when harvested. (sensible!)
Made the Hydroponics instructions paper a bit better.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@83 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-08 19:03:08 +00:00
Skiedrake
eb5394d3e7 Some hydro bugfixes. You can now extract seeds from nettles.
As they were of different object type, extractor didn't work with them.

Also adjusted poison effect a bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@78 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 23:51:57 +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
19613cf1b8 Fixed stuff that went missing in the merge.
Although kept detective's revolver ammo at 5, instead of 7 to which someone had changed it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@75 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 19:52:03 +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
b782759b3d Added fatguy directions East+West, engineering suit now has fat directions East+West too. Could someone continue work on this one too, im slowly making more and more fatsuits, and it'd be good to have some help. Just follow the general outline of the engineering fatsuit.
Also, removed the SLICES THE CHEESE/MEATBREAD message, it was broadcast to the world. The show_message proc doesn't fucking work no matter what I do, im getting undefined proc. So i removed it for now, replaced it with W.visible_message. Could someone fix this, somehow, then tell me what the bloody problem was?

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@72 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 08:48:33 +00:00
polyxenitopalidou
c0a9db6274 Completely fixed the microwave to display and handle the cheese_amount var properly.
Included Skie's fix of the syringe gun firing at the table when placed on it.

ENOUGH WITH MY SILLY SMALL REVS.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@64 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-06 09:03:29 +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
musketstgstation@gmail.com
d4c61fd1d3 Three small changes - Buckets are now available from autolathes, added generic remote signaller cartridges to the Tool Storage vending machine, adjusted AI status display density to 0 by request of veryinky
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@12 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-29 03:06:13 +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