From c6b666ebce2c72bc8461de8ff1d768b7b55e3518 Mon Sep 17 00:00:00 2001 From: Kristian Date: Sun, 6 Oct 2019 22:43:42 +0200 Subject: [PATCH] Drones no longer delete dropped items. --- .../simple_animal/friendly/drone/inventory.dm | 16 ++++++++-------- .../simple_animal/guardian/types/dextrous.dm | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm index c9fdc5dcefb..6ac9c4701d2 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm @@ -6,7 +6,7 @@ //Drone hands -/mob/living/simple_animal/drone/doUnEquip(obj/item/I, force, silent = FALSE) +/mob/living/simple_animal/drone/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE) if(..()) update_inv_hands() if(I == head) @@ -15,22 +15,22 @@ if(I == internal_storage) internal_storage = null update_inv_internal_storage() - return 1 - return 0 + return TRUE + return FALSE /mob/living/simple_animal/drone/can_equip(obj/item/I, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE) switch(slot) if(SLOT_HEAD) if(head) - return 0 + return FALSE if(!((I.slot_flags & ITEM_SLOT_HEAD) || (I.slot_flags & ITEM_SLOT_MASK))) - return 0 - return 1 + return FALSE + return TRUE if(SLOT_GENERC_DEXTROUS_STORAGE) if(internal_storage) - return 0 - return 1 + return FALSE + return TRUE ..() diff --git a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm index 18dace32bb6..f0093c318db 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm @@ -40,21 +40,21 @@ ..() //lose items, then return //SLOT HANDLING BULLSHIT FOR INTERNAL STORAGE -/mob/living/simple_animal/hostile/guardian/dextrous/doUnEquip(obj/item/I, force, silent = FALSE) +/mob/living/simple_animal/hostile/guardian/dextrous/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE) if(..()) update_inv_hands() if(I == internal_storage) internal_storage = null update_inv_internal_storage() - return 1 - return 0 + return TRUE + return FALSE /mob/living/simple_animal/hostile/guardian/dextrous/can_equip(obj/item/I, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE) switch(slot) if(SLOT_GENERC_DEXTROUS_STORAGE) if(internal_storage) - return 0 - return 1 + return FALSE + return TRUE ..() /mob/living/simple_animal/hostile/guardian/dextrous/equip_to_slot(obj/item/I, slot)