Merge pull request #14085 from Citadel-Station-13/silicons-patch-24

ok as funny as this is, painting pets in gear painters is the result of a potentially awful bug regarding mob holder drop logic
This commit is contained in:
Putnam3145
2021-01-26 22:24:57 -08:00
committed by GitHub
2 changed files with 8 additions and 1 deletions
+1 -1
View File
@@ -141,7 +141,7 @@
/obj/item/clothing/head/mob_holder/dropped(mob/user)
. = ..()
if(held_mob && isturf(loc))//don't release on soft-drops
if(held_mob && !ismob(loc))//don't release on soft-drops
release()
/obj/item/clothing/head/mob_holder/proc/release()
+7
View File
@@ -62,6 +62,8 @@
if(!user.transferItemToLoc(I, src))
to_chat(user, "<span class='warning'>[I] is stuck to your hand!</span>")
return
if(QDELETED(I))
return
user.visible_message("<span class='notice'>[user] inserts [I] into [src]'s receptable.</span>")
inserted = I
@@ -72,6 +74,11 @@
/obj/machinery/gear_painter/AllowDrop()
return FALSE
/obj/machinery/gear_painter/handle_atom_del(atom/movable/AM)
if(AM == inserted)
inserted = null
return ..()
/obj/machinery/gear_painter/AltClick(mob/user)
. = ..()
if(!user.CanReach(src))