Merge pull request #12687 from Ghommie/Ghommie-cit832

Fixing obscured inventory slots unequip block, for real.
This commit is contained in:
silicons
2020-07-04 00:10:49 -07:00
committed by GitHub
11 changed files with 28 additions and 22 deletions
+1
View File
@@ -794,6 +794,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
reagents.clear_reagents()
/obj/item/clothing/mask/vape/equipped(mob/user, slot)
. = ..()
if(slot == SLOT_WEAR_MASK)
if(!screw)
to_chat(user, "<span class='notice'>You start puffing on the vape.</span>")
@@ -355,6 +355,7 @@
emaggedhitdamage = 0
/obj/item/borg/lollipop/equipped()
. = ..()
check_amount()
/obj/item/borg/lollipop/dropped(mob/user)