cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,647 Commits 5 Branches 0 Tags
c11c37514c52a25efabc9c5f3a973be40179a2c5
Commit Graph

17 Commits

Author SHA1 Message Date
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Datraen
efbe346c12 Removes circuit boards from relevant checks for microwaves, cooking. 2016-05-05 01:24:38 -04:00
Datraen
ae18758550 Replaces previous microwave hackfix with proper checks. 
Previously a second list was used, rather than a proper removal of the components_list. The procs were restricted rather than checking for if it was a machine and proceeding appropriately.
 2016-04-02 18:39:34 -04:00
Datraen
725ff4d03f Microwaves no longer try cooking their components while cooking. 2016-03-27 15:49:06 -04:00
Kelenius
317abc6b79 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
 2015-04-28 10:49:26 +03:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
Mustafa Kalash
1a614c12de Switches hacky list copying method in check_items and check_fruit to use Copy(). Uses Cut() to make sure that one item does not satisfy the need for multiple items of the same type. 2015-04-01 11:41:46 -04:00
Kelenius
b4b635f32d Chemistry commit 
I messed something in the git
 2015-03-25 19:09:10 +03:00
Zuhayr
cf0a358ad6 KITCHEN CODE IS WORKING. YES. I CAN DIE NOW. 2015-02-16 22:11:59 +10:30
Zuhayr
2f8aa744bc Well now the microwave works except for anything involving fruit. I hate this code. 2015-02-16 21:11:54 +10:30
Zuhayr
c739438c7a Well, now the kitchen can't produce ANYTHING, not just regular 
food. No runtimes though. Progress.
 2015-02-15 23:06:35 +10:30
Zuhayr
fdf0360a69 Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP. 2015-02-04 10:55:33 +10:30
giacomand@gmail.com
285f31f0c4 -You can now store donuts in the donut box. The next donut you pull out will be the last one you put in. 
-Changed the class type of donuts. donut/normal is now the regular donut. All other donuts have been made this way. (I.E: donut/chaos)
-Hopefully the merged records proc will now not spit out runtimes.
-You cannot enter a name without any character now. This way you can also click on the link.
-Added some coloured caps to their respected coloured wardrobes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4123 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-07-20 00:12:50 +00:00
quartz235@gmail.com
b3f7865754 moving all the git stuff over to this so people who don't want to spend 8 years figuring out the bass ackward git system can actually run our server code 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2983 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-25 05:05:55 +00:00
rastaf.zero@gmail.com
7707d5a58e Runtime errors were spotted in logs, please respond to svn if you can fix it. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1447 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-04-15 09:26:36 +00:00
rastaf.zero@gmail.com
ad6a6e42aa Penlight fits in medical belt. 
Fixed several runtime errors.
Monkeys and aliens won't stack dozens of blood stains.
Fixed crash in FEA code related to melting floors.
When screwdrived destructive analyzer unlink from RD console protolate instead of itself.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1443 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-04-14 03:52:09 +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