From 5c2cfc3b4457c3e899f8654aedc43d0bac6873bc Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Mon, 5 May 2014 01:01:51 +0200 Subject: [PATCH] corpse script fix --- scripts/radial/npc/corpse.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/radial/npc/corpse.py b/scripts/radial/npc/corpse.py index b552e41a..453b7382 100644 --- a/scripts/radial/npc/corpse.py +++ b/scripts/radial/npc/corpse.py @@ -15,9 +15,6 @@ def createRadial(core, owner, target, radials): return def handleSelection(core, owner, target, option): -<<<<<<< HEAD - #owner.sendSystemMessage('Correct Loot Radial called', 0) -======= if option == 164 and target.getAttachment('AI') and core.resourceService.canHarvest(owner, target): core.resourceService.doHarvest(owner, target, 'meat') @@ -25,7 +22,6 @@ def handleSelection(core, owner, target, option): core.resourceService.doHarvest(owner, target, 'hide') if option == 166 and target.getAttachment('AI') and core.resourceService.canHarvest(owner, target): core.resourceService.doHarvest(owner, target, 'bone') ->>>>>>> origin/master if option == 36 and target: #core.lootService.handleLootRequest(owner,target) core.lootService.handleLootRequest(owner,target)