Zuhayr 1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +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 branch 'master' of https://github.com/Baystation12/Baystation12

2014-09-01 22:03:29 +09:30

items

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

random

…

structures

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +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

rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)

2014-06-20 18:42:25 +10:00

structures.dm

Hydroponics rewrite, details will be in PR. Big commit.

2014-07-25 22:16:04 +09:30

weapons.dm

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

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