phil235 6aadd8df8d Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5 ...

Conflicts:
	code/modules/mob/living/carbon/life.dm

2015-04-23 01:32:20 +02:00

..

admin

Merge pull request #9044 from Incoming5643/donks_will_be_put

2015-04-22 17:50:10 +10:00

assembly

Flying animals no longer triggers mines and mousetraps.

2015-04-07 20:20:29 +02:00

awaymissions

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

client

Adds Abduction Mode

2015-04-13 18:40:15 +02:00

clothing

Merge pull request #9085 from kingofkosmos/weldmaskbuckelefix

2015-04-22 21:37:31 +02:00

crafting

IED fixes

2015-04-13 07:00:19 -07:00

detectivework

…

emoji

…

events

Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.

2015-04-14 13:54:36 +02:00

flufftext

…

food&drinks

Reorganizing the reagents files. Goon chems are no longer in separate files.

2015-04-16 22:07:24 +02:00

holiday

Fixes the meat type of many simple animals

2015-04-11 14:18:32 +02:00

hydroponics

Adding the chemical reactions and recipes for the new recipes.

2015-04-04 19:29:12 +02:00

library

…

lighting

Gang v3 has been tested and is now good to go!

2015-04-19 22:26:15 -06:00

mining

Merge pull request #8925 from xxalpha/ripped

2015-04-22 17:49:57 +10:00

mob

Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5

2015-04-23 01:32:20 +02:00

nano

moved process() to datum. made /datum/reagents/ process instead of the containers.

2015-04-07 17:13:59 -07:00

ninja

Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.

2015-04-14 13:54:36 +02:00

paperwork

Gang mode changelog and minute tweaks

2015-04-20 08:31:19 -06:00

power

Merge pull request #8967 from phil235/BundleFix1

2015-04-16 18:18:53 +10:00

procedural mapping

…

projectiles

Fixed syringes being chambered when stored in a backpack.

2015-04-20 21:05:18 +01:00

reagents

Merge pull request #9095 from phil235/BundleFix4

2015-04-22 08:42:42 -05:00

recycling

Fixes infinite rod via disposals duplication

2015-04-16 09:25:03 -07:00

research

Merge pull request #8925 from xxalpha/ripped

2015-04-22 17:49:57 +10:00

scripting

…

security levels

…

shuttle

Merge pull request #8581 from MrPerson/lighting_2015

2015-04-12 13:14:32 +02:00

surgery

Adds Abduction Mode

2015-04-13 18:40:15 +02:00

telesci

…