LetterJay 962177c423 Merge branch 'master' into upstream-merge-27652

2017-06-05 23:16:40 -05:00

..

devices

Another spawn timer (#1388)

2017-06-04 09:07:16 -07:00

robot

refactor another spawn cooldown (#1392)

2017-06-04 09:05:12 -07:00

stacks

[READY] Stacks will change item_states and w_class based on how full they are. (#1370)

2017-06-04 09:08:33 -07:00

weapons

The Crafting Menu now has subcategories! (#1364)

2017-06-04 09:09:59 -07:00

apc_frame.dm

…

blueprints.dm

…

body_egg.dm

…

bodybag.dm

…

candle.dm

…

cardboard_cutouts.dm

[Centcom] Nanotrasen Private Security 2.0

2017-05-28 16:39:14 -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

…