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

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm

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

..

hud

Fixes #5656

2014-11-04 19:38:15 -05:00

adjacent.dm

Corrected swapped comments

2014-05-05 01:10:18 +02:00

ai.dm

Botcall, TG edition!

2014-09-25 09:44:41 -05:00

click.dm

Keep the define around as that is a good idea

2014-10-20 22:49:06 +13:00

cyborg.dm

Fully implemented AI photography, with HUD!

2014-07-30 15:21:30 -05:00

drag_drop.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

item_attack.dm

adding diagonal attack animation.

2014-11-07 15:42:07 +01:00

observer.dm

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

2014-08-29 04:21:15 -07:00

oldcode.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

other_mobs.dm

Cuts /disease variables from 28 to 23 (includes new ones)

2014-10-30 06:21:14 +00:00

overmind.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

telekinesis.dm

Fixes issue #1442

2014-11-05 13:55:31 -03:00