Merge pull request #10059 from lolman360/HeadCorgi

you can pick up corgis now
This commit is contained in:
Ghom
2019-12-21 11:05:36 +01:00
committed by GitHub
21 changed files with 199 additions and 113 deletions
+11 -3
View File
@@ -102,9 +102,17 @@
return ..()
/obj/machinery/disposal/proc/place_item_in_disposal(obj/item/I, mob/user)
I.forceMove(src)
user.visible_message("[user.name] places \the [I] into \the [src].", "<span class='notice'>You place \the [I] into \the [src].</span>")
if(istype(I, /obj/item/clothing/head/mob_holder))
var/obj/item/clothing/head/mob_holder/H = I
var/mob/living/m = H.held_mob
H.release()
if(m)
user.start_pulling(m, 1)
stuff_mob_in(m,user)
return//you don't want this going into disposals ever
if(user.temporarilyRemoveItemFromInventory(I)) //double-checks never hurt
I.forceMove(src)
user.visible_message("[user.name] places \the [I] into \the [src].", "<span class='notice'>You place \the [I] into \the [src].</span>")
//mouse drop another mob or self
/obj/machinery/disposal/MouseDrop_T(mob/living/target, mob/living/user)
if(istype(target))