Tigercat2000 29f42f8b61 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/silicon/pai/life.dm

2015-11-07 20:54:24 -08:00

..

_defines.dm

Add borg headlamp, add movement states for surgeon/miner bot, add jetpack overlay to all miner borgs

2015-07-30 19:33:49 +02:00

action.dm

Merge pull request #2330 from Robertha89/master

2015-10-10 18:23:36 -04:00

ai.dm

Port Bay's silicon law manager

2015-08-31 02:18:49 +02:00

alien_larva.dm

-tg- pull refactor

2015-10-10 11:15:52 -07:00

alien.dm

-tg- pull refactor

2015-10-10 11:15:52 -07:00

hud.dm

FUUUUUUUUUUUUUUUUUUUUUUUUUUUU

2015-10-08 18:38:45 -04:00

human.dm

-tg- pull refactor

2015-10-10 11:15:52 -07:00

monkey.dm

-tg- pull refactor

2015-10-10 11:15:52 -07:00

movable_screen_objects.dm

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

other_mobs.dm

-tg- pull refactor

2015-10-10 11:15:52 -07:00

robot.dm

-tg- pull refactor

2015-10-10 11:15:52 -07:00

screen_objects.dm

Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark

2015-10-19 16:13:51 -07:00