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

Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

2015-04-08 19:36:49 +02:00

..

admin

Merge pull request #8624 from Cheridan/day42_betsoff

2015-04-02 20:15:18 +11: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

Recieve --> receive grammarfix

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

clothing

Merge pull request #8723 from kingofkosmos/grammarfixes

2015-04-04 20:00:21 +02:00

crafting

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

2015-04-08 19:36:49 +02:00

detectivework

resprites forensic scanner, cargo tagger, and rped

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

emoji

…

events

Merge pull request #8751 from MrPerson/kudzu_more_like_crapzu_amirite

2015-04-08 09:04:17 -05:00

flufftext

…

food&drinks

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

2015-04-08 19:36:49 +02:00

holiday

Fix-it-Phil

2015-03-29 06:17:25 +11: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

mining

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

2015-04-08 22:51:45 +10:00

mob

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

2015-04-08 19:36:49 +02:00

nano

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

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

ninja

Merge pull request #8737 from RemieRichards/NinjaCleanup2

2015-04-05 21:54:33 -05:00

paperwork

Change select holiday names to #defines

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

power

Effect pooling

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

procedural mapping

…

projectiles

Recieve --> receive grammarfix

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

reagents

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

2015-04-08 19:36:49 +02:00

recycling

resprites forensic scanner, cargo tagger, and rped

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

research

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

2015-04-07 16:21:07 -07:00

scripting

NTSL Expansion

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

security levels

…

shuttle

Recieve --> receive grammarfix

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

surgery

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

2015-04-08 19:36:49 +02:00

telesci

Effect pooling

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