Tigercat2000 986c687d27 Merge remote-tracking branch 'upstream/master' into lighttiles ...

Conflicts:
	code/game/objects/items/stacks/tiles/tile_types.dm

2016-01-05 18:49:36 -08:00

..

devices

Restores a Few Object Verbs

2016-01-04 16:42:53 -05: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

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

2016-01-05 18:49:36 -08:00

weapons

Merge pull request #3116 from Fox-McCloud/slipping-floors

2016-01-05 21:42:26 -05:00

ashtray.dm

…

blueprints.dm

Fixed text error when using blueprints

2015-11-24 16:19:11 +01:00

bodybag.dm

…

candle.dm

…

changestone.dm

…

contraband.dm

…

crayons.dm

…

dehy_carp.dm

…

documents.dm

…

flag.dm

Tajara back to Tajaran

2015-12-17 16:57:12 -05: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

Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

2015-12-07 16:14:26 +01:00

shooting_range.dm

…

toys.dm

Merge pull request #2832 from Fox-McCloud/action-figure-change

2015-12-14 20:53:56 -05:00

trash.dm

Snacks

2015-11-13 17:16:47 -05:00