Commit Graph
53 Commits
Author SHA1 Message Date
AffectedArc07andGitHub bd91a1b962 Obliterates the RSC (#26498) 2024-08-15 18:20:11 +00:00
Mitchs98andGitHub 2e860880ea Ports Condiment Sprites from TG. Ports Mayonnaise, Peanut Butter, Olives, and Olive Oil from TG (#22796)
* sprites

* Code Phase 1

* olives ur oil

* grammars ur sentences

* the hash slinging slasher

* the trash thinging

* salts ur olives

* bottles ur wasabi
2023-10-12 17:53:42 +01:00
9a11a8ef92 Resprites gibber, food processor, grinder, bottler. (#20583)
* more sprites!

* gr

* Update code/modules/food_and_drinks/kitchen_machinery/gibber.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-15 20:46:21 +01:00
363464801c Ice Cream Cone Tweaks and New Sprites redux (#19544)
* Ice Cream, reagent colour, and drink colour update

* re-add accidentally removed drink

* updates for lewcc and sean's review

* a few new names and updates for lewcc's review

* adding S34N's suggestion

* fix merge comflict

* Update code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/desserts.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* modified things as per Sirryan's review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-12-12 22:15:43 -05:00
Vi3triceandGitHub 6bb0036974 Point where you go (#19670) 2022-11-12 08:55:57 +01:00
Henri215andGitHub 5fc267c58d Adds in hand sprites for plastic fork, pspoon, pspork, pknife and spork (#19082)
* adds in hand sprites for pfork/pspoon/pspork

* added in hand sprite for plastic knife

* forgot to add left hand for spork,spoon and fork

* no idea how that sprite got removed

* fix spork icon and add right hand

* left hand for spork

* ??

* fixing conflict mistakes

* test

* ..

* left hand fix

* fix of the fix
2022-10-01 00:18:09 -05:00
S34NandGitHub 39b335b2f1 Resprites ice cream machine and food cart (#19033)
* kitchen machine

* thing

* mcramon
2022-09-25 17:22:25 +01:00
1c7882cb11 Ports the TG Dish Drive. A quality of life machine for service. (#18855)
* ILOVEBARTENDING

* improvements

* oopsie daisy

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: ElorgRHG <71735193+ElorgRHG@users.noreply.github.com>

* Update cable.dm

* fixes cable runtimes

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* applies for code critique

* steelslayerreview

* Update code/game/machinery/constructable_frame.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: ElorgRHG <71735193+ElorgRHG@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-04 10:36:11 +01:00
S34NW 85c53544dd bodybags, new cutlery, proper booze+beer dispenser, big heater beaker 2021-08-20 12:32:23 +01:00
S34NW e390fd9a8b reworked so its just part 1 2021-08-19 22:03:37 +01:00
SabreMLandGitHub 159cdb71e0 Can't think of a commit name (#15107) 2020-12-13 21:50:15 +00:00
Darkmight9andGitHub 8782c2ca32 Culinary QoL update (#14610)
* Culinary QoL update

* Changed the culinary tool apron sprites
2020-10-17 13:30:44 -04:00
Fox McCloud 38c9c508e6 Makes Ice Cream GC 2020-07-09 11:03:12 -04:00
TheSardele 30f313cb93 Makes All-In-One Grinders constructable
All-In-One Grinders can now be constructed from a machine frame using the appropriate circuit board, 2 manipulators and a matter bin.
2019-07-19 17:58:52 +02:00
f75de97c6e Port over Corn and affected's work on Lavaland
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
2019-04-01 23:41:32 +02:00
Mark van Alphen ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
UmeFuuandGitHub fd487913e9 Adds circular cutter sprite
Needed for new cookies recipe
2019-02-12 20:12:46 -03:00
Mitchell 54c4325c46 Adds Sushi Mat and Sushi Makiroll
Makes sushi 100% more efficient and viable to make a restaurant out of.
2018-12-07 13:28:10 -06:00
FalseIncarnate 7a2e065a10 Adds mixing bowls 2018-03-25 21:44:38 -04:00
IK3I f94f77fc50 The Utensil of the future! 2018-01-23 18:45:55 -06:00
uraniummeltdown c067dcf385 new cult whetstone sprite 2017-09-30 22:48:18 +04:00
uraniummeltdown a516635947 new TG whetstone sprite 2017-02-11 18:04:55 +04:00
Fox-McCloud 706347fd84 even more work 2017-01-22 08:11:31 -05:00
FalseIncarnate 496c3a7843 Paradise Pop
Adds in a new Bottler machine used to combine a set of three ingredients
into a beverage!

Adds a new line of drinks, branded Paradise Pop, to be made with the
bottler. Currently, the possible flavors are:
- Paradise Punch
- Apple-pocalypse
- Berry Banned
- Blackeye Brew
- Grape Granade
- Meteor Malt
These beverages currently have no mechanical effect, though that will be
added at a later date along with additional recipes

The bottler can dispense empty glass bottles, plastic bottles, or metal
cans as well as fill these containers with the result of a processing of
ingredients. Successful processing requires both careful selection of
ingredients AND proper ordering, or else the entire drink is rendered a
horrible and nigh-undrinkable disaster.

Used cans and bottles, both from the bottler and the vending machines,
can be reinserted for recycling even when crushed, so pick up that can!
Clown stole all your cans and bottles for his latest prank? Simply slide
in some sheets of glass, plastic, or metal to restock the machine's
reserves!

Order your Bottler today from cargo for only 35 supply points, and we'll
even throw in a free wrench to help you move it to its new home! (will
map one into the bar later)

Minor other changes:
Sugarcane and grapes received kitchen_tag values, so they may be used in
the bottler
- Also allows grapes to be properly juiced again in a blender
Water bottles from the vendors now are plastic bottles, instead of glass
2016-07-01 13:31:09 -04:00
Aurorablade db887489d3 tiggersgonnaeatme 2016-03-23 17:31:29 -04:00
Fox-McCloud a4c61c7ee9 Ports Whetstones 2016-02-25 02:03:53 -05:00
Fox-McCloud f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
Markolie d8f98d6082 Add dmisort.sh script, and sorts all icons in .dmi files 2015-09-17 01:08:58 +02:00
DZD 5ce49bb3b3 Machine Upgrade Update
- Partial port of tgstation/-tg-station#9813
2015-08-20 21:03:19 -04:00
FalseIncarnate ae13c938c5 Kitchen Overhaul
MASSIVE overhaul to the kitchen, should make the chef job more
interesting.

Additions:
- Candy Maker!
- - This machine allows the chef to create a variety of sugary treats
for the crew to enjoy.
- Candy! Lots of candy and this is only the first wave!
- - More candy planned / dreamed for the future
- Candy Moulds
- - Craftable from plastic sheets, also available in the kitchen vendor.
Use these to make different candy types
- - These are returned if you successfully make the candy. Screw up and
the mould is destroyed!
- Cardboard Tubes are now craftable from cardboard

Changes:
- Oven and Grill have been updated to work more in line with the
Microwave and Candy Maker.
- - This means that they are also buildable and upgradeable!
- - Boards for the oven, grill, and candy maker are available from the
circuit printer.
- Many recipes moved from the microwave to the oven and grill.
- - For example, bread is made in the oven, and kabobs are made on the
grill.
- Adds "byproduct" var to recipes
- - Allows for the return of an item in addition to the result,
currently used for candy moulds

Fixes
- Adds Grape Juice reagent.
- - This will fix a runtime and also allow people to actually drink from
the purple cans.

Sprite Credits
- Many thanks to FoS for their sprites for a lot of the candies which I
combined and recolored
- - Also thanks for the new sprites which were included, but not all
used (yet!)
- I also edited and created some horrible sprites for a few candy items
and machine states.
- - Hopefully they will be such an eyesore that a real spriter steps up
and provides something nice.

This overhaul should hopefully add a little variety to the chef role,
while keeping it largely unchanged in terms of difficulty.
2015-03-08 05:09:19 -04:00
Tigercat2000 4ee50db53e Adds an 'animation' for feeding people into the gibber. 2015-03-03 15:28:13 +01:00
Markolie 876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
ZuhayrandZomgPonies 38559ab477 Makes forks usable.
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
	icons/obj/kitchen.dmi
2014-06-22 10:58:50 -04:00
iamgoofballandZomgPonies 424a2522b9 CIVILLIAN OVERHAUL UNO: Chef and the Kitchen
Conflicts:
	baystation12.dme
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
	icons/obj/kitchen.dmi
2014-05-03 21:15:41 -04:00
ZomgPonies 5518c017aa Animated monkey on meatspikes 2013-12-10 23:37:37 -05:00
ZomgPonies 04c71e1709 New cooking recipe precursors 2013-10-27 00:06:01 -04:00
ZomgPonies b0aff645a3 Massive traitor item overhaul 2013-09-23 05:41:53 -04:00
ZomgPonies a4daca1c05 I scream, you scream, we scream for ICE CREAM 2013-09-11 17:26:53 -04:00
NerdyBoy1104 390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
d_h2005@yahoo.com ee64a4014e -Reverted default UI sprites to Erro's old-style. Retina-scalding Orange and new Midnight UI scheme are now found in screen1_Orange.dmi and screen1_Midnight.dmi, respectively.
-Driest Martinis will no longer be invisible.
-Braincakes are now able to be cut into slices.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3641 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-23 01:32:24 +00:00
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