phil235 74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation ...

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

2014-11-04 18:55:07 +01:00

..

admin

Merge pull request #5502 from tkdrg/ifitwasntforthosemeddlingadmins

2014-11-03 18:01:10 -08:00

assembly

Adding checks for stun, restrained to many object verbs.

2014-11-01 19:18:01 +01:00

awaymissions

Rewrote maploader to act faster and better handle set variables.

2014-10-26 16:26:48 +01:00

client

Merge pull request #5490 from tkdrg/hiasl

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

clothing

Merge pull request #5460 from paprka/rdturtle

2014-11-03 18:18:18 -08:00

crafting

…

detectivework

removes useless spawn

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

events

Adding some missing do_attack_animation()

2014-11-03 15:11:39 +01:00

flufftext

…

food&drinks

Merge pull request #5427 from paprka/littlejanitorthings

2014-11-03 17:19:37 -08:00

holiday

Nothing to see here, continue with your planned spooking, citizens.

2014-10-31 21:52:10 +01:00

hydroponics

Merge pull request #5494 from phil235/BiogenFullFix1

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

library

You can no longer start printing a book with the book binder is it's already busy printing one.

2014-10-27 18:56:50 +01:00

mining

Merge pull request #5569 from Menshin/runtimes_roundsup

2014-11-03 17:13:18 -08:00

mob

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

2014-11-04 18:55:07 +01:00

nano

…

paperwork

Adding checks for stun, restrained to many object verbs.

2014-11-01 19:18:01 +01:00

power

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

2014-11-04 18:55:07 +01:00

projectiles

Merge pull request #5520 from paprka/minerscrubs

2014-11-03 17:12:02 -08:00

reagents

Merge pull request #5512 from RemieRichards/AcidBurns

2014-11-03 18:11:49 -08:00

recycling

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

2014-11-04 18:55:07 +01:00

research

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

2014-11-03 17:57:40 -08:00

scripting

…

security levels

…

shuttle

…

surgery

…

telesci

…