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

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

..

backpack.dm

Complements the satchels with backpacks

2014-08-08 22:20:11 +03:00

bags.dm

…

belt.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame

2014-09-01 18:31:26 -07:00

bible.dm

…

boxes.dm

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

briefcase.dm

…

fancy.dm

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

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

firstaid.dm

Added storage/misc for objs that don't fit in

2014-05-04 00:40:08 +03:00

internal.dm

Fixes internal storage on ground

2014-05-10 23:41:48 -04:00

lockbox.dm

…

misc.dm

Added storage/misc for objs that don't fit in

2014-05-04 00:40:08 +03:00

secure.dm

…

storage.dm

Fixes internal storage on ground

2014-05-10 23:41:48 -04:00

toolbox.dm

…

uplink_kits.dm

…

wallets.dm

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