cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Giving someone an object makes them pick it up as well. (#24818)

Browse Source 
* ctrl z ctrl v

* UNTESTED CHANGES BUT OVERHAULS GIVE

* Update code/modules/paperwork/paper.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
BiancaWilkson
2024-04-06 23:46:48 +00:00
committed by GitHub
co-authored by DGamerL
parent b5e38368ed
commit db699400f4
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/give.dm
+1
View File
@@ -174,6 +174,7 @@
receiver.put_in_hands(I)
I.add_fingerprint(receiver)
I.on_give(giver, receiver)
I.pickup(receiver)
receiver.visible_message("<span class='notice'>[giver] handed [I] to [receiver].</span>")
receiver.clear_alert("take item [item_UID]")
code/modules/paperwork/paper.dm
+9 -8
View File
@@ -840,14 +840,15 @@
qdel(src)
/obj/item/paper/pickup(user)
if(contact_poison && ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/clothing/gloves/G = H.gloves
if(!istype(G) || !G.safe_from_poison)
H.reagents.add_reagent(contact_poison, contact_poison_volume)
add_attack_logs(src, user, "Picked up [src], coated with [contact_poison] by [contact_poison_poisoner]")
contact_poison = null
. = ..()
..()
if(!contact_poison || !ishuman(user))
return
var/mob/living/carbon/human/H = user
var/obj/item/clothing/gloves/G = H.gloves
if(!istype(G) || !G.safe_from_poison)
H.reagents.add_reagent(contact_poison, contact_poison_volume)
add_attack_logs(src, user, "Picked up [src], coated with [contact_poison] by [contact_poison_poisoner]")
contact_poison = null
/obj/item/paper/researchnotes
name = "paper - 'Research Notes'"