9cf4a0bfc6
Merge pull request #8114 from phil235/CookTrash
...
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
bb10824737
Improvised heating fix: Fixes dough recipe from egg + 15u flour beaker.
...
Adds a limit to how hot the beaker reagents can be heated. (no hotter than the heat source)
moving reagent_containers/attackby() to reagents/reagent_containers.dm for better visibility.
2015-03-03 22:35:11 +01:00
c2290c6c5c
Merge pull request #7913 from phil235/NewPlants
...
Adds new plants to botany
2015-03-03 11:23:32 +01:00
467e102b49
Fixes trash disappearing when washed in a sink.
...
Fixes waffle trash being named "waffles".
Replacing some stat/weakened/stunned checks with incapacitated()
Fixes meat cutlets and steak not including meat type in their name (e.g. raw corgi meat cutlet)
Harvesting meat from simple animals now takes time, has a sound, and can be done with any sharp item.
2015-03-03 00:07:08 +01:00
daffcdf075
Merge pull request #7987 from phil235/SugarSatietyRemoval
...
Remove sugar satiety effect
2015-03-02 18:17:40 +01:00
2be30eb89e
Merge pull request #8083 from Delimusca/getochemboyz
...
added improvised heating
2015-03-02 08:58:12 -06:00
d856e240c2
Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
...
Conflicts:
icons/mob/head.dmi
2015-03-02 13:45:15 +01:00
747ebbc78d
added improvised heating
2015-02-28 20:51:39 -07:00
f6e18e9e45
Re-adds the shot glass sprites.
2015-02-27 17:14:50 -06:00
fa0e5344ef
Removes sugar effects.
2015-02-27 19:01:32 +01:00
809a1be279
Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
...
Conflicts:
icons/mob/head.dmi
2015-02-25 18:50:42 +01:00
7c93a9081e
Merge pull request #7941 from phil235/SmallFoodRenamingFix
...
Fixes custom food renaming for sandwiches.
2015-02-25 08:24:38 -06:00
588c79873f
Merge pull request #7562 from Iamgoofball/drugs
...
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
2c7ffaaea2
Fixes custom food naming for sandwiches.
2015-02-23 22:24:49 +01:00
7b33271e85
Fix all foods getting the warning message about ingredient being too big.
2015-02-23 13:51:31 +01:00
bd870d649c
Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice).
2015-02-22 22:10:25 +01:00
e24e94544e
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
code/modules/food&drinks/food/snacks_meat.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
icons/obj/drinks.dmi
icons/obj/food.dmi
2015-02-20 22:00:53 -08:00
23677f4df1
Merge pull request #7808 from phil235/CookingTweaks
...
Cooking Tweaks
2015-02-20 12:02:04 -06:00
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
83db82e62d
Fixed a typo
2015-02-19 11:52:40 +01:00
dbee9709d1
Merge pull request #7790 from phil235/CryoStingExploitFix
...
Fixes cryosting detection exploit
2015-02-18 21:48:45 -08:00
abd604f785
derp
2015-02-18 20:59:42 +01:00
c0d7015fe6
Adds renaming custom food with a pen.
...
Adds a changelog.
2015-02-18 19:55:42 +01:00
fa00cee00c
Fixes that damn typo FOR REAL THIS TIME
2015-02-18 11:53:20 -06:00
262e7e5b5f
Tweaking cake nutriment amounts
2015-02-18 14:27:41 +01:00
024559f801
Buffs nutriment amounts in doughs and their cooked counterparts, as well as meats.
...
Fixed a recipe.
2015-02-18 14:02:18 +01:00
6e938b5cd7
Fixes cryosting exploit by removing ice reagent from cryosting, removing the beer+frostoil= icedbeer (ice+beer=iced beer already exists), and buffing frostoil effect to compensate.
2015-02-17 19:54:14 +01:00
6914fb0ecc
Merge pull request #7756 from dannno/ohnoimlate
...
Oh no! I'm running late!
2015-02-16 20:43:42 +01:00
bef844fb89
i hope senpai isnt mad at me
2015-02-15 14:15:02 -05:00
2817785936
Merge pull request #7718 from TheVekter/shotglasseshowdotheywork
...
Re-adds Toxins Special and B-52 to glasses.
2015-02-14 18:33:00 -06:00
d3df7d6240
Merge pull request #7708 from phil235/GrabProcessorAdjacencyFix
...
Fixes being able to stuff slime/monkey in processors even through closed windoors.
2015-02-14 17:00:06 -06:00
ddd86a5655
oh no i'm running late
2015-02-14 16:23:02 -05:00
2e7479c998
Adding cake batter, pie dough and raw pastry base recipes to tablecrafting in case people struggle to add milk to the dough.
...
Adding opencontainer flag to dough, doughslice and flat dough so you can transfer reagent to them using a beaker.
Renaming sandwich without a top to "toast".
2015-02-14 15:27:08 +01:00
cd916eb1d9
Re-adds Toxins Special and B-52 to glasses. Oops.
2015-02-13 18:34:58 -06:00
d9a435bdf7
Fixes being able to stuff slime/monkey in processors even through closed windoors.
2015-02-13 20:24:56 +01:00
897618d42f
Fixed some recipes in chef recipes book. Fixed jelly sandwich recipes. Remove unused milk/soymilk carton sprites from drinks.dmi
2015-02-12 21:39:20 +01:00
216630f1db
Merge pull request #7572 from phil235/CookingOverhaul
...
Cooking overhaul
2015-02-12 08:01:17 -06:00
7c360499be
Merge pull request #7644 from TZK13/Novaflowers-and-Watermelons
...
Novaflower and watermelon improvements
2015-02-11 09:14:16 -06:00
549b71a487
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
...
Conflicts:
icons/obj/drinks.dmi
Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
575b117a70
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
icons/obj/drinks.dmi
2015-02-10 21:37:49 -08:00
3861126c2c
Reverts drunkenness changes per #7439
...
Fixes a typo
Makes players drink full shot no matter how much is in glass
2015-02-10 15:54:15 -06:00
2b346676c1
Moved shotglasses back to drinkingglass.dm. Again.
...
Added a bunch more iconstates for each drink in the booze-o-mat. Any drink the shot doesn't recognize comes up as a "shot of... what?"
2015-02-10 11:50:28 -06:00
edf3364765
Novaflowers now ignite people with the amount of fire stacks applied depending on potency and you can now juice whole watermelons.
2015-02-10 06:26:03 -06:00
f26ceabf3a
Made Toxins Special and B-52 exclusive to shot glasses.
...
Tweaked drunkenness to make it less effective at lower booze levels, but moreso at higher.
Changelog.
2015-02-10 02:21:50 -06:00
24ed9dd3e0
Wow apparently I broke the tequila sprite
2015-02-10 00:22:22 -06:00
f49abb5117
Adds multiple drinks to the shotglass list so they can be mixed within.
...
Re-adds bottle of booze that got removed in a merge conflict a while back.
2015-02-09 18:25:03 -06:00
ba18c0e925
Adds sprites and iconstates for shot glass.
2015-02-09 17:38:23 -06:00
e728185a49
Fixes shot glass sprite changing when something's poured in (TEMP FIX)
2015-02-09 16:55:11 -06:00
732a54fe63
Making all meat subtypes of snacks/meat
...
Adding specific cutlets and raw cutlets for a lot of types of meat.
Enabling reagent transfer from ingredients to resulting dish for foodtablecrafting
Adjusting tablecraft food recipes reagents accordingly.
Adding raw pastry base and pastry base food and including it into certain recipes.
2015-02-08 21:36:54 +01:00
Cheridan
phil235
Swag McYolosteinen
phil235
Delimusca
TheVekter
Razharas
Remie Richards
Iamgoofball
hornygranny
dannno
TZK13