ok this is going to be a pain in the ass ain't it (#2458)

lets hope nothing blows up this time (Flags PR but it works!)
This commit is contained in:
kevinz000
2017-08-22 05:01:38 -07:00
committed by GitHub
parent 6a309b5996
commit 35b7b93b24
535 changed files with 2471 additions and 1486 deletions
+2 -2
View File
@@ -35,7 +35,7 @@
/obj/item/proc/attack(mob/living/M, mob/living/user)
if(flags & NOBLUDGEON)
if(flags_1 & NOBLUDGEON_1)
return
if(!force)
playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1)
@@ -54,7 +54,7 @@
//the equivalent of the standard version of attack() but for object targets.
/obj/item/proc/attack_obj(obj/O, mob/living/user)
if(flags & NOBLUDGEON)
if(flags_1 & NOBLUDGEON_1)
return
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(O)