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

..

hud

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

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

adjacent.dm

REFACTOR: Firelock click override code

2015-05-15 17:13:03 -07:00

ai.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

click_override.dm

Middle Click Override

2015-07-16 21:51:20 -04:00

click.dm

changes

2015-10-14 20:39:29 -04:00

cyborg.dm

Point Rework

2015-09-17 22:26:03 -04:00

drag_drop.dm

…

item_attack.dm

Bloody Mess Fix

2015-11-05 08:01:26 -05:00

observer.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

oldcode.dm

Replace magic intent words with defines, grab fixes

2015-09-07 11:51:00 -07:00

other_mobs.dm

Replace magic intent words with defines, grab fixes

2015-09-07 11:51:00 -07:00

overmind.dm

…

rig.dm

Baystation Rigsuits

2015-10-05 16:42:00 -07:00

telekinesis.dm

Pass II

2015-07-09 19:51:40 -04:00