Commit Graph

587 Commits

Author SHA1 Message Date
FalseIncarnate
9d13429769 Candy Fixes, Juicer Fix
Fixes a number of New() procs for candies that would runtime
- Issue was caused by incorrect arguments for the add_reagent proc

Fixes gummy worms being incorrectly named gummy bears

Fixes the candy cane recipe resulting in a mint rather than a candy cane

Re-paths recipes for flavored candies to not be subtypes of the plain
version to fix the generation of candy moulds from recipes that don't
require the mould.
- Also applied this to candybars so the recipe path better communicates
the end-result

Updates the recipes for the WTF (druggy) gummy bears and worms to work
with the botany update ambrosia
- Previously checked for the hardcoded path rather than the kitchen_tag
which the rest of the kitchen was updated to use

Fixes the juicer failing to juice watermelon slices
2015-07-30 19:01:43 -04:00
Fox-McCloud
1ee7853d65 Merge pull request #1476 from TheDZD/mining2
Mining Overhaul [Soon™]
2015-07-29 20:51:24 -04:00
FalseIncarnate
ad9ad7fc40 Kitchen Overhaul 2: Table Edition
Moves a number of kitchen recipes to utilize table-crafting!
- Instead of dumping the ingredients in the microwave, simply collect
them on the table to assemble your dish via the table-crafting menu
- The option to assemble the dish will only appear if all the
ingredients are present on the SAME table section.

Table-crafted foods:
- Sandwich
- Slime Jelly Sandwich
- Cherry Jelly Sandwich
- Slime Jelly Burger
- Cherry Jelly Burger
- Not-a-sandwich
- Egg Wrap
- Herb Salad
- Aesir Salad
- Valid Salad
- Ingredients are unchanged

Standardizes the chef's knife usage!
- Now the chef can use the Cutlet knife (knife utensil), kitchen knife,
butcher knife, or scalpel to cut meat into cutlets!
- Now the Cutlet Knife (knife utensil) can be properly used to slice
cakes, pizza, bread, flat dough, and so forth instead of scooping up a
bit onto the knife.
- If a food object cannot be sliced (no slice_path defined), it will
scoop up a bit as before. Forks, spoons, and plastic knives will always
scoop, regardless of slice_path.

Fixes the Toasted Sandwich microwave recipe not working.
- It was missing a result, meaning it was not being loaded as an
acceptable recipe and causing the microwave to reject sandwiches.

BACKEND CODER CRAP:
- Tablecrafting recipes now can support botany produce and adjusting
chems in the result item.
- New fruit list var is used for botany produce
- New AdjustChems proc is used to handle final chem adjustments, such as
removing or adding chems from the finished product.
2015-07-25 06:38:09 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
TheDZD
13f01232c9 Merge pull request #1480 from Fox-McCloud/qdel-the-dels
The Great Del() Cull of 2015
2015-07-09 22:37:43 -04:00
DZD
916f9bf4bb Sort of compiles
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
FalseIncarnate
fa4fa1237e Cold Reactions and Applejack
Adds the ability to make a chemical reaction only occur when at or below
a specified temperature.

Adds new reaction for freezing water into ice
- Must be at or below 270K to turn water to ice

Adds two new reagents/drinks: Applejack and Jack Rose cocktail
-Applejack is obtained by freezing cider at or below 270K
- Applejack is slightly more potent than cider, due to it's alcohol
concentration being higher
- Jack Rose is a new mixed drink that is 4 parts Applejack, 1 part Lemon
Juice

Only Ice and Applejack utilize the cold reactions at this time, but the
functionality is in place for future reactions.
- This should allow coders more flexibility with defining new reactions
that may realistically occur at low temperatures.

Renamed the existing "required_temp" variable for reactions to
"min_temp" to better communicate it's purpose and differentiate it from
the new "max_temp" variable for cold reactions.
2015-07-08 04:34:25 -04:00
Tigercat2000
3a45d52fe0 Fix remaining non-returning Destroys()
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
2015-07-06 09:20:39 -07:00
FalseIncarnate
39305b1a86 Food/Pill Fixes
Fixes Food and Pills so that they actually transfer their reagents
properly
- Big thanks to Krausus for helping with locating and correcting the
issue

Fixes IPCs being able to eat pills.
- They have a monitor for a head, where do you think you're going to put
that?

Fixes IPCs being immune to the soothing effects of water
- IPCs that are on fire can be properly doused with a splashing of
water.
2015-06-30 09:27:06 -04:00
Fox-McCloud
a89ddd5a7d Adds in Ether 2015-06-28 20:39:26 -04:00
ZomgPonies
4d9baf9936 Merge pull request #1358 from Fox-McCloud/sarin-tabun
Sarin -> Tabun
2015-06-22 21:40:51 -04:00
Tigercat2000
d20298e996 -tg- atom pooling system, qdel changes
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00
Fox-McCloud
a75a1165dc Sarin->Tabun 2015-06-20 15:21:24 -04:00
Tigercat2000
82f6855755 Initial Compiling port of MetaStation 2015-06-04 09:12:37 -07:00
Krausus
887a4bad03 Fixes corgis consuming food at warp speed
Also fixes a small issue with the code that restores corgi health when
they eat.
2015-05-30 05:48:03 -04:00
ZomgPonies
277a900aa7 Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs
Simple Animal Refactor+Update+Fixes and Pet Collars
2015-05-28 22:45:03 -04:00
ZomgPonies
52e8720bd8 Merge pull request #1195 from Fox-McCloud/wolpin-fix
Wolpin Fix+Monkey Tail Fix
2015-05-28 12:34:17 -04:00
Fox-McCloud
cd112b5364 Wolpin Fix+Monkey Tail Fix 2015-05-28 04:04:39 -04:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
Krausus
460fccd8db Fixes syringe blood duping 2015-05-27 21:56:01 -04:00
ZomgPonies
e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
ZomgPonies
1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
ZomgPonies
41bc4eed31 Merge pull request #1156 from Fox-McCloud/spess-dogs
New Race: Canine Race--Vulpkanin
2015-05-25 04:43:04 -04:00
Fox-McCloud
bc3ecd68c6 Removes Nanomachines 2015-05-24 18:31:12 -04:00
Fox-McCloud
791ebc0b7f New Race: Canine Race--Vulpkanin 2015-05-24 01:00:19 -04:00
Fox-McCloud
4702df3a49 tweaks. 2015-05-23 01:08:42 -04:00
Fox-McCloud
0f0a7c7985 Virus Tweaks 2015-05-22 23:18:59 -04:00
ZomgPonies
c8f9aa0c33 Merge pull request #1140 from Fox-McCloud/tweaking-stuff
Tweaks and Fixes 2.0
2015-05-22 17:24:29 -04:00
Fox-McCloud
8bdc09ad38 Merge pull request #1111 from ArgyleSweatshop/patch-2
Make Sake,Kahlua, and Soy Sauce Recipe more realistic
2015-05-22 17:02:15 -04:00
Fox-McCloud
1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
ArgyleSweatshop
6d4435f4d0 Adds flour to flour packs
Doesn't affect anything cooking-related, but allows you to get flour if you grind up flour packets
2015-05-21 15:33:31 -04:00
FalseIncarnate
1f6ce567f7 Food Reagent Update (First Pass)
Initial update of food reagents to utilize new nutrient reagents

Fixes the blood tomato mutant list to actually allow mutation into
killer tomato.
2015-05-19 18:45:44 -04:00
ZomgPonies
1e2fca836a Merge pull request #1093 from Fox-McCloud/spray
Spraybottle Changes
2015-05-18 10:19:56 -04:00
Krausus
6aec924f73 Fixes biogenerator issues
Fixes the biogenerator getting stuck if it can't fill a beaker, eating
resources if it can't fill a beaker, and getting splashed every time you
tried to load a beaker.
2015-05-18 08:54:26 -04:00
Krausus
f669cd17cd Fixes Industrial Dropper icons 2015-05-18 03:22:03 -04:00
Fox-McCloud
65c8070ec8 Spraybottle Changes 2015-05-17 18:43:57 -04:00
Tigercat2000
9d91387473 Fluff item restoration - Flasks, Lighters
This commit readds every fluff lighter to a new lighters.dm file, as well
as moving every lighter into it. There are enough to justify seperating it
from cigs_lighters.dm. Fluff lighter paths have not been touched for
compatibility to the database and map.

This commit also readds the flasks, with the fluff paths removed.
2015-05-16 05:36:56 -07:00
Tigercat2000
625dbb5295 Merge remote-tracking branch 'upstream/master' into LightShit
Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm
2015-05-10 13:56:28 -07:00
Tigercat2000
e1249fc640 Lighting overhaul.
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
Tigercat2000
e33e658178 Water_act system - for all your watery needs
This is the first commit of the Water_act system for monkey cubes,
showers, and mobs. The idea of the system is to outsource the effects of
water to the object/mob being affected instead of a bunch of snowflake
code.
2015-05-09 05:43:47 -07:00
Krausus
2dde7e42d6 Fixes can code copy-pasta and minor drink bugs
This fixes IPCs being able to drink from cans, being able to pour things
into closed cans, and the IPC force-feeding-drink failure message going
to the wrong person
2015-05-04 04:59:04 -04:00
Fox-McCloud
5aada8a9a3 Merge pull request #906 from Krausus/NicotineAddiction
Cigarette Fixes/Tweaks
2015-05-02 23:29:49 -04:00
veganzombeh
79c084450a Various fixes 2015-05-01 17:54:30 +01:00
Krausus
e5f0d0bb6a Changes nicotine pre-generation and fixes lacing 2015-05-01 01:41:19 -04:00
Fox-McCloud
c1826deeda Various Fixes 2015-04-29 18:12:24 -04:00
Fox-McCloud
837538ce95 Reverts a Few Chem Changes 2015-04-27 17:41:13 -04:00
ZomgPonies
100789f6ec Merge pull request #877 from Fox-McCloud/beakerbomb
[Goonchem] Beaker Bombs
2015-04-26 10:07:46 -04:00
Fox-McCloud
fb579b0d19 assembly fixes 2015-04-25 22:43:40 -04:00
Fox-McCloud
c226067277 [Goonchem] Beaker Bombs 2015-04-25 05:28:56 -04:00