Commit Graph

866 Commits

Author SHA1 Message Date
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
ArgyleSweatshop
0dc472bf01 Make Sake,Kahlua, and Soy Sauce Recipe more realistic
Soy sauce is definitely not made from acid, so I made the recipe more realistic, using the INTERNET!

Also, Kahlua is made from rum or vodka in addition to the ingredients already included, so I added that.
Sake is made from rice alcohol and it is by and large always diluted by water, so that was added to the recipe.
2015-05-19 19:21:05 -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
FalseIncarnate
96ef62e297 Diet Changes
Changes the Kidan racial diet to DIET_HERB, from DIET_OMNI, to maintain
consistency with Paradise Lore.

Removes diet flags from Diona and IPCs since they utilize alternate
nutrition sources. This prevents them from benefiting from any
nutriment, protein, or plant-matter they metabolize.

Adjusted comments in the on_mob_life procs for Protein and Plant-matter
to better explain the diet flag checks and correct a copy-paste mistake
on the comments.
2015-05-19 06:14:41 -04:00
FalseIncarnate
fbd2ce16e6 Nutrient Split and Diet Flag
Adds Protein and Plant-matter reagents, nutritional values of 15

Reduces nutritional value of Nutriment to 12, down from 15

Adds new flag defines for racial diets, and new dietflags var to species
(must be set manually in the species definition, otherwise it will be
null)

Assigns each species their respective diet's flag:
- Carnivores: Unathi, Slime People
- Omnivores: Human, Tajaran, Kidan, Vox, IPC, Shadowpeople, Golems,
Plasmaman, Nucleation, Vox Armalis
- Herbivores: Skrell, Diona, Grey, Wryn

Adds checks to all nutrient on_mob_life procs to handle simple_animals
versus carbon/human mobs
- Simple animals will heal from any nutrient source, but don't gain
nutritional value since they don't appear to deplete it

Adds check to Nutriment on_mob_life proc to ensure that the diet for a
species has been set
- Failure to set a diet flag will prevent the species from benefitting
from ANY nutrients, while metabolizing the reagents normally
- This is largely for ensuring the species is properly defined

Adds checks to Protein and Plant-matter on_mob_life procs to handle
incompatible diets
- Ingesting Protein does not benefit Herbivores, but will metabolize out
of the body normally
-Ingesting Plant-matter does not benefit Carnivores, but will metabolize
out of the body normally
2015-05-19 04:55:30 -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
0996890e44 Merge remote-tracking branch 'upstream/master' into fluffclean
Conflicts:
	paradise.dme
2015-05-16 05:38:40 -07: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
Krausus
2efeed6410 Fixes blood reagent runtimes
add_reagent was never creating blood with its default data, because it
always nulled out the data if none was provided
2015-05-16 01:41:46 -04:00
Fox-McCloud
8a5e3663df Fixes and Tweaks 2015-05-15 21:58:24 -04:00
ZomgPonies
5531226247 Fixes colors runtiming. Oops. 2015-05-14 00:51:45 -04:00
ZomgPonies
a35bee860d Simpler color mixing 2015-05-13 00:01:32 -04:00
ZomgPonies
e8782f90bd Merge pull request #1003 from Fox-McCloud/sound-tweak
Black Powder Sound Tweak
2015-05-11 21:54:31 -04:00
ZomgPonies
f22ae3acbe Merge pull request #998 from tigercat2000/LightShit
Baystation12's Lighting Overhaul
2015-05-11 17:06:30 -04:00
Krausus
65ce3e4c20 Fixes numbered contents grouping different things
Also fixes a runtime from the black powder fix. Whoops!
2015-05-11 08:53:14 -04:00
Krausus
264244630c Fixes black powder decals not exploding away 2015-05-11 08:36:25 -04:00
Fox-McCloud
e2ee01b621 Black Powder Sound Tweak 2015-05-10 21:51:50 -04: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
ZomgPonies
6610e0965e Merge pull request #983 from tigercat2000/water_act
Water_act system - for all your watery needs
2015-05-10 16:14:55 -04:00
ZomgPonies
23b2fac794 Merge pull request #980 from FalseIncarnate/master
Botany / Xenobotany Update [Feature][Sprites]
2015-05-10 16:05:57 -04: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
b7b13f15a4 Merge remote-tracking branch 'upstream/master' into water_act
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2015-05-10 05:41:52 -07:00
ZomgPonies
99a18df13b Merge pull request #976 from Fox-McCloud/cryox
[Goonchem] Cryox/Clonex Change
2015-05-09 18:34:21 -04: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
FalseIncarnate
db9d9fc647 Botany / Xenobotany Update
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)

Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.

Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)

Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.

I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
2015-05-09 06:00:24 -04:00
Fox-McCloud
a02f560711 [Goonchem] Cryox/Clonex Change 2015-05-08 18:32:00 -04:00
Fox-McCloud
a8ead35ea5 Fixes Blob Zombies 2015-05-07 17:35:43 -04:00
ZomgPonies
d106462fa5 Merge pull request #796 from TheDZD/shadowling
Port of /tg/station's Shadowlings [WIP]
2015-05-04 20:38:20 -04: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
Krausus
7651325497 Reverts nicotine addiction changes 2015-04-30 22:30:53 -04:00
Krausus
54b979eb34 Adds nicotine addiction to smokables 2015-04-30 09:22:21 -04:00
Tigercat2000
627c600b81 Restore CLF3 to standard level
Whoops. Forgot to reintegrate a fire_stacks multiplication when I
reintegrated mob fire.
2015-04-29 17:17:34 -07:00
Tigercat2000
43a09daddc Merge remote-tracking branch 'Fox/fixessssss' into okayletstrysomethingslightlydifferent
Conflicts:
	code/modules/reagents/reagent_containers/glass_containers.dm
	maps/cyberiad.dmm

Fawwkss wai ;-;
2015-04-29 15:31:21 -07:00
Fox-McCloud
c1826deeda Various Fixes 2015-04-29 18:12:24 -04:00
Tigercat2000
38ab273dda Fix up reagent bombs, remove carbon fire_act
Carbon mobs do not actually need a fire_act, all it was doing was breaking
things with hardsuits. Reagent bombs are supposed to have a unique proc
instead of fire_act, so fixed.
2015-04-29 14:42:57 -07:00
Krausus
57cd8f69c7 Fixes Colorful Reagent coloring non-simple mobs 2015-04-29 07:52:56 -04:00