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

Merge pull request #16725 from SabreML/wrapping-teleportation

Browse Source 
Fixes package wrapper teleportation
This commit is contained in:
variableundefined
2021-09-17 20:44:54 -05:00
committed by GitHub
parent 3a0f05d0f0 867cfb24f5
commit dfbba739c6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/sortingmachinery.dm
+6 -6
View File
@@ -96,14 +96,12 @@
var/atom/A = i
A.emp_act(severity)
/obj/item/smallDelivery/attack_self(mob/user as mob)
if(wrapped && wrapped.loc) //sometimes items can disappear. For example, bombs. --rastaf0
wrapped.loc = user.loc
/obj/item/smallDelivery/attack_self(mob/user)
if(wrapped?.loc == src) //sometimes items can disappear. For example, bombs. --rastaf0
wrapped.forceMove(get_turf(src))
if(ishuman(user))
user.put_in_hands(wrapped)
else
wrapped.loc = get_turf(src)
playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1)
playsound(src, 'sound/items/poster_ripped.ogg', 50, TRUE)
qdel(src)
/obj/item/smallDelivery/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -163,6 +161,8 @@
if(is_type_in_list(target, no_wrap))
return
if(is_type_in_list(A.loc, list(/obj/item/smallDelivery, /obj/structure/bigDelivery)))
return
if(target.anchored)
return
if(target in user)