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

..

devices

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

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

mountable_frames

Axes Some Pooling

2015-10-08 01:26:15 -04:00

robot

Cell update

2015-09-28 19:04:22 +02:00

stacks

-tg- style inventory update, stripping update

2015-10-04 16:53:48 -07:00

weapons

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

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

ashtray.dm

Pass I

2015-09-04 05:18:48 -04:00

blueprints.dm

…

bodybag.dm

Further fixes to morgues and crematoriums

2015-07-14 04:08:56 -04:00

candle.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

changestone.dm

…

contraband.dm

…

crayons.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

dehy_carp.dm

…

documents.dm

…

flag.dm

flag

2015-10-13 19:14:25 -04:00

latexballoon.dm

…

misc.dm

…

policetape.dm

Replace magic intent words with defines, grab fixes

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

random_items.dm

Fixes and pinpointer update

2015-10-05 00:26:43 +02:00

shooting_range.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

toys.dm

Spanssss

2015-09-30 13:45:54 -07:00

trash.dm

…