Tigercat2000 ee32c0a35a Merge branch 'master' into intent_define ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

2015-09-08 04:43:13 -07:00

..

devices

oops

2015-09-04 22:56:52 -04:00

mountable_frames

Pass I

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

robot

unused var axing

2015-09-04 18:04:34 -04:00

stacks

Pass I

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

weapons

Merge branch 'master' into intent_define

2015-09-08 04:43:13 -07:00

ashtray.dm

Pass I

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

blueprints.dm

Replace 2 A.name==Space checks with istypes

2015-05-22 11:23:20 -07:00

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

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

contraband.dm

[Goonchem] Reagent Decals

2015-04-17 18:27:49 -04:00

crayons.dm

Progress bars + Wall Rationalization

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

dehy_carp.dm

Carp Plushie Syndies Buff

2015-04-24 01:40:24 -04:00

documents.dm

Ports Antag Objectives from TG

2015-01-30 23:40:41 -05:00

flag.dm

The Great Del() Cull of 2015

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

latexballoon.dm

Modify fire_act to temperature_expose where needed

2015-04-29 16:56:12 -07:00

misc.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

policetape.dm

Replace magic intent words with defines, grab fixes

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

random_items.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

shooting_range.dm

The Great Del() Cull of 2015

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

toys.dm

Pass I

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

trash.dm

LINDA, Stage 1

2015-04-28 08:43:42 -07:00