cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-23 13:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9601 from Ghommie/Ghommie-cit265

Browse Source 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
This commit is contained in:
kevinz000
2020-10-03 19:35:47 -03:00
committed by Dip
parent 76f9c30103
commit b8bc551d51
120 changed files with 563 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/misc.dm
+4 -4
View File
@@ -330,13 +330,13 @@
if(proximity_flag)
consume_everything(target)
/obj/item/melee/supermatter_sword/throw_impact(target)
/obj/item/melee/supermatter_sword/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
..()
if(ismob(target))
var/mob/M
if(ismob(hit_atom))
var/mob/M = hit_atom
if(src.loc == M)
M.dropItemToGround(src)
consume_everything(target)
consume_everything(hit_atom)
/obj/item/melee/supermatter_sword/pickup(user)
..()