Lzimann 53677a7f7f Fixes conflicts

2017-04-28 08:37:13 -03:00

..

devices

Fixes conflicts

2017-04-28 08:37:13 -03:00

robot

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12:00

stacks

Removes adhoc types

2017-04-22 22:07:51 +01:00

weapons

Fixes conflicts

2017-04-28 08:37:13 -03:00

apc_frame.dm

Refactors picture frames to use wall frames system

2017-04-17 15:37:05 +03:00

blueprints.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

body_egg.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

bodybag.dm

Ports storage objects to Initialize (#25992)

2017-04-08 19:28:28 -03:00

candle.dm

Candles and life candles are the color of fire (#24886)

2017-03-10 20:01:35 -05:00

cardboard_cutouts.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

charter.dm

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12:00

control_wand.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

crayons.dm

Adds crayon grinding (#26605)

2017-04-27 11:16:43 -03:00

dehy_carp.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

documents.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

eightball.dm

Update eightball.dm

2017-04-10 23:33:38 -04:00

latexballoon.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

nuke_tools.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

religion.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

shooting_range.dm

Replaces /image with /mutable_appearance, where appropriate (#26518)

2017-04-25 12:15:16 +02:00

taster.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

toys.dm

Fix conflicts

2017-04-25 10:51:49 -03:00

trash.dm

…