Files
CHOMPStation2/code/game/objects/weapons.dm
mwerezak 9bfb4642a2 Merge remote-tracking branch 'upstream/dev' into stun-baton
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	Made all obj/item/weapons have "swing_hit" as their default hitsound.
	Made hitsound not play when the attack misses.
2014-07-31 14:31:21 -04:00

151 B