Commit Graph

18 Commits

Author SHA1 Message Date
mport2004@gmail.com
17ed3899c4 Fixed the map/code issues that the body bags caused.
/obj/effects is now /obj/effect.
/obj/station_objects is now /obj/structure.
Did a bit of minor blob work. 
The Bay 12 body bags were replaced with closets because having two sets of code that do almost the same thing is silly.
Changed back a few of the last jobproc edits as the remove from list before assign was a check to see if the mob was fucked up and if it was remove it so we did not check it again as it would still be fucked up.
The medbay/tox monkeys names are random once more.  More random name monkeys will help with changeling and clean up the observe/mob menus.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2324 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-03 10:28:57 +00:00
baloh.matevz
e8c6b08419 - Object tree grouped a bit more.
Two new categories were made: station_objects and effects. station_objects, which I'm sure someone will want renamed to 'structures' contains the objects which don't need process() or power code.

Effects contains objects which are either landmarks, triggers, spawners or decal.

Screenshot:
http://www.kamletos.si/new%20object%20tree.PNG

I didn't notice any bugs, but with a revision editing 276 files of byond code, you never know.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2323 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-03 06:54:28 +00:00
tronaldnwn@hotmail.com
ecb5c6d65c Food reagent updates because of stuff.
Sugary plants, blend them for sugars.

Foods Sugar packets are removed, coco paste removed (it is now a reagent), and crushed leaves are removed (due to not taking advantage of the potency system).

Blend Coco Pods for Coco! Then add sugar and milk (or soymilk) for a chocolate bar! Or add water for hot chocolate (chocolate milk TBA). Crushed chocolate renamed crushed coco (is a reagent).

Kitchen closet has a condiment bottle of sugar in it now, rather than a billion packets of sugar.

Candies apples use 5 units of sugar now, rather than a pack of sugar.

Modified some new hydroponics plants to take advantage of the potency system.

Had a go with a few drink bottles in party crates that weren't showing up due to a typo!

Feed Nuka Cola to humans or animals and they won't just spaz out, they will spaz out so much not even the cold can slow them down.

Deleted some redundant reagents (there were two lime juices, two creams, and I forget what else). Rearranged a few reagents. Capisin and frost oil never added nutriment factor to start with, and they really shouldn't. That's pretty much it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1839 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-12 06:20:12 +00:00
firecage@hotmail.com
d3a062af9c Changes by me:
Added two new hats to the station. A Security Coft Hat and a Green Bandana.

Security Coft Hat can be found in security lockers. Sugar packs can be found in kitchen locker.

Map updated with Green Bandanas in Hydro and one Sec Coft Hat on the security table.

Hydro has two new plants, the Athelas Morgan's Tears(which has some healing properties) and the White Beet.

White beet and Morgan's Tears can be used on a grinder or blender and made into Sugur and into Crushed Athelas Morgan's Tears respectively.

Credits for sprites goes to Farart.

--------------------------------------------

Changes by Petethegoat

CODING CHANGES:
Level 3 biosuit closets no longer have a jumpsuit and shoes in them.

MAPPING CHANGES:
Virology now has a disposal. It goes straight to space like the ones in xenobio and the incinerator room.
Virology now has an air alarm.
The monkeys in Virology now have different names than the ones in Genetics.

Xenobiology containment rooms have been slightly reduced in size.

The boxing ring in the fitness room has thinner glass walls.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1811 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-09 18:31:23 +00:00
uporotiy
6d2331729d Detective's office
No longer noir anymore. The monochrome effect was lagging people who saw it for the first time in the round up due to the icon operations and it was just too high of a cost for this.
 Kitchen
Removed the chance of xenomeat being spawned.
 Hydro
I accidentally a default icon_state.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1754 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-02 05:06:59 +00:00
rastaf.zero@gmail.com
1010d955ed You have to turn off your stunbaton before wash it suing sink.
latex loves + short piece of wire + some air from tank = ballon!
Another version of kitchen sink sprite.
New vending machine - dinnerware. Dispenses knives, forks and trays. Will do more once we get functional spoons.
New uniform - Waiter Outfit. Chef can give it to his assistant.
Water cooler was added to kitchen.
Kitchen was expanded.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1453 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-16 15:44:08 +00:00
rastaf.zero@gmail.com
8170e9e260 A Big Kitchen Update.
A new powerful microwave code allows completely new recipes.
All cooked food all have transferred in all the reagents which ingredients had (except of nutriments).
A new neat food sprites from Farart.
New/changed recipes for cooking with microwave:
- Berry Pie was replaced with Berry Clafoutis with new sprite. Recipe: 2 flour, 1 egg, 2 berries (not berryjuice);
- Fortune cookies: 1 flour, 1 egg, piece of paper with prophecy;
- Meat stake: 1 unit of salt, 1 unit of black pepper, 1 slab of meat;
- Pizza "Margherita": 2 flour, 4 wedges of cheese, 1 tomato;
- Meat Pizza: 2 flour, 2 slabs of meat, 1 wedge of cheese, 1 tomato;
- Mushroom Pizza: 2 flour, 5 any mushrooms;
- Vegetable Pizza: 2 flour, 1 eggplant, 1 carrot, 1 corn, 1 tomato;
- Spacy Liberty Duff: 10 units of water, 5 units of vodka, 3 Liberty Caps;
- Amanita Jelly: 5 units of water, 10 units of vodka, 3 Amanitas;
- Meatball Soup: 20 units of water, 1 meatball (aka faggot), 1 carrot, 1 potato;
- Vegetable Soup: 20 units of water, 1 carrot, 1 corn, 1 eggplant, 1 potato;
- Meatball Soup: 20 units of water, 1 meatball (aka faggot), 1 carrot, 1 potato;
- Nettle Soup: 20 units of water, 1 nettle, 1 egg, 1 potato;
- Hot Chili stew: 1 slab of meat, 1 chili pepper, 1 tomato;
- Cold Chili stew: 1 slab of meat, 1 ice pepper, 1 tomato;
Other bugfixes:
Fixed items showing under vendomats/microwaves.
Activated item_state for anesthetic tank.
Runes are under tables and doors now.
Fixed runtime errors caused by some reagents.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1440 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-13 14:27:29 +00:00
baloh.matevz
c09e60b3d8 Moved some stuff from the meat locker (now meat fridge) into the kitchen locker to hopefully reduce the right-click menu length when you open the meat fridge. Added the kitchen cabinet back to the map, contains chef garbs, trays and flour. Meat fridge now only contains meat and eggs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1293 316c924e-a436-60f5-8080-3fe189b3f50e
2011-03-27 22:06:16 +00:00
baloh.matevz
ac74a20207 Mapping:
- reverted to 2.0.5 map
- re-added vault (since some 135deg wires were used instead of 90deg ones, I'd just like to say that I'm not really worried about which set is used, just so long as the entire power-net is wired in the same way. If you want 90deg wires, please re-wire the entire station. Consistency is important in game design.)
- Fixed wiring through the vault which made the bridge and other areas loose power
- Added some generic stuff to the vault.

New access:
- fixed the ID computer to include both mint accesses, vault access and mining station access. The latter two are new. QM doesn't have mining station access (so he can't access EVA and the production areas on that station) HoP has them tho.

Other:
- Vault doors are now opaque, so you can't see through them. Hoping vey will add the missing icon states asap.
- You can now manually add coins into the money bag (also fixed poor money bag interaction window formatting)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1236 316c924e-a436-60f5-8080-3fe189b3f50e
2011-03-22 22:12:02 +00:00
mport2004@gmail.com
54b1d50b25 The crew monitoring computer should work better now
North solars expanded slightly
Cargo can now order engine parts
Power computer wont update every second so you can actually use the thing now
Rotate verb for the emitters and Particle Accelerator
Solar tracker does not use "in world" anymore

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1013 316c924e-a436-60f5-8080-3fe189b3f50e
2011-02-10 11:20:52 +00:00
hunterluthi
1aca784129 Changed spawn percentage for xenomeat in the kitchen from 20% to 5%. 20% is too much griff.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@717 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-28 05:59:36 +00:00
morikou@gmail.com
cac1fdb477 Prisoner Management Update:
* New Implant: Chem. Insert up to 10 units of chemicals into implant with a syringe (while still in implant case) and then can use a prisoner management console to trigger 1, 5, or 10 units of the chemical to be injected into the implanted subject. Once all the chemicals are used up, the implant disables itself.
* Prisoner Management Console can now detect the approximate location of prisoners with tracking implants in them. It gives slightly more useful information then the tracker but isn't portable.
* AI cannot access Prisoner Management Console (unless malf/XISC).
* Prisoner Management Console re-added to Armory (It no longer can trigger explosive implants). Play nice or else you'll get your toys taken away from you.

BORK BORK update:
* Re-did ChemMaster. Now it allows you transfer reagents in and out of a buffer. You can then turn the contents of the buffer into either a pill or a bottle. When removing reagents from the buffer, you can either delete them entirely or return them to the beaker. However, removing the beaker clears the contents of the buffer (so no mixing inside the ChemMaster!). CondiMaster Neo is almost identical to the ChemMaster except it only makes condiment bottles (no pills).
* Milk now being handled like the other reagents (as intended). Remember: 5 units of milk = 1 cup.
* Soymilk interchangable with regular milk in microwave recipes. (again, 5 units = 1 cup)
* Xenomeatbread! 3 xeno meat, 3 cheese, 3 flour. Extra Heretical!
* Monkey related food items renamed to generic meat (since I'm adding animals, I really don't want to add a new food items for every single new animal).
* Cola removed from fridge. Thematically appropriate but it just clutters it up (especially since there are vending machines all over the damn place).
* Faggots removed from meat locker. Instead, a small amount of meat spawns in there.
* Carp processes modified. Code is a littles cleaner (lawl) and the random pathing a a little cleaner as well.

Badmin Update:
* By request, Admins can now trigger radiation event.
* Confirmation warning on admin-triggered carp event.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@660 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-18 18:18:14 +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
a63f701330 •Kitchen update works again. Derp. I'll hunt the guy that removed all the (src)s down, you can be sure of that.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@97 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-13 15:50:17 +00:00
polyxenitopalidou
4af226a865 •Knife, trays and milk spawns in the kitchen again
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@82 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-08 18:40:20 +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
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