Instant summons no longer works on the NAD. (#23604)

* We have fun here sir.

* thanks grunt

* Extra failsafe
This commit is contained in:
Qwertytoforty
2024-01-06 16:47:08 -05:00
committed by GitHub
parent 89c9b0970d
commit 40f25b0aac
+9 -2
View File
@@ -28,6 +28,9 @@
for(var/obj/item in hand_items)
if(istype(item, /obj/item/organ/internal/brain)) //Yeah, sadly this doesn't work due to the organ system.
break
if(istype(item, /obj/item/disk/nuclear)) //Let's not make nukies suffer with this bullshit.
to_chat(user, "<span class='notice'>[item] has some built in protections against such summoning magic.</span>")
break
if(ABSTRACT in item.flags)
continue
if(NODROP in item.flags)
@@ -120,8 +123,12 @@
return
if(visible_item)
item_to_retrieve.loc.visible_message("<span class='warning'>[item_to_retrieve] suddenly disappears!</span>")
var/list/heres_disky = item_to_retrieve.search_contents_for(/obj/item/disk/nuclear)
heres_disky += item_to_retrieve.loc.search_contents_for(/obj/item/disk/nuclear) //So if you mark another item in a bag, we don't pull
for(var/obj/item/disk/nuclear/N in heres_disky)
N.forceMove(get_turf(item_to_retrieve))
N.visible_message("<span class='warning'>As [item_to_retrieve] vanishes, [N] remains behind!</span>")
break //If you have 2 nads, well, congrats? Keeps message from doubling up
if(target.hand) //left active hand
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_LEFT_HAND, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_RIGHT_HAND, FALSE, TRUE))