Firecage 7f96592b87 Merge Conflict Fix

2016-01-27 13:29:38 +02:00

..

area_copy.dm

This is bit better.

2015-12-26 14:10:09 +01:00

areas.dm

…

computer_funcs.dm

Changes flag name from ABSTRACT to NODECONSTRUCT

2015-11-30 20:26:03 -05:00

computer.dm

…

holo_effect.dm

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

items.dm

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

turfs.dm

Divide beach coast icon into two.

2016-01-17 23:26:43 +00:00