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

Revert "Merge pull request #16520 from SabreML/fix-bundle-4"

Browse Source 
This reverts commit 9a62622fbc, reversing
changes made to 841ad0f1fd.
This commit is contained in:
AffectedArc07
2021-09-07 16:16:40 +01:00
parent cb942efdaf
commit b0e9db64bd
24 changed files with 90 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/sortingmachinery.dm
+4 -4
View File
@@ -97,10 +97,12 @@
A.emp_act(severity)
/obj/item/smallDelivery/attack_self(mob/user as mob)
if(wrapped?.loc == src) //sometimes items can disappear. For example, bombs. --rastaf0
wrapped.forceMove(get_turf(src))
if(wrapped && wrapped.loc) //sometimes items can disappear. For example, bombs. --rastaf0
wrapped.loc = user.loc
if(ishuman(user))
user.put_in_hands(wrapped)
else
wrapped.loc = get_turf(src)
playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1)
qdel(src)
@@ -161,8 +163,6 @@
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)