cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)

Browse Source 
About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167
This commit is contained in:
spookydonut
2020-01-28 10:51:15 +13:00
committed by oranges
parent b7aa7ef4b4
commit ac7f2b5166
25 changed files with 84 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+3 -3
View File
@@ -377,9 +377,9 @@
S.add(transfer)
return transfer
/obj/item/stack/Crossed(obj/o)
if(istype(o, merge_type) && !o.throwing)
merge(o)
/obj/item/stack/Crossed(atom/movable/AM)
if(istype(AM, merge_type) && !AM.throwing)
merge(AM)
. = ..()
/obj/item/stack/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)