Markolie 9adff714b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql ...

Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt

2015-09-23 07:07:17 +02:00

..

devices

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

2015-09-23 07:07:17 +02:00

mountable_frames

Pass I

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

robot

runtime fixes, pick name re-addition

2015-09-17 19:23:49 -04:00

stacks

Fix broken tile stacks

2015-09-18 05:02:29 +02:00

weapons

Implant fixes/updates

2015-09-23 02:51:33 +02: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

The Great Del() Cull of 2015

2015-07-09 02:48:34 -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

Atmos fixes

2015-09-22 05:15:05 +02:00

shooting_range.dm

The Great Del() Cull of 2015

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

toys.dm

suicide act for the suicide game

2015-09-20 09:13:51 -04:00

trash.dm

…