Shadowlight213 9112e71914 Fixes merge conflicts

2016-07-22 01:04:45 -07:00

..

devices

Fixed camera bugs being unable to show camera view.

2016-07-19 21:58:19 -04:00

robot

Fixes Borg Stun Attack and Simple Animal Armor Penetration (#19269)

2016-07-12 16:00:35 -04:00

stacks

Makes shuttles superficially buildable (#18974)

2016-07-14 21:25:49 +12:00

weapons

Fixes merge conflicts

2016-07-22 01:04:45 -07:00

apc_frame.dm

…

blueprints.dm

…

body_egg.dm

Merge pull request #18729 from coiax/remove-spawn-3

2016-06-21 20:11:08 +12:00

bodybag.dm

Code cleanup; silicons, melee, hallucinations

2016-06-24 14:03:44 +01:00

candle.dm

Adds fireplaces, eswords are hot, cardboard is flammable (#19118)

2016-07-06 10:16:47 +12:00

cardboard_cutouts.dm

Bug fixes for cardboard cutouts

2016-07-09 14:19:49 +01:00

charter.dm

Merge pull request #18936 from MrStonedOne/patch-222

2016-06-28 00:05:40 +12:00

control_wand.dm

properly

2016-06-13 09:43:01 -04:00

crayons.dm

Ratvarian grammar/punctuation rules are now enforced by code, automatic ratvarian is no longer just rot13 without the rules.

2016-07-19 23:25:14 +01:00

dehy_carp.dm

Using a dehydrated carp no longer strips the neutral faction from the owner.

2016-06-14 22:01:00 -04:00

documents.dm

…

latexballoon.dm

Code cleanup; silicons, melee, hallucinations

2016-06-24 14:03:44 +01:00

nuke_tools.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

shooting_range.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

toys.dm

Adds dextrous guardian (#19254)

2016-07-13 11:25:00 +12:00

trash.dm

Code cleanup; silicons, melee, hallucinations

2016-06-24 14:03:44 +01:00