Poojawa 789064a3a5 Clean up .rej files

2017-06-28 02:24:03 -05:00

..

devices

Clean up .rej files

2017-06-28 02:24:03 -05:00

robot

Fixes dead PKborgs having active dampener fields

2017-06-13 02:24:06 -05:00

stacks

Merge pull request #1778 from Citadel-Station-13/upstream-merge-28766

2017-06-26 06:26:46 -05:00

weapons

Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588

2017-06-27 22:59:32 -05:00

apc_frame.dm

Intercoms are now constructable

2017-06-23 13:40:25 -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

Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881

2017-06-08 03:35:23 -05: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

Ports Goonchat

2017-06-08 16:27:56 -05:00

trash.dm

…