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

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-Medicine.dm

2015-03-14 20:00:35 -07:00

..

admin

Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup

2015-03-12 20:47:11 -05:00

assembly

…

awaymissions

…

client

Merge pull request #8134 from Miauw62/ghostradios

2015-03-10 23:56:28 +01:00

clothing

Merge pull request #8257 from phil235/ReflectFix

2015-03-14 16:15:52 -05:00

crafting

Fix typo in catalyst.

2015-03-15 00:23:47 +01:00

detectivework

…

emoji

…

events

A restructure/removal/cleanup of Ninja Code

2015-03-09 20:43:56 +00:00

flufftext

…

food&drinks

Merge pull request #8296 from phil235/TablecraftFix

2015-03-14 19:41:56 -05:00

holiday

…

hydroponics

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

2015-03-14 20:00:35 -07:00

library

…

mining

Improves drill's handling of power

2015-03-05 17:12:12 +11:00

mob

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

2015-03-14 20:00:35 -07:00

nano

Auto load required nanoui files on client login

2015-02-25 12:25:21 +13:00

ninja

Moves ninja shoes into the ninja folder

2015-03-09 23:02:26 +00:00

paperwork

Merge pull request #8290 from Ahammer18/droneassfinal

2015-03-13 13:57:43 -05:00

power

A restructure/removal/cleanup of Ninja Code

2015-03-09 20:43:56 +00:00

procedural mapping

…

projectiles

Merge pull request #8283 from Miauw62/taserdelayymao

2015-03-13 12:58:24 -05:00

reagents

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

2015-03-14 20:00:35 -07:00

recycling

Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.

2015-03-09 21:48:45 +00:00

research

Merge pull request #8237 from GunHog/CherryFlavoredPins

2015-03-13 12:57:28 -05:00

scripting

…

security levels

…

shuttle

…

surgery

Merge pull request #8235 from Incoming5643/you_wouldnt_download_a_car

2015-03-13 12:23:44 +01:00

telesci

…