Markolie 7039ac7a6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction ...

# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm

2017-02-08 19:21:57 +01:00

..

glass.dm

Mass replace

2016-07-07 19:34:02 -07:00

leather.dm

Part three: The Hierophant. Also minor fixes for the other bosses.

2016-10-24 21:39:40 +02:00

light.dm

move all floor tiles to tiles.dmi, origin_tech materials=1 for base tile object, rename tranquillite tile item state

2017-02-06 21:41:39 +04:00

mineral.dm

Merge remote-tracking branch 'remotes/upstream/master' into mineral

2017-02-05 17:40:39 +04:00

sheet_types.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction

2017-02-05 19:46:41 +01:00

sheets.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00