LetterJay 81e4f39733 Merge branch 'master' into upstream-merge-27669

2017-05-30 17:02:11 -05:00

..

devices

Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361

2017-05-30 15:15:51 -05:00

robot

Fixes projectile dampening fields being on infinite cooldown (#1263)

2017-05-28 15:20:00 -07:00

stacks

Splits up mine_items.dm

2017-05-26 13:19:42 -05:00

weapons

Merge pull request #1307 from Citadel-Station-13/upstream-merge-27846

2017-05-30 15:48:44 -05:00

apc_frame.dm

Refactors picture frames to use wall frames system

2017-04-21 17:54:34 -05:00

blueprints.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

body_egg.dm

…

bodybag.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

candle.dm

…

cardboard_cutouts.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

charter.dm

[MIRROR] Land Claim Flag (#951)

2017-05-14 20:16:17 -07:00

control_wand.dm

…

crayons.dm

Decentralized and Vastly Improved Gang Influence System

2017-05-20 18:37:48 -05:00

dehy_carp.dm

…

documents.dm

…

eightball.dm

Eightballs are tiny items (#1013)

2017-05-18 12:37:43 -05:00

latexballoon.dm

…

nuke_tools.dm

…

religion.dm

…

shooting_range.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

taster.dm

…

toys.dm

Adds a new toy to arcade prizes. A rumbling toy toolbox meant to mimic hisgrace

2017-05-18 16:36:43 -05:00

trash.dm

…