Markolie 90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom ...

Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi

2015-09-15 04:18:27 +02:00

..

devices

In hand sprite overhaul

2015-09-13 22:44:18 +02: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

materials-consitency

2015-09-12 16:22:39 -04:00

weapons

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom

2015-09-15 04:18:27 +02: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

…

contraband.dm

…

crayons.dm

Progress bars + Wall Rationalization

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

dehy_carp.dm

…

documents.dm

…

flag.dm

The Great Del() Cull of 2015

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

latexballoon.dm

…

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

In hand sprite overhaul

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

trash.dm

…