Tigercat2000 633a9e68b4 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.

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

..

hud

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

2015-10-19 16:13:51 -07: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

Make darkness clickable

2015-10-01 01:35:59 +02:00

cyborg.dm

Point Rework

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

drag_drop.dm

…

item_attack.dm

Remove Jointbreaking, Joint fracturing, and Knifing

2015-05-10 06:46:58 -07: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

Add missing overmind clicks.

2014-02-28 19:19:49 -05:00

rig.dm

Baystation Rigsuits

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

telekinesis.dm

Pass II

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