Sparks will now disappear properly
Merge pull request #106 from Markolie/master

Bug fixes
Merge pull request #31 from ParadiseSS13/master

Merge from Master
Foxes
Merge pull request #108 from Fox-McCloud/Foxes

Foxes
Bug fixes, map fixes
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	maps/cyberiad.dmm
Ports over NanoUI camera console map from Baystation12
Separate R&D design files
R&D UI rework
Empty RPED in disposals
Trash bags disposals fix
R&D submenus, autolathe rework from /tg/
Locked message change
Virology fix
Transit tube pressure fix
Raise player:alien gamma armory ratio
Removes an ugly window
Karma fix
Merge pull request #109 from Markolie/master

Bug fixes, map fixes, R&D rework