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

..

jetpack.dm

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

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

tank_types.dm

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

tanks.dm

Baystation Rigsuits

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

watertank.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00