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

Merge pull request #13003 from Incoming5643/stop_being_broken_at_being_broken

Browse Source 
The further trials and tribulations of the supermatter sword bugfix
This commit is contained in:
Cheridan
2015-11-14 11:49:55 -06:00
parent 20242d946c bf34b97b1e
commit 9a68f6b69b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/melee/misc.dm
+3 -3
View File
@@ -157,12 +157,12 @@
if(!istype(T,/turf/space))
consume_turf(T)
/obj/item/weapon/melee/supermatter_sword/afterattack(target, mob/user)
..()
/obj/item/weapon/melee/supermatter_sword/afterattack(target, mob/user, proximity_flag)
if(user && target == user)
user.drop_item()
if(Adjacent(target))
if(proximity_flag)
consume_everything(target)
..()
/obj/item/weapon/melee/supermatter_sword/throw_impact(target)
..()