From 564c890bb3285aa7a5646e68fb55077a44b2b091 Mon Sep 17 00:00:00 2001 From: HelmCrab <90987989+Thera-Pissed@users.noreply.github.com> Date: Sun, 23 Jun 2024 21:47:25 -0500 Subject: [PATCH] part 3 simple fixes --- code/modules/clothing/ears/_ears.dm | 2 +- code/modules/mining/equipment/angle_grinder.dm | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm index 2d6673b8634b..22174ddfaaf4 100644 --- a/code/modules/clothing/ears/_ears.dm +++ b/code/modules/clothing/ears/_ears.dm @@ -15,7 +15,7 @@ name = "earmuffs" desc = "Protects your hearing from loud noises, and quiet ones as well." icon_state = "earmuffs" - slot_flags = ITEM_SLOT_EARS | ITEM_SLOT_NECK + slot_flags = ITEM_SLOT_EARS item_state = "earmuffs" strip_delay = 15 equip_delay_other = 25 diff --git a/code/modules/mining/equipment/angle_grinder.dm b/code/modules/mining/equipment/angle_grinder.dm index 0abbed33ad8b..067dfa716852 100644 --- a/code/modules/mining/equipment/angle_grinder.dm +++ b/code/modules/mining/equipment/angle_grinder.dm @@ -105,6 +105,9 @@ remove_grinder() /obj/item/anglegrinderpack/proc/consume_charge(cost = power_cost) + if(!cell) + remove_grinder() + return if(cell.charge >= cost) cell.charge -= cost return TRUE @@ -141,6 +144,7 @@ . += "The cell is missing!" else . += "[src] is [round(cell.percent())]% charged." + . += "You could remove the cell with a screwdriver." /obj/item/anglegrinder name = "angle grinder" @@ -164,6 +168,8 @@ // Trick to make the deconstruction that need a lit welder work. (bypassing fuel test) /obj/item/anglegrinder/tool_use_check(mob/living/user, amount) + if(!pack.cell) + return FALSE if(pack.consume_charge()) return TRUE else