DZD 4bcdb94a99 Merge with upstream/master ...

Fixes conflicts

2015-02-18 13:41:32 -05:00

..

devices

Merge with upstream/master

2015-02-18 13:41:32 -05:00

robot

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

stacks

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

weapons

Merge with upstream/master

2015-02-18 13:41:32 -05:00

apc_frame.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

ashtray.dm

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

blueprints.dm

Fix wall smoothing

2015-01-08 19:44:56 +01:00

bodybag.dm

Locker sounds update- Instead of an istype() check in closets.dm, it now

2015-02-07 22:43:28 +01:00

candle.dm

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

changestone.dm

Unused/WorkInProgress folder cleanup

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

contraband.dm

…

crayons.dm

…

documents.dm

Ports Antag Objectives from TG

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

flag.dm

Use station_name proc where possible, mapfix

2015-01-21 23:37:05 +01:00

latexballoon.dm

…

policetape.dm

Merge with upstream/master

2015-02-12 16:43:01 -05:00

random_items.dm

Unused/WorkInProgress folder cleanup

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

shooting_range.dm

Projectile Laser Update

2014-11-26 19:16:21 -05:00

toys.dm

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

trash.dm

Trash autoignition

2014-07-20 10:59:44 -04:00