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

..

sheets

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

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

tiles

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

medical.dm

fixes, comfrey, and aloe

2017-01-23 05:25:42 -05:00

nanopaste.dm

…

rods.dm

Merge branch 'master' into w_class

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

stack_recipe.dm

Refactor stack recipes

2016-07-31 07:20:26 -07:00

stack.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

telecrystal.dm

…