Jordie0608 26ca19e07d Merge branch 'master' of https://github.com/tgstation/-tg-station into tfwyoubreakyourownfix ...

Conflicts:
	code/modules/mining/mine_items.dm

2015-04-17 18:02:45 +10:00

..

admin

* Fixes observers not seeing abductor hivemind

2015-04-16 12:15:41 +02: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

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

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

crafting

IED fixes

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

detectivework

resprites forensic scanner, cargo tagger, and rped

2015-03-22 11:54:26 -05:00

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

Fixes wingfangchu recipe. It is now a soup (consistent with its sprite)

2015-04-14 18:44:55 +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

Adds a verb_exclaim var. Fixes #8478.

2015-03-22 18:55:59 +01:00

lighting

Moved lighting stuff from controllers folder to its own module

2015-04-12 02:25:28 -07:00

mining

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

2015-04-17 18:02:45 +10:00

mob

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

2015-04-17 18:02:45 +10: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

Change select holiday names to #defines

2015-03-25 15:01:06 -07:00

power

Merge pull request #8967 from phil235/BundleFix1

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

procedural mapping

…

projectiles

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

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

reagents

Merge pull request #8967 from phil235/BundleFix1

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

recycling

resprites forensic scanner, cargo tagger, and rped

2015-03-22 11:54:26 -05:00

research

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

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

scripting

NTSL Expansion

2015-03-25 16:22:21 -05:00

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

Effect pooling

2015-03-24 11:44:49 -07:00