Esword update
Dual Eswords Now Deflect Shots
Stop, HAMMER TIME!
Syni Venors
Admin Room/Syndi Shuttle update
Bulldog In-Hand Fix
Revert "Admin Room/Syndi Shuttle update - Merge Conflict Fix"

This reverts commit 86416d7fb3124cc845dd906e50feb9f35d0756a0.
Map Changes, Attempt #2
Map Changes, Merge Conflict Fix? I hope?
Revert "Map Changes, Merge Conflict Fix? I hope?"

This reverts commit a2a4ace9f893b51108f941f0df04ef1b1ed8a871.
Revert "Map Changes, Attempt #2"

This reverts commit 5801818e95cd3b0a45bd727cd55526c0a9c16691.
Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes
Fixing merge conflict
Fix merge conflict
Merge conflict fix
Map merge fix attempt three
Merge pull request #1 from ZomgPonies/master

Upstream merge
And committing the map changes
Merge branch 'changes-1' of https://github.com/Markolie/Paradise into changes-1
Additional constructable and upgradeable machines, adds soap to drones, updates teleporter