LetterJay 22aef374e2 Merge branch 'master' into upstream-merge-26140

2017-05-13 01:28:34 -04:00

..

devices

[MIRROR] GPS Personalizations [Post TGPSUI] (#642)

2017-05-10 16:27:49 -07:00

robot

Fixes dropped cyborg repair modules

2017-05-04 17:50:32 -05:00

stacks

[MIRROR] Adamantine golem leadership (#785)

2017-05-08 22:16:09 -07:00

weapons

Merge branch 'master' into upstream-merge-26140

2017-05-13 01:28:34 -04: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

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

April sync (#360)

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

charter.dm

manual merge

2017-04-29 11:42:28 -05:00

control_wand.dm

Bleeding edgy refresh (#303)

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

crayons.dm

Adds crayon grinding

2017-04-27 09:17:44 -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

April sync (#360)

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

latexballoon.dm

Bleeding edgy refresh (#303)

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

nuke_tools.dm

Bleeding edgy refresh (#303)

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

religion.dm

Bleeding edgy refresh (#303)

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

shooting_range.dm

Replaces /image with /mutable_appearance (#556)

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

taster.dm

Bleeding edgy refresh (#303)

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

toys.dm

Curator Update

2017-05-03 22:22:12 -05:00

trash.dm

Tg patch branch to master (#192)

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