summaryrefslogtreecommitdiff
path: root/init.lua
diff options
context:
space:
mode:
authorZefram <zefram@fysh.org>2014-07-22 15:33:16 +0100
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>2014-07-23 09:50:50 -0400
commit46d44eebcf9bb148cea505fcb4f25a97efcd6368 (patch)
tree9ad89b790d7f0da2ca919d944fc7b34f8887ed57 /init.lua
parentb832c0ad067bf48506c07cddd7ee98f476ffada8 (diff)
downloadpipeworks-46d44eebcf9bb148cea505fcb4f25a97efcd6368.tar
pipeworks-46d44eebcf9bb148cea505fcb4f25a97efcd6368.tar.gz
pipeworks-46d44eebcf9bb148cea505fcb4f25a97efcd6368.tar.bz2
pipeworks-46d44eebcf9bb148cea505fcb4f25a97efcd6368.tar.xz
pipeworks-46d44eebcf9bb148cea505fcb4f25a97efcd6368.zip
Refactor deployer and dispenser
Merge implementations into a single "wielder" mechanism. Clean up the code a bit. Fix get_player_control_bits for the dispenser (it wasn't indicating the sneak setting). Fix drops for dispenser (dispenser_on was dropping as itself). Show item image, as well as name, at head of form.
Diffstat (limited to 'init.lua')
-rw-r--r--init.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/init.lua b/init.lua
index 265ae1d..625a99c 100644
--- a/init.lua
+++ b/init.lua
@@ -114,14 +114,13 @@ dofile(pipeworks.modpath.."/flowing_logic.lua")
dofile(pipeworks.modpath.."/crafts.lua")
dofile(pipeworks.modpath.."/tubes.lua")
dofile(pipeworks.modpath.."/trashcan.lua")
+dofile(pipeworks.modpath.."/wielder.lua")
if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end
if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end
if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end
if pipeworks.enable_redefines then dofile(pipeworks.modpath.."/compat.lua") end
if pipeworks.enable_autocrafter then dofile(pipeworks.modpath.."/autocrafter.lua") end
-if pipeworks.enable_deployer then dofile(pipeworks.modpath.."/deployer.lua") end
-if pipeworks.enable_dispenser then dofile(pipeworks.modpath.."/dispenser.lua") end
if pipeworks.enable_node_breaker then
dofile(pipeworks.modpath.."/node_breaker.lua")