Zuhayr cc52be3192 Merge resolution, replaced 2 wires lost in map merge.

2014-09-25 23:54:24 +09:30

..

closets

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

effects

Merge remote-tracking branch 'upstream/master' into dev

2014-09-10 22:14:37 +01:00

items

Merge resolution, replaced 2 wires lost in map merge.

2014-09-25 23:54:24 +09:30

random

Cables are now stacks

2014-08-25 18:54:35 +04:00

structures

Merge resolution, replaced 2 wires lost in map merge.

2014-09-25 23:54:24 +09:30

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Allows refitting to change worn sprite

2014-09-02 08:31:16 -04:00

objs.dm

…

structures.dm

Fixes #6495

2014-09-25 18:33:42 +09:30

weapons.dm

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00