diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 83cc09a624..caebb9cf10 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -5,13 +5,11 @@ /mob/proc/get_active_held_item() return get_item_for_held_index(active_hand_index) - //Finds the opposite limb for the active one (eg: upper left arm will find the item in upper right arm) //So we're treating each "pair" of limbs as a team, so "both" refers to them /mob/proc/get_inactive_held_item() return get_item_for_held_index(get_inactive_hand_index()) - //Finds the opposite index for the active one (eg: upper left arm will find the item in upper right arm) //So we're treating each "pair" of limbs as a team, so "both" refers to them /mob/proc/get_inactive_hand_index() @@ -24,12 +22,9 @@ other_hand = 0 return other_hand - /mob/proc/get_item_for_held_index(i) if(i > 0 && i <= held_items.len) return held_items[i] - return FALSE - //Odd = left. Even = right /mob/proc/held_index_to_dir(i) @@ -37,17 +32,14 @@ return "r" return "l" - //Check we have an organ for this hand slot (Dismemberment), Only relevant for humans /mob/proc/has_hand_for_held_index(i) return TRUE - //Check we have an organ for our active hand slot (Dismemberment),Only relevant for humans /mob/proc/has_active_hand() return has_hand_for_held_index(active_hand_index) - //Finds the first available (null) index OR all available (null) indexes in held_items based on a side. //Lefts: 1, 3, 5, 7... //Rights:2, 4, 6, 8... diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 0d8a0880a8..a063d090db 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -16,8 +16,6 @@ return item return module_active - - /mob/living/silicon/robot/proc/uneq_module(obj/item/O) if(!O) return 0 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index 8e9f5574e0..5c1229c130 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -125,9 +125,8 @@ Difficulty: Medium adjustHealth(-(L.maxHealth * 0.5)) L.gib() return TRUE - DelayNextAction(CLICK_CD_MELEE, flush = TRUE) - miner_saw.melee_attack_chain(src, target, null, ATTACK_IGNORE_CLICKDELAY | ATTACK_IGNORE_ACTION | NO_AUTO_CLICKDELAY_HANDLING) - DiscardCurrentAction() + miner_saw.melee_attack_chain(src, target, null, ATTACK_IGNORE_CLICKDELAY) + FlushCurrentAction() if(guidance) adjustHealth(-2) transform_weapon()