LetterJay 2a0e31f0f2 Merge pull request #1955 from Citadel-Station-13/upstream-merge-29136 ...

[MIRROR] Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds

2017-07-09 23:04:45 -05:00

..

devices

Fixes cartridges not linking with their host PDAs on creation

2017-07-06 09:06:29 -05:00

robot

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

stacks

Fixes wrapping objects

2017-07-09 10:14:16 -05:00

weapons

Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds

2017-07-09 06:44:49 -05:00

apc_frame.dm

Intercoms are now constructable

2017-06-23 13:40:25 -05:00

blueprints.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

body_egg.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

bodybag.dm

April sync (#360)

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

candle.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

cardboard_cutouts.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

control_wand.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

crayons.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

dehy_carp.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

documents.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

eightball.dm

Eightballs are tiny items (#1013)

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

latexballoon.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

nuke_tools.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

religion.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

shooting_range.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

taster.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

theft_tools.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

toys.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

trash.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00