Skip to content

Commit

Permalink
part 3 simple fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Thera-Pissed committed Jun 24, 2024
1 parent 575c8d5 commit 564c890
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/clothing/ears/_ears.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions code/modules/mining/equipment/angle_grinder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -141,6 +144,7 @@
. += "<spawn class='notice'>The cell is missing!</span>"
else
. += "<span class='notice'>[src] is [round(cell.percent())]% charged.</span>"
. += "<span class='notice'>You could remove the cell with a screwdriver.</span>"

/obj/item/anglegrinder
name = "angle grinder"
Expand All @@ -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
Expand Down

0 comments on commit 564c890

Please sign in to comment.