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

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm

2014-11-13 17:17:23 +01:00

..

admin

Merge pull request #5695 from Aranclanos/lelerrocode

2014-11-08 15:09:21 -08:00

assembly

Fixes #5604 signaler runtime

2014-11-08 10:09:19 -03:00

awaymissions

Merge pull request #5803 from Menshin/sleeping_in_closets

2014-11-11 10:55:07 -08:00

client

Merge pull request #5490 from tkdrg/hiasl

2014-11-03 17:26:53 -08:00

clothing

Adds NODROP to the Atmos watertank nozzle. I have no regrets.

2014-11-09 13:56:12 -08:00

crafting

moved files and fixed tablecrafting

2014-10-17 10:30:04 -07:00

detectivework

removes useless spawn

2014-10-26 14:35:27 -07:00

events

Merge pull request #5425 from Menshin/meteor_redux

2014-11-08 15:24:44 -08:00

flufftext

Merge pull request #5318 from phil235/MsgFix2

2014-10-19 21:39:06 -05:00

food&drinks

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

2014-11-08 01:07:29 +00:00

holiday

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

hydroponics

Merge pull request #5494 from phil235/BiogenFullFix1

2014-11-03 17:23:41 -08:00

library

Conflicts solving

2014-11-04 20:24:52 +01:00

mining

Removed hilarious but useless sleep() in closets/boxes New()

2014-11-10 01:59:32 +01:00

mob

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

2014-11-13 17:17:23 +01:00

nano

…

paperwork

Conflicts solving

2014-11-04 20:24:52 +01:00

power

Merge pull request #5719 from MrPerson/pls_dont_make_fun_of_the_singulo_shes_not_fat_just_big_boned

2014-11-08 15:08:40 -08:00

projectiles

last minute changes to gun for massive realism

2014-11-03 23:47:20 -08:00

reagents

-Adds secure atmos closets to Atmos

2014-11-09 11:16:58 -08:00

recycling

Merge pull request #5732 from phil235/DisposalConstructionRuntimeFix

2014-11-08 09:31:52 +01:00

research

Merge pull request #5786 from Miauw62/runtime1

2014-11-10 08:43:10 -08:00

scripting

…

security levels

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

2014-10-05 13:48:11 +02:00

shuttle

…

surgery

…

telesci

Removes telesci comp's update_icon override

2014-10-07 23:16:52 +11:00